Workspace member (#552)

* fix: clean small back-end issues

* fix: apollo factory causing infinite loop on token renew

* feat: small refactor and add ability to remove workspace member

* fix: test
This commit is contained in:
Jérémy M
2023-07-10 11:25:11 +02:00
committed by GitHub
parent f2c49907a8
commit c529c49ea6
14 changed files with 316 additions and 97 deletions

View File

@ -12,21 +12,15 @@ const StyledContainer = styled.div`
flex-direction: row;
margin-bottom: ${({ theme }) => theme.spacing(0)};
margin-top: ${({ theme }) => theme.spacing(4)};
padding: ${({ theme }) => theme.spacing(3)};
`;
const AvatarContainer = styled.div`
margin: ${({ theme }) => theme.spacing(3)};
`;
const TextContainer = styled.div`
const Content = styled.div`
display: flex;
flex: 1;
flex-direction: column;
justify-content: center;
`;
const NameAndEmailContainer = styled.div`
display: flex;
flex-direction: column;
margin-left: ${({ theme }) => theme.spacing(3)};
`;
const NameText = styled.span`
@ -41,29 +35,26 @@ type OwnProps = {
workspaceMember: {
user: Pick<User, 'firstName' | 'lastName' | 'avatarUrl' | 'email'>;
};
accessory?: React.ReactNode;
};
export function WorkspaceMemberCard({ workspaceMember }: OwnProps) {
export function WorkspaceMemberCard({ workspaceMember, accessory }: OwnProps) {
return (
<StyledContainer>
<AvatarContainer>
<Avatar
avatarUrl={getImageAbsoluteURIOrBase64(
workspaceMember.user.avatarUrl,
)}
placeholder={workspaceMember.user.firstName || ''}
type="squared"
size={40}
/>
</AvatarContainer>
<TextContainer>
<NameAndEmailContainer>
<NameText>
{workspaceMember.user.firstName} {workspaceMember.user.lastName}{' '}
</NameText>
<EmailText>{workspaceMember.user.email}</EmailText>
</NameAndEmailContainer>
</TextContainer>
<Avatar
avatarUrl={getImageAbsoluteURIOrBase64(workspaceMember.user.avatarUrl)}
placeholder={workspaceMember.user.firstName || ''}
type="squared"
size={40}
/>
<Content>
<NameText>
{workspaceMember.user.firstName} {workspaceMember.user.lastName}{' '}
</NameText>
<EmailText>{workspaceMember.user.email}</EmailText>
</Content>
{accessory}
</StyledContainer>
);
}

View File

@ -1,18 +1,15 @@
import { gql } from '@apollo/client';
export const GET_CURRENT_WORKSPACE = gql`
query GetCurrentWorkspace {
currentWorkspace {
export const GET_WORKSPACE_MEMBERS = gql`
query GetWorkspaceMembers {
workspaceMembers: findManyWorkspaceMember {
id
workspaceMember {
user {
id
user {
id
email
avatarUrl
firstName
lastName
}
email
avatarUrl
firstName
lastName
}
}
}

View File

@ -24,3 +24,11 @@ export const REMOVE_WORKSPACE_LOGO = gql`
}
}
`;
export const REMOVE_WORKSPACE_MEMBER = gql`
mutation RemoveWorkspaceMember($where: WorkspaceMemberWhereUniqueInput!) {
deleteWorkspaceMember(where: $where) {
id
}
}
`;