Revert "bug/IVYPORTAL-18051-Portal-Dashboard-shows-no-permission-scre…

…en-when-dashboards-is-empty" This reverts commit 2d4c740.
axonivy-market · Dec 6, 2024 · 667cdfb · 667cdfb
1 parent a107ca6
commit 667cdfb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 345 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,6 +91,8 @@ 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.addDefaultDashboardsIfMissing(collectedDashboards);
+    DashboardUtils.addDefaultTaskCaseListDashboardsIfMissing(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.addDefaultDashboardsIfMissing(this.dashboards);
+      DashboardUtils.addDefaultTaskCaseListDashboardsIfMissing(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,16 +134,12 @@ public static List<Dashboard> getVisiblePublicDashboards() {
   public static List<Dashboard> getPublicDashboards() {
     String dashboardJson = Ivy.var().get(PortalVariable.DASHBOARD.key);
     List<Dashboard> visibleDashboards = jsonToDashboards(dashboardJson);
-    addDefaultDashboardsIfMissing(visibleDashboards);
+    addDefaultTaskCaseListDashboardsIfMissing(visibleDashboards);
     setDashboardAsPublic(visibleDashboards);
     return visibleDashboards;
   }
 
-  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());
-    }
+  public static void addDefaultTaskCaseListDashboardsIfMissing(List<Dashboard> dashboards) {
     if (!hasDashboardWithId(dashboards, DEFAULT_CASE_LIST_DASHBOARD)) {
       dashboards.add(0, DefaultDashboardUtils.getDefaultCaseListDashboard());
     }
@@ -202,7 +198,7 @@ public static List<Dashboard> collectDashboards() {
       }
     }
     collectedDashboards.addAll(idToDashboard.values());
-    addDefaultDashboardsIfMissing(collectedDashboards);
+    addDefaultTaskCaseListDashboardsIfMissing(collectedDashboards);
     return collectedDashboards;
   }