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

Evolveum · Feb 22, 2022 · b298720 · b298720
2 parents f1fd94c + 37b8b51
commit b298720
Show file tree

Hide file tree

Showing 168 changed files with 5,069 additions and 1,482 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
@@ -14,6 +14,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -29,6 +30,7 @@
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.polystring.PolyString;
+import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
 import com.evolveum.midpoint.util.ClassPathUtil;
@@ -415,6 +417,13 @@ private ContainerPanelConfigurationType compileContainerPanelConfiguration(Class
             config.setApplicableForOperation(panelInstance.applicableForOperation()[0]);
         }
 
+        if (StringUtils.isNotEmpty(panelInstance.containerPath())) {
+            config.setPath(prismContext.itemPathParser().asItemPathType(panelInstance.containerPath()));
+        }
+        if (StringUtils.isNotEmpty(panelInstance.type())) {
+            config.setType(QNameUtil.uriToQName(panelInstance.type(), SchemaConstantsGenerated.NS_COMMON));
+        }
+
         return config;
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/MessagePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/MessagePanel.java
@@ -6,31 +6,41 @@
  */
 package com.evolveum.midpoint.gui.api.component.result;
 
-import java.io.Serializable;
-
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 
 public class MessagePanel extends BasePanel<String> {
 
     private static final String ID_MESSAGE = "message";
 
+    private static final String ID_DETAILS_BOX = "detailsBox";
+
+    private static final String ID_ICON_TYPE = "iconType";
+
+    private static final String ID_CLOSE = "close";
+
     public enum MessagePanelType {INFO, WARN, SUCCESS, ERROR}
 
     private MessagePanelType type;
 
+    private boolean closeVisible;
+
     public MessagePanel(String id, MessagePanelType type, IModel<String> model) {
+        this(id, type, model, true);
+    }
+
+    public MessagePanel(String id, MessagePanelType type, IModel<String> model, boolean closeVisible) {
         super(id, model);
-        this.type = type;
 
+        this.type = type;
+        this.closeVisible = closeVisible;
     }
 
     @Override
@@ -40,38 +50,34 @@ protected void onInitialize() {
     }
 
     public void initLayout() {
-
-        WebMarkupContainer detailsBox = new WebMarkupContainer("detailsBox");
+        WebMarkupContainer detailsBox = new WebMarkupContainer(ID_DETAILS_BOX);
         detailsBox.setOutputMarkupId(true);
         detailsBox.add(AttributeModifier.append("class", createHeaderCss()));
         add(detailsBox);
 
         initHeader(detailsBox);
-
     }
 
     private IModel<String> createHeaderCss() {
-
-        return (IModel<String>) () -> {
+        return () -> {
             switch (type) {
                 case INFO:
                     return " box-info";
                 case SUCCESS:
                     return " box-success";
                 case ERROR:
                     return " box-danger";
-                case WARN: // TODO:
+                case WARN:
                 default:
                     return " box-warning";
-                }
-            };
+            }
+        };
     }
 
     private void initHeader(WebMarkupContainer box) {
-        WebMarkupContainer iconType = new WebMarkupContainer("iconType");
+        WebMarkupContainer iconType = new WebMarkupContainer(ID_ICON_TYPE);
         iconType.setOutputMarkupId(true);
-        iconType.add(new AttributeAppender("class", (IModel) () -> {
-
+        iconType.add(AttributeAppender.append("class", () -> {
             switch (type) {
                 case INFO:
                     return " fa-info";
@@ -82,29 +88,29 @@ private void initHeader(WebMarkupContainer box) {
                 case WARN:
                 default:
                     return " fa-warning";
-                }
-            }));
+            }
+        }));
 
         box.add(iconType);
 
-        Label message =  new Label(ID_MESSAGE, getModel());
+        Label message = new Label(ID_MESSAGE, getModel());
         box.add(message);
 
-        AjaxLink<Void> close = new AjaxLink<Void>("close") {
+        AjaxLink<Void> close = new AjaxLink<>(ID_CLOSE) {
 
             private static final long serialVersionUID = 1L;
 
             @Override
             public void onClick(AjaxRequestTarget target) {
                 close(target);
-
             }
         };
+        close.setVisible(closeVisible);
 
         box.add(close);
     }
 
-    public void close(AjaxRequestTarget target){
+    public void close(AjaxRequestTarget target) {
         this.setVisible(false);
         target.add(this);
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -204,7 +204,7 @@
 import com.evolveum.midpoint.web.util.ObjectTypeGuiDescriptor;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.schema.util.cases.ApprovalUtils;
-import com.evolveum.midpoint.wf.util.ChangesByState;
+import com.evolveum.midpoint.wf.api.ChangesByState;
 import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.query_3.QueryType;

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
@@ -8,6 +8,7 @@
 
 import java.util.*;
 
+import com.evolveum.midpoint.gui.api.component.result.MessagePanel;
 import com.evolveum.midpoint.gui.api.prism.ItemStatus;
 import com.evolveum.midpoint.gui.impl.component.menu.DetailsNavigationPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.component.OperationalButtonsPanel;
@@ -24,10 +25,14 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.string.StringValue;
@@ -345,7 +350,7 @@ private ContainerPanelConfigurationType findDefaultConfiguration() {
                 .stream()
                 .filter(config -> isApplicableForOperation(config) && WebComponentUtil.getElementVisibility(config.getVisibility()))
                 .findFirst()
-                .get();
+                .orElseGet(() -> null);
     }
 
     private ContainerPanelConfigurationType findDefaultConfiguration(List<ContainerPanelConfigurationType> configs) {
@@ -382,6 +387,15 @@ private boolean isApplicableForOperation(ContainerPanelConfigurationType configu
     }
 
     private void initMainPanel(ContainerPanelConfigurationType panelConfig, MidpointForm form) {
+        if (panelConfig == null) {
+//            form.addOrReplace(new Label(ID_MAIN_PANEL, Model.of("No panels defined"))); // todo - create nicer panel
+            WebMarkupContainer panel = new MessagePanel(ID_MAIN_PANEL, MessagePanel.MessagePanelType.WARN, createStringResource("AbstractPageObjectDetails.noPanels"), false);
+            panel.add(AttributeAppender.append("style", "margin-top: 20px;"));
+
+            form.addOrReplace(panel);
+            return;
+        }
+
         getSessionStorage().setObjectDetailsStorage("details" + getType().getSimpleName(), panelConfig);
         String panelType = panelConfig.getPanelType();
         if (panelType == null) {

diff --git a/.../com/evolveum/midpoint/gui/impl/page/admin/cases/component/OperationRequestCasePanel.java b/.../com/evolveum/midpoint/gui/impl/page/admin/cases/component/OperationRequestCasePanel.java
@@ -20,7 +20,7 @@
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.prism.show.SceneDto;
 import com.evolveum.midpoint.web.component.prism.show.ScenePanel;
-import com.evolveum.midpoint.wf.util.ChangesByState;
+import com.evolveum.midpoint.wf.api.ChangesByState;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseType;
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/PageSystemConfiguration.java b/...om/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/PageSystemConfiguration.java
@@ -67,22 +67,20 @@ public PageSystemConfiguration() {
 
     private void initLayout() {
         IModel<List<CompositedIconButtonDto>> model = Model.ofList(Arrays.asList(
-                createCompositedButton("Basic", "fa fa-wrench", PageSystemBasic.class),
+                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("Notifications", "fa fa-envelope", PageSystemNotification.class),
-                createCompositedButton("Logging", "fa fa-file-text", PageSystemLogging.class),
-//                createCompositedButton("Profiling", "fa fa-camera", PageProfiling.class)
-                createCompositedButton("Admin GUI configuration", "fa fa-camera", PageSystemAdminGui.class),
-                createCompositedButton("Workflow configuration", "fa fa-camera", PageSystemWorkflow.class),
-                createCompositedButton("Role management", "fa fa-camera", PageRoleManagement.class),
-                createCompositedButton("Internals", "fa fa-camera", PageInternals.class),
-//                createCompositedButton("Deployment information", "fa fa-camera", PageDeploymentInformation.class)
-                createCompositedButton("Access certification", "fa fa-camera", PageAccessCertification.class)
-//                createCompositedButton("Infrastructure", "fa fa-camera", PageInfrastructure.class)
-//                createCompositedButton("Full text configuration", "fa fa-camera", PageFullTextSearch.class)
+                createCompositedButton("fa fa-camera", PageSystemPolicies.class),
+                createCompositedButton("fa fa-envelope", PageSystemNotification.class),
+                createCompositedButton("fa fa-file-text", PageSystemLogging.class),
+                createCompositedButton("fa fa-camera", PageProfiling.class),
+                createCompositedButton("fa fa-camera", PageSystemAdminGui.class),
+                createCompositedButton("fa fa-camera", PageSystemWorkflow.class),
+                createCompositedButton("fa fa-camera", PageRoleManagement.class),
+                createCompositedButton("fa fa-camera", PageSystemInternals.class),
+                createCompositedButton("fa fa-camera", PageAccessCertification.class)
         ));
 
         MultiCompositedButtonPanel panel = new MultiCompositedButtonPanel(ID_CONTAINER, model) {
@@ -96,14 +94,16 @@ protected void buttonClickPerformed(AjaxRequestTarget target, AssignmentObjectRe
         add(panel);
     }
 
-    private CompositedIconButtonDto createCompositedButton(String type, String icon, Class<? extends WebPage> page) {
+    private CompositedIconButtonDto createCompositedButton(String icon, Class<? extends WebPage> page) {
+        String title = page.getSimpleName() + ".title";
+
         CompositedIconButtonDto button = new CompositedIconButtonDto();
         CompositedIconBuilder builder = new CompositedIconBuilder();
-        builder.setTitle(type);
+        builder.setTitle(title);
         builder.setBasicIcon(icon, IconCssStyle.IN_ROW_STYLE);
         button.setCompositedIcon(builder.build());
         DisplayType displayType = new DisplayType();
-        displayType.setLabel(new PolyStringType(type));
+        displayType.setLabel(new PolyStringType(title));
         button.setAdditionalButtonDisplayType(displayType);
         button.setPage(page);
 

diff --git a/...nt/gui/impl/page/admin/systemconfiguration/component/AccessCertificationContentPanel.html b/...nt/gui/impl/page/admin/systemconfiguration/component/AccessCertificationContentPanel.html
@@ -0,0 +1,18 @@
+<!--
+  ~ Copyright (c) 2022 Evolveum and contributors
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+<html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:panel>
+    <div class="row">
+        <div class="col-md-12">
+            <div wicket:id="mainPanel" />
+        </div>
+    </div>
+</wicket:panel>
+</body>
+</html>
diff --git a/...nt/gui/impl/page/admin/systemconfiguration/component/AccessCertificationContentPanel.java b/...nt/gui/impl/page/admin/systemconfiguration/component/AccessCertificationContentPanel.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2022 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.component;
+
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel;
+import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel;
+import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel;
+import com.evolveum.midpoint.prism.path.ItemPath;
+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.model.PrismContainerWrapperModel;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.LoggingConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
+
+@PanelType(name = "accessCertificationPanel")
+@PanelInstance(
+        identifier = "accessCertificationPanel",
+        applicableForType = AccessCertificationConfigurationType.class,
+        display = @PanelDisplay(
+                label = "AccessCertificationContentPanel.label",
+                icon = GuiStyleConstants.CLASS_CIRCLE_FULL,
+                order = 10
+        )
+)
+public class AccessCertificationContentPanel extends AbstractObjectMainPanel<SystemConfigurationType, AssignmentHolderDetailsModel<SystemConfigurationType>> {
+
+    private static final String ID_MAIN_PANEL = "mainPanel";
+
+    public AccessCertificationContentPanel(String id, AssignmentHolderDetailsModel<SystemConfigurationType> model, ContainerPanelConfigurationType config) {
+        super(id, model, config);
+    }
+
+    @Override
+    protected void initLayout() {
+        SingleContainerPanel panel = new SingleContainerPanel(ID_MAIN_PANEL,
+                PrismContainerWrapperModel.fromContainerWrapper(getObjectWrapperModel(), ItemPath.create(SystemConfigurationType.F_ACCESS_CERTIFICATION)),
+                AccessCertificationConfigurationType.COMPLEX_TYPE);
+        add(panel);
+    }
+}
diff --git a/.../midpoint/gui/impl/page/admin/systemconfiguration/component/ClassLoggersContentPanel.java b/.../midpoint/gui/impl/page/admin/systemconfiguration/component/ClassLoggersContentPanel.java
@@ -7,16 +7,6 @@
 
 package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.component;
 
-import java.util.Arrays;
-import java.util.List;
-
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-
-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;
-import org.apache.wicket.model.IModel;
-
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
@@ -33,6 +23,18 @@
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ClassLoggerConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.LoggingConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
+
+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;
+import org.apache.wicket.model.IModel;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Created by Viliam Repan (lazyman).
@@ -78,13 +80,7 @@ protected void onClick(AjaxRequestTarget target, IModel<PrismContainerValueWrapp
                     }
                 },
                 new PrismPropertyWrapperColumn<>(getContainerModel(), ClassLoggerConfigurationType.F_LEVEL,
-                        AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) {
-
-                    @Override
-                    protected void onClick(AjaxRequestTarget target, IModel<PrismContainerValueWrapper<ClassLoggerConfigurationType>> model) {
-                        ClassLoggersContentPanel.this.itemDetailsPerformed(target, model);
-                    }
-                }
+                        AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase())
         );
     }