Merge remote-tracking branch 'origin/master'

Evolveum · Sep 25, 2023 · 425497a · 425497a
2 parents b0e2997 + 2d8ddbf
commit 425497a
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 28 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/GuiDisplayTypeUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/GuiDisplayTypeUtil.java
@@ -261,6 +261,13 @@ public static String getHelp(DisplayType displayType) {
         return LocalizationUtil.translatePolyString(displayType.getHelp());
     }
 
+    public static String getTooltip(DisplayType displayType) {
+        if (displayType == null || displayType.getTooltip() == null) {
+            return "";
+        }
+        return LocalizationUtil.translatePolyString(displayType.getTooltip());
+    }
+
     public static String getDisplayTypeTitle(DisplayType displayType) {
         if (displayType == null || displayType.getTooltip() == null) {
             return "";

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/MemberSearchPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/MemberSearchPanel.java
@@ -44,14 +44,14 @@ protected void onScopeItemChanged(AjaxRequestTarget target) {
 //                }
             }
         };
-        scopeSearchItemPanel.add(new VisibleBehaviour(() -> isScopeVisible()));
+        scopeSearchItemPanel.add(new VisibleBehaviour(this::isScopeVisible));
         scopeSearchItemPanel.setOutputMarkupId(true);
         scopeSearchItemPanel.setOutputMarkupPlaceholderTag(true);
         add(scopeSearchItemPanel);
 
         RelationSearchItemPanel relationSearchItemPanel = new RelationSearchItemPanel(ID_RELATION,
                 new PropertyModel<>(getModel(), AbstractRoleSearchItemWrapper.F_RELATION));
-        relationSearchItemPanel.add(new VisibleBehaviour(() -> isRelationVisible()));
+        relationSearchItemPanel.add(new VisibleBehaviour(this::isRelationVisible));
         relationSearchItemPanel.setOutputMarkupId(true);
         add(relationSearchItemPanel);
 
@@ -66,19 +66,19 @@ protected void onIndirectItemChanged(AjaxRequestTarget target) {
 //                }
             }
         };
-        indirectSearchItemPanel.add(new VisibleBehaviour(() -> isIndirectVisible()));
+        indirectSearchItemPanel.add(new VisibleBehaviour(this::isIndirectVisible));
         indirectSearchItemPanel.setOutputMarkupId(true);
         add(indirectSearchItemPanel);
 
         TenantSearchItemPanel tenantSearchItemPanel = new TenantSearchItemPanel(ID_TENANT,
                 new PropertyModel<>(getModel(), AbstractRoleSearchItemWrapper.F_TENANT));
-        tenantSearchItemPanel.add(new VisibleBehaviour(() -> isParameterSearchVisible()));
+        tenantSearchItemPanel.add(new VisibleBehaviour(this::isTenantVisible));
         tenantSearchItemPanel.setOutputMarkupId(true);
         add(tenantSearchItemPanel);
 
         ProjectSearchItemPanel projectSearchItemWrapper = new ProjectSearchItemPanel(ID_PROJECT,
                 new PropertyModel<>(getModel(), AbstractRoleSearchItemWrapper.F_PROJECT));
-        projectSearchItemWrapper.add(new VisibleBehaviour(() -> isParameterSearchVisible()));
+        projectSearchItemWrapper.add(new VisibleBehaviour(this::isProjectVisible));
         projectSearchItemWrapper.setOutputMarkupId(true);
         add(projectSearchItemWrapper);
 
@@ -113,8 +113,12 @@ private boolean isIndirectVisible() {
         return getModelObject().isIndirectVisible();
     }
 
-    private boolean isParameterSearchVisible() {
-        return getModelObject().isParameterSearchVisible();
+    private boolean isTenantVisible() {
+        return getModelObject().isTenantVisible();
+    }
+
+    private boolean isProjectVisible() {
+        return getModelObject().isTenantVisible();
     }
 
 }
