MID-8378 small update to previous commit

Evolveum · Dec 19, 2022 · 242256c · 242256c
1 parent 3471058
commit 242256c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -149,7 +149,17 @@ protected void onConfigure() {
     }
 
     protected void createBreadcrumb() {
-        addBreadcrumb(new Breadcrumb(getPageTitleModel(), this.getClass(), getPageParameters()));
+        PageParameters pageParameters = getPageParameters();
+        removePageParametersIfNeeded(pageParameters);
+        addBreadcrumb(new Breadcrumb(getPageTitleModel(), this.getClass(), pageParameters));
+    }
+
+    private void removePageParametersIfNeeded(PageParameters parameters) {
+        pageParametersToBeRemoved().forEach(parameters::remove);
+    }
+
+    protected List<String> pageParametersToBeRemoved() {
+        return new ArrayList<>();
     }
 
     public void updateBreadcrumbParameters(String key, Object value) {

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
@@ -491,7 +491,7 @@ private void clearSessionStorageForResourcePage() {
     }
 
     @Override
-    protected List<String> pageParametersToBeRemovedFromBreadcrumb() {
+    protected List<String> pageParametersToBeRemoved() {
         return List.of(PageBase.PARAMETER_SEARCH_BY_NAME);
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
@@ -235,7 +235,7 @@ private Long xgc2long(XMLGregorianCalendar gc) {
     }
 
     @Override
-    protected List<String> pageParametersToBeRemovedFromBreadcrumb() {
+    protected List<String> pageParametersToBeRemoved() {
         return List.of(PageBase.PARAMETER_SEARCH_BY_NAME);
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
@@ -422,7 +422,7 @@ public List<SelectableBean<UserType>> isAnythingSelected(AjaxRequestTarget targe
     }
 
     @Override
-    protected List<String> pageParametersToBeRemovedFromBreadcrumb() {
+    protected List<String> pageParametersToBeRemoved() {
         return List.of(PageBase.PARAMETER_SEARCH_BY_NAME);
     }
 }