refactoring of ajaxbutton behavior

Evolveum · Aug 26, 2021 · ddab3a8 · ddab3a8
1 parent 7895b42
commit ddab3a8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 32 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
@@ -773,11 +773,6 @@ private void initCartButton(WebMarkupContainer mainHeader) {
         AjaxButton cartButton = new AjaxButton(ID_CART_BUTTON) {
             private static final long serialVersionUID = 1L;
 
-            @Override
-            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
-                attributes.setChannel(new AjaxChannel("blocking", AjaxChannel.Type.ACTIVE));
-            }
-
             @Override
             public void onClick(AjaxRequestTarget ajaxRequestTarget) {
                 navigateToNext(new PageAssignmentsList(true));

diff --git a/.../java/com/evolveum/midpoint/gui/impl/prism/panel/component/ExpressionTypeSelectPopup.java b/.../java/com/evolveum/midpoint/gui/impl/prism/panel/component/ExpressionTypeSelectPopup.java
@@ -94,11 +94,6 @@ public void onClick(AjaxRequestTarget target) {
                 addExpressionPerformed(target, expressionType);
             }
 
-            @Override
-            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
-                super.updateAjaxAttributes(attributes);
-                attributes.setEventPropagation(AjaxRequestAttributes.EventPropagation.BUBBLE);
-            }
         };
         add(select);
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxButton.java
@@ -7,6 +7,8 @@
 package com.evolveum.midpoint.web.component;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.ajax.AjaxChannel;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;
@@ -45,4 +47,12 @@ protected void onComponentTag(ComponentTag tag) {
             tag.setType(XmlTag.TagType.OPEN);
         }
     }
+
+    @Override
+    protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+        super.updateAjaxAttributes(attributes);
+        attributes.setEventPropagation(AjaxRequestAttributes.EventPropagation.BUBBLE);
+        attributes.setChannel(new AjaxChannel("blocking", AjaxChannel.Type.ACTIVE));
+    }
+
 }
diff --git a/...rc/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java b/...rc/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
@@ -98,11 +98,6 @@ public boolean isVisible() {
                 .createStringResource("PageAssignmentDetails.addToCartButton")) {
             private static final long serialVersionUID = 1L;
 
-            @Override
-            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
-                attributes.setChannel(new AjaxChannel("blocking", AjaxChannel.Type.ACTIVE));
-            }
-
             @Override
             public void onClick(AjaxRequestTarget target) {
                 AssignmentEditorDto dto = AssignmentEditorDto.createDtoFromObject(getObject().asObjectable(), UserDtoStatus.ADD, parentPage);

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
@@ -296,12 +296,6 @@ private void initButtonsPanel(WebMarkupContainer parametersPanel) {
             public void onClick(AjaxRequestTarget ajaxRequestTarget) {
                 AbstractShoppingCartTabPanel.this.addAllAssignmentsPerformed(ajaxRequestTarget);
             }
-
-            @Override
-            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
-                super.updateAjaxAttributes(attributes);
-                attributes.setEventPropagation(AjaxRequestAttributes.EventPropagation.BUBBLE);
-            }
         };
         addAllButton.add(new VisibleEnableBehaviour() {
             private static final long serialVersionUID = 1L;
@@ -327,11 +321,6 @@ public boolean isEnabled() {
         AjaxButton goToShoppingCartButton = new AjaxButton(ID_GO_TO_SHOPPING_CART_BUTTON, createStringResource("AbstractShoppingCartTabPanel.goToShoppingCartButton")) {
             private static final long serialVersionUID = 1L;
 
-            @Override
-            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
-                attributes.setChannel(new AjaxChannel("blocking", AjaxChannel.Type.ACTIVE));
-            }
-
             @Override
             public void onClick(AjaxRequestTarget ajaxRequestTarget) {
                 AbstractShoppingCartTabPanel.this.getPageBase().navigateToNext(new PageAssignmentsList(true));

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
@@ -236,12 +236,6 @@ public void onClick(AjaxRequestTarget target) {
                 }
             }
 
-            @Override
-            protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
-                super.updateAjaxAttributes(attributes);
-                attributes.setEventPropagation(AjaxRequestAttributes.EventPropagation.BUBBLE);
-            }
-
         };
         requestAssignments.add(new VisibleEnableBehaviour() {
             @Override