JNG-5889 bulk detect hidden by (#450)

BlackBeltTechnology · Aug 22, 2024 · 0f43d84 · 0f43d84
1 parent bb8390d
commit 0f43d84
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 5 deletions.
diff --git a/.../src/test/resources/snapshots/frontend-react/src/components/table/EagerTable.tsx.snapshot b/.../src/test/resources/snapshots/frontend-react/src/components/table/EagerTable.tsx.snapshot
@@ -422,7 +422,7 @@ export function EagerTable<T extends GridValidRowModel, TStored extends T, S ext
             <GridToolbarContainer>
               {toolBarActions.map((toolBarAction: ToolBarActionProps<T>) =>
                 actions[toolBarAction.name] &&
-                toolBarAction.enabled(data, selectionModel, ownerData, isFormUpdateable) ? (
+                toolBarAction.enabled(data, selectionModel, getSelectedRows(), ownerData, isFormUpdateable) ? (
                   <Button
                     key={toolBarAction.id}
                     id={toolBarAction.id}

diff --git a/...d/src/test/resources/snapshots/frontend-react/src/components/table/LazyTable.tsx.snapshot b/...d/src/test/resources/snapshots/frontend-react/src/components/table/LazyTable.tsx.snapshot
@@ -605,7 +605,7 @@ export function LazyTable<T extends GridValidRowModel, TStored extends T, S exte
             <GridToolbarContainer>
               {toolBarActions.map((toolBarAction: ToolBarActionProps<T>) =>
                 actions[toolBarAction.name] &&
-                toolBarAction.enabled(data, selectionModel, ownerData, isFormUpdateable) ? (
+                toolBarAction.enabled(data, selectionModel, getSelectedRows(), ownerData, isFormUpdateable) ? (
                   <Button
                     key={toolBarAction.id}
                     id={toolBarAction.id}

diff --git a/.../containers/View/Galaxy/Table/components/ViewGalaxyTableTableComponent/index.tsx.snapshot b/.../containers/View/Galaxy/Table/components/ViewGalaxyTableTableComponent/index.tsx.snapshot
@@ -281,6 +281,7 @@ export function ViewGalaxyTableTableComponent(props: ViewGalaxyTableTableCompone
       enabled: (
         data: ViewGalaxyStored[],
         selectionModel: GridRowSelectionModel,
+        selectedRows: ViewGalaxyStored[],
         ownerData?: any,
         isFormUpdateable?: () => boolean,
       ): boolean => true,
@@ -296,6 +297,7 @@ export function ViewGalaxyTableTableComponent(props: ViewGalaxyTableTableCompone
       enabled: (
         data: ViewGalaxyStored[],
         selectionModel: GridRowSelectionModel,
+        selectedRows: ViewGalaxyStored[],
         ownerData?: any,
         isFormUpdateable?: () => boolean,
       ): boolean => true,
@@ -311,6 +313,7 @@ export function ViewGalaxyTableTableComponent(props: ViewGalaxyTableTableCompone
       enabled: (
         data: ViewGalaxyStored[],
         selectionModel: GridRowSelectionModel,
+        selectedRows: ViewGalaxyStored[],
         ownerData?: any,
         isFormUpdateable?: () => boolean,
       ): boolean => true,
@@ -326,6 +329,7 @@ export function ViewGalaxyTableTableComponent(props: ViewGalaxyTableTableCompone
       enabled: (
         data: ViewGalaxyStored[],
         selectionModel: GridRowSelectionModel,
+        selectedRows: ViewGalaxyStored[],
         ownerData?: any,
         isFormUpdateable?: () => boolean,
       ): boolean => true,
@@ -341,6 +345,7 @@ export function ViewGalaxyTableTableComponent(props: ViewGalaxyTableTableCompone
       enabled: (
         data: ViewGalaxyStored[],
         selectionModel: GridRowSelectionModel,
+        selectedRows: ViewGalaxyStored[],
         ownerData?: any,
         isFormUpdateable?: () => boolean,
       ): boolean => true,
@@ -356,6 +361,7 @@ export function ViewGalaxyTableTableComponent(props: ViewGalaxyTableTableCompone
       enabled: (
         data: ViewGalaxyStored[],
         selectionModel: GridRowSelectionModel,
+        selectedRows: ViewGalaxyStored[],
         ownerData?: any,
         isFormUpdateable?: () => boolean,
       ): boolean => true,
@@ -371,6 +377,7 @@ export function ViewGalaxyTableTableComponent(props: ViewGalaxyTableTableCompone
       enabled: (
         data: ViewGalaxyStored[],
         selectionModel: GridRowSelectionModel,
+        selectedRows: ViewGalaxyStored[],
         ownerData?: any,
         isFormUpdateable?: () => boolean,
       ): boolean => data.length > 0,
@@ -386,6 +393,7 @@ export function ViewGalaxyTableTableComponent(props: ViewGalaxyTableTableCompone
       enabled: (
         data: ViewGalaxyStored[],
         selectionModel: GridRowSelectionModel,
+        selectedRows: ViewGalaxyStored[],
         ownerData?: any,
         isFormUpdateable?: () => boolean,
       ): boolean => selectionModel.length > 0,
@@ -401,6 +409,7 @@ export function ViewGalaxyTableTableComponent(props: ViewGalaxyTableTableCompone
       enabled: (
         data: ViewGalaxyStored[],
         selectionModel: GridRowSelectionModel,
+        selectedRows: ViewGalaxyStored[],
         ownerData?: any,
         isFormUpdateable?: () => boolean,
       ): boolean => selectionModel.length > 0,

diff --git a/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiPageContainerHelper.java b/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiPageContainerHelper.java
@@ -225,6 +225,15 @@ public static MaskEntry getMaskForTable(Table table, PageDefinition pageDefiniti
             }
         }
 
+        for (Button button: table.getTableActionButtonGroup().getButtons()) {
+            if (button.getHiddenBy() != null) {
+                mask.addPrimitives(button.getHiddenBy().getName());
+            }
+            if (button.getEnabledBy() != null) {
+                mask.addPrimitives(button.getEnabledBy().getName());
+            }
+        }
+
         return mask;
     }
 

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
@@ -367,6 +367,11 @@ public static String tableButtonVisibilityConditions(Button button, Table table,
             result += "selectionModel.length > 0";
             if (container.isView() && button.getActionDefinition().getIsCallOperationAction()) {
                 return result + " && !editMode";
+            } else if (button.getActionDefinition().getIsBulkCallOperationAction() && button.getHiddenBy() != null) {
+                if (container.isView()) {
+                    result += " && !editMode";
+                }
+                return result + " && selectedRows.every(s => !s." + button.getHiddenBy().getName() + ")";
             }
             return result;
         }

diff --git a/judo-ui-react/src/main/resources/actor/src/components/table/EagerTable.tsx.hbs b/judo-ui-react/src/main/resources/actor/src/components/table/EagerTable.tsx.hbs
@@ -467,7 +467,7 @@ export function EagerTable<T extends GridValidRowModel, TStored extends T, S ext
           toolbar: () => (
             <GridToolbarContainer>
               {
-                toolBarActions.map( (toolBarAction: ToolBarActionProps<T>) => actions[toolBarAction.name] && toolBarAction.enabled(data, selectionModel, ownerData, isFormUpdateable) ? (
+                toolBarActions.map( (toolBarAction: ToolBarActionProps<T>) => actions[toolBarAction.name] && toolBarAction.enabled(data, selectionModel, getSelectedRows(), ownerData, isFormUpdateable) ? (
                   <Button
                     key={toolBarAction.id}
                     id={toolBarAction.id}

diff --git a/judo-ui-react/src/main/resources/actor/src/components/table/LazyTable.tsx.hbs b/judo-ui-react/src/main/resources/actor/src/components/table/LazyTable.tsx.hbs
@@ -628,7 +628,7 @@ export function LazyTable<T extends GridValidRowModel, TStored extends T, S exte
           toolbar: () => (
             <GridToolbarContainer>
               {
-                toolBarActions.map( (toolBarAction: ToolBarActionProps<T>) => actions[toolBarAction.name] && toolBarAction.enabled(data, selectionModel, ownerData, isFormUpdateable) ? (
+                toolBarActions.map( (toolBarAction: ToolBarActionProps<T>) => actions[toolBarAction.name] && toolBarAction.enabled(data, selectionModel, getSelectedRows(), ownerData, isFormUpdateable) ? (
                   <Button
                     key={toolBarAction.id}
                     id={toolBarAction.id}

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/components/table/index.tsx.hbs b/judo-ui-react/src/main/resources/actor/src/containers/components/table/index.tsx.hbs
@@ -179,7 +179,7 @@ export function {{ componentName table }}(props: {{ componentName table }}Props)
       variant: {{{ variantForButton button }}},
       hiddenBy: {{# if button.hiddenBy }}true{{ else }}false{{/ if }},
       label: { 'translationKey': '{{ getTranslationKeyForVisualElement button }}', 'defaultValue': '{{ button.label }}' },
-      enabled: (data: {{# with (getReferenceClassType table) as |classType| }}{{# if classType.isMapped }}{{ classDataName (getReferenceClassType table) 'Stored' }}[]{{ else }}{{ classDataName (getReferenceClassType table) '' }}[]{{/ if }}{{/ with }}, selectionModel: GridRowSelectionModel, ownerData?: any, isFormUpdateable?: () => boolean): boolean => {{{ tableButtonVisibilityConditions button table container }}},
+      enabled: (data: {{# with (getReferenceClassType table) as |classType| }}{{ classDataName (getReferenceClassType table) '' }}{{# if classType.isMapped }}Stored{{/ if }}[]{{/ with }}, selectionModel: GridRowSelectionModel, selectedRows: {{# with (getReferenceClassType table) as |classType| }}{{ classDataName (getReferenceClassType table) '' }}{{# if classType.isMapped }}Stored{{/ if }}[]{{/ with }}, ownerData?: any, isFormUpdateable?: () => boolean): boolean => {{{ tableButtonVisibilityConditions button table container }}},
       isBulk: {{ boolValue actionDefinition.isBulk }},
       {{# if button.confirmation }}
         confirmation: t('{{ getTranslationKeyForVisualElement button }}.confirmation', { defaultValue: '{{ button.confirmation.confirmationMessage }}' }) as string,

diff --git a/judo-ui-react/src/main/resources/actor/src/utilities/table.ts.hbs b/judo-ui-react/src/main/resources/actor/src/utilities/table.ts.hbs
@@ -51,6 +51,7 @@ export interface ToolBarActionProps<T> {
   enabled: (
     data: T[],
     selectionModel: GridRowSelectionModel,
+    selectedRows: T[],
     ownerData?: any,
     isFormUpdateable?: () => boolean,
   ) => boolean;