ack PR comments

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table-skeleton.tsx

@@ -1,14 +1,33 @@
 import { useEffect, useMemo, useState } from 'react'
 import { Loader2, RotateCw, X } from 'lucide-react'
 import { Badge, Button, Tooltip } from '@/components/emcn'
+import { Skeleton } from '@/components/ui/skeleton'
 import { useSession } from '@/lib/auth/auth-client'
 import type { PermissionType } from '@/lib/workspaces/permissions/utils'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import type { WorkspacePermissions } from '@/hooks/queries/workspace'
 import { PermissionSelector } from './permission-selector'
-import { PermissionsTableSkeleton } from './permissions-table-skeleton'
 import type { UserPermissions } from './types'
 
+const PermissionsTableSkeleton = () => (
+  <div className='scrollbar-hide max-h-[300px] overflow-y-auto'>
+    <div className='flex items-center justify-between gap-[8px] py-[8px]'>
+      <div className='min-w-0 flex-1'>
+        <div className='flex items-center gap-[8px]'>
+          <Skeleton className='h-[14px] w-40 rounded-[4px]' />
+        </div>
+      </div>
+      <div className='flex flex-shrink-0 items-center'>
+        <div className='inline-flex gap-[2px]'>
+          <Skeleton className='h-[28px] w-[44px] rounded-[5px]' />
+          <Skeleton className='h-[28px] w-[44px] rounded-[5px]' />
+          <Skeleton className='h-[28px] w-[44px] rounded-[5px]' />
+        </div>
+      </div>
+    </div>
+  </div>
+)
+
 export interface PermissionsTableProps {
   userPermissions: UserPermissions[]
   onPermissionChange: (userId: string, permissionType: PermissionType) => void

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table.tsx

@@ -55,6 +55,7 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
   } | null>(null)
   const [resendCooldowns, setResendCooldowns] = useState<Record<string, number>>({})
   const [resentInvitationIds, setResentInvitationIds] = useState<Record<string, boolean>>({})
+  const [resendingInvitationIds, setResendingInvitationIds] = useState<Record<string, boolean>>({})
   const params = useParams()
   const workspaceId = params.workspaceId as string
 
@@ -329,12 +330,20 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
       const secondsLeft = resendCooldowns[invitationId]
       if (secondsLeft && secondsLeft > 0) return
 
+      if (resendingInvitationIds[invitationId]) return
+
       setErrorMessage(null)
+      setResendingInvitationIds((prev) => ({ ...prev, [invitationId]: true }))
 
       resendInvitation.mutate(
         { invitationId, workspaceId },
         {
           onSuccess: () => {
+            setResendingInvitationIds((prev) => {
+              const next = { ...prev }
+              delete next[invitationId]
+              return next
+            })
             setResentInvitationIds((prev) => ({ ...prev, [invitationId]: true }))
             setTimeout(() => {
               setResentInvitationIds((prev) => {
@@ -369,20 +378,20 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
             cooldownIntervalsRef.current.set(invitationId, interval)
           },
           onError: (error) => {
+            setResendingInvitationIds((prev) => {
+              const next = { ...prev }
+              delete next[invitationId]
+              return next
+            })
             logger.error('Error resending invitation:', error)
             setErrorMessage(error.message || 'Failed to resend invitation. Please try again.')
           },
         }
       )
     },
-    [workspaceId, userPerms.canAdmin, resendCooldowns, resendInvitation]
+    [workspaceId, userPerms.canAdmin, resendCooldowns, resendingInvitationIds, resendInvitation]
   )
 
-  const resendingInvitationIds = useMemo(() => {
-    if (!resendInvitation.isPending || !resendInvitation.variables) return {}
-    return { [resendInvitation.variables.invitationId]: true }
-  }, [resendInvitation.isPending, resendInvitation.variables])
-
   const handleSubmit = useCallback(
     (e: React.FormEvent) => {
       e.preventDefault()
@@ -435,6 +444,7 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
     setInvitationToRemove(null)
     setResendCooldowns({})
     setResentInvitationIds({})
+    setResendingInvitationIds({})
 
     cooldownIntervalsRef.current.forEach((interval) => clearInterval(interval))
     cooldownIntervalsRef.current.clear()

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx

@@ -201,36 +201,36 @@ export function useWorkspaceManagement({
 
       logger.info('Leaving workspace:', workspaceToLeave.id)
 
-      leaveWorkspaceMutation.mutate(
-        { userId: sessionUserId, workspaceId: workspaceToLeave.id },
-        {
-          onSuccess: async () => {
-            logger.info('Left workspace successfully:', workspaceToLeave.id)
-
-            const isLeavingCurrentWorkspace =
-              workspaceIdRef.current === workspaceToLeave.id ||
-              activeWorkspaceRef.current?.id === workspaceToLeave.id
-
-            if (isLeavingCurrentWorkspace) {
-              logger.info(
-                'Leaving current workspace - using full workspace refresh with URL validation'
-              )
-              hasValidatedRef.current = false
-              const { data: updatedWorkspaces } = await refetchWorkspaces()
-
-              const remainingWorkspaces = (updatedWorkspaces || []).filter(
-                (w) => w.id !== workspaceToLeave.id
-              )
-              if (remainingWorkspaces.length > 0) {
-                await switchWorkspace(remainingWorkspaces[0])
-              }
-            }
-          },
-          onError: (error) => {
-            logger.error('Error leaving workspace:', error)
-          },
+      try {
+        await leaveWorkspaceMutation.mutateAsync({
+          userId: sessionUserId,
+          workspaceId: workspaceToLeave.id,
+        })
+
+        logger.info('Left workspace successfully:', workspaceToLeave.id)
+
+        const isLeavingCurrentWorkspace =
+          workspaceIdRef.current === workspaceToLeave.id ||
+          activeWorkspaceRef.current?.id === workspaceToLeave.id
+
+        if (isLeavingCurrentWorkspace) {
+          logger.info(
+            'Leaving current workspace - using full workspace refresh with URL validation'
+          )
+          hasValidatedRef.current = false
+          const { data: updatedWorkspaces } = await refetchWorkspaces()
+
+          const remainingWorkspaces = (updatedWorkspaces || []).filter(
+            (w) => w.id !== workspaceToLeave.id
+          )
+          if (remainingWorkspaces.length > 0) {
+            await switchWorkspace(remainingWorkspaces[0])
+          }
         }
-      )
+      } catch (error) {
+        logger.error('Error leaving workspace:', error)
+        throw error
+      }
     },
     [refetchWorkspaces, switchWorkspace, sessionUserId, leaveWorkspaceMutation]
   )