Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Mar 15, 2023 · 9446970 · 9446970
2 parents 5b80f6e + 721a02d
commit 9446970
Show file tree

Hide file tree

Showing 24 changed files with 222 additions and 42 deletions.
diff --git a/...point/gui/impl/page/admin/resource/component/wizard/AbstractResourceWizardBasicPanel.java b/...point/gui/impl/page/admin/resource/component/wizard/AbstractResourceWizardBasicPanel.java
@@ -14,8 +14,10 @@
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.schema.result.OperationResult;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.IModel;
 
@@ -88,4 +90,17 @@ protected IModel<PrismContainerValueWrapper<C>> getValueModel() {
     protected String getCssForWidthOfFeedbackPanel() {
         return "col-8";
     }
+
+    protected ContainerPanelConfigurationType getConfiguration(){
+        if (StringUtils.isEmpty(getPanelType())) {
+            return null;
+        }
+        return WebComponentUtil.getContainerConfiguration(
+                getAssignmentHolderDetailsModel().getObjectDetailsPageConfiguration().getObject(),
+                getPanelType());
+    }
+
+    protected String getPanelType() {
+        return null;
+    }
 }
diff --git a/...m/midpoint/gui/impl/page/admin/resource/component/wizard/AbstractResourceWizardTable.java b/...m/midpoint/gui/impl/page/admin/resource/component/wizard/AbstractResourceWizardTable.java
@@ -20,6 +20,8 @@
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
@@ -39,8 +41,9 @@ public abstract class AbstractResourceWizardTable<C extends Containerable, CV ex
     public AbstractResourceWizardTable(
             String id,
             IModel<PrismContainerValueWrapper<CV>> valueModel,
+            ContainerPanelConfigurationType config,
             Class<C> type) {
-        super(id, type);
+        super(id, type, config);
         this.valueModel = valueModel;
     }
 

diff --git a/...l/page/admin/resource/component/wizard/objectType/ResourceObjectTypeTableWizardPanel.java b/...l/page/admin/resource/component/wizard/objectType/ResourceObjectTypeTableWizardPanel.java
@@ -17,6 +17,12 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 
+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.xml.ns._public.common.common_3.OperationTypeType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.IModel;
 
@@ -34,11 +40,16 @@
 /**
  * @author lskublik
  */
