JNG-5761-fix association table edit mode

BlackBeltTechnology · Jun 12, 2024 · 3c8c823 · 3c8c823
1 parent 38c293d
commit 3c8c823
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiWidgetHelper.java b/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiWidgetHelper.java
@@ -341,8 +341,13 @@ public static String tableButtonVisibilityConditions(Button button, Table table,
         if (button.getActionDefinition().getIsOpenCreateFormAction() && !table.isIsEager() && container.isView()) {
             return "!editMode && (isFormUpdateable ? isFormUpdateable() : false)";
         }
-        if (button.getActionDefinition().getIsOpenSelectorAction() && container.isView()) {
-            return "(isFormUpdateable ? isFormUpdateable() : false)";
+        if (container.isView()) {
+            if (button.getActionDefinition().getIsOpenSelectorAction() || button.getActionDefinition().getIsRemoveAction()) {
+                return "(isFormUpdateable ? (isFormUpdateable()" + (!table.isIsEager() ? "&& !editMode" : "") + ") : false)";
+            }
+            if (button.getActionDefinition().getIsBulkRemoveAction() || button.getActionDefinition().getIsClearAction()) {
+                return "(isFormUpdateable ? (isFormUpdateable()" + (!table.isIsEager() ? "&& !editMode" : "") + " && selectionModel.length > 0) : false)";
+            }
         }
         if (button.getActionDefinition().getIsClearAction()) {
             String result = "data.length > 0";