Merge pull request #26 from jetstreamapp/bug/24

Permission table has incorrect type label #24
jetstreamapp · Jan 20, 2023 · 66b0eec · 66b0eec
2 parents 468002c + 698bba8
commit 66b0eec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.../jetstream/src/app/components/manage-permissions/utils/permission-manager-table-utils.tsx b/.../jetstream/src/app/components/manage-permissions/utils/permission-manager-table-utils.tsx
@@ -247,7 +247,7 @@ export function getObjectColumns(
           permissionType: 'object',
           id: permissionSetId,
           type: 'Permission Set',
-          label: permissionSet.Name,
+          label: permissionSet?.Name || '',
           actionType: startCase(permissionType) as 'Create' | 'Read' | 'Edit' | 'Delete' | 'ViewAll' | 'ModifyAll',
           actionKey: permissionType,
         })
@@ -411,8 +411,8 @@ export function getFieldColumns(
           isFirstItem: i === 0,
           permissionType: 'field',
           id: permissionSetId,
-          type: 'Profile',
-          label: permissionSet.Name,
+          type: 'Permission Set',
+          label: permissionSet?.Name || '',
           actionType: startCase(permissionType) as 'Read' | 'Edit',
           actionKey: permissionType,
         })

diff --git a/libs/ui/src/lib/popover/ContextMenu.tsx b/libs/ui/src/lib/popover/ContextMenu.tsx
@@ -125,7 +125,6 @@ export function ContextMenu({ containerId, menu, onItemSelected, children }: Con
           display: contents;
         `}
         onContextMenu={(event) => {
-          console.log('containerId', containerId);
           if (containerId) {
             try {
               const itemId =