feat(ui): added table skeleton and loading for settings page,

fix(ui): resolved missing loading state in add new member and whitespace in project settings page

frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx

@@ -36,10 +36,12 @@ export const OrgSettingsPage = () => {
   const { createNotification } = useNotificationContext();
 
   const orgId = currentOrg?._id || '';
-  const { data: orgUsers } = useGetOrgUsers(orgId);
-  const { data: workspaceMemberships } = useGetUserWorkspaceMemberships(orgId);
+  const { data: orgUsers, isLoading: isOrgUserLoading } = useGetOrgUsers(orgId);
+  const { data: workspaceMemberships, isLoading: IsWsMembershipLoading } =
+    useGetUserWorkspaceMemberships(orgId);
   const { data: wsKey } = useGetUserWsKey(currentWorkspace?._id || '');
-  const { data: incidentContact } = useGetOrgIncidentContact(orgId);
+  const { data: incidentContact, isLoading: IsIncidentContactLoading } =
+    useGetOrgIncidentContact(orgId);
 
   const renameOrg = useRenameOrg();
   const removeUserOrgMembership = useDeleteOrgMembership();
@@ -197,9 +199,9 @@ export const OrgSettingsPage = () => {
 
   /**
    * This function deleted a workspace.
-   * It first checks if there is more than one workspace aviable. Otherwise, it doesn't delete
+   * It first checks if there is more than one workspace available. Otherwise, it doesn't delete
    * It then checks if the name of the workspace to be deleted is correct. Otherwise, it doesn't delete.
-   * It then deletes the workspace and forwards the user to another aviable workspace.
+   * It then deletes the workspace and forwards the user to another available workspace.
    */
   // const executeDeletingWorkspace = async () => {
   //   const userWorkspaces = await getWorkspaces();
@@ -237,6 +239,7 @@ export const OrgSettingsPage = () => {
             {t('section-members:org-members-description')}
           </p>
           <OrgMembersTable
+            isLoading={isOrgUserLoading && IsWsMembershipLoading}
             isMoreUserNotAllowed={isMoreUsersNotAllowed}
             orgName={currentOrg?.name || ''}
             members={orgUsers}
@@ -261,6 +264,7 @@ export const OrgSettingsPage = () => {
           </div>
           <div className="w-full">
             <OrgIncidentContactsTable
+              isLoading={IsIncidentContactLoading}
               contacts={incidentContact}
               onRemoveContact={onRemoveIncidentContact}
               onAddContact={onAddIncidentContact}

frontend/src/views/Settings/OrgSettingsPage/components/OrgIncidentContactsTable/OrgIncidentContactsTable.tsx

@@ -1,6 +1,11 @@
 import { useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
-import { faMagnifyingGlass, faPlus, faTrash } from '@fortawesome/free-solid-svg-icons';
+import {
+  faContactBook,
+  faMagnifyingGlass,
+  faPlus,
+  faTrash
+} from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
@@ -8,6 +13,7 @@ import * as yup from 'yup';
 import {
   Button,
   DeleteActionModal,
+  EmptyState,
   FormControl,
   IconButton,
   Input,
@@ -15,16 +21,17 @@ import {
   ModalContent,
   Table,
   TableContainer,
+  TableSkeleton,
   TBody,
   Td,
   Th,
   THead,
-  Tr
-} from '@app/components/v2';
+  Tr} from '@app/components/v2';
 import { usePopUp } from '@app/hooks';
 import { IncidentContact } from '@app/hooks/api/types';
 
 type Props = {
+  isLoading?: boolean;
   contacts?: IncidentContact[];
   onRemoveContact: (email: string) => Promise<void>;
   onAddContact: (email: string) => Promise<void>;
@@ -39,7 +46,8 @@ type TAddContactForm = yup.InferType<typeof addContactFormSchema>;
 export const OrgIncidentContactsTable = ({
   contacts = [],
   onAddContact,
-  onRemoveContact
+  onRemoveContact,
+  isLoading
 }: Props) => {
   const [searchContact, setSearchContact] = useState('');
   const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
@@ -66,6 +74,10 @@ export const OrgIncidentContactsTable = ({
     handlePopUpClose('removeContact');
   };
 
+  const filteredContacts = contacts.filter(({ email }) =>
+    email.toLocaleLowerCase().includes(searchContact)
+  );
+
   return (
     <div className="w-full">
       <div className="mb-4 flex">
@@ -96,28 +108,25 @@ export const OrgIncidentContactsTable = ({
               </Tr>
             </THead>
             <TBody>
-              {contacts
-                ?.filter(({ email }) => email.toLocaleLowerCase().includes(searchContact))
-                ?.map(({ email }) => (
-                  <Tr key={email}>
-                    <Td className="w-full">{email}</Td>
-                    <Td className="mr-4">
-                      <IconButton
-                        ariaLabel="delete"
-                        colorSchema="danger"
-                        onClick={() => handlePopUpOpen('removeContact', { email })}
-                      >
-                        <FontAwesomeIcon icon={faTrash} />
-                      </IconButton>
-                    </Td>
-                  </Tr>
-                ))}
+              {isLoading && <TableSkeleton columns={2} key="incident-contact" />}
+              {filteredContacts?.map(({ email }) => (
+                <Tr key={email}>
+                  <Td className="w-full">{email}</Td>
+                  <Td className="mr-4">
+                    <IconButton
+                      ariaLabel="delete"
+                      colorSchema="danger"
+                      onClick={() => handlePopUpOpen('removeContact', { email })}
+                    >
+                      <FontAwesomeIcon icon={faTrash} />
+                    </IconButton>
+                  </Td>
+                </Tr>
+              ))}
             </TBody>
           </Table>
-          {contacts
-          ?.filter(({ email }) => email.toLocaleLowerCase().includes(searchContact))
-          ?.length === 0 && (
-            <div className='py-4 bg-bunker-800 text-sm text-center text-bunker-400 w-full mx-auto flex justify-center'>No incident contacts found</div>
+          {filteredContacts?.length === 0 && !isLoading && (
+            <EmptyState title="No incident contacts found" icon={faContactBook} />
           )}
         </TableContainer>
       </div>

frontend/src/views/Settings/OrgSettingsPage/components/OrgMembersTable/OrgMembersTable.tsx

@@ -1,6 +1,6 @@
 import { useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
-import { faMagnifyingGlass, faPlus, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { faMagnifyingGlass, faPlus, faTrash, faUsers } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
@@ -8,6 +8,7 @@ import * as yup from 'yup';
 import {
   Button,
   DeleteActionModal,
+  EmptyState,
   FormControl,
   IconButton,
   Input,
@@ -17,14 +18,14 @@ import {
   SelectItem,
   Table,
   TableContainer,
+  TableSkeleton,
   Tag,
   TBody,
   Td,
   Th,
   THead,
   Tr,
-  UpgradePlanModal
-} from '@app/components/v2';
+  UpgradePlanModal} from '@app/components/v2';
 import { usePopUp } from '@app/hooks';
 import { OrgUser, Workspace } from '@app/hooks/api/types';
 
@@ -32,6 +33,7 @@ type Props = {
   members?: OrgUser[];
   workspaceMemberships?: Record<string, Workspace[]>;
   orgName: string;
+  isLoading?: boolean;
   isMoreUserNotAllowed: boolean;
   onRemoveMember: (userId: string) => Promise<void>;
   onInviteMember: (email: string) => Promise<void>;
@@ -56,7 +58,8 @@ export const OrgMembersTable = ({
   onInviteMember,
   onGrantAccess,
   onRoleChange,
-  userId
+  userId,
+  isLoading
 }: Props) => {
   const [searchMemberFilter, setSearchMemberFilter] = useState('');
   const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
@@ -72,8 +75,8 @@ export const OrgMembersTable = ({
     formState: { isSubmitting }
   } = useForm<TAddMemberForm>({ resolver: yupResolver(addMemberFormSchema) });
 
-  const onAddMember = ({ email }: TAddMemberForm) => {
-    onInviteMember(email);
+  const onAddMember = async ({ email }: TAddMemberForm) => {
+    await onInviteMember(email);
     handlePopUpClose('addMember');
     reset();
   };
@@ -140,73 +143,79 @@ export const OrgMembersTable = ({
               </Tr>
             </THead>
             <TBody>
-              {filterdUser.map(({ user, inviteEmail, role, _id: orgMembershipId, status }) => {
-                const name = user ? `${user.firstName} ${user.lastName}` : '-';
-                const email = user?.email || inviteEmail;
-                const userWs = workspaceMemberships?.[user?._id];
+              {isLoading && <TableSkeleton columns={5} key="org-members" />}
+              {!isLoading &&
+                filterdUser.map(({ user, inviteEmail, role, _id: orgMembershipId, status }) => {
+                  const name = user ? `${user.firstName} ${user.lastName}` : '-';
+                  const email = user?.email || inviteEmail;
+                  const userWs = workspaceMemberships?.[user?._id];
 
-                return (
-                  <Tr key={`org-membership-${orgMembershipId}`} className="w-full">
-                    <Td>{name}</Td>
-                    <Td>{email}</Td>
-                    <Td>
-                      {status === 'accepted' && (
-                        <Select
-                          defaultValue={role}
-                          isDisabled={userId === user?._id}
-                          className="w-full bg-mineshaft-600"
-                          onValueChange={(selectedRole) =>
-                            onRoleChange(orgMembershipId, selectedRole)
-                          }
-                        >
-                          {(isIamOwner || role === 'owner') && (
-                            <SelectItem value="owner">owner</SelectItem>
-                          )}
-                          <SelectItem value="admin">admin</SelectItem>
-                          <SelectItem value="member">member</SelectItem>
-                        </Select>
-                      )}
-                      {(status === 'invited' || status === 'verified') && (
-                        <Button colorSchema="secondary" onClick={() => onInviteMember(email)}>
-                          Resent Invite
-                        </Button>
-                      )}
-                      {status === 'completed' && (
-                        <Button
-                          colorSchema="secondary"
-                          onClick={() => onGrantAccess(user?._id, user?.publicKey)}
-                        >
-                          Grant Access
-                        </Button>
-                      )}
-                    </Td>
-                    <Td>
-                      {userWs ? (
-                        userWs?.map(({ name: wsName, _id }) => (
-                          <Tag key={`user-${user._id}-workspace-${_id}`} className="my-1">
-                            {wsName}
-                          </Tag>
-                        ))
-                      ) : (
-                        <Tag colorSchema="red">This user isn&apos;t part of any projects yet</Tag>
-                      )}
-                    </Td>
-                    <Td>
-                      {userId !== user?._id && <IconButton
-                        ariaLabel="delete"
-                        colorSchema="danger"
-                        isDisabled={userId === user?._id}
-                        onClick={() => handlePopUpOpen('removeMember', { id: orgMembershipId })}
-                      >
-                        <FontAwesomeIcon icon={faTrash} />
-                      </IconButton>}
-                    </Td>
-                  </Tr>
-                );
-              })}
+                  return (
+                    <Tr key={`org-membership-${orgMembershipId}`} className="w-full">
+                      <Td>{name}</Td>
+                      <Td>{email}</Td>
+                      <Td>
+                        {status === 'accepted' && (
+                          <Select
+                            defaultValue={role}
+                            isDisabled={userId === user?._id}
+                            className="w-full bg-mineshaft-600"
+                            onValueChange={(selectedRole) =>
+                              onRoleChange(orgMembershipId, selectedRole)
+                            }
+                          >
+                            {(isIamOwner || role === 'owner') && (
+                              <SelectItem value="owner">owner</SelectItem>
+                            )}
+                            <SelectItem value="admin">admin</SelectItem>
+                            <SelectItem value="member">member</SelectItem>
+                          </Select>
+                        )}
+                        {(status === 'invited' || status === 'verified') && (
+                          <Button colorSchema="secondary" onClick={() => onInviteMember(email)}>
+                            Resent Invite
+                          </Button>
+                        )}
+                        {status === 'completed' && (
+                          <Button
+                            colorSchema="secondary"
+                            onClick={() => onGrantAccess(user?._id, user?.publicKey)}
+                          >
+                            Grant Access
+                          </Button>
+                        )}
+                      </Td>
+                      <Td>
+                        {userWs ? (
+                          userWs?.map(({ name: wsName, _id }) => (
+                            <Tag key={`user-${user._id}-workspace-${_id}`} className="my-1">
+                              {wsName}
+                            </Tag>
+                          ))
+                        ) : (
+                          <Tag colorSchema="red">This user isn&apos;t part of any projects yet</Tag>
+                        )}
+                      </Td>
+                      <Td>
+                        {userId !== user?._id && (
+                          <IconButton
+                            ariaLabel="delete"
+                            colorSchema="danger"
+                            isDisabled={userId === user?._id}
+                            onClick={() => handlePopUpOpen('removeMember', { id: orgMembershipId })}
+                          >
+                            <FontAwesomeIcon icon={faTrash} />
+                          </IconButton>
+                        )}
+                      </Td>
+                    </Tr>
+                  );
+                })}
             </TBody>
           </Table>
-          {filterdUser.length === 0 && <tr className='bg-bunker-800 text-sm py-4 text-center text-bunker-400 w-full mx-auto flex justify-center'><td className='col-span-5'>No project members found</td></tr>}
+          {!isLoading && filterdUser?.length === 0 && (
+            <EmptyState title="No project members found" icon={faUsers} />
+          )}
         </TableContainer>
       </div>
       <Modal