Skip to content

Commit f5d22b9

Browse files
committed
fix(resource): prevent permission-gated breadcrumb items from flashing on load
1 parent da54dcf commit f5d22b9

2 files changed

Lines changed: 26 additions & 6 deletions

File tree

apps/sim/app/workspace/[workspaceId]/files/files.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1585,10 +1585,11 @@ export function Files() {
15851585
}
15861586
: undefined,
15871587
dropdownItems:
1588-
isCurrentFolder && canEdit
1588+
isCurrentFolder && (canEdit || userPermissions.isLoading)
15891589
? [
15901590
{
15911591
label: 'Rename',
1592+
disabled: !canEdit,
15921593
onClick: () => breadcrumbRenameRef.current.startRename(folder.id, folder.name),
15931594
},
15941595
]
@@ -1605,6 +1606,7 @@ export function Files() {
16051606
router,
16061607
workspaceId,
16071608
canEdit,
1609+
userPermissions.isLoading,
16081610
breadcrumbRename.editingId,
16091611
breadcrumbRename.editValue,
16101612
])

apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -814,24 +814,42 @@ export function KnowledgeBase({
814814
}
815815
: undefined,
816816
dropdownItems: [
817-
...(userPermissions.canEdit
817+
...(userPermissions.canEdit || userPermissions.isLoading
818818
? [
819819
{
820820
label: 'Rename',
821821
icon: Pencil,
822+
disabled: !userPermissions.canEdit,
822823
onClick: () => kbRename.startRename(id, knowledgeBaseName),
823824
},
824-
{ label: 'Tags', icon: Tag, onClick: () => setShowTagsModal(true) },
825-
{ label: 'Delete', icon: Trash, onClick: () => setShowDeleteDialog(true) },
825+
{
826+
label: 'Tags',
827+
icon: Tag,
828+
disabled: !userPermissions.canEdit,
829+
onClick: () => setShowTagsModal(true),
830+
},
831+
{
832+
label: 'Delete',
833+
icon: Trash,
834+
disabled: !userPermissions.canEdit,
835+
onClick: () => setShowDeleteDialog(true),
836+
},
826837
]
827838
: []),
828839
],
829840
},
830841
]
831842

832843
const headerActions: HeaderAction[] = [
833-
...(userPermissions.canEdit
834-
? [{ label: 'New connector', icon: Plus, onClick: () => setShowAddConnectorModal(true) }]
844+
...(userPermissions.canEdit || userPermissions.isLoading
845+
? [
846+
{
847+
label: 'New connector',
848+
icon: Plus,
849+
disabled: !userPermissions.canEdit,
850+
onClick: () => setShowAddConnectorModal(true),
851+
},
852+
]
835853
: []),
836854
]
837855

0 commit comments

Comments
 (0)