Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Oct 7, 2022 · 337d02b · 337d02b
2 parents 0513041 + d4ac622
commit 337d02b
Show file tree

Hide file tree

Showing 12 changed files with 323 additions and 219 deletions.
diff --git a/.../java/com/evolveum/midpoint/gui/impl/component/button/SelectableItemListPopoverPanel.html b/.../java/com/evolveum/midpoint/gui/impl/component/button/SelectableItemListPopoverPanel.html
@@ -25,7 +25,6 @@
 
             <div class="mt-2 mb-1">
                 <a wicket:id="addButton" class="btn btn-sm btn-success"/>
-                <a wicket:id="removeButton" class="btn btn-sm btn-danger"/>
                 <a wicket:id="closeButton" class="btn btn-sm btn-default"/>
             </div>
         </div>

diff --git a/.../java/com/evolveum/midpoint/gui/impl/component/button/SelectableItemListPopoverPanel.java b/.../java/com/evolveum/midpoint/gui/impl/component/button/SelectableItemListPopoverPanel.java
@@ -55,7 +55,6 @@ public abstract class SelectableItemListPopoverPanel<T> extends BasePanel<List<T
     private static final String ID_ITEM_NAME = "itemName";
     private static final String ID_ITEM_HELP = "itemHelp";
     private static final String ID_ADD_BUTTON = "addButton";
-    private static final String ID_REMOVE_BUTTON = "removeButton";
     private static final String ID_CLOSE_BUTTON = "closeButton";
 
     public SelectableItemListPopoverPanel(String id, IModel<List<T>> popupItemModel) {
@@ -178,24 +177,9 @@ public void onClick(AjaxRequestTarget target) {
                 addItemsPerformed(getSelectedItemList(), target);
             }
         };
-        addButton.add(new VisibleBehaviour(this::isAddButtonVisible));
+        addButton.add(new VisibleBehaviour(this::isSelectable));
         popover.add(addButton);
 
-        AjaxButton removeButton = new AjaxButton(ID_REMOVE_BUTTON, createStringResource("SearchItemPanel.remove")) {
-
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                String popoverId = SelectableItemListPopoverPanel.this.get(ID_POPOVER).getMarkupId();
-                target.appendJavaScript("$('#" + popoverId + "').toggle();");
-
-                removeItemsPerformed(getSelectedItemList(), target);
-            }
-        };
-        removeButton.add(new VisibleBehaviour(this::isRemoveButtonVisible));
-        popover.add(removeButton);
-
         AjaxButton close = new AjaxButton(ID_CLOSE_BUTTON, createStringResource("SearchPanel.close")) {
 
             private static final long serialVersionUID = 1L;
@@ -209,19 +193,14 @@ public void onClick(AjaxRequestTarget target) {
 
     }
 
-    protected boolean isRemoveButtonVisible() {
-        return true;
-    }
-
-    protected boolean isAddButtonVisible() {
-        return true;
+    private boolean isSelectable() {
+        if (getModelObject() == null) {
+            return false;
+        }
+        return CollectionUtils.isNotEmpty(getModelObject().stream().filter(item -> item instanceof SelectableRow).collect(Collectors.toList()));
     }
 
-    protected void addItemsPerformed(List<T> item, AjaxRequestTarget target){
-    }
-
-    protected void removeItemsPerformed(List<T> item, AjaxRequestTarget target){
-    }
+    protected abstract void addItemsPerformed(List<T> item, AjaxRequestTarget target);
 
     protected abstract Component getPopoverReferenceComponent();
 

diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/component/search/AvailableFilterWrapper.java b/...src/main/java/com/evolveum/midpoint/gui/impl/component/search/AvailableFilterWrapper.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.html
@@ -14,10 +14,22 @@
             <button type="button" class="btn btn-default" wicket:id="saveSearchButton">
                 <i class="fa fa-save"></i>
             </button>
-            <button wicket:id="savedSearchMenu" class="btn btn-default dropdown-toggle">
+            <button wicket:id="savedSearchMenu" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                 <span class="caret"></span>
             </button>
-            <div wicket:id="savedFiltersPopover"/>
+            <div class="dropdown-menu dropdown-menu-left" role="menu" wicket:id="savedFilterMenu">
+                <label><wicket:message key="SearchPanel.savedFilters" /></label>
+                <div wicket:id="savedFilterItem">
+                    <div class="d-flex dropdown-item">
+                        <a wicket:id="savedFilterName">
+                            <wicket:container wicket:id="savedFilterNameLabel" />
+                        </a>
+                        <a type="button" class="btn btn-xs" style="pointer-events: none !important;" wicket:id="savedFilterRemoveButton">
+                            <i class="fa fa-trash" style="color: red;"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
         </div>
     </form>
     <wicket:fragment wicket:id="basicSearchFragment">