change identifiers for role wizard panels

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/MultiSelectTileTablePanel.html

@@ -27,9 +27,11 @@
 <wicket:fragment wicket:id="headerFragment">
     <div class="d-flex flex-column">
         <div class="card-header d-flex">
-            <div class="mr-auto pr-4">
-                <div wicket:id="viewToggle"/>
-            </div>
+            <wicket:enclosure child="viewToggle">
+                <div class="mr-auto pr-4">
+                    <div wicket:id="viewToggle"/>
+                </div>
+            </wicket:enclosure>
             <div class="ml-auto" wicket:id="panelHeader"/>
         </div>
         <div class="card-header d-flex flex-column" style="min-height: 5.4rem;" wicket:id="selectedItemsContainer">

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java

@@ -93,6 +93,11 @@ private AbstractPageObjectDetails(PageParameters params, PrismObject<O> object)
         super(params);
         isAdd = (params == null || params.isEmpty()) && object == null;
         objectDetailsModels = createObjectDetailsModels(object);
+    }
+
+    @Override
+    protected void onInitialize() {
+        super.onInitialize();
         initLayout();
     }
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/GovernanceCardsPanel.java

@@ -282,11 +282,6 @@ protected PageStorage getPageStorage() {
                         return getMemberPanelStorage();
                     }
 
