hopefully fixing MID-8142 and not breaking anything else :)

Evolveum · Oct 12, 2022 · a654e55 · a654e55
1 parent f8708de
commit a654e55
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/component/search/DeadShadowSearchItemWrapper.java b/...ain/java/com/evolveum/midpoint/gui/impl/component/search/DeadShadowSearchItemWrapper.java
@@ -27,7 +27,10 @@ public ObjectFilter createFilter(Class type, PageBase pageBase, VariablesMap var
         }
         Boolean value = selectedValue.getValue();
         if (BooleanUtils.isTrue(value)) {
-            return null; // let the default behavior to take their chance
+            return PrismContext.get().queryFor(ShadowType.class)
+                    .item(ShadowType.F_DEAD)
+                    .eq(true)
+                    .buildFilter();
         }
 
         return PrismContext.get().queryFor(ShadowType.class)

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java
@@ -585,6 +585,17 @@ private static <C extends Containerable> PropertySearchItemWrapper createPropert
             itemWrapper.setName(WebComponentUtil.getItemDefinitionDisplayNameOrName(itemDef, null));
             return itemWrapper;
         }
+        if (path != null) {
+            if (ShadowType.F_OBJECT_CLASS.equivalent(path)) {
+                return new ObjectClassSearchItemWrapper();
+            } else if (ShadowType.F_DEAD.equivalent(path)) {
+                DeadShadowSearchItemWrapper deadWrapper = new DeadShadowSearchItemWrapper(Arrays.asList(new SearchValue<>(true), new SearchValue<>(false)));
+                deadWrapper.setValue(new SearchValue(false));
+                return deadWrapper;
+            } else {
+                return new TextSearchItemWrapper(path, itemDef);
+            }
+        }
         if (valueTypeName != null) {
             if (DOMUtil.XSD_BOOLEAN.equals(valueTypeName)) {
                 List<DisplayableValue<Boolean>> list = new ArrayList<>();
@@ -604,15 +615,7 @@ private static <C extends Containerable> PropertySearchItemWrapper createPropert
                     itemDef.getValueEnumerationRef().getOid(),
                     itemDef.getValueEnumerationRef().getTargetType());
         }
-        if (path != null) {
-            if (ShadowType.F_OBJECT_CLASS.equivalent(path)) {
-                return new ObjectClassSearchItemWrapper();
-            } else if (ShadowType.F_DEAD.equivalent(path)) {
-                return new DeadShadowSearchItemWrapper(Arrays.asList(new SearchValue<>(true), new SearchValue<>(false)));
-            } else {
-                return new TextSearchItemWrapper(path, itemDef);
-            }
-        }
+
         return new TextSearchItemWrapper();
     }