fix(resource): self-remove keydown listener on Escape and include session loading in isLoading guard

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/components/resource/resource.tsx

@@ -233,7 +233,10 @@ export const ResourceTable = memo(function ResourceTable({
     if (!contextMenuRowId) return
     const clear = () => setContextMenuRowId(null)
     const handleKeyDown = (e: KeyboardEvent) => {
-      if (e.key === 'Escape') clear()
+      if (e.key === 'Escape') {
+        document.removeEventListener('keydown', handleKeyDown)
+        clear()
+      }
     }
     const timeoutId = setTimeout(() => {
       document.addEventListener('pointerdown', clear, { once: true })

apps/sim/hooks/use-user-permissions.ts

@@ -33,17 +33,17 @@ export function useUserPermissions(
   permissionsLoading = false,
   permissionsError: string | null = null
 ): WorkspaceUserPermissions {
-  const { data: session } = useSession()
+  const { data: session, isPending: sessionLoading } = useSession()
 
   const userPermissions = useMemo((): WorkspaceUserPermissions => {
     const sessionEmail = session?.user?.email
-    if (permissionsLoading || !sessionEmail) {
+    if (permissionsLoading || sessionLoading || !sessionEmail) {
       return {
         canRead: false,
         canEdit: false,
         canAdmin: false,
         userPermissions: 'read',
-        isLoading: permissionsLoading,
+        isLoading: permissionsLoading || sessionLoading,
         error: permissionsError,
       }
     }
@@ -99,7 +99,7 @@ export function useUserPermissions(
       isLoading: false,
       error: permissionsError,
     }
-  }, [session, workspacePermissions, permissionsLoading, permissionsError])
+  }, [session, sessionLoading, workspacePermissions, permissionsLoading, permissionsError])
 
   return userPermissions
 }