improved menu for simulations, tags and audit log viewer

Evolveum · Jan 17, 2023 · 2423e87 · 2423e87
1 parent 3003315
commit 2423e87
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
@@ -280,7 +280,9 @@ public class GuiStyleConstants {
 
     public static final String CLASS_ICON_HISTORY = "fa fa-history";
 
-    public static final String CLASS_SIMULATION_RESULT = CLASS_CIRCLE_FULL;
+    public static final String CLASS_TODO_FIXME_NOT_YET_DEFINED = "fas fa-question-circle text-fuchsia";
 
-    public static final String CLASS_TAG = CLASS_CIRCLE_FULL;
+    public static final String CLASS_SIMULATION_RESULT = CLASS_TODO_FIXME_NOT_YET_DEFINED;
+
+    public static final String CLASS_TAG = CLASS_TODO_FIXME_NOT_YET_DEFINED;
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
@@ -16,9 +16,6 @@
 import com.evolveum.midpoint.gui.impl.page.admin.simulation.PageSimulationResult;
 import com.evolveum.midpoint.gui.impl.page.admin.simulation.PageSimulationResults;
 
-import com.evolveum.midpoint.gui.impl.page.admin.simulation.PageTag;
-import com.evolveum.midpoint.gui.impl.page.admin.simulation.PageTags;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -317,6 +314,8 @@ private SideBarMenuItem createMainNavigationMenu(boolean experimentalFeaturesEna
         menu.addMainMenuItem(createNodesItems());
         menu.addMainMenuItem(createReportsItems());
         menu.addMainMenuItem(createSimulationItems());
+        menu.addMainMenuItem(createAuditItems());
+
         return menu;
     }
 
@@ -484,29 +483,32 @@ private MainMenuItem createReportsItems() {
         MainMenuItem reportMenu = createMainMenuItem("PageAdmin.menu.top.reports", GuiStyleConstants.CLASS_REPORT_ICON);
         createBasicAssignmentHolderMenuItems(reportMenu, PageTypes.REPORT);
         reportMenu.addMenuItem(new MenuItem("PageAdmin.menu.top.reports.created", PageCreatedReports.class));
-        reportMenu.addMenuItem(new MenuItem("PageAuditLogViewer.menuName", PageAuditLogViewer.class));
         return reportMenu;
     }
 
+    private MainMenuItem createAuditItems() {
+        return createMainMenuItem("PageAuditLogViewer.menuName", GuiStyleConstants.CLASS_TODO_FIXME_NOT_YET_DEFINED, PageAuditLogViewer.class);
+    }
+
     private MainMenuItem createSimulationItems() {
-        MainMenuItem simulation = createMainMenuItem("PageAdmin.menu.top.simulations", GuiStyleConstants.CLASS_SIMULATION_RESULT);
-        simulation.addMenuItem(new MenuItem("PageAdmin.menu.top.simulationResults", PageSimulationResults.class));
+        MainMenuItem menu = createMainMenuItem("PageAdmin.menu.top.simulationResults", GuiStyleConstants.CLASS_SIMULATION_RESULT);
+        menu.addMenuItem(new MenuItem("PageAdmin.menu.top.simulationResults.list", PageSimulationResults.class));
 
         boolean editActive = classMatches(PageSimulationResult.class);
         if (editActive) {
-            MenuItem edit = new MenuItem("PageAdmin.menu.top.simulationResult", PageSimulationResult.class);
+            MenuItem edit = new MenuItem("PageAdmin.menu.top.simulationResults.view", PageSimulationResult.class);
             edit.setDynamic(true);
-            simulation.addMenuItem(edit);
+            menu.addMenuItem(edit);
         }
 
-        simulation.addMenuItem(new MenuItem("PageAdmin.menu.top.tags", PageTags.class));
-        if (classMatches(PageTags.class)) {
-            MenuItem edit = new MenuItem("PageAdmin.menu.top.tag", PageTag.class);
-            edit.setDynamic(true);
-            simulation.addMenuItem(edit);
-        }
+        return menu;
+    }
 
-        return simulation;
+    private MainMenuItem createTagItems() {
+        MainMenuItem menu = createMainMenuItem("PageAdmin.menu.top.tags", GuiStyleConstants.CLASS_TAG);
+        createBasicAssignmentHolderMenuItems(menu, PageTypes.TAG);
+
+        return menu;
     }
 
     private SideBarMenuItem createConfigurationMenu(boolean experimentalFeaturesEnabled) {
@@ -515,6 +517,7 @@ private SideBarMenuItem createConfigurationMenu(boolean experimentalFeaturesEnab
         item.addMainMenuItem(createMessageTemplatesItems());
         item.addMainMenuItem(createObjectsCollectionItems());
         item.addMainMenuItem(createObjectTemplatesItems());
+        item.addMainMenuItem(createTagItems());
         item.addMainMenuItem(createMainMenuItem("PageAdmin.menu.top.configuration.bulkActions", "fa fa-bullseye", PageBulkAction.class));
         item.addMainMenuItem(createMainMenuItem("PageAdmin.menu.top.configuration.importObject", "fa fa-upload", PageImportObject.class));
         item.addMainMenuItem(createRepositoryObjectsMenu());

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/PageTypes.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/PageTypes.java
@@ -22,6 +22,8 @@
 import com.evolveum.midpoint.gui.impl.page.admin.service.PageService;
 import com.evolveum.midpoint.gui.impl.page.admin.simulation.PageSimulationResult;
 import com.evolveum.midpoint.gui.impl.page.admin.simulation.PageSimulationResults;
+import com.evolveum.midpoint.gui.impl.page.admin.simulation.PageTag;
+import com.evolveum.midpoint.gui.impl.page.admin.simulation.PageTags;
 import com.evolveum.midpoint.gui.impl.page.admin.task.PageTask;
 import com.evolveum.midpoint.gui.impl.page.admin.user.PageUser;
 import com.evolveum.midpoint.util.QNameUtil;
@@ -54,7 +56,8 @@ public enum PageTypes {
     OBJECT_COLLECTION("objectCollections", GuiStyleConstants.CLASS_OBJECT_COLLECTION_ICON, PageObjectCollections.class, PageObjectCollection.class, ObjectCollectionType.COMPLEX_TYPE),
     OBJECT_TEMPLATE("objectTemplates", GuiStyleConstants.CLASS_OBJECT_TEMPLATE_ICON, PageObjectTemplates.class, PageObjectTemplate.class, ObjectTemplateType.COMPLEX_TYPE),
     REPORT("reports", GuiStyleConstants.CLASS_REPORT_ICON, PageReports.class, PageReport.class, ReportType.COMPLEX_TYPE),
-    SIMULATION_RESULT("simulationResults", GuiStyleConstants.CLASS_SIMULATION_RESULT, PageSimulationResults.class, PageSimulationResult.class, SimulationResultType.COMPLEX_TYPE);
+    SIMULATION_RESULT("simulationResults", GuiStyleConstants.CLASS_SIMULATION_RESULT, PageSimulationResults.class, PageSimulationResult.class, SimulationResultType.COMPLEX_TYPE),
+    TAG("tags", GuiStyleConstants.CLASS_TAG, PageTags.class, PageTag.class, TagType.COMPLEX_TYPE);
 
     private String identifier;
     private String icon;