diff --git a/...om/evolveum/midpoint/gui/impl/component/search/wrapper/AbstractRoleSearchItemWrapper.java b/...om/evolveum/midpoint/gui/impl/component/search/wrapper/AbstractRoleSearchItemWrapper.java
@@ -210,15 +210,27 @@ public boolean isSearchScope(SearchBoxScopeType scope) {
     }
 
     public boolean isSearchScopeVisible() {
-        return scopeSearchItemWrapper != null;
+        return scopeSearchItemWrapper != null && scopeSearchItemWrapper.isVisible();
     }
 
     public boolean isRelationVisible() {
-        return CollectionUtils.isNotEmpty(getSupportedRelations()) || isSearchScope(SearchBoxScopeType.ONE_LEVEL);
+        boolean wrapperVisibility = relationSearchItemWrapper == null || relationSearchItemWrapper.isVisible();
+        return wrapperVisibility && (CollectionUtils.isNotEmpty(getSupportedRelations()) || isSearchScope(SearchBoxScopeType.ONE_LEVEL));
     }
 
     public boolean isIndirectVisible() {
-        return !isSearchScope(SearchBoxScopeType.SUBTREE);
+        boolean wrapperVisibility = indirectSearchItemWrapper == null || indirectSearchItemWrapper.isVisible();
+        return wrapperVisibility && !isSearchScope(SearchBoxScopeType.SUBTREE);
+    }
+
+    public boolean isTenantVisible() {
+        boolean wrapperVisibility = tenantSearchItemWrapper == null || tenantSearchItemWrapper.isVisible();
+        return wrapperVisibility && isParameterSearchVisible();
+    }
+
+   public boolean isProjectVisible() {
+        boolean wrapperVisibility = projectSearchItemWrapper == null || projectSearchItemWrapper.isVisible();
+        return wrapperVisibility && isParameterSearchVisible();
     }
 
     public boolean isParameterSearchVisible() {

diff --git a/...va/com/evolveum/midpoint/gui/impl/component/search/wrapper/IndirectSearchItemWrapper.java b/...va/com/evolveum/midpoint/gui/impl/component/search/wrapper/IndirectSearchItemWrapper.java
@@ -6,12 +6,16 @@
  */
 package com.evolveum.midpoint.gui.impl.component.search.wrapper;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.search.panel.IndirectSearchItemPanel;
 import com.evolveum.midpoint.util.DisplayableValue;
 import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.IndirectSearchItemConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchBoxModeType;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class IndirectSearchItemWrapper extends AbstractSearchItemWrapper<Boolean> {
 
     private IndirectSearchItemConfigurationType indirectConfig;
@@ -22,7 +26,8 @@ public IndirectSearchItemWrapper(IndirectSearchItemConfigurationType indirectCon
 
     @Override
     public boolean isVisible() {
-        return true;
+        return indirectConfig == null
+                || WebComponentUtil.getElementVisibility(indirectConfig.getVisibility());
     }
 
     @Override
@@ -37,17 +42,22 @@ public DisplayableValue<Boolean> getDefaultValue() {
 
     @Override
     public String getName() {
-        return "abstractRoleMemberPanel.indirectMembers";
+        var display = indirectConfig == null ? null : indirectConfig.getDisplay();
+        var name = GuiDisplayTypeUtil.getTranslatedLabel(display);
+        return StringUtils.isEmpty(name) ? "abstractRoleMemberPanel.indirectMembers" : name;
     }
 
     @Override
     public String getHelp() {
-        return "abstractRoleMemberPanel.indirectMembers.tooltip";
+        var display = indirectConfig == null ? null : indirectConfig.getDisplay();
+        var help = GuiDisplayTypeUtil.getHelp(display);
+        return StringUtils.isEmpty(help) ? "abstractRoleMemberPanel.indirectMembers.tooltip" : help;
     }
 
     @Override
     public String getTitle() {
-        return ""; //todo
+        var display = indirectConfig == null ? null : indirectConfig.getDisplay();
+        return GuiDisplayTypeUtil.getTooltip(display);
     }
 
     @Override

diff --git a/...ava/com/evolveum/midpoint/gui/impl/component/search/wrapper/ProjectSearchItemWrapper.java b/...ava/com/evolveum/midpoint/gui/impl/component/search/wrapper/ProjectSearchItemWrapper.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.component.search.wrapper;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.search.panel.ProjectSearchItemPanel;
 import com.evolveum.midpoint.prism.PrismContext;
@@ -41,7 +42,9 @@ public DisplayableValue<ObjectReferenceType> getDefaultValue() {
 
     @Override
     public String getName() {
-        return "abstractRoleMemberPanel.project";
+        var display = projectConfig == null ? null : projectConfig.getDisplay();
+        var name = GuiDisplayTypeUtil.getTranslatedLabel(display);
+        return StringUtils.isEmpty(name) ? "abstractRoleMemberPanel.project" : name;
     }
 
 
@@ -60,7 +63,8 @@ public String getHelp() {
 
     @Override
     public String getTitle() {
-        return ""; //todo
+        var display = projectConfig == null ? null : projectConfig.getDisplay();
+        return GuiDisplayTypeUtil.getTooltip(display);
     }
 
     public PrismReferenceDefinition getProjectRefDef() {
@@ -75,6 +79,7 @@ protected PrismReferenceDefinition getReferenceDefinition(ItemName refName) {
 
     @Override
     public boolean isVisible() {
-        return true;
+        return projectConfig == null
+                || WebComponentUtil.getElementVisibility(projectConfig.getVisibility());
     }
 }
diff --git a/...va/com/evolveum/midpoint/gui/impl/component/search/wrapper/RelationSearchItemWrapper.java b/...va/com/evolveum/midpoint/gui/impl/component/search/wrapper/RelationSearchItemWrapper.java
@@ -8,6 +8,8 @@
 
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.search.panel.RelationSearchItemPanel;
 import com.evolveum.midpoint.prism.PrismConstants;
 import com.evolveum.midpoint.util.QNameUtil;
@@ -18,6 +20,8 @@
 import com.evolveum.midpoint.util.DisplayableValue;
 import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -40,8 +44,10 @@ public boolean isEnabled() {
         return CollectionUtils.isNotEmpty(relationSearchItemConfigurationType.getSupportedRelations());
     }
 
+    @Override
     public boolean isVisible() {
-        return true;
+        return relationSearchItemConfigurationType == null
+                || WebComponentUtil.getElementVisibility(relationSearchItemConfigurationType.getVisibility());
     }
 
     @Override
@@ -51,18 +57,23 @@ public Class<RelationSearchItemPanel> getSearchItemPanelClass() {
 
     @Override
     public String getName() {
-        return "relationDropDownChoicePanel.relation";
+        var display = relationSearchItemConfigurationType == null ? null : relationSearchItemConfigurationType.getDisplay();
+        var name = GuiDisplayTypeUtil.getTranslatedLabel(display);
+        return StringUtils.isEmpty(name) ? "relationDropDownChoicePanel.relation" : name;
     }
 
     @Override
     public String getHelp() {
-        return "relationDropDownChoicePanel.tooltip.relation";
+        var display = relationSearchItemConfigurationType == null ? null : relationSearchItemConfigurationType.getDisplay();
+        var help = GuiDisplayTypeUtil.getHelp(display);
+        return StringUtils.isEmpty(help) ? "relationDropDownChoicePanel.tooltip.relation" : help;
     }
 
 
     @Override
     public String getTitle() {
-        return ""; //todo
+        var display = relationSearchItemConfigurationType == null ? null : relationSearchItemConfigurationType.getDisplay();
+        return GuiDisplayTypeUtil.getTooltip(display);
     }
 
     @Override

diff --git a/.../java/com/evolveum/midpoint/gui/impl/component/search/wrapper/ScopeSearchItemWrapper.java b/.../java/com/evolveum/midpoint/gui/impl/component/search/wrapper/ScopeSearchItemWrapper.java
@@ -6,12 +6,17 @@
  */
 package com.evolveum.midpoint.gui.impl.component.search.wrapper;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.search.panel.ScopeSearchItemPanel;
 import com.evolveum.midpoint.util.DisplayableValue;
 import com.evolveum.midpoint.gui.impl.component.search.SearchValue;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.DisplayType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ScopeSearchItemConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchBoxScopeType;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class ScopeSearchItemWrapper extends AbstractSearchItemWrapper<SearchBoxScopeType> {
 
     private ScopeSearchItemConfigurationType scopeConfig;
@@ -27,7 +32,7 @@ public boolean isEnabled() {
     }
 
     public boolean isVisible() {
-        return true;
+        return scopeConfig == null || WebComponentUtil.getElementVisibility(scopeConfig.getVisibility());
     }
 
     @Override
@@ -42,17 +47,22 @@ public DisplayableValue<SearchBoxScopeType> getDefaultValue() {
 
     @Override
     public String getName() {
-        return "abstractRoleMemberPanel.searchScope";
+        var display = scopeConfig == null ? null : scopeConfig.getDisplay();
+        var name = GuiDisplayTypeUtil.getTranslatedLabel(display);
+        return StringUtils.isEmpty(name) ? "abstractRoleMemberPanel.searchScope" : name;
     }
 
     @Override
     public String getHelp() {
-        return "abstractRoleMemberPanel.searchScope.tooltip";
+        var display = scopeConfig == null ? null : scopeConfig.getDisplay();
+        var help = GuiDisplayTypeUtil.getHelp(display);
+        return StringUtils.isEmpty(help) ? "abstractRoleMemberPanel.searchScope.tooltip" : help;
     }
 
     @Override
     public String getTitle() {
-        return ""; //todo
+        var display = scopeConfig == null ? null : scopeConfig.getDisplay();
+        return GuiDisplayTypeUtil.getTooltip(display);
     }
 
 //    @Override

diff --git a/...java/com/evolveum/midpoint/gui/impl/component/search/wrapper/TenantSearchItemWrapper.java b/...java/com/evolveum/midpoint/gui/impl/component/search/wrapper/TenantSearchItemWrapper.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.component.search.wrapper;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.search.panel.TenantSearchItemPanel;
 import com.evolveum.midpoint.prism.PrismContext;
@@ -40,7 +41,9 @@ public DisplayableValue<ObjectReferenceType> getDefaultValue() {
 
     @Override
     public String getName() {
-        return "abstractRoleMemberPanel.tenant";
+        var display = tenantConfig == null ? null : tenantConfig.getDisplay();
+        var name = GuiDisplayTypeUtil.getTranslatedLabel(display);
+        return StringUtils.isEmpty(name) ? "abstractRoleMemberPanel.tenant" : name;
     }
 
 
@@ -59,7 +62,8 @@ public String getHelp() {
 
     @Override
     public String getTitle() {
-        return ""; //todo
+        var display = tenantConfig == null ? null : tenantConfig.getDisplay();
+        return GuiDisplayTypeUtil.getTooltip(display);
     }
 
     public PrismReferenceDefinition getTenantDefinition() {
@@ -74,6 +78,6 @@ protected PrismReferenceDefinition getReferenceDefinition(ItemName refName) {
 
     @Override
     public boolean isVisible() {
-        return true;
+        return tenantConfig == null || WebComponentUtil.getElementVisibility(tenantConfig.getVisibility());
     }
 }