revert identifier for wizard mapping panels

Evolveum · Jul 20, 2023 · a77317d · a77317d
1 parent 02a43e2
commit a77317d
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 34 deletions.
diff --git a/...age/admin/resource/component/wizard/objectType/activation/PredefinedMappingStepPanel.java b/...age/admin/resource/component/wizard/objectType/activation/PredefinedMappingStepPanel.java
@@ -62,7 +62,7 @@ protected IModel<?> getSubTextModel() {
 
     @Override
     protected boolean isSubmitVisible() {
-        return true;
+        return false;
     }
 
     @Override
@@ -72,13 +72,7 @@ protected boolean isExitButtonVisible() {
 
     @Override
     public VisibleEnableBehaviour getBackBehaviour() {
-        return VisibleBehaviour.ALWAYS_INVISIBLE;
-    }
-
-    @Override
-    protected void onSubmitPerformed(AjaxRequestTarget target) {
-        super.onSubmitPerformed(target);
-        onExitPerformed(target);
+        return VisibleBehaviour.ALWAYS_VISIBLE_ENABLED;
     }
 
     @Override
@@ -91,6 +85,12 @@ public VisibleEnableBehaviour getNextBehaviour() {
         return VisibleBehaviour.ALWAYS_INVISIBLE;
     }
 
+    @Override
+    public boolean onBackPerformed(AjaxRequestTarget target) {
+        onExitPerformed(target);
+        return false;
+    }
+
     @Override
     protected ItemVisibilityHandler getVisibilityHandler() {
         return wrapper -> {

diff --git a/...omponent/wizard/objectType/attributeMapping/InboundMappingMainConfigurationStepPanel.java b/...omponent/wizard/objectType/attributeMapping/InboundMappingMainConfigurationStepPanel.java
@@ -29,15 +29,15 @@
 /**
  * @author lskublik
  */
-@PanelInstance(identifier = "rw-mapping-inbound-main",
+@PanelInstance(identifier = "rw-attributes-inbound-main",
         applicableForType = ResourceType.class,
         applicableForOperation = OperationTypeType.WIZARD,
-        display = @PanelDisplay(label = "PageResource.wizard.step.mapping.inbound.main", icon = "fa fa-screwdriver-wrench"),
+        display = @PanelDisplay(label = "PageResource.wizard.step.attributes.inbound.main", icon = "fa fa-screwdriver-wrench"),
         expanded = true)
 public class InboundMappingMainConfigurationStepPanel
         extends AbstractValueFormResourceWizardStepPanel<MappingType, ResourceDetailsModel> {
 
-    public static final String PANEL_TYPE = "rw-mapping-inbound-main";
+    public static final String PANEL_TYPE = "rw-attributes-inbound-main";
 
     private static final List<ItemName> VISIBLE_ITEMS = List.of(
             MappingType.F_NAME,
@@ -65,17 +65,17 @@ protected String getPanelType() {
 
     @Override
     public IModel<String> getTitle() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.main");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.main");
     }
 
     @Override
     protected IModel<?> getTextModel() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.main.text");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.main.text");
     }
 
     @Override
     protected IModel<?> getSubTextModel() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.main.subText");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.main.subText");
     }
 
     @Override

diff --git a/...nent/wizard/objectType/attributeMapping/InboundMappingOptionalConfigurationStepPanel.java b/...nent/wizard/objectType/attributeMapping/InboundMappingOptionalConfigurationStepPanel.java
@@ -28,15 +28,15 @@
 /**
  * @author lskublik
  */
-@PanelInstance(identifier = "rw-mapping-inbound-optional",
+@PanelInstance(identifier = "rw-attributes-inbound-optional",
         applicableForType = ResourceType.class,
         applicableForOperation = OperationTypeType.WIZARD,
-        display = @PanelDisplay(label = "PageResource.wizard.step.mapping.inbound.optional", icon = "fa fa-screwdriver-wrench"),
+        display = @PanelDisplay(label = "PageResource.wizard.step.attributes.inbound.optional", icon = "fa fa-screwdriver-wrench"),
         expanded = true)
 public class InboundMappingOptionalConfigurationStepPanel
         extends AbstractValueFormResourceWizardStepPanel<MappingType, ResourceDetailsModel> {
 
-    public static final String PANEL_TYPE = "rw-mapping-inbound-optional";
+    public static final String PANEL_TYPE = "rw-attributes-inbound-optional";
 
     private static final List<ItemName> VISIBLE_ITEMS = List.of(
             MappingType.F_DESCRIPTION,
@@ -62,17 +62,17 @@ protected String getPanelType() {
 
     @Override
     public IModel<String> getTitle() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.optional");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.optional");
     }
 
     @Override
     protected IModel<?> getTextModel() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.optional.text");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.optional.text");
     }
 
     @Override
     protected IModel<?> getSubTextModel() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.optional.subText");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.optional.subText");
     }
 
     @Override

diff --git a/...mponent/wizard/objectType/attributeMapping/OutboundMappingMainConfigurationStepPanel.java b/...mponent/wizard/objectType/attributeMapping/OutboundMappingMainConfigurationStepPanel.java
@@ -29,15 +29,15 @@
 /**
  * @author lskublik
  */
