different fixes, including fixes after merge, some code adaptation etc.

Evolveum · Dec 15, 2022 · 0131df5 · 0131df5
1 parent 3a10075
commit 0131df5
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 16 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -5463,4 +5463,19 @@ public static String translateMessage(LocalizableMessage msg) {
 
         return application.getLocalizationService().translate(msg, getCurrentLocale());
     }
+
+    public static CompiledObjectCollectionView getCompiledObjectCollectionView(GuiObjectListViewType listViewType, ContainerPanelConfigurationType config, PageBase pageBase) {
+        Task task = pageBase.createSimpleTask("Compile collection");
+        OperationResult result = task.getResult();
+        try {
+            CompiledObjectCollectionView compiledCollectionViewFromPanelConfiguration = new CompiledObjectCollectionView();
+            pageBase.getModelInteractionService().compileView(compiledCollectionViewFromPanelConfiguration, listViewType, task, result);
+            return compiledCollectionViewFromPanelConfiguration;
+        } catch (Throwable e) {
+            LOGGER.error("Cannot compile object collection view for panel configuration {}. Reason: {}", config, e.getMessage(), e);
+            result.recordFatalError("Cannot compile object collection view for panel configuration " + config + ". Reason: " + e.getMessage(), e);
+            pageBase.showResult(result);
+        }
+        return null;
+    }
 }
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
@@ -1019,16 +1019,7 @@ private CompiledObjectCollectionView getCompiledCollectionViewFromPanelConfigura
         if (listViewType == null) {
             return null;
         }
-        Task task = getPageBase().createSimpleTask("Compile collection");
-        OperationResult result = task.getResult();
-        try {
-            compiledCollectionViewFromPanelConfiguration = new CompiledObjectCollectionView();
-            getPageBase().getModelInteractionService().compileView(compiledCollectionViewFromPanelConfiguration, listViewType, task, result);
-        } catch (Throwable e) {
-            LOGGER.error("Cannot compile object collection view for panel configuration {}. Reason: {}", config, e.getMessage(), e);
-            result.recordFatalError("Cannot compile object collection view for panel configuration " + config + ". Reason: " + e.getMessage(), e);
-            getPageBase().showResult(result);
-        }
+        compiledCollectionViewFromPanelConfiguration = WebComponentUtil.getCompiledObjectCollectionView(listViewType, config, getPageBase());
         return compiledCollectionViewFromPanelConfiguration;
 
     }

diff --git a/.../main/java/com/evolveum/midpoint/gui/impl/component/search/factory/SearchItemContext.java b/.../main/java/com/evolveum/midpoint/gui/impl/component/search/factory/SearchItemContext.java
@@ -12,7 +12,6 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -35,6 +34,8 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchItemType;
 import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
 
+import org.jetbrains.annotations.Nullable;
+
 public class SearchItemContext implements Serializable {
 
 
@@ -166,7 +167,7 @@ public String getDisplayName() {
         if (StringUtils.isNotEmpty(name)) {
             return name;
         }
-        name = WebComponentUtil.getItemDefinitionDisplayNameOrName(itemDef, null);
+        name = WebComponentUtil.getItemDefinitionDisplayNameOrName(itemDef);
         if (StringUtils.isNotEmpty(name)) {
             return name;
         }

diff --git a/...a/com/evolveum/midpoint/gui/impl/component/search/wrapper/ReferenceSearchItemWrapper.java b/...a/com/evolveum/midpoint/gui/impl/component/search/wrapper/ReferenceSearchItemWrapper.java
@@ -9,7 +9,6 @@
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.search.panel.ReferenceSearchItemPanel;
-import com.evolveum.midpoint.gui.impl.component.search.wrapper.PropertySearchItemWrapper;
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismReferenceDefinition;

diff --git a/...n/java/com/evolveum/midpoint/gui/impl/component/search/wrapper/TextSearchItemWrapper.java b/...n/java/com/evolveum/midpoint/gui/impl/component/search/wrapper/TextSearchItemWrapper.java
@@ -7,7 +7,6 @@
 package com.evolveum.midpoint.gui.impl.component.search.wrapper;
 
 import com.evolveum.midpoint.gui.impl.component.search.panel.TextSearchItemPanel;
-import com.evolveum.midpoint.gui.impl.component.search.wrapper.PropertySearchItemWrapper;
 import com.evolveum.midpoint.prism.ItemDefinition;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.util.DisplayableValue;

diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
@@ -239,7 +239,7 @@ protected PageStorage getPageStorage(String storageKey) {
 
             @Override
             protected SearchBoxConfigurationType getDefaultSearchBoxConfiguration(Class<AH> type) {
-                return SearchBoxConfigurationUtil.getDefaultOrgMembersSearchBoxConfiguration(type, getAbstractRoleType(), getDefaultSupportedObjectTypes(true), getSupportedRelations(), getPageBase());
+                return getDefaultMemberSearchBoxConfig(type);
             }
 
 //            @Override
@@ -310,6 +310,10 @@ protected boolean isCreateNewObjectEnabled() {
         memberContainer.add(childrenListPanel);
     }
 
+    protected  <AH extends AssignmentHolderType> SearchBoxConfigurationType getDefaultMemberSearchBoxConfig(Class<AH> type) {
+        return SearchBoxConfigurationUtil.getDefaultOrgMembersSearchBoxConfiguration(type, getAbstractRoleType(), getDefaultSupportedObjectTypes(true), getSupportedRelations(), getPageBase());
+    }
+
     protected boolean reloadPageOnRefresh() {
         return false;
     }

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/GovernanceCardsPanel.java b/...om/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/GovernanceCardsPanel.java
@@ -16,6 +16,9 @@
 import com.evolveum.midpoint.gui.impl.component.tile.*;
 import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.FocusDetailsModels;
 import com.evolveum.midpoint.gui.impl.page.admin.resource.component.TemplateTile;
+import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
+import com.evolveum.midpoint.prism.Containerable;
+import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.schema.GetOperationOptions;
@@ -85,11 +88,31 @@ private void initSearchModel() {
         searchModel = new LoadableDetachableModel<>() {
             @Override
             protected Search<FocusType> load() {
-                return createMemberSearch(FocusType.class);
+
+                SearchFactory<FocusType> searchFactory = new SearchFactory<>()
+                        .type(FocusType.class)
+                        .defaultSearchBoxConfig(getDefaultMemberSearchBoxConfig(FocusType.class))
+                        .collectionView(getObjectCollectionView())
+                        .modelServiceLocator(getPageBase());
+
+                return searchFactory.createSearch();
+
+
+
+//                return createMemberSearch(FocusType.class);
             }
         };
     }
 
+    private CompiledObjectCollectionView getObjectCollectionView() {
+        ContainerPanelConfigurationType config = getPanelConfiguration();
+        if (config == null) {
+            return null;
+        }
+        GuiObjectListViewType listViewType = config.getListView();
+        return WebComponentUtil.getCompiledObjectCollectionView(listViewType, config, getPageBase());
+    }
+
     @Override
     public QName getType() {
         QName type = super.getType();