MID-7442 more small improvements and fixes for system config ui

Evolveum · Feb 28, 2022 · 541aafb · 541aafb
1 parent 5ec7c7d
commit 541aafb
Show file tree

Hide file tree

Showing 15 changed files with 93 additions and 3 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
@@ -417,7 +417,16 @@ private ContainerPanelConfigurationType compileContainerPanelConfiguration(Class
             config.setApplicableForOperation(panelInstance.applicableForOperation()[0]);
         }
 
-        createDefaultVirtualContainer(config, panelInstance.containerPath(), panelInstance.expanded());
+         createDefaultVirtualContainer(config, panelInstance.containerPath(), panelInstance.expanded());
+        if (panelInstance.hiddenContainers().length > 0) {
+            for (String path : panelInstance.hiddenContainers()) {
+                VirtualContainersSpecificationType c = new VirtualContainersSpecificationType();
+                c.setVisibility(UserInterfaceElementVisibilityType.HIDDEN);
+                ItemPathType itemPath = prismContext.itemPathParser().asItemPathType(path);
+                c.setPath(itemPath);
+                config.getContainer().add(c);
+            }
+        }
 
         if (StringUtils.isNotEmpty(panelInstance.type())) {
             config.setType(QNameUtil.uriToQName(panelInstance.type(), SchemaConstantsGenerated.NS_COMMON));

diff --git a/...java/com/evolveum/midpoint/gui/impl/page/admin/component/GenericSingleContainerPanel.java b/...java/com/evolveum/midpoint/gui/impl/page/admin/component/GenericSingleContainerPanel.java
@@ -66,7 +66,14 @@
         ),
         containerPath = "adminGuiConfiguration",
         type = "AdminGuiConfigurationType",