+@PanelType(name = "rw-types")
+@PanelInstance(identifier = "rw-types",
+        applicableForType = ResourceType.class,
+        applicableForOperation = OperationTypeType.WIZARD,
+        display = @PanelDisplay(label = "ResourceObjectTypeTableWizardPanel.title", icon = "fa fa-object-group"))
 public abstract class ResourceObjectTypeTableWizardPanel extends AbstractWizardBasicPanel<ResourceDetailsModel> {
 
     private static final Trace LOGGER = TraceManager.getTrace(ResourceObjectTypeTableWizardPanel.class);
 
-    private static final String PANEL_TYPE = "schemaHandling";
+    private static final String PANEL_TYPE = "rw-types";
     private static final String ID_TABLE = "table";
 
     public ResourceObjectTypeTableWizardPanel(String id, ResourceDetailsModel model) {

diff --git a/.../impl/page/admin/resource/component/wizard/objectType/associations/AssociationsTable.java b/.../impl/page/admin/resource/component/wizard/objectType/associations/AssociationsTable.java
@@ -34,8 +34,8 @@ public abstract class AssociationsTable extends AbstractResourceWizardTable<Reso
 
     public AssociationsTable(
             String id,
-            IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> valueModel) {
-        super(id, valueModel, ResourceObjectAssociationType.class);
+            IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> valueModel, ContainerPanelConfigurationType config) {
+        super(id, valueModel, config, ResourceObjectAssociationType.class);
     }
 
     @Override

diff --git a/...admin/resource/component/wizard/objectType/associations/AssociationsTableWizardPanel.java b/...admin/resource/component/wizard/objectType/associations/AssociationsTableWizardPanel.java
@@ -12,8 +12,14 @@
 import com.evolveum.midpoint.gui.impl.page.admin.resource.component.wizard.AbstractResourceWizardBasicPanel;
 import com.evolveum.midpoint.gui.impl.component.wizard.WizardPanelHelper;
 import com.evolveum.midpoint.util.annotation.Experimental;
+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.xml.ns._public.common.common_3.OperationTypeType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectAssociationType;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.IModel;
 
@@ -25,9 +31,18 @@
 /**
  * @author lskublik
  */
+
+
 @Experimental
+@PanelType(name = "rw-associations")
+@PanelInstance(identifier = "rw-associations",
+        applicableForType = ResourceType.class,
+        applicableForOperation = OperationTypeType.WIZARD,
+        display = @PanelDisplay(label = "AssociationsTableWizardPanel.headerLabel", icon = "fa fa-shield"))
 public abstract class AssociationsTableWizardPanel extends AbstractResourceWizardBasicPanel<ResourceObjectTypeDefinitionType> {
 
+    private static final String PANEL_TYPE = "rw-association";
+
     private static final String ID_TABLE = "table";
 
     public AssociationsTableWizardPanel(
@@ -43,7 +58,7 @@ protected void onInitialize() {
     }
 
     private void initLayout() {
-        AssociationsTable table = new AssociationsTable(ID_TABLE, getValueModel()) {
+        AssociationsTable table = new AssociationsTable(ID_TABLE, getValueModel(), getConfiguration()) {
             @Override
             protected void editItemPerformed(
                     AjaxRequestTarget target,
@@ -91,4 +106,8 @@ protected AssociationsTable getTable() {
     protected String getCssForWidthOfFeedbackPanel() {
         return "col-11";
     }
+
+    protected String getPanelType() {
+        return PANEL_TYPE;
+    }
 }
diff --git a/...e/admin/resource/component/wizard/objectType/attributeMapping/AttributeMappingsTable.java b/...e/admin/resource/component/wizard/objectType/attributeMapping/AttributeMappingsTable.java
@@ -47,8 +47,8 @@ public abstract class AttributeMappingsTable<P extends Containerable> extends Ab
 
     public AttributeMappingsTable(
             String id,
-            IModel<PrismContainerValueWrapper<P>> valueModel) {
-        super(id, valueModel, MappingType.class);
+            IModel<PrismContainerValueWrapper<P>> valueModel, ContainerPanelConfigurationType config) {
+        super(id, valueModel, config, MappingType.class);
     }
 
     protected PrismContainerValueWrapper createNewValue(AjaxRequestTarget target) {

diff --git a/...ource/component/wizard/objectType/attributeMapping/AttributeMappingsTableWizardPanel.java b/...ource/component/wizard/objectType/attributeMapping/AttributeMappingsTableWizardPanel.java
@@ -11,18 +11,25 @@
 import java.util.Optional;
 
 import com.evolveum.midpoint.gui.api.component.tabs.IconPanelTab;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.page.admin.resource.ResourceDetailsModel;
 import com.evolveum.midpoint.gui.impl.page.admin.resource.component.wizard.AbstractResourceWizardBasicPanel;
 
 import com.evolveum.midpoint.gui.impl.component.wizard.WizardPanelHelper;
 
 import com.evolveum.midpoint.prism.Containerable;
 
-import com.evolveum.midpoint.web.component.AjaxTabbedPanel;
-
+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.TabCenterTabbedPanel;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationTypeType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.markup.html.tabs.ITab;
@@ -42,8 +49,20 @@
 /**
  * @author lskublik
  */
+@PanelType(name = "rw-attribute-mappings")
+@PanelInstance(identifier = "rw-attribute-inbounds",
+        applicableForType = ResourceType.class,
+        applicableForOperation = OperationTypeType.WIZARD,
+        display = @PanelDisplay(label = "AttributeMappingsTableWizardPanel.inboundTable", icon = "fa fa-arrow-right-to-bracket"))
+@PanelInstance(identifier = "rw-attribute-outbounds",
+        applicableForType = ResourceType.class,
+        applicableForOperation = OperationTypeType.WIZARD,
+        display = @PanelDisplay(label = "AttributeMappingsTableWizardPanel.outboundTable", icon = "fa fa-arrow-right-from-bracket"))
 public abstract class AttributeMappingsTableWizardPanel<P extends Containerable> extends AbstractResourceWizardBasicPanel<P> {
 
+    private static final String INBOUND_PANEL_TYPE = "rw-attribute-inbounds";
+    private static final String OUTBOUND_PANEL_TYPE = "rw-attribute-outbounds";
+
     private static final String ID_TAB_TABLE = "tabTable";
 
     private final WrapperContext.AttributeMappingType initialTab;
@@ -104,7 +123,7 @@ private ITab createInboundTableTab() {
 
             @Override
             public WebMarkupContainer createPanel(String panelId) {
-                return new InboundAttributeMappingsTable<>(panelId, getValueModel()) {
+                return new InboundAttributeMappingsTable<>(panelId, getValueModel(), getConfiguration(INBOUND_PANEL_TYPE)) {
                     @Override
                     protected void editItemPerformed(
                             AjaxRequestTarget target,
@@ -134,7 +153,7 @@ private ITab createOutboundTableTab() {
 
             @Override
             public WebMarkupContainer createPanel(String panelId) {
-                return new OutboundAttributeMappingsTable<>(panelId, getValueModel()) {
+                return new OutboundAttributeMappingsTable<>(panelId, getValueModel(), getConfiguration(OUTBOUND_PANEL_TYPE)) {
                     @Override
                     protected void editItemPerformed(
                             AjaxRequestTarget target,
@@ -233,4 +252,10 @@ protected IModel<String> getSubTextModel() {
     protected String getCssForWidthOfFeedbackPanel() {
         return "col-11";
     }
+
+    protected ContainerPanelConfigurationType getConfiguration(String panelType){
+        return WebComponentUtil.getContainerConfiguration(
+                getAssignmentHolderDetailsModel().getObjectDetailsPageConfiguration().getObject(),
+                panelType);
+    }
 }
diff --git a/...min/resource/component/wizard/objectType/attributeMapping/AttributeOutboundStepPanel.java b/...min/resource/component/wizard/objectType/attributeMapping/AttributeOutboundStepPanel.java
@@ -32,7 +32,7 @@
 public class AttributeOutboundStepPanel<ODM extends ObjectDetailsModels>
         extends AbstractValueFormResourceWizardStepPanel<MappingType, ODM> {
 
-    public static final String PANEL_TYPE = "rw-attribute-outbound";
+    private static final String PANEL_TYPE = "rw-attribute-outbound";
 
     public AttributeOutboundStepPanel(ODM model, IModel<PrismContainerValueWrapper<MappingType>> newValueModel) {
         super(model, newValueModel);

diff --git a/.../resource/component/wizard/objectType/attributeMapping/InboundAttributeMappingsTable.java b/.../resource/component/wizard/objectType/attributeMapping/InboundAttributeMappingsTable.java
@@ -15,10 +15,10 @@
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.web.component.data.column.IconColumn;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.DisplayType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MappingType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceAttributeDefinitionType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectTypeDefinitionType;
 
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.model.IModel;
@@ -32,8 +32,10 @@
  * @author lskublik
  */
 public abstract class InboundAttributeMappingsTable<P extends Containerable> extends AttributeMappingsTable<P>{
-    public InboundAttributeMappingsTable(String id, IModel<PrismContainerValueWrapper<P>> valueModel) {
-        super(id, valueModel);
+    public InboundAttributeMappingsTable(
+            String id, IModel<PrismContainerValueWrapper<P>> valueModel,
+            ContainerPanelConfigurationType config) {
+        super(id, valueModel, config);
     }
 
     @Override

diff --git a/...age/admin/resource/component/wizard/objectType/attributeMapping/MappingOverrideTable.java b/...age/admin/resource/component/wizard/objectType/attributeMapping/MappingOverrideTable.java
@@ -54,8 +54,9 @@ public abstract class MappingOverrideTable extends AbstractResourceWizardTable<R
 
     public MappingOverrideTable(
             String id,
-            IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> valueModel) {
-        super(id, valueModel, ResourceAttributeDefinitionType.class);
+            IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> valueModel,
+            ContainerPanelConfigurationType config) {
+        super(id, valueModel, config, ResourceAttributeDefinitionType.class);
     }
 
     protected PrismContainerValueWrapper createNewValue(AjaxRequestTarget target) {

diff --git a/...source/component/wizard/objectType/attributeMapping/MappingOverridesTableWizardPanel.java b/...source/component/wizard/objectType/attributeMapping/MappingOverridesTableWizardPanel.java
@@ -10,9 +10,15 @@
 import com.evolveum.midpoint.gui.impl.page.admin.resource.ResourceDetailsModel;
 import com.evolveum.midpoint.gui.impl.page.admin.resource.component.wizard.AbstractResourceWizardBasicPanel;
 import com.evolveum.midpoint.gui.impl.component.wizard.WizardPanelHelper;
+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.xml.ns._public.common.common_3.OperationTypeType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceAttributeDefinitionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectTypeDefinitionType;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.IModel;
 import org.jetbrains.annotations.NotNull;
@@ -22,8 +28,16 @@
 /**
  * @author lskublik
  */
+
+@PanelType(name = "rw-attributes")
+@PanelInstance(identifier = "rw-attributes",
+        applicableForType = ResourceType.class,
+        applicableForOperation = OperationTypeType.WIZARD,
+        display = @PanelDisplay(label = "MappingOverridesTableWizardPanel.text", icon = "fa fa-shuffle"))
 public abstract class MappingOverridesTableWizardPanel extends AbstractResourceWizardBasicPanel<ResourceObjectTypeDefinitionType> {
 
+    private static final String PANEL_TYPE = "rw-attributes";
+
     private static final String ID_TABLE = "table";
 
     public MappingOverridesTableWizardPanel(
@@ -40,7 +54,7 @@ protected void onInitialize() {
 
     private void initLayout() {
 
-        MappingOverrideTable table = new MappingOverrideTable(ID_TABLE, getValueModel()) {
+        MappingOverrideTable table = new MappingOverrideTable(ID_TABLE, getValueModel(), getConfiguration()) {
             @Override
             protected void editItemPerformed(AjaxRequestTarget target, IModel<PrismContainerValueWrapper<ResourceAttributeDefinitionType>> rowModel, List<PrismContainerValueWrapper<ResourceAttributeDefinitionType>> listItems) {
                 inEditNewValue(rowModel, target);
@@ -86,4 +100,8 @@ protected IModel<String> getSubTextModel() {
     protected String getCssForWidthOfFeedbackPanel() {
         return "col-10";
     }
+
+    protected String getPanelType() {
+        return PANEL_TYPE;
+    }
 }
diff --git a/...resource/component/wizard/objectType/attributeMapping/OutboundAttributeMappingsTable.java b/...resource/component/wizard/objectType/attributeMapping/OutboundAttributeMappingsTable.java
@@ -46,8 +46,9 @@ public abstract class OutboundAttributeMappingsTable<P extends Containerable> ex
 
     private static final Trace LOGGER = TraceManager.getTrace(OutboundAttributeMappingsTable.class);
 
-    public OutboundAttributeMappingsTable(String id, IModel<PrismContainerValueWrapper<P>> valueModel) {
-        super(id, valueModel);
+    public OutboundAttributeMappingsTable(
+            String id, IModel<PrismContainerValueWrapper<P>> valueModel, ContainerPanelConfigurationType config) {
+        super(id, valueModel, config);
     }
 
     @Override

diff --git a/...page/admin/resource/component/wizard/objectType/correlation/CorrelationItemRefsTable.java b/...page/admin/resource/component/wizard/objectType/correlation/CorrelationItemRefsTable.java
@@ -19,7 +19,6 @@
 import com.evolveum.midpoint.gui.impl.component.input.ContainersDropDownPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.resource.component.wizard.AbstractResourceWizardTable;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
-import com.evolveum.midpoint.prism.PrismContainerValue;
 import com.evolveum.midpoint.prism.path.ItemName;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.util.exception.SchemaException;
@@ -55,8 +54,8 @@ public class CorrelationItemRefsTable extends AbstractResourceWizardTable<Correl
 
     public CorrelationItemRefsTable(
             String id,
-            IModel<PrismContainerValueWrapper<ItemsSubCorrelatorType>> valueModel) {
-        super(id, valueModel, CorrelationItemType.class);
+            IModel<PrismContainerValueWrapper<ItemsSubCorrelatorType>> valueModel, ContainerPanelConfigurationType config) {
+        super(id, valueModel, config, CorrelationItemType.class);
     }
 
     @Override