From dc741f388d91c4bb3ba479ea0c9518c4eea4e329 Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Thu, 23 Mar 2023 14:40:42 +0800
Subject: [PATCH] add loading state for org members and roles

---
 .../Organization/TeamSettings/MembersView.tsx | 80 ++++++++++---------
 .../TeamSettings/TeamSettings.tsx             |  2 +-
 2 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx b/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx
index 34f67b1eb3e..7958d26f3f7 100644
--- a/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx
+++ b/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx
@@ -2,27 +2,21 @@ import Image from 'next/image'
 import * as Tooltip from '@radix-ui/react-tooltip'
 import { useState, Fragment } from 'react'
 import { observer } from 'mobx-react-lite'
-import {
-  Badge,
-  Button,
-  Loading,
-  Listbox,
-  IconUser,
-  Modal,
-  IconAlertCircle,
-  IconHelpCircle,
-} from 'ui'
+import { Badge, Button, Loading, Listbox, IconUser, Modal, IconAlertCircle, IconLoader } from 'ui'
 
-import { Member, Role } from 'types'
+import { Member } from 'types'
 import { useStore, useParams } from 'hooks'
-import { isInviteExpired, getUserDisplayName } from '../Organization.utils'
 
-import { useProfileQuery } from 'data/profile/profile-query'
-import { useOrganizationMemberUpdateMutation } from 'data/organizations/organization-member-update-mutation'
+import ShimmeringLoader from 'components/ui/ShimmeringLoader'
 import Table from 'components/to-be-cleaned/Table'
 import MemberActions from './MemberActions'
 import RolesHelperModal from './RolesHelperModal/RolesHelperModal'
 import { getRolesManagementPermissions } from './TeamSettings.utils'
+import { isInviteExpired, getUserDisplayName } from '../Organization.utils'
+import { useProfileQuery } from 'data/profile/profile-query'
+import { useOrganizationRolesQuery } from 'data/organizations/organization-roles-query'
+import { useOrganizationDetailQuery } from 'data/organizations/organization-detail-query'
+import { useOrganizationMemberUpdateMutation } from 'data/organizations/organization-member-update-mutation'
 
 interface SelectedMember extends Member {
   oldRoleId: number
@@ -30,24 +24,38 @@ interface SelectedMember extends Member {
 }
 
 export interface MembersViewProps {
-  roles: Role[]
-  members: Member[]
   searchString: string
 }
 
-const MembersView = ({ searchString, roles, members }: MembersViewProps) => {
+const MembersView = ({ searchString }: MembersViewProps) => {
   const { ui } = useStore()
   const { slug } = useParams()
 
   const { data: profile } = useProfileQuery()
+  const { data: detailData, isLoading: isLoadingOrgDetails } = useOrganizationDetailQuery({ slug })
+  const { data: rolesData, isLoading: isLoadingRoles } = useOrganizationRolesQuery({ slug })
+  const { mutate: updateOrganizationMember, isLoading } = useOrganizationMemberUpdateMutation({
+    onSuccess() {
+      ui.setNotification({
+        category: 'success',
+        message: `Successfully updated role for ${getUserDisplayName(selectedMember)}`,
+      })
+    },
+    onError() {
+      ui.setNotification({
+        category: 'error',
+        message: `Failed to update role for ${getUserDisplayName(selectedMember)}`,
+      })
+    },
+  })
 
+  const roles = rolesData?.roles ?? []
+  const members = detailData?.members ?? []
   const { rolesAddable, rolesRemovable } = getRolesManagementPermissions(roles)
 
   const [selectedMember, setSelectedMember] = useState<SelectedMember>()
   const [userRoleChangeModalVisible, setUserRoleChangeModalVisible] = useState(false)
 
-  if (!members) return <div />
-
   const filteredMembers = (
     !searchString
       ? members
@@ -68,21 +76,6 @@ const MembersView = ({ searchString, roles, members }: MembersViewProps) => {
     return roles.find((x: any) => x.id === id)?.name
   }
 
-  const { isLoading, mutate } = useOrganizationMemberUpdateMutation({
-    onSuccess() {
-      ui.setNotification({
-        category: 'success',
-        message: `Successfully updated role for ${getUserDisplayName(selectedMember)}`,
-      })
-    },
-    onError() {
-      ui.setNotification({
-        category: 'error',
-        message: `Failed to update role for ${getUserDisplayName(selectedMember)}`,
-      })
-    },
-  })
-
   const handleRoleChange = async () => {
     if (!selectedMember) return
 
@@ -95,11 +88,20 @@ const MembersView = ({ searchString, roles, members }: MembersViewProps) => {
       throw new Error('gotrue_id is required')
     }
 
-    mutate({ slug, gotrueId: gotrue_id, roleId: newRoleId })
-
+    updateOrganizationMember({ slug, gotrueId: gotrue_id, roleId: newRoleId })
     setUserRoleChangeModalVisible(false)
   }
 
+  if (isLoadingOrgDetails) {
+    return (
+      <div className="py-4 space-y-2">
+        <ShimmeringLoader />
+        <ShimmeringLoader className="w-3/4" />
+        <ShimmeringLoader className="w-1/2" />
+      </div>
+    )
+  }
+
   return (
     <>
       <div className="rounded">
@@ -185,7 +187,11 @@ const MembersView = ({ searchString, roles, members }: MembersViewProps) => {
                       </Table.td>
 
                       <Table.td>
-                        {role !== undefined ? (
+                        {isLoadingRoles ? (
+                          <div className="w-[140px]">
+                            <IconLoader className="animate-spin" size={16} strokeWidth={1.5} />
+                          </div>
+                        ) : role !== undefined ? (
                           <Tooltip.Root delayDuration={0}>
                             <Tooltip.Trigger className="w-[140px]">
                               <Listbox
diff --git a/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx b/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx
index 9289a210943..fe2a3ae0e24 100644
--- a/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx
+++ b/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx
@@ -117,7 +117,7 @@ const TeamSettings = () => {
         </div>
       </div>
       <div className="container my-4 max-w-4xl space-y-8">
-        <MembersView searchString={searchString} roles={roles} members={members} />
+        <MembersView searchString={searchString} />
       </div>
     </>
   )