one more fix for filter saving

Evolveum · Jun 8, 2022 · f9a5b12 · f9a5b12
1 parent c6004bc
commit f9a5b12
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SaveSearchPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SaveSearchPanel.java
@@ -231,6 +231,7 @@ private SearchItemType createOidSearchItem(OidSearchItemWrapper oidSearchItemWra
     private void saveSearchItemToAdminConfig(AvailableFilterType availableFilter, AjaxRequestTarget ajaxRequestTarget) {
         FocusType principalFocus = getPageBase().getPrincipalFocus();
         boolean viewExists = true;
+        boolean addItemToPath = true;
         List<ItemName> path = new ArrayList<>();
         Object valueToAdd = null;
         if (!(principalFocus instanceof UserType)) {
@@ -240,19 +241,24 @@ private void saveSearchItemToAdminConfig(AvailableFilterType availableFilter, Aj
         if (adminGui == null) {
             viewExists = false;
             adminGui = new AdminGuiConfigurationType();
-            path.add(UserType.F_ADMIN_GUI_CONFIGURATION);
             valueToAdd = adminGui;
+            addItemToPath = false;
         }
+        path.add(UserType.F_ADMIN_GUI_CONFIGURATION);
 
         GuiObjectListViewsType views = adminGui.getObjectCollectionViews();
+        if (addItemToPath) {
+            path.add(AdminGuiConfigurationType.F_OBJECT_COLLECTION_VIEWS);
+        }
         if (views == null) {
             viewExists = false;
             views = new GuiObjectListViewsType();
-            adminGui.objectCollectionViews(views);
-            if (valueToAdd == null) {
+            if (valueToAdd != null) {
+                adminGui.objectCollectionViews(views);
+            } else {
                 valueToAdd = views;
-                path.add(AdminGuiConfigurationType.F_OBJECT_COLLECTION_VIEWS);
             }
+            addItemToPath = false;
         }
 
         StringValue collectionViewParameter = WebComponentUtil.getCollectionNameParameterValue(getPageBase());
@@ -264,27 +270,34 @@ private void saveSearchItemToAdminConfig(AvailableFilterType availableFilter, Aj
                 objectListView = listView;
             }
         }
+        if (addItemToPath) {
+            path.add(GuiObjectListViewsType.F_OBJECT_COLLECTION_VIEW);
+        }
         if (objectListView == null) {
             viewExists = false;
             objectListView = new GuiObjectListViewType();
             objectListView.setType(WebComponentUtil.containerClassToQName(PrismContext.get(), type));
-            views.getObjectCollectionView().add(objectListView);
-            if (valueToAdd == null) {
+            if (valueToAdd != null) {
+                views.getObjectCollectionView().add(objectListView);
+            } else {
                 valueToAdd = objectListView;
-                path.add(GuiObjectListViewsType.F_OBJECT_COLLECTION_VIEW);
             }
+            addItemToPath = false;
         }
         if (objectListView.getIdentifier() == null) {
             objectListView.setIdentifier(defaultCollectionViewIdentifier);
         }
         SearchBoxConfigurationType searchConfig = objectListView.getSearchBoxConfiguration();
+        if (addItemToPath) {
+            path.add(GuiObjectListViewType.F_SEARCH_BOX_CONFIGURATION);
+            path.add(SearchBoxConfigurationType.F_AVAILABLE_FILTER);
+        }
         if (searchConfig == null) {
             searchConfig = new SearchBoxConfigurationType();
-            objectListView.searchBoxConfiguration(searchConfig);
-            if (valueToAdd == null) {
+            if (valueToAdd != null) {
+                objectListView.setSearchBoxConfiguration(searchConfig);
+            } else {
                 valueToAdd = availableFilter;
-                path.add(GuiObjectListViewType.F_SEARCH_BOX_CONFIGURATION);
-                path.add(SearchBoxConfigurationType.F_AVAILABLE_FILTER);
             }
         }
         if (searchConfig.getAvailableFilter() == null) {
@@ -314,6 +327,7 @@ private void saveSearchItemToAdminConfig(AvailableFilterType availableFilter, Aj
             ajaxRequestTarget.add(getPageBase().getFeedbackPanel());
             return;
         }
+        result.recomputeStatus();
         getPageBase().showResult(result);
         ajaxRequestTarget.add(getPageBase().getFeedbackPanel());
     }