Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Feb 28, 2022 · 246d789 · 246d789
2 parents 426a3de + 54a9533
commit 246d789
Show file tree

Hide file tree

Showing 96 changed files with 5,477 additions and 920 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
@@ -455,7 +455,7 @@ private void addPanelTypeConfiguration(Class<?> clazz, ContainerPanelConfigurati
                 config.setType(def.getTypeName());
             }
         }
-        createDefaultVirtualContainer(config, panelType.defaultContainerPath(), false);
+        createDefaultVirtualContainer(config, panelType.defaultContainerPath(), null);
 
         if (panelType.experimental() && BooleanUtils.isNotTrue(experimentalFeaturesEnabled)) {
             config.setVisibility(UserInterfaceElementVisibilityType.HIDDEN);

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/PageSystemConfiguration.java b/...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/PageSystemConfiguration.java
@@ -7,15 +7,6 @@
 
 package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
 import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
 import com.evolveum.midpoint.authentication.api.authorization.Url;
@@ -31,10 +22,18 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.CompositedIconButtonDto;
 import com.evolveum.midpoint.web.component.MultiCompositedButtonPanel;
-import com.evolveum.midpoint.web.page.admin.configuration.PageInternals;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.DisplayType;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * @author lazyman
  * @author skublik
@@ -68,10 +67,6 @@ public PageSystemConfiguration() {
     private void initLayout() {
         IModel<List<CompositedIconButtonDto>> model = Model.ofList(Arrays.asList(
                 createCompositedButton("fa fa-wrench", PageSystemBasic.class),
-//                createCompositedButton("Object policies", "fa  fa-umbrella", PageObjectPoliciesConfiguration.class)
-//                createCompositedButton("Global policy rule", "fa fa-eye", PageGlobalPolicyRule.class)
-//                createCompositedButton("Global projection policy", "fa fa-globe", PageGlobalProjectionPolicy.class)
-//                createCompositedButton("Cleanup policy", "fa  fa-eraser", PageCleanupPolicy.class)
                 createCompositedButton("fa fa-camera", PageSystemPolicies.class),
                 createCompositedButton("fa fa-envelope", PageSystemNotification.class),
                 createCompositedButton("fa fa-file-text", PageSystemLogging.class),

diff --git a/...olveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageAccessCertification.java b/...olveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageAccessCertification.java
@@ -49,18 +49,4 @@ public PageAccessCertification(PrismObject<SystemConfigurationType> object) {
     public Class<? extends Containerable> getDetailsType() {
         return AccessCertificationConfigurationType.class;
     }
-
-//    @Override
-//    protected List<ITab> createTabs() {
-//        List<ITab> tabs = new ArrayList<>();
-//        tabs.add(new PanelTab(createStringResource("pageSystemConfiguration.accessCertification.title")) {
-//
-//            @Override
-//            public WebMarkupContainer createPanel(String panelId) {
-//                return createContainerPanel(panelId, getObjectModel(), SystemConfigurationType.F_ACCESS_CERTIFICATION, AccessCertificationConfigurationType.COMPLEX_TYPE);
-//            }
-//
-//        });
-//        return tabs;
-//    }
 }
diff --git a/...um/midpoint/gui/impl/page/admin/systemconfiguration/page/PageBaseSystemConfiguration.java b/...um/midpoint/gui/impl/page/admin/systemconfiguration/page/PageBaseSystemConfiguration.java
@@ -6,17 +6,11 @@
  */
 package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.page;
 
-import javax.xml.namespace.QName;
-
-import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
-
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel;
 import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.PageAssignmentHolderDetails;
 import com.evolveum.midpoint.gui.impl.util.GuiImplUtil;
+import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -26,6 +20,11 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
 
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import javax.xml.namespace.QName;
 import java.util.Arrays;
 import java.util.List;
 
@@ -58,7 +57,7 @@ protected Panel createSummaryPanel(String id, IModel<SystemConfigurationType> mo
 
             @Override
             protected String getDefaultIconCssClass() {
-                return null;
+                return getSummaryIconCssClass();
             }
 
             @Override
@@ -70,9 +69,22 @@ protected String getIconBoxAdditionalCssClass() {
             protected String getBoxAdditionalCssClass() {
                 return null;
             }
+
+            @Override
+            protected IModel<String> getDisplayNameModel() {
+                return getPageTitleModel();
+            }
         };
     }
 
+    protected String getSummaryIconCssClass() {
+        return GuiStyleConstants.CLASS_SYSTEM_CONFIGURATION_ICON;
+    }
+
+    protected IModel<String> getSummaryDisplayNameModel() {
+        return getPageTitleModel();
+    }
+
     @Override
     protected String getObjectOidParameter() {
         return SystemObjectsType.SYSTEM_CONFIGURATION.value();
@@ -87,7 +99,7 @@ protected GuiObjectDetailsPageType loadDetailsPageConfiguration(PrismObject<Syst
                 CompiledGuiProfile profile = getModelServiceLocator().getCompiledGuiProfile();
                 try {
                     GuiObjectDetailsPageType defaultPageConfig = null;
-                    for (Class<?extends Containerable> clazz : getAllDetailsTypes()) {
+                    for (Class<? extends Containerable> clazz : getAllDetailsTypes()) {
                         QName type = GuiImplUtil.getContainerableTypeName(clazz);
                         if (defaultPageConfig == null) {
                             defaultPageConfig = profile.findObjectDetailsConfiguration(type);

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageRoleManagement.java b/...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageRoleManagement.java
@@ -6,19 +6,18 @@
  */
 package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.page;
 
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
 import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
 import com.evolveum.midpoint.authentication.api.authorization.Url;
 import com.evolveum.midpoint.authentication.api.util.AuthConstants;
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AdminGuiConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleManagementConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
 
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
 @PageDescriptor(
         urls = {
                 @Url(mountUrl = "/admin/config/system/roleManagement"),
@@ -51,18 +50,4 @@ public Class<? extends Containerable> getDetailsType() {
         return RoleManagementConfigurationType.class;
     }
 
-//    @Override
-//    protected List<ITab> createTabs() {
-//        List<ITab> tabs = new ArrayList<>();
-//        tabs.add(new AbstractTab(createStringResource("pageSystemConfiguration.roleManagement.title")) {
-//
-//            private static final long serialVersionUID = 1L;
-//
-//            @Override
-//            public WebMarkupContainer getPanel(String panelId) {
-//                return createContainerPanel(panelId, getObjectModel(), SystemConfigurationType.F_ROLE_MANAGEMENT, RoleManagementConfigurationType.COMPLEX_TYPE);
-//            }
-//        });
-//        return tabs;
-//    }
 }
diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageSystemAdminGui.java b/...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageSystemAdminGui.java
@@ -7,16 +7,15 @@
 
 package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.page;
 
+import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
+import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
+import com.evolveum.midpoint.authentication.api.authorization.Url;
 import com.evolveum.midpoint.authentication.api.util.AuthConstants;
-
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.PrismObject;
-
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
-import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
-import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
-import com.evolveum.midpoint.authentication.api.authorization.Url;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AdminGuiConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
 
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
@@ -51,69 +50,4 @@ public PageSystemAdminGui(PrismObject<SystemConfigurationType> object) {
     public Class<? extends Containerable> getDetailsType() {
         return AdminGuiConfigurationType.class;
     }
-
-    //    @Override
-//    protected List<ITab> createTabs() {
-//        List<ITab> tabs = new ArrayList<>();
-//
-//        PrismContainerWrapperModel<SystemConfigurationType, AdminGuiConfigurationType> adminGuiModel = PrismContainerWrapperModel.fromContainerWrapper(getObjectModel(), SystemConfigurationType.F_ADMIN_GUI_CONFIGURATION);
-//
-//        tabs.add(new AbstractTab(createStringResource("User dashboard links details")) {
-//
-//            private static final long serialVersionUID = 1L;
-//
-//            @Override
-//            public WebMarkupContainer getPanel(String panelId) {
-//                return createContainerPanel(panelId, adminGuiModel, AdminGuiConfigurationType.F_USER_DASHBOARD_LINK, RichHyperlinkType.COMPLEX_TYPE);
-//            }
-//        });
-//
-//        tabs.add(new AbstractTab(createStringResource("Object collection views")) {
-//
-//            private static final long serialVersionUID = 1L;
-//
-//            @Override
-//            public WebMarkupContainer getPanel(String panelId) {
-////                return new AdminGuiObjectCollectionViewsPanel(panelId,
-////                        PrismContainerWrapperModel.fromContainerWrapper(getObjectModel(), ItemPath.create(SystemConfigurationType.F_ADMIN_GUI_CONFIGURATION, AdminGuiConfigurationType.F_OBJECT_COLLECTION_VIEWS, GuiObjectListViewsType.F_OBJECT_COLLECTION_VIEW)));
-//                return createContainerPanel(panelId, adminGuiModel, AdminGuiConfigurationType.F_OBJECT_COLLECTION_VIEWS, GuiObjectListViewsType.COMPLEX_TYPE);
-//            }
-//        });
-//
-//        tabs.add(new AbstractTab(createStringResource("Object details")) {
-//
-//            private static final long serialVersionUID = 1L;
-//
-//            @Override
-//            public WebMarkupContainer getPanel(String panelId) {
-//                return createContainerPanel(panelId, adminGuiModel, AdminGuiConfigurationType.F_OBJECT_DETAILS, GuiObjectDetailsSetType.COMPLEX_TYPE);
-//            }
-//        });
-//
-//
-//        tabs.add(new AbstractTab(createStringResource("Additional menu link")) {
-//
-//            private static final long serialVersionUID = 1L;
-//
-//            @Override
-//            public WebMarkupContainer getPanel(String panelId) {
-//                return createContainerPanel(panelId, adminGuiModel, AdminGuiConfigurationType.F_ADDITIONAL_MENU_LINK, RichHyperlinkType.COMPLEX_TYPE);
-//            }
-//        });
-//
-//        tabs.add(new AbstractTab(createStringResource("Configurable user dashboard")) {
-//
-//            private static final long serialVersionUID = 1L;
-//
-//            @Override
-//            public WebMarkupContainer getPanel(String panelId) {
-//                return createContainerPanel(panelId, adminGuiModel, AdminGuiConfigurationType.F_CONFIGURABLE_USER_DASHBOARD, ConfigurableUserDashboardType.COMPLEX_TYPE);
-//            }
-//        });
-//
-//
-//        return tabs;
-//    }
-
-
 }
diff --git a/...a/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageSystemBasic.java b/...a/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageSystemBasic.java
@@ -8,10 +8,14 @@
 
 import com.evolveum.midpoint.authentication.api.util.AuthConstants;
 
+import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
 import com.evolveum.midpoint.authentication.api.authorization.Url;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 @PageDescriptor(
         urls = {
@@ -27,19 +31,16 @@
         })
 public class PageSystemBasic extends PageBaseSystemConfiguration {
 
+    private static final long serialVersionUID = 1L;
+
+    public PageSystemBasic() {
+    }
+
+    public PageSystemBasic(PageParameters parameters) {
+        super(parameters);
+    }
 
-//    @Override
-//    protected List<ITab> createTabs() {
-//        List<ITab> tabs = new ArrayList<>();
-//        tabs.add(new PanelTab(createStringResource("pageSystemConfiguration.system.title")) {
-//
-//            private static final long serialVersionUID = 1L;
-//
-//            @Override
-//            public WebMarkupContainer createPanel(String panelId) {
-//                return new SystemConfigPanel(panelId, getObjectModel());
-//            }
-//        });
-//        return tabs;
-//    }
+    public PageSystemBasic(PrismObject<SystemConfigurationType> object) {
+        super(object);
+    }
 }
diff --git a/...volveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageSystemNotification.java b/...volveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageSystemNotification.java
@@ -17,6 +17,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.NotificationConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
 
+import org.apache.wicket.model.IModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import java.util.Arrays;

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageSystemWorkflow.java b/...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/page/PageSystemWorkflow.java
@@ -50,18 +50,4 @@ public Class<? extends Containerable> getDetailsType() {
         return WfConfigurationType.class;
     }
 
-//    @Override
-//    protected List<ITab> createTabs() {
-//        List<ITab> tabs = new ArrayList<>();
-//        tabs.add(new AbstractTab(createStringResource("pageSystemConfiguration.workflow.title")) {
-//
-//            private static final long serialVersionUID = 1L;
-//
-//            @Override
-//            public WebMarkupContainer getPanel(String panelId) {
-//                return createContainerPanel(panelId, getObjectModel(), SystemConfigurationType.F_WORKFLOW_CONFIGURATION, WfConfigurationType.COMPLEX_TYPE);
-//            }
-//        });
-//        return tabs;
-//    }
 }