-                    @Override
-                    protected String getTilesHeaderCssClasses() {
-                        return getTilesFooterCssClasses();
-                    }
-
                     @Override
                     protected IModel<Search> createSearchModel() {
                         return (IModel) searchModel;

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/AccessApplicationRoleStepPanel.java

@@ -28,8 +28,8 @@
 
 import java.util.*;
 
-@PanelType(name = "roleWizard-access-application-role")
-@PanelInstance(identifier = "roleWizard-access-application-role",
+@PanelType(name = "brw-access")
+@PanelInstance(identifier = "brw-access",
         applicableForType = RoleType.class,
         applicableForOperation = OperationTypeType.WIZARD,
         display = @PanelDisplay(label = "PageRole.wizard.step.access.applicationRole", icon = "fa fa-list"),
@@ -39,7 +39,7 @@ public class AccessApplicationRoleStepPanel
 
     private static final Trace LOGGER = TraceManager.getTrace(AccessApplicationRoleStepPanel.class);
 
-    public static final String PANEL_TYPE = "roleWizard-access-application-role";
+    public static final String PANEL_TYPE = "brw-access";
 
     private IModel<List<AbstractMap.SimpleEntry<String, String>>> selectedItems = Model.ofList(new ArrayList<>());
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/AccessApplicationStepPanel.java

@@ -17,15 +17,15 @@
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-@PanelType(name = "roleWizard-access-application")
-@PanelInstance(identifier = "roleWizard-access-application",
+@PanelType(name = "apprw-access")
+@PanelInstance(identifier = "apprw-access",
         applicableForType = RoleType.class,
         applicableForOperation = OperationTypeType.WIZARD,
         display = @PanelDisplay(label = "PageRole.wizard.step.access.application", icon = "fa fa-list"),
         containerPath = "empty")
 public class AccessApplicationStepPanel extends SingleTileWizardStepPanel<ServiceType, FocusDetailsModels<RoleType>, AssignmentType> {
 
-    public static final String PANEL_TYPE = "roleWizard-access-application";
+    public static final String PANEL_TYPE = "apprw-access";
 
     public AccessApplicationStepPanel(FocusDetailsModels<RoleType> model) {
         super(model);

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/ApplicationRoleWizardPanel.java

@@ -10,29 +10,18 @@
 import com.evolveum.midpoint.gui.api.component.wizard.WizardModel;
 import com.evolveum.midpoint.gui.api.component.wizard.WizardPanel;
 import com.evolveum.midpoint.gui.api.component.wizard.WizardStep;
-import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
 import com.evolveum.midpoint.gui.impl.component.wizard.AbstractWizardPanel;
 import com.evolveum.midpoint.gui.impl.component.wizard.WizardPanelHelper;
 import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.FocusDetailsModels;
 
-import com.evolveum.midpoint.gui.impl.page.admin.resource.ResourceDetailsModel;
-import com.evolveum.midpoint.gui.impl.page.admin.resource.component.wizard.objectType.ResourceObjectTypeWizardPanel;
-import com.evolveum.midpoint.gui.impl.page.admin.resource.component.wizard.objectType.attributeMapping.AttributeOutboundStepPanel;
-import com.evolveum.midpoint.gui.impl.page.admin.resource.component.wizard.objectType.credentials.CredentialsWizardPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.role.component.wizard.construction.*;
-import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.schema.result.OperationResult;
 
-import org.apache.wicket.model.IModel;
-
-import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -70,7 +59,6 @@ protected void onSubmitPerformed(AjaxRequestTarget target) {
     private void onFinishBasicWizardPerformed(AjaxRequestTarget target) {
         OperationResult result = onSavePerformed(target);
         if (!result.isError()) {
-//            WebComponentUtil.createToastForCreateObject(target, RoleType.COMPLEX_TYPE);
             exitToPreview(target);
         }
     }
@@ -104,13 +92,6 @@ private void showConstructionWizard(AjaxRequestTarget target){
                 new ConstructionWizardPanel(getIdOfChoicePanel(), createHelper())
         );
 
-//        WizardModel wizardModel = new WizardModel(createConstructionSteps(valueModel));
-//        if (StringUtils.isNotEmpty(stepId)) {
-//            wizardModel.setActiveStepById(stepId);
-//        }
-//        showWizardFragment(
-//                target,
-//                new WizardPanel(getIdOfWizardPanel(), wizardModel));
     }
 
     private WizardPanelHelper<AssignmentType, FocusDetailsModels<RoleType>> createHelper() {
@@ -127,81 +108,6 @@ public OperationResult onSaveObjectPerformed(AjaxRequestTarget target) {
         };
     }
 
-//    private List<WizardStep> createConstructionSteps(IModel<PrismContainerValueWrapper<AssignmentType>> valueModel) {
-//        List<WizardStep> steps = new ArrayList<>();
-//
-//        ConstructionResourceStepPanel selectResource =
-//                new ConstructionResourceStepPanel(getHelper().getDetailsModel(), valueModel) {
-//
-//            @Override
-//            protected void onExitPerformed(AjaxRequestTarget target) {
-//                super.onExitPerformed(target);
-//                exitToPreview(target);
-//            }
-//        };
-//
-//        steps.add(selectResource);
-//
-//        steps.add(new ConstructionResourceObjectTypeStepPanel(getHelper().getDetailsModel(), selectResource.getValueModel()){
-//            @Override
-//            protected void onExitPerformed(AjaxRequestTarget target) {
-//                super.onExitPerformed(target);
-//                exitToPreview(target);
-//            }
-//        });
-//
-//        steps.add(new ConstructionGroupStepPanel(getHelper().getDetailsModel(), selectResource.getValueModel()){
-//            @Override
-//            protected void onExitPerformed(AjaxRequestTarget target) {
-//                super.onExitPerformed(target);
-//                exitToPreview(target);
-//            }
-//        });
-//
-//        steps.add( new ConstructionOutboundMappingsStepPanel(getHelper().getDetailsModel(), selectResource.getValueModel()) {
-//            @Override
-//            protected void inEditOutboundValue(IModel<PrismContainerValueWrapper<MappingType>> rowModel, AjaxRequestTarget target) {
-//                showOutboundAttributeMappingWizardFragment(target, rowModel, selectResource.getValueModel());
-//            }
-//
-//            @Override
-//            protected void onExitPerformed(AjaxRequestTarget target) {
-//                super.onExitPerformed(target);
-//                exitToPreview(target);
-//            }
-//
-//            @Override
-//            protected void onSubmitPerformed(AjaxRequestTarget target) {
-//                super.onSubmitPerformed(target);
-//                ApplicationRoleWizardPanel.this.onFinishBasicWizardPerformed(target);
-//            }
-//        });
-//
-//        return steps;
-//    }
-//
-//    private void showOutboundAttributeMappingWizardFragment(
-//            AjaxRequestTarget target,
-//            IModel<PrismContainerValueWrapper<MappingType>> rowModel,
-//            IModel<PrismContainerValueWrapper<AssignmentType>> valueModel) {
-//        showWizardFragment(
-//                target,
-//                new WizardPanel(getIdOfWizardPanel(), new WizardModel(createOutboundAttributeMappingSteps(rowModel, valueModel))));
-//    }
-//
-//    private List<WizardStep> createOutboundAttributeMappingSteps(
-//            IModel<PrismContainerValueWrapper<MappingType>> rowModel,
-//            IModel<PrismContainerValueWrapper<AssignmentType>> valueModel) {
-//        List<WizardStep> steps = new ArrayList<>();
-//        steps.add(new AttributeOutboundStepPanel<>(getAssignmentHolderModel(), rowModel) {
-//            @Override
-//            protected void onExitPerformed(AjaxRequestTarget target) {
-//                showConstructionWizard(target, valueModel, ConstructionOutboundMappingsStepPanel.PANEL_TYPE);
-//            }
-//        });
-//        return steps;
-//    }
-
     private void showGovernanceMembersPanel(AjaxRequestTarget target) {
         showChoiceFragment(target, new GovernanceMembersWizardPanel(
                 getIdOfChoicePanel(),

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/BasicInformationStepPanel.java

@@ -27,15 +27,15 @@
 /**
  * @author lskublik
  */
-@PanelType(name = "roleWizard-basic")
-@PanelInstance(identifier = "roleWizard-basic",
+@PanelType(name = "arw-basic")
+@PanelInstance(identifier = "arw-basic",
         applicableForType = RoleType.class,
         applicableForOperation = OperationTypeType.WIZARD,
         display = @PanelDisplay(label = "PageRole.wizard.step.basicInformation", icon = "fa fa-wrench"),
         containerPath = "empty")
 public class BasicInformationStepPanel extends AbstractFormWizardStepPanel<FocusDetailsModels<RoleType>> {
 
-    public static final String PANEL_TYPE = "roleWizard-basic";
+    public static final String PANEL_TYPE = "arw-basic";
 
     public BasicInformationStepPanel(FocusDetailsModels<RoleType> model) {
         super(model);

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/GovernanceMembersWizardPanel.java

@@ -13,13 +13,17 @@
 import com.evolveum.midpoint.gui.impl.page.admin.resource.ResourceDetailsModel;
 import com.evolveum.midpoint.gui.impl.page.admin.resource.component.ResourceUncategorizedPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.resource.component.TemplateTile;
+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.data.BoxedTablePanel;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationTypeType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
 
 import org.apache.wicket.behavior.Behavior;
@@ -33,9 +37,15 @@
 /**
  * @author lskublik
  */
+
+@PanelType(name = "arw-governance")
+@PanelInstance(identifier = "arw-governance",
+        applicableForType = RoleType.class,
+        applicableForOperation = OperationTypeType.WIZARD,
+        display = @PanelDisplay(label = "GovernanceMembersWizardPanel.title", icon = "fa fa-users"))
 public class GovernanceMembersWizardPanel extends AbstractWizardBasicPanel<FocusDetailsModels<RoleType>> {
 
-    public static final String PANEL_TYPE = "roleWizard-governance";
+    public static final String PANEL_TYPE = "arw-governance";
     private static final String ID_TABLE = "table";
 
     public GovernanceMembersWizardPanel(String id, FocusDetailsModels<RoleType> model) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/MembersWizardPanel.java

@@ -12,6 +12,9 @@
 import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component.AbstractRoleMemberPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.FocusDetailsModels;
 import com.evolveum.midpoint.task.api.Task;
+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.AjaxIconButton;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -31,9 +34,15 @@
 /**
  * @author lskublik
  */
+
+@PanelType(name = "arw-members")
+@PanelInstance(identifier = "arw-members",
+        applicableForType = RoleType.class,
+        applicableForOperation = OperationTypeType.WIZARD,
+        display = @PanelDisplay(label = "MembersWizardPanel.title", icon = "fa fa-users"))
 public class MembersWizardPanel extends AbstractWizardBasicPanel<FocusDetailsModels<RoleType>> {
 
-    public static final String PANEL_TYPE = "roleWizard-members";
+    public static final String PANEL_TYPE = "arw-members";
     private static final String ID_TABLE = "table";
 
     public MembersWizardPanel(String id, FocusDetailsModels<RoleType> model) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/construction/ConstructionGroupStepPanel.java

@@ -65,8 +65,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-@PanelType(name = "roleWizard-construction-group")
-@PanelInstance(identifier = "roleWizard-construction-group",
+@PanelType(name = "arw-construction-associations")
+@PanelInstance(identifier = "arw-construction-associations",
         applicableForType = AbstractRoleType.class,
         applicableForOperation = OperationTypeType.WIZARD,
         display = @PanelDisplay(label = "PageRole.wizard.step.construction.group"),
@@ -76,7 +76,7 @@ public class ConstructionGroupStepPanel<AR extends AbstractRoleType>
 
     private static final Trace LOGGER = TraceManager.getTrace(ConstructionGroupStepPanel.class);
 
-    public static final String PANEL_TYPE = "roleWizard-construction-group";
+    public static final String PANEL_TYPE = "arw-construction-associations";
 
     private static final String ID_FOOTER_FRAGMENT = "footerFragment";
     private static final String ID_SEARCH_ON_RESOURCE_BUTTON = "searchOnResourceButton";

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/construction/ConstructionOutboundMappingsStepPanel.java

@@ -21,8 +21,8 @@
 import com.evolveum.midpoint.web.component.prism.ValueStatus;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-@PanelType(name = "roleWizard-construction-mapping")
-@PanelInstance(identifier = "roleWizard-construction-mapping",
+@PanelType(name = "arw-construction-mapping")
+@PanelInstance(identifier = "arw-construction-mapping",
         applicableForType = AbstractRoleType.class,
         applicableForOperation = OperationTypeType.WIZARD,
         display = @PanelDisplay(label = "PageRole.wizard.step.construction.mapping", icon = "fa fa-arrow-right-from-bracket"),
@@ -32,7 +32,7 @@ public class ConstructionOutboundMappingsStepPanel<AR extends AbstractRoleType>
 
     private static final Trace LOGGER = TraceManager.getTrace(ConstructionOutboundMappingsStepPanel.class);
 
-    public static final String PANEL_TYPE = "roleWizard-construction-mapping";
+    public static final String PANEL_TYPE = "arw-construction-mapping";
 
     protected static final String ID_PANEL = "panel";
     private final IModel<PrismContainerValueWrapper<ConstructionType>> constructionModel;

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/construction/ConstructionResourceObjectTypeStepPanel.java

@@ -38,8 +38,8 @@
 import java.util.List;
 import java.util.Optional;
 
-@PanelType(name = "roleWizard-construction-objectType")
-@PanelInstance(identifier = "roleWizard-construction-objectType",
+@PanelType(name = "arw-construction-objectType")
+@PanelInstance(identifier = "arw-construction-objectType",
         applicableForType = AbstractRoleType.class,
         applicableForOperation = OperationTypeType.WIZARD,
         display = @PanelDisplay(label = "PageRole.wizard.step.construction.objectType", icon = "fa fa-database"),
@@ -48,7 +48,7 @@ public class ConstructionResourceObjectTypeStepPanel<AR extends AbstractRoleType
 
     private static final Trace LOGGER = TraceManager.getTrace(ConstructionResourceObjectTypeStepPanel.class);
 
-    public static final String PANEL_TYPE = "roleWizard-construction-objectType";
+    public static final String PANEL_TYPE = "arw-construction-objectType";
 
     private static final String ID_TILES_CONTAINER = "tilesContainer";
     private static final String ID_TILES = "tiles";

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/construction/ConstructionResourceStepPanel.java

@@ -39,8 +39,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@PanelType(name = "roleWizard-construction-resource")
-@PanelInstance(identifier = "roleWizard-construction-resource",
+@PanelType(name = "arw-construction-resource")
+@PanelInstance(identifier = "arw-construction-resource",
         applicableForType = AbstractRoleType.class,
         applicableForOperation = OperationTypeType.WIZARD,
         display = @PanelDisplay(label = "PageRole.wizard.step.construction.resource", icon = "fa fa-database"),
@@ -49,7 +49,7 @@ public class ConstructionResourceStepPanel<AR extends AbstractRoleType> extends
 
     private static final Trace LOGGER = TraceManager.getTrace(ConstructionResourceStepPanel.class);
 
-    public static final String PANEL_TYPE = "roleWizard-construction-resource";
+    public static final String PANEL_TYPE = "arw-construction-resource";
 
     public ConstructionResourceStepPanel(
             FocusDetailsModels<AR> model, IModel<PrismContainerValueWrapper<AssignmentType>> valueModel) {