implementing MID-9017 - displaying everywhere displayName for resourc…

…e objectType definition instead of kind/intent/objectClass
Evolveum · Aug 25, 2023 · 1979397 · 1979397
1 parent 97b8d7e
commit 1979397
Show file tree

Hide file tree

Showing 122 changed files with 2,577 additions and 2,470 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java
@@ -13,6 +13,7 @@
 import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 
 import com.evolveum.midpoint.gui.api.util.ObjectTypeListUtil;
+import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -115,7 +116,7 @@ private List<CompositedIconButtonDto> newButtonDescription() {
             CompositedIconBuilder builder = new CompositedIconBuilder();
             builder.setBasicIcon(GuiDisplayTypeUtil.getIconCssClass(defaultButtonDisplayType), IconCssStyle.IN_ROW_STYLE)
                     .appendColorHtmlValue(GuiDisplayTypeUtil.getIconColor(defaultButtonDisplayType))
-                    .appendLayerIcon(WebComponentUtil.createIconType(GuiStyleConstants.CLASS_PLUS_CIRCLE, "green"), IconCssStyle.BOTTOM_RIGHT_STYLE);
+                    .appendLayerIcon(IconAndStylesUtil.createIconType(GuiStyleConstants.CLASS_PLUS_CIRCLE, "green"), IconCssStyle.BOTTOM_RIGHT_STYLE);
 
             defaultButton.setAdditionalButtonDisplayType(defaultButtonDisplayType);
             defaultButton.setCompositedIcon(builder.build());
@@ -155,7 +156,7 @@ private CompositedIconButtonDto createCompositedButtonForAssignmentRelation(Assi
         buttonDto.setAdditionalButtonDisplayType(additionalButtonDisplayType);
 
         CompositedIconBuilder builder = WebComponentUtil.getAssignmentRelationIconBuilder(getPageBase(), relation,
-                additionalButtonDisplayType.getIcon(), WebComponentUtil.createIconType(GuiStyleConstants.EVO_ASSIGNMENT_ICON, "green"));
+                additionalButtonDisplayType.getIcon(), IconAndStylesUtil.createIconType(GuiStyleConstants.EVO_ASSIGNMENT_ICON, "green"));
         CompositedIcon icon = null;
         if (builder != null) {
             icon = builder.build();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
@@ -18,6 +18,8 @@
 import com.evolveum.midpoint.gui.impl.component.search.Search;
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.AbstractRoleSearchItemWrapper;
 import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component.MemberOperationsTaskCreator;
+import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
+import com.evolveum.midpoint.gui.impl.util.RelationUtil;
 import com.evolveum.midpoint.model.api.AssignmentCandidatesSpecification;
 import com.evolveum.midpoint.model.api.AssignmentObjectRelation;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
@@ -447,7 +449,7 @@ private List<CompositedIconButtonDto> getAssignButtonDescription() {
                 DisplayType additionalDispayType = GuiDisplayTypeUtil.getAssignmentObjectRelationDisplayType(ChooseMemberPopup.this.getPageBase(),
                         relation, "abstractRoleMemberPanel.menu.assignMember");
                 CompositedIconBuilder builder = WebComponentUtil.getAssignmentRelationIconBuilder(ChooseMemberPopup.this.getPageBase(), relation,
-                        additionalDispayType.getIcon(), WebComponentUtil.createIconType(GuiStyleConstants.EVO_ASSIGNMENT_ICON, "green"));
+                        additionalDispayType.getIcon(), IconAndStylesUtil.createIconType(GuiStyleConstants.EVO_ASSIGNMENT_ICON, "green"));
                 CompositedIcon icon = builder.build();
                 CompositedIconButtonDto buttonDto = createCompositedIconButtonDto(additionalDispayType, relation, icon);
                 buttons.add(buttonDto);
@@ -538,7 +540,7 @@ public StringResourceModel getTitle() {
             stableRelation = relations.stream().findFirst().orElse(null);
         }
         if (stableRelation != null) {
-            RelationDefinitionType def = WebComponentUtil.getRelationDefinition(stableRelation);
+            RelationDefinitionType def = RelationUtil.getRelationDefinition(stableRelation);
             if (def != null) {
                 String label = GuiDisplayTypeUtil.getTranslatedLabel(def.getDisplay());
                 return createStringResource("ChooseMemberPopup.selectObjectWithRelation", label);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java
@@ -10,6 +10,12 @@
 import java.util.List;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.api.util.LocalizationUtil;
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
+import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
+
+import com.evolveum.midpoint.gui.impl.util.RelationUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -77,7 +83,7 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
                     ObjectReferenceType ort = new ObjectReferenceType();
                     ort.setOid(o.getOid());
                     ort.setType(WebComponentUtil.classToQName(DisplayNamePanel.this.getPageBase().getPrismContext(), o.getClass()));
-                    WebComponentUtil.dispatchToObjectDetailsPage(ort, DisplayNamePanel.this, false);
+                    DetailsPageUtil.dispatchToObjectDetailsPage(ort, DisplayNamePanel.this, false);
                 }
             }
         };
@@ -117,7 +123,7 @@ private boolean hasDetailsPage() {
         if (StringUtils.isBlank(((ObjectType) containerable).getOid())) {
             return false;
         }
-        return WebComponentUtil.hasDetailsPage(containerable.getClass());
+        return DetailsPageUtil.hasDetailsPage(containerable.getClass());
     }
 
     protected WebMarkupContainer createTypeImagePanel(String idTypeImage) {
@@ -138,10 +144,10 @@ protected String createImageModel() {
             return "";
         }
         if (ConstructionType.class.isAssignableFrom(getModelObject().getClass())) {
-            return WebComponentUtil.createDefaultColoredIcon(ResourceType.COMPLEX_TYPE);
+            return IconAndStylesUtil.createDefaultColoredIcon(ResourceType.COMPLEX_TYPE);
         }
 
-        return WebComponentUtil.createDefaultColoredIcon(getModelObject().asPrismContainerValue().getComplexTypeDefinition().getTypeName());
+        return IconAndStylesUtil.createDefaultColoredIcon(getModelObject().asPrismContainerValue().getComplexTypeDefinition().getTypeName());
 
     }
 
@@ -176,7 +182,7 @@ protected IModel<String> createHeaderModel() {
             if (QNameUtil.match(DOMUtil.XSD_STRING, name.getDefinition().getTypeName())) {
                 return (String) name.getRealValue();
             } else if (QNameUtil.match(PolyStringType.COMPLEX_TYPE, name.getDefinition().getTypeName())) {
-                return WebComponentUtil.getTranslatedPolyString((PolyString) name.getRealValue());
+                return LocalizationUtil.translatePolyString((PolyString) name.getRealValue());
             }
 
             return name.getRealValue().toString();
@@ -207,7 +213,7 @@ private boolean isIdentifierVisible() {
     // TODO: maybe move relation methods to subclass if we want this panel to be really reusable
 
     private boolean isRelationVisible() {
-        return !WebComponentUtil.isDefaultRelation(getRelation());
+        return !RelationUtil.isDefaultRelation(getRelation());
     }
 
     private boolean isKindIntentVisible(IModel<String> kindIntentLabelModel) {

diff --git a/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java b/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
@@ -12,12 +12,12 @@
 import java.util.Map;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.impl.util.RelationUtil;
 import com.evolveum.midpoint.model.api.AssignmentObjectRelation;
 
 import com.evolveum.midpoint.web.component.input.RelationDropDownChoice;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.panel.Fragment;
 
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
@@ -78,7 +78,7 @@ protected IModel<QName> createQNameModel(QName defaultRelation) {
     }
 
     protected List<QName> getSupportedRelations() {
-        return WebComponentUtil.getCategoryRelationChoices(AreaCategoryType.ADMINISTRATION, getPageBase());
+        return RelationUtil.getCategoryRelationChoices(AreaCategoryType.ADMINISTRATION, getPageBase());
     }
 
     protected QName getPredefinedRelation() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -12,6 +12,8 @@
 import java.util.List;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
+import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.Component;
@@ -108,7 +110,7 @@ protected ExecuteChangeOptionsDto load() {
     @Override
     protected void onInitialize() {
         super.onInitialize();
-        setAdditionalBoxCssClasses(WebComponentUtil.getBoxCssClasses(WebComponentUtil.classToQName(getPrismContext(), getType())));
+        setAdditionalBoxCssClasses(IconAndStylesUtil.getBoxCssClasses(WebComponentUtil.classToQName(getPrismContext(), getType())));
     }
 
     @Override
@@ -121,7 +123,7 @@ protected void newObjectPerformed(AjaxRequestTarget target, AssignmentObjectRela
             collectionView = getObjectCollectionView();
         }
         try {
-            WebComponentUtil.initNewObjectWithReference(getPageBase(),
+            DetailsPageUtil.initNewObjectWithReference(getPageBase(),
                     relation != null && CollectionUtils.isNotEmpty(relation.getObjectTypes()) ?
                             relation.getObjectTypes().get(0) : WebComponentUtil.classToQName(getPrismContext(), getType()),
                     getNewObjectReferencesList(collectionView, relation));
@@ -349,7 +351,7 @@ protected boolean isImportObjectButtonVisible() {
 
     private AjaxCompositedIconButton createCreateReportButton(String buttonId) {
         final CompositedIconBuilder builder = new CompositedIconBuilder();
-        builder.setBasicIcon(WebComponentUtil.createReportIcon(), IconCssStyle.IN_ROW_STYLE);
+        builder.setBasicIcon(IconAndStylesUtil.createReportIcon(), IconCssStyle.IN_ROW_STYLE);
         IconType plusIcon = new IconType();
         plusIcon.setCssClass(GuiStyleConstants.CLASS_ADD_NEW_OBJECT);
         plusIcon.setColor("green");
@@ -543,8 +545,8 @@ public IModel<String> getConfirmationMessageModel() {
     }
 
     protected void objectDetailsPerformed(O object) {
-        if (WebComponentUtil.hasDetailsPage(object.getClass())) {
-            WebComponentUtil.dispatchToObjectDetailsPage(object.getClass(), object.getOid(), this, true);
+        if (DetailsPageUtil.hasDetailsPage(object.getClass())) {
+            DetailsPageUtil.dispatchToObjectDetailsPage(object.getClass(), object.getOid(), this, true);
         } else {
             error("Could not find proper response page");
             throw new RestartResponseException(getPageBase());

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
@@ -12,12 +12,12 @@
 
 import com.evolveum.midpoint.gui.impl.component.search.Search;
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.AbstractRoleSearchItemWrapper;
+import com.evolveum.midpoint.gui.impl.util.RelationUtil;
 import com.evolveum.midpoint.web.component.input.RelationDropDownChoice;
 
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.jetbrains.annotations.NotNull;
 
@@ -106,7 +106,7 @@ protected boolean isVisibleParameterPanel() {
     protected QName getDefaultRelation() {
         QName relation = getRelationValueFromSearch();
         if (QNameUtil.match(relation, PrismConstants.Q_ANY)) {
-            QName defRelation = WebComponentUtil.getDefaultRelation();
+            QName defRelation = RelationUtil.getDefaultRelation();
             if (getSupportedRelations().contains(defRelation)) {
                 relation = defRelation;
             } else {

diff --git a/...ain/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.java b/...ain/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.evolveum.midpoint.gui.impl.util.ProvisioningObjectsUtil;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -83,7 +84,7 @@ protected void initParametersPanel(Fragment parametersPanel) {
         kindContainer.setOutputMarkupId(true);
         parametersPanel.add(kindContainer);
 
-        DropDownChoicePanel<ShadowKindType> kindSelector = WebComponentUtil.createEnumPanel(ShadowKindType.class, ID_KIND,
+        DropDownChoicePanel<ShadowKindType> kindSelector = WebComponentUtil.createEnumPanel(ID_KIND,
                 WebComponentUtil.createReadonlyModelFromEnum(ShadowKindType.class), Model.of(),
                 ResourceTypeAssignmentPopupTabPanel.this, true);
         kindSelector.setOutputMarkupId(true);
@@ -145,7 +146,7 @@ protected void onUpdate(AjaxRequestTarget target) {
 
             @Override
             public Object getDisplayValue(ResourceAssociationDefinition refinedAssociationDefinition) {
-                return WebComponentUtil.getAssociationDisplayName(refinedAssociationDefinition);
+                return ProvisioningObjectsUtil.getAssociationDisplayName(refinedAssociationDefinition);
             }
 
             @Override
@@ -213,7 +214,7 @@ protected List<ResourceAssociationDefinition> load() {
                 if (resource == null) {
                     return new ArrayList<>();
                 }
-                return WebComponentUtil.getRefinedAssociationDefinition(resource, getKindValue(), getIntentValue());
+                return ProvisioningObjectsUtil.getRefinedAssociationDefinition(resource, getKindValue(), getIntentValue());
             }
         };
     }

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
@@ -12,6 +12,7 @@
 
 import com.evolveum.midpoint.authentication.api.util.AuthUtil;
 import com.evolveum.midpoint.gui.api.util.ObjectTypeListUtil;
+import com.evolveum.midpoint.gui.impl.util.RelationUtil;
 import com.evolveum.midpoint.schema.processor.ResourceObjectTypeDefinition;
 import com.evolveum.midpoint.schema.processor.ResourceSchema;
 import com.evolveum.midpoint.schema.processor.ResourceSchemaFactory;
@@ -240,7 +241,7 @@ public boolean isVisible() {
         relationContainer.setOutputMarkupId(true);
         add(relationContainer);
 
-        DropDownChoicePanel<RelationTypes> relationSelector = WebComponentUtil.createEnumPanel(RelationTypes.class, ID_RELATION,
+        DropDownChoicePanel<RelationTypes> relationSelector = WebComponentUtil.createEnumPanel(ID_RELATION,
                 WebComponentUtil.createReadonlyModelFromEnum(RelationTypes.class), Model.of(RelationTypes.MEMBER), TypedAssignablePanel.this, false);
         relationSelector.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
         relationSelector.setOutputMarkupId(true);
@@ -259,7 +260,7 @@ public boolean isVisible() {
         kindContainer.setOutputMarkupId(true);
         add(kindContainer);
 
-        DropDownChoicePanel kindSelector = WebComponentUtil.createEnumPanel(ShadowKindType.class, ID_KIND,
+        DropDownChoicePanel kindSelector = WebComponentUtil.createEnumPanel(ID_KIND,
                 WebComponentUtil.createReadonlyModelFromEnum(ShadowKindType.class), Model.of(ShadowKindType.ACCOUNT), TypedAssignablePanel.this, false);
         kindSelector.setOutputMarkupId(true);
         kindSelector.getBaseFormComponent().add(new VisibleEnableBehaviour() {
@@ -358,7 +359,7 @@ private QName getSelectedRelation() {
                 (DropDownChoicePanel<RelationTypes>) get(ID_RELATION_CONTAINER).get(ID_RELATION);
         RelationTypes relation = relationPanel.getModel().getObject();
         if (relation == null) {
-            return WebComponentUtil.getDefaultRelationOrFail();
+            return RelationUtil.getDefaultRelationOrFail();
         }
         return relation.getRelation();
     }

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java b/...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
@@ -14,6 +14,7 @@
 import java.util.List;
 import java.util.Locale;
 
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
@@ -138,7 +139,7 @@ public void onClick(AjaxRequestTarget target) {
                     return; // just for safety
                 }
                 ObjectReferenceType ref = ObjectTypeUtil.createObjectRef(oid, ObjectTypes.TASK);
-                WebComponentUtil.dispatchToObjectDetailsPage(ref, getPageBase(), false);
+                DetailsPageUtil.dispatchToObjectDetailsPage(ref, getPageBase(), false);
             }
         };
         backgroundTaskLink.add(new VisibleBehaviour(
@@ -165,7 +166,7 @@ public void onClick(AjaxRequestTarget target) {
                     return; // just for safety
                 }
                 ObjectReferenceType ref = ObjectTypeUtil.createObjectRef(oid, ObjectTypes.CASE);
-                WebComponentUtil.dispatchToObjectDetailsPage(ref, getPageBase(), false);
+                DetailsPageUtil.dispatchToObjectDetailsPage(ref, getPageBase(), false);
             }
         };
         aCase.add(new VisibleBehaviour(() -> getModelObject().getCaseOid() != null && getModelObject().isCaseVisible()));

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/DisplayableChoiceRenderer.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/DisplayableChoiceRenderer.java
@@ -19,7 +19,7 @@
 /**
  * Created by Viliam Repan (lazyman).
  */
-public class DisplayableChoiceRenderer<T extends Serializable> implements IChoiceRenderer<DisplayableValue<T>> {
+public class DisplayableChoiceRenderer<T> implements IChoiceRenderer<DisplayableValue<T>> {
 
     private static final long serialVersionUID = 1L;