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

Evolveum · Aug 3, 2023 · f3e2b59 · f3e2b59
2 parents b2d5e18 + 41f701f
commit f3e2b59
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 15 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/component/wizard/AbstractFormWizardStepPanel.java b/...ain/java/com/evolveum/midpoint/gui/impl/component/wizard/AbstractFormWizardStepPanel.java
@@ -80,6 +80,11 @@ protected ContainerPanelConfigurationType getContainerConfiguration() {
         return getContainerConfiguration(getPanelType());
     }
 
+    @Override
+    public String getStepId() {
+        return getPanelType();
+    }
+
     protected abstract String getPanelType();
 
     protected boolean checkMandatory(ItemWrapper itemWrapper) {

diff --git a/.../main/java/com/evolveum/midpoint/gui/impl/component/wizard/SelectTileWizardStepPanel.java b/.../main/java/com/evolveum/midpoint/gui/impl/component/wizard/SelectTileWizardStepPanel.java
@@ -82,6 +82,11 @@ protected ObjectQuery getCustomQuery() {
 
     protected abstract String getPanelType();
 
+    @Override
+    public String getStepId() {
+        return getPanelType();
+    }
+
     protected TileTablePanel<TemplateTile<SelectableBean<O>>, SelectableBean<O>> getTable() {
         return (TileTablePanel) get(ID_TABLE);
     }

diff --git a/...i/impl/page/admin/resource/component/wizard/AbstractValueFormResourceWizardStepPanel.java b/...i/impl/page/admin/resource/component/wizard/AbstractValueFormResourceWizardStepPanel.java
@@ -132,6 +132,11 @@ protected ContainerPanelConfigurationType getContainerConfiguration() {
 
     protected abstract String getPanelType();
 
+    @Override
+    public String getStepId() {
+        return getPanelType();
+    }
+
     protected ItemVisibilityHandler getVisibilityHandler() {
         return null;
     }

diff --git a/...idpoint/gui/impl/page/admin/resource/component/wizard/basic/BasicResourceWizardPanel.java b/...idpoint/gui/impl/page/admin/resource/component/wizard/basic/BasicResourceWizardPanel.java
@@ -32,25 +32,10 @@
  */
 public class BasicResourceWizardPanel extends AbstractWizardPanel<ResourceType, ResourceDetailsModel> {
 
-//    private static final String ID_FRAGMENT = "fragment";
-//    private static final String ID_TEMPLATE_FRAGMENT = "templateFragment";
-//    private static final String ID_TEMPLATE = "template";
-//    private static final String ID_WIZARD_FRAGMENT = "wizardFragment";
-//    private static final String ID_MAIN_FORM = "mainForm";
-//    private static final String ID_WIZARD = "wizard";
-
-//    private final ResourceDetailsModel resourceModel;
-
     public BasicResourceWizardPanel(String id, WizardPanelHelper<ResourceType, ResourceDetailsModel> helper) {
         super(id, helper);
-//        this.resourceModel = model;
     }
 
-//    @Override
-//    protected void onInitialize() {
-//        super.onInitialize();
-//        initLayout();
-//    }
 
     protected void initLayout() {
         add(createChoiceFragment(createTemplatePanel()));

diff --git a/...impl/page/admin/resource/component/wizard/objectType/synchronization/ActionStepPanel.java b/...impl/page/admin/resource/component/wizard/objectType/synchronization/ActionStepPanel.java
@@ -257,4 +257,9 @@ protected IModel<?> getTextModel() {
     protected IModel<?> getSubTextModel() {
         return createStringResource("PageResource.wizard.step.synchronization.reaction.action.subText");
     }
+
+    @Override
+    public String getStepId() {
+        return PANEL_TYPE;
+    }
 }
diff --git a/...age/admin/role/component/wizard/construction/ConstructionResourceObjectTypeStepPanel.java b/...age/admin/role/component/wizard/construction/ConstructionResourceObjectTypeStepPanel.java
@@ -344,4 +344,9 @@ public void onStepChanged(WizardStep newStep) {
             oldOidResource = resourceOid;
         }
     }
+
+    @Override
+    public String getStepId() {
+        return PANEL_TYPE;
+    }
 }