rebasing

Author: joaosoutto

packages/components/modules/profiles/common/graphql/mutations/RemoveMember.ts

@@ -2,7 +2,7 @@ import { useNotification } from '@baseapp-frontend/utils'
 
 import { Disposable, UseMutationConfig, graphql, useMutation } from 'react-relay'
 
-import { RemoveMemberMutation } from '../../../../__generated__/RemoveMemberMutation.graphql'
+import { RemoveMemberMutation } from '../../../../../__generated__/RemoveMemberMutation.graphql'
 
 export const ProfileRemoveMemberMutationQuery = graphql`
   mutation RemoveMemberMutation($input: ProfileRemoveMemberInput!) {

packages/components/modules/profiles/web/ProfileMembers/MemberItem/index.tsx

@@ -7,9 +7,10 @@ import { ConfirmDialog } from '@baseapp-frontend/design-system/components/web/di
 import { Box, Button, MenuItem, SelectChangeEvent, Typography, useTheme } from '@mui/material'
 import { useFragment } from 'react-relay'
 
-import { ProfileItemFragment$key } from '../../../../../__generated__/ProfileItemFragment.graphql'
+import { ProfileItemFragment$key } from '../../../../../../__generated__/ProfileItemFragment.graphql'
 import { ProfileItemFragment, useChangeUserRoleMutation } from '../../../common'
-import { MemberRoles, MemberStatuses, roleOptions } from '../constants'
+import { useRemoveMemberMutation } from '../../../common/graphql/mutations/RemoveMember'
+import { MemberActions, MemberRoles, MemberStatuses, roleOptions } from '../constants'
 import { capitalizeFirstLetter } from '../utils'
 import { MemberItemContainer, MemberPersonalInformation, Select } from './styled'
 import { MemberItemProps } from './types'
@@ -130,7 +131,7 @@ const MemberItem: FC<MemberItemProps> = ({
     if (haveMemberRoleAndStatus) {
       return (
         <Box>
-          <Button variant="soft" color="inherit" sx={{ pointerEvents: 'none' }}>
+          <Button variant="outlined" color="inherit" sx={{ pointerEvents: 'none' }}>
             {status === MemberStatuses.active
               ? capitalizeFirstLetter(memberRole)
               : capitalizeFirstLetter(status)}

packages/components/modules/profiles/web/ProfileMembers/index.tsx

@@ -6,7 +6,6 @@ import { LoadingState as DefaultLoadingState } from '@baseapp-frontend/design-sy
 import { Typography } from '@mui/material'
 import { useLazyLoadQuery } from 'react-relay'
 
-import { UserMembersListPaginationQuery as UserMembersListPaginationQueryType } from '../../../../__generated__/UserMembersListPaginationQuery.graphql'
 import { UserMembersListPaginationQuery } from '../../common'
 import MembersList from './MembersList'
 import { NUMBER_OF_MEMBERS_ON_FIRST_LOAD } from './constants'
@@ -15,14 +14,11 @@ import type { ProfileMembersProps, ProfileMembersSuspendedProps } from './types'
 const ProfileMembers: FC<ProfileMembersProps> = ({ MembersListProps = {} }) => {
   const { currentProfile } = useCurrentProfile()
 
-  const data = useLazyLoadQuery<UserMembersListPaginationQueryType>(
-    UserMembersListPaginationQuery,
-    {
-      profileId: currentProfile?.id || '',
-      count: NUMBER_OF_MEMBERS_ON_FIRST_LOAD,
-      orderBy: 'status',
-    },
-  )
+  const data = useLazyLoadQuery(UserMembersListPaginationQuery, {
+    profileId: currentProfile?.id || '',
+    count: NUMBER_OF_MEMBERS_ON_FIRST_LOAD,
+    orderBy: 'status',
+  })
 
   if (!data.profile) return null
   return <MembersList userRef={data?.profile} {...MembersListProps} />
@@ -41,7 +37,7 @@ const ProfileMembersSuspended: FC<ProfileMembersSuspendedProps> = ({
     <Typography component="p" variant="body2" color="text.secondary" mb={4}>
       {subtitle}
     </Typography>
-    <Suspense fallback={<InitialLoadingState />}>
+    <Suspense fallback={<InitialLoadingState CircularProgressProps={{ size: 20 }} />}>
       <ProfileMembers {...props} />
     </Suspense>
   </>