fix for shadow search - dead item search for projection panel, resouc…

…e and objectClass for repository obejcts.
Evolveum · Jan 23, 2023 · 1b6a44a · 1b6a44a
1 parent d7fd348
commit 1b6a44a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...n/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java b/...n/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java
@@ -139,7 +139,7 @@ private List<SearchItemType> createSearchItemList() {
         for (ItemPath path : availableDefinitions.keySet()) {
             SearchItemType searchItem = new SearchItemType();
             searchItem.setPath(new ItemPathType(path));
-            if (isFixedItem(type, path)) {
+            if (isFixedItem(type, path) || isDeadItemForProjections(path) ) {
                 searchItem.setVisibleByDefault(true);
             }
             searchItems.add(searchItem);
@@ -148,6 +148,13 @@ private List<SearchItemType> createSearchItemList() {
         return searchItems;
     }
 
+    private boolean isDeadItemForProjections(ItemPath path) {
+        if (CollectionPanelType.PROJECTION_SHADOW != collectionPanelType) {
+            return false;
+        }
+        return ItemPath.create(ShadowType.F_DEAD).equivalent(path);
+    }
+
     private List<SearchItemType> createReportSearchItems(ObjectCollectionReportEngineConfigurationType reportCollection) {
         List<SearchFilterParameterType> parameters = reportCollection.getParameter();
         List<SearchItemType> searchItems = parameters

diff --git a/...main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java b/...main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java
@@ -210,7 +210,8 @@ public SearchableItemsDefinitions additionalSearchContext(SearchContext ctx) {
 
         SHADOW_SEARCHABLE_ITEMS.put(CollectionPanelType.DEBUG,
                 Arrays.asList(
-                        ItemPath.create(ShadowType.F_DEAD),
+                        ItemPath.create(ShadowType.F_OBJECT_CLASS),
+                        ItemPath.create(ShadowType.F_RESOURCE_REF),
                         ItemPath.create(ShadowType.F_INTENT),
                         ItemPath.create(ShadowType.F_KIND),
                         ItemPath.create(ShadowType.F_EXISTS),