-        expanded = true
+        expanded = true,
+        hiddenContainers = {
+                "adminGuiConfiguration/additionalMenuLink",
+                "adminGuiConfiguration/userDashboardLink",
+                "adminGuiConfiguration/objectCollectionViews",
+                "adminGuiConfiguration/objectDetails",
+                "adminGuiConfiguration/configurableUserDashboard"
+        }
 )
 @PanelInstance(
         identifier = "wfConfigurationPanel",

diff --git a/...int/gui/impl/page/admin/systemconfiguration/component/AdditionalMenuLinkContentPanel.java b/...int/gui/impl/page/admin/systemconfiguration/component/AdditionalMenuLinkContentPanel.java
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -59,4 +60,9 @@ public AdditionalMenuLinkContentPanel(String id, AssignmentHolderDetailsModel mo
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/.../impl/page/admin/systemconfiguration/component/ConfigurableUserDashboardContentPanel.java b/.../impl/page/admin/systemconfiguration/component/ConfigurableUserDashboardContentPanel.java
@@ -10,6 +10,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.markup.html.list.ListItem;
@@ -107,4 +109,9 @@ protected MultivalueContainerDetailsPanel<ConfigurableUserDashboardType> getMult
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/...dpoint/gui/impl/page/admin/systemconfiguration/component/CustomTransportContentPanel.java b/...dpoint/gui/impl/page/admin/systemconfiguration/component/CustomTransportContentPanel.java
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
@@ -104,4 +105,9 @@ protected MultivalueContainerDetailsPanel<CustomTransportConfigurationType> getM
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/.../midpoint/gui/impl/page/admin/systemconfiguration/component/EventHandlerContentPanel.java b/.../midpoint/gui/impl/page/admin/systemconfiguration/component/EventHandlerContentPanel.java
@@ -10,6 +10,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -102,4 +103,9 @@ protected MultivalueContainerDetailsPanel<EventHandlerType> getMultivalueContain
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/...midpoint/gui/impl/page/admin/systemconfiguration/component/FileTransportContentPanel.java b/...midpoint/gui/impl/page/admin/systemconfiguration/component/FileTransportContentPanel.java
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
@@ -104,4 +105,9 @@ protected MultivalueContainerDetailsPanel<FileTransportConfigurationType> getMul
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/...point/gui/impl/page/admin/systemconfiguration/component/GuiObjectDetailsContentPanel.java b/...point/gui/impl/page/admin/systemconfiguration/component/GuiObjectDetailsContentPanel.java
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -104,4 +105,9 @@ protected MultivalueContainerDetailsPanel<GuiObjectDetailsPageType> getMultivalu
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/...midpoint/gui/impl/page/admin/systemconfiguration/component/MailTransportContentPanel.java b/...midpoint/gui/impl/page/admin/systemconfiguration/component/MailTransportContentPanel.java
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -101,4 +102,9 @@ protected MultivalueContainerDetailsPanel<MailTransportConfigurationType> getMul
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/.../gui/impl/page/admin/systemconfiguration/component/ObjectCollectionViewsContentPanel.java b/.../gui/impl/page/admin/systemconfiguration/component/ObjectCollectionViewsContentPanel.java
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -105,4 +106,9 @@ protected MultivalueContainerDetailsPanel<GuiObjectListViewType> getMultivalueCo
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/...eum/midpoint/gui/impl/page/admin/systemconfiguration/component/RelationsContentPanel.java b/...eum/midpoint/gui/impl/page/admin/systemconfiguration/component/RelationsContentPanel.java
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -103,4 +104,9 @@ protected MultivalueContainerDetailsPanel<RelationDefinitionType> getMultivalueC
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/...oint/gui/impl/page/admin/systemconfiguration/component/RichHyperlinkListContentPanel.java b/...oint/gui/impl/page/admin/systemconfiguration/component/RichHyperlinkListContentPanel.java
@@ -56,7 +56,10 @@ AbstractItemWrapperColumn.ColumnType.LINK, getPageBase()) {
                     protected void onClick(AjaxRequestTarget target, IModel<PrismContainerValueWrapper<RichHyperlinkType>> model) {
                         RichHyperlinkListContentPanel.this.itemDetailsPerformed(target, model);
                     }
-                }
+                },
+                new PrismPropertyWrapperColumn<>(getContainerModel(), RichHyperlinkType.F_TARGET_URL, AbstractItemWrapperColumn.ColumnType.STRING, getPageBase()),
+                new PrismPropertyWrapperColumn<>(getContainerModel(), RichHyperlinkType.F_ICON, AbstractItemWrapperColumn.ColumnType.STRING, getPageBase()),
+                new PrismPropertyWrapperColumn<>(getContainerModel(), RichHyperlinkType.F_COLOR, AbstractItemWrapperColumn.ColumnType.STRING, getPageBase())
         );
     }
 

diff --git a/.../midpoint/gui/impl/page/admin/systemconfiguration/component/SmsTransportContentPanel.java b/.../midpoint/gui/impl/page/admin/systemconfiguration/component/SmsTransportContentPanel.java
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
@@ -104,4 +105,9 @@ protected MultivalueContainerDetailsPanel<SmsTransportConfigurationType> getMult
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/...oint/gui/impl/page/admin/systemconfiguration/component/UserDashboardLinkContentPanel.java b/...oint/gui/impl/page/admin/systemconfiguration/component/UserDashboardLinkContentPanel.java
@@ -14,11 +14,14 @@
 import com.evolveum.midpoint.web.application.PanelDisplay;
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AdminGuiConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
 
+import java.util.List;
+
 /**
  * Created by Viliam Repan (lazyman).
  */
@@ -45,4 +48,9 @@ public UserDashboardLinkContentPanel(String id, AssignmentHolderDetailsModel mod
     protected UserProfileStorage.TableId getTableId() {
         return UserProfileStorage.TableId.PAGE_MESSAGE_TEMPLATE_LOCALIZED_CONTENT_PANEL;    // todo fix
     }
+
+    @Override
+    protected List<InlineMenuItem> createInlineMenu() {
+        return getDefaultMenuActions();
+    }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/PanelInstance.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/PanelInstance.java
@@ -66,6 +66,8 @@
 
     String containerPath() default "";
 
+    String[] hiddenContainers() default {};
+
     String type() default "";
 
     boolean expanded() default false;