bug/IVYPORTAL-18051-Portal-Dashboard-shows-no-permission-screen-when-…

…dashboards-is-empty _ adapt logic _ import default dashboard
axonivy-market · Nov 28, 2024 · 2d4c740 · 2d4c740
1 parent fc1f4ca
commit 2d4c740
Show file tree

Hide file tree

Showing 5 changed files with 345 additions and 7 deletions.
diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java
@@ -91,8 +91,6 @@ public void buildPortalLeftMenu(ITask workingTask, boolean isWorkingOnATask) {
     mainMenuModel = new DefaultMenuModel();
     mainMenuModel.getElements().add(buildDashboardItem()); // menuIndex = 0
 
-
-
     List<SubMenuItem> subMenuItems = PortalMenuNavigator.callSubMenuItemsProcess();
     int menuIndex = 1;
     for (SubMenuItem subMenu : subMenuItems) {

diff --git a/...vyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardDetailModificationBean.java b/...vyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardDetailModificationBean.java
@@ -182,7 +182,7 @@ protected List<Dashboard> collectDashboards() {
     } catch (PortalException e) {
       Ivy.log().error(e);
     }
-    DashboardUtils.addDefaultTaskCaseListDashboardsIfMissing(collectedDashboards);
+    DashboardUtils.addDefaultDashboardsIfMissing(collectedDashboards);
     return collectedDashboards.stream()
         .filter(dashboard -> dashboard.getId().equals(selectedDashboardId)).collect(Collectors.toList());
   }

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardModificationBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardModificationBean.java
@@ -72,7 +72,7 @@ protected void collectDashboardsForManagement() {
     String dashboardInUserProperty = readDashboardBySessionUser();
     if (isPublicDashboard) {
       this.dashboards = DashboardUtils.getPublicDashboards();
-      DashboardUtils.addDefaultTaskCaseListDashboardsIfMissing(this.dashboards);
+      DashboardUtils.addDefaultDashboardsIfMissing(this.dashboards);
     } else if (StringUtils.isNoneEmpty(dashboardInUserProperty)) {
       List<Dashboard> myDashboards = getVisibleDashboards(dashboardInUserProperty);
       this.dashboards.addAll(myDashboards);

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardUtils.java
@@ -134,12 +134,16 @@ public static List<Dashboard> getVisiblePublicDashboards() {
   public static List<Dashboard> getPublicDashboards() {
     String dashboardJson = Ivy.var().get(PortalVariable.DASHBOARD.key);
     List<Dashboard> visibleDashboards = jsonToDashboards(dashboardJson);
-    addDefaultTaskCaseListDashboardsIfMissing(visibleDashboards);
+    addDefaultDashboardsIfMissing(visibleDashboards);
     setDashboardAsPublic(visibleDashboards);
     return visibleDashboards;
   }
 
-  public static void addDefaultTaskCaseListDashboardsIfMissing(List<Dashboard> dashboards) {
+  public static void addDefaultDashboardsIfMissing(List<Dashboard> dashboards) {
+    List<Dashboard> dashboardsWithoutItem = dashboards.stream().filter(dashboard -> !dashboard.getIsTopMenu()).toList();
+    if (dashboardsWithoutItem.size() == 0) {
+      dashboards.add(0,DefaultDashboardUtils.getDefaultDashboard());
+    }
     if (!hasDashboardWithId(dashboards, DEFAULT_CASE_LIST_DASHBOARD)) {
       dashboards.add(0, DefaultDashboardUtils.getDefaultCaseListDashboard());
     }
@@ -198,7 +202,7 @@ public static List<Dashboard> collectDashboards() {
       }
     }
     collectedDashboards.addAll(idToDashboard.values());
-    addDefaultTaskCaseListDashboardsIfMissing(collectedDashboards);
+    addDefaultDashboardsIfMissing(collectedDashboards);
     return collectedDashboards;
   }