-@PanelInstance(identifier = "rw-mapping-inbound-main",
+@PanelInstance(identifier = "rw-attributes-inbound-main",
         applicableForType = ResourceType.class,
         applicableForOperation = OperationTypeType.WIZARD,
-        display = @PanelDisplay(label = "PageResource.wizard.step.mapping.inbound.main", icon = "fa fa-screwdriver-wrench"),
+        display = @PanelDisplay(label = "PageResource.wizard.step.attributes.inbound.main", icon = "fa fa-screwdriver-wrench"),
         expanded = true)
 public class OutboundMappingMainConfigurationStepPanel<ODM extends ObjectDetailsModels>
         extends AbstractValueFormResourceWizardStepPanel<MappingType, ODM> {
 
-    public static final String PANEL_TYPE = "rw-mapping-inbound-main";
+    public static final String PANEL_TYPE = "rw-attributes-inbound-main";
 
     private static final List<ItemName> VISIBLE_ITEMS = List.of(
             MappingType.F_NAME,
@@ -64,17 +64,17 @@ protected String getPanelType() {
 
     @Override
     public IModel<String> getTitle() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.main");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.main");
     }
 
     @Override
     protected IModel<?> getTextModel() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.main.text");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.main.text");
     }
 
     @Override
     protected IModel<?> getSubTextModel() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.main.subText");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.main.subText");
     }
 
     @Override

diff --git a/...ent/wizard/objectType/attributeMapping/OutboundMappingOptionalConfigurationStepPanel.java b/...ent/wizard/objectType/attributeMapping/OutboundMappingOptionalConfigurationStepPanel.java
@@ -29,15 +29,15 @@
 /**
  * @author lskublik
  */
-@PanelInstance(identifier = "rw-mapping-inbound-optional",
+@PanelInstance(identifier = "rw-attributes-inbound-optional",
         applicableForType = ResourceType.class,
         applicableForOperation = OperationTypeType.WIZARD,
-        display = @PanelDisplay(label = "PageResource.wizard.step.mapping.inbound.optional", icon = "fa fa-screwdriver-wrench"),
+        display = @PanelDisplay(label = "PageResource.wizard.step.attributes.inbound.optional", icon = "fa fa-screwdriver-wrench"),
         expanded = true)
 public class OutboundMappingOptionalConfigurationStepPanel<ODM extends ObjectDetailsModels>
         extends AbstractValueFormResourceWizardStepPanel<MappingType, ODM> {
 
-    public static final String PANEL_TYPE = "rw-mapping-inbound-optional";
+    public static final String PANEL_TYPE = "rw-attributes-inbound-optional";
 
     private static final List<ItemName> VISIBLE_ITEMS = List.of(
             MappingType.F_DESCRIPTION,
@@ -63,17 +63,17 @@ protected String getPanelType() {
 
     @Override
     public IModel<String> getTitle() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.optional");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.optional");
     }
 
     @Override
     protected IModel<?> getTextModel() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.optional.text");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.optional.text");
     }
 
     @Override
     protected IModel<?> getSubTextModel() {
-        return createStringResource("PageResource.wizard.step.mapping.inbound.optional.subText");
+        return createStringResource("PageResource.wizard.step.attributes.inbound.optional.subText");
     }
 
     @Override

diff --git a/...impl/page/admin/role/component/wizard/construction/ConstructionOutboundMainStepPanel.java b/...impl/page/admin/role/component/wizard/construction/ConstructionOutboundMainStepPanel.java
@@ -21,7 +21,7 @@
 @PanelInstance(identifier = "arw-construction-mapping-main",
         applicableForType = AbstractRoleType.class,
         applicableForOperation = OperationTypeType.WIZARD,
-        display = @PanelDisplay(label = "PageResource.wizard.step.mapping.outbound.main", icon = "fa fa-circle"),
+        display = @PanelDisplay(label = "PageResource.wizard.step.attributes.outbound.main", icon = "fa fa-circle"),
         containerPath = "empty")
 public class ConstructionOutboundMainStepPanel<AHD extends AssignmentHolderDetailsModel> extends OutboundMappingMainConfigurationStepPanel<AHD> {
 

diff --git a/.../page/admin/role/component/wizard/construction/ConstructionOutboundOptionalStepPanel.java b/.../page/admin/role/component/wizard/construction/ConstructionOutboundOptionalStepPanel.java
@@ -21,7 +21,7 @@
 @PanelInstance(identifier = "arw-construction-mapping-optional",
         applicableForType = AbstractRoleType.class,
         applicableForOperation = OperationTypeType.WIZARD,
-        display = @PanelDisplay(label = "PageResource.wizard.step.mapping.outbound.optional", icon = "fa fa-circle"),
+        display = @PanelDisplay(label = "PageResource.wizard.step.attributes.outbound.optional", icon = "fa fa-circle"),
         containerPath = "empty")
 public class ConstructionOutboundOptionalStepPanel<AHD extends AssignmentHolderDetailsModel> extends OutboundMappingOptionalConfigurationStepPanel<AHD> {