Merge pull request #279 from AmbireTech/development

v0.69.48
AmbireTech · Aug 27, 2024 · b1ea4ce · b1ea4ce
2 parents 0b8b395 + 21233f2
commit b1ea4ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adex-interface",
-  "version": "0.69.47",
+  "version": "0.69.48",
   "private": true,
   "dependencies": {
     "@ambire/login-sdk-core": "^0.0.21",

diff --git a/src/components/common/CustomTable/CustomTable.tsx b/src/components/common/CustomTable/CustomTable.tsx
@@ -81,6 +81,7 @@ export const CustomTable = ({
 }: CustomTableProps) => {
   const isMobile = useMediaQuery('(max-width: 75rem)')
   const selectedElements = useSet<string>()
+  const hasSelectActions = useMemo(() => !!selectedActions?.length, [selectedActions?.length])
 
   const columns: string[] = useMemo(
     () =>
@@ -124,7 +125,7 @@ export const CustomTable = ({
   )
 
   const masterActionMenu = useMemo(() => {
-    return (
+    return hasSelectActions ? (
       <Group>
         {selectedActions?.map((a) => {
           const label = getLabel(a.label, selectedElements)
@@ -151,25 +152,25 @@ export const CustomTable = ({
           )
         })}
       </Group>
-    )
+    ) : null
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedActions, selectedElements, selectedElements.size])
+  }, [hasSelectActions, selectedActions, selectedElements, selectedElements.size])
 
   const masterSelectAction = useMemo(
     () =>
-      selectedActions && (
+      hasSelectActions && (
         <Checkbox
           size="sm"
           checked={currentPageElementsAllSelected}
           onChange={() => handleCheckboxMaster()}
         />
       ),
-    [currentPageElementsAllSelected, handleCheckboxMaster, selectedActions]
+    [currentPageElementsAllSelected, handleCheckboxMaster, hasSelectActions]
   )
 
   const colHeadings: string[] = useMemo(
-    () => [...(selectedActions ? ['select'] : []), ...headings, ...(actions ? ['actions'] : [])],
-    [actions, headings, selectedActions]
+    () => [...(hasSelectActions ? ['select'] : []), ...headings, ...(actions ? ['actions'] : [])],
+    [actions, headings, hasSelectActions]
   )
 
   const rows = useMemo(() => {
@@ -233,7 +234,7 @@ export const CustomTable = ({
       const rowKey = e.id?.toString() || i
 
       const colsToMap = [
-        ...(selectedActions ? ['select'] : []),
+        ...(hasSelectActions ? ['select'] : []),
         ...columns,
         ...(activeActions.length ? ['actions'] : [])
       ]
@@ -303,7 +304,7 @@ export const CustomTable = ({
 
       {isMobile ? (
         <Stack gap="xl">
-          {selectedActions && (
+          {hasSelectActions && (
             <Group align="center" justify="left" pt="xs">
               Select all: {masterSelectAction}
             </Group>