Merge pull request #1573 from akto-api-security/hotfix/fix_bulk_actions

Fixing minor bugs
akto-api-security · Oct 1, 2024 · 8501bb2 · 8501bb2
2 parents a43f12c + 8ff2528
commit 8501bb2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...web/polaris_web/web/src/apps/dashboard/components/shared/treeView/PrettifyDisplayName.jsx b/...web/polaris_web/web/src/apps/dashboard/components/shared/treeView/PrettifyDisplayName.jsx
@@ -4,7 +4,7 @@ import { ChevronRightMinor, ChevronDownMinor } from "@shopify/polaris-icons"
 import { Badge, Box, Checkbox, HorizontalStack, Icon, Text, Tooltip } from '@shopify/polaris';
 
 function PrettifyDisplayName({name, level, isTerminal, isOpen, selectItems, collectionIds}) {
-    const selectedItems = TableStore.getState().selectedItems
+    const selectedItems = TableStore.getState().selectedItems.flat()
     const [checked, setChecked] = useState(false)
 
     const checkedVal = collectionIds.every(id => selectedItems.includes(id))

diff --git a/.../dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/treeView/transform.js b/.../dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/treeView/transform.js
@@ -201,9 +201,14 @@ const treeViewFunc = {
             return{
                 ...c,
                 id: c.apiCollectionIds || c.id,
-                displayNameComp: c?.isTerminal ? c.displayName: (
+                displayNameComp: c?.isTerminal ? (
+                    <Box maxWidth="180px">
+                        <TooltipText tooltip={c.displayName} text={c.displayName} />
+                    </Box>
+                )
+                : (
                         <HorizontalStack gap={"1"} align="space-between" wrap={false}>
-                            <Box maxWidth="180px">
+                            <Box maxWidth="200px">
                                 <TooltipText tooltip={c.level} text={c.level} textProps={{variant: 'headingSm'}} />
                             </Box>
                             <Badge size="small" status="new">{c?.apiCollectionIds?.length}</Badge>