🚚(frontend) move to members/members-add

Move addUsers to members/members-add.
Rename some of the occurences of user to member.

src/frontend/apps/e2e/__tests__/app-impress/pad-add-members.spec.ts

@@ -16,9 +16,9 @@ test.describe('Document add users', () => {
     await createPad(page, 'select-multi-users', browserName, 1);
 
     await page.getByLabel('Open the document options').click();
-    await page.getByRole('button', { name: 'Add a user' }).click();
+    await page.getByRole('button', { name: 'Add members' }).click();
 
-    const inputSearch = page.getByLabel(/Find a user to add to the document/);
+    const inputSearch = page.getByLabel(/Find a member to add to the document/);
     await expect(inputSearch).toBeVisible();
 
     // Select user 1
@@ -77,9 +77,9 @@ test.describe('Document add users', () => {
     await createPad(page, 'user-invitation', browserName, 1);
 
     await page.getByLabel('Open the document options').click();
-    await page.getByRole('button', { name: 'Add a user' }).click();
+    await page.getByRole('button', { name: 'Add members' }).click();
 
-    const inputSearch = page.getByLabel(/Find a user to add to the document/);
+    const inputSearch = page.getByLabel(/Find a member to add to the document/);
 
     const email = randomName('test@test.fr', browserName, 1)[0];
     await inputSearch.fill(email);
@@ -127,9 +127,9 @@ test.describe('Document add users', () => {
     await createPad(page, 'user-twice', browserName, 1);
 
     await page.getByLabel('Open the document options').click();
-    await page.getByRole('button', { name: 'Add a user' }).click();
+    await page.getByRole('button', { name: 'Add members' }).click();
 
-    const inputSearch = page.getByLabel(/Find a user to add to the document/);
+    const inputSearch = page.getByLabel(/Find a member to add to the document/);
     await inputSearch.fill('user');
     const responseSearchUser = await responsePromiseSearchUser;
     const users = (await responseSearchUser.json()).results as {
@@ -152,7 +152,7 @@ test.describe('Document add users', () => {
     expect(responseAddMember.ok()).toBeTruthy();
 
     await page.getByLabel('Open the document options').click();
-    await page.getByRole('button', { name: 'Add a user' }).click();
+    await page.getByRole('button', { name: 'Add members' }).click();
 
     await inputSearch.fill('user');
     await expect(
@@ -167,9 +167,9 @@ test.describe('Document add users', () => {
     await createPad(page, 'invitation-twice', browserName, 1);
 
     await page.getByLabel('Open the document options').click();
-    await page.getByRole('button', { name: 'Add a user' }).click();
+    await page.getByRole('button', { name: 'Add members' }).click();
 
-    const inputSearch = page.getByLabel(/Find a user to add to the document/);
+    const inputSearch = page.getByLabel(/Find a member to add to the document/);
 
     const email = randomName('test@test.fr', browserName, 1)[0];
     await inputSearch.fill(email);
@@ -191,7 +191,7 @@ test.describe('Document add users', () => {
     expect(responseCreateInvitation.ok()).toBeTruthy();
 
     await page.getByLabel('Open the document options').click();
-    await page.getByRole('button', { name: 'Add a user' }).click();
+    await page.getByRole('button', { name: 'Add members' }).click();
 
     await inputSearch.fill(email);
     await expect(page.getByRole('option', { name: email })).toBeHidden();

src/frontend/apps/e2e/__tests__/app-impress/pad-tools.spec.ts

@@ -177,7 +177,7 @@ test.describe('Pad Tools', () => {
     await page.getByLabel('Open the document options').click();
 
     await expect(
-      page.getByRole('button', { name: 'Add a user' }),
+      page.getByRole('button', { name: 'Add members' }),
     ).toBeVisible();
     await expect(
       page.getByRole('button', { name: 'Generate PDF' }),
@@ -230,7 +230,9 @@ test.describe('Pad Tools', () => {
 
     await page.getByLabel('Open the document options').click();
 
-    await expect(page.getByRole('button', { name: 'Add a user' })).toBeHidden();
+    await expect(
+      page.getByRole('button', { name: 'Add members' }),
+    ).toBeHidden();
     await expect(
       page.getByRole('button', { name: 'Generate PDF' }),
     ).toBeVisible();
@@ -282,7 +284,9 @@ test.describe('Pad Tools', () => {
 
     await page.getByLabel('Open the document options').click();
 
-    await expect(page.getByRole('button', { name: 'Add a user' })).toBeHidden();
+    await expect(
+      page.getByRole('button', { name: 'Add members' }),
+    ).toBeHidden();
     await expect(
       page.getByRole('button', { name: 'Generate PDF' }),
     ).toBeVisible();

src/frontend/apps/impress/src/features/pads/addUsers/index.ts

@@ -1 +0,0 @@
-export * from './components/ModalAddUsers';

src/frontend/apps/impress/src/features/pads/members/members-add/api/useCreateDocAccess.tsx

@@ -2,8 +2,13 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 import { APIError, errorCauses, fetchAPI } from '@/api';
 import { User } from '@/core/auth';
+import {
+  Access,
+  KEY_LIST_PAD,
+  Pad,
+  Role,
+} from '@/features/pads/pad-management';
 
-import { Access, KEY_LIST_PAD, Pad, Role } from '../../pad-management';
 import { OptionType } from '../types';
 
 import { KEY_LIST_USER } from './useUsers';
@@ -11,27 +16,27 @@ import { KEY_LIST_USER } from './useUsers';
 interface CreateDocAccessParams {
   role: Role;
   docId: Pad['id'];
-  userId: User['id'];
+  memberId: User['id'];
 }
 
 export const createDocAccess = async ({
-  userId,
+  memberId,
   role,
   docId,
 }: CreateDocAccessParams): Promise<Access> => {
   const response = await fetchAPI(`documents/${docId}/accesses/`, {
     method: 'POST',
     body: JSON.stringify({
-      user: userId,
+      user: memberId,
       role,
     }),
   });
 
   if (!response.ok) {
     throw new APIError(
-      `Failed to add the user in the doc.`,
+      `Failed to add the member in the doc.`,
       await errorCauses(response, {
-        type: OptionType.NEW_USER,
+        type: OptionType.NEW_MEMBER,
       }),
     );
   }

src/frontend/apps/impress/src/features/pads/members/members-add/components/ModalAddMembers.tsx

@@ -18,10 +18,10 @@ import { useCreateDocAccess, useCreateInvitation } from '../api';
 import IconAddUser from '../assets/add-user.svg';
 import {
   OptionInvitation,
-  OptionNewUser,
+  OptionNewMember,
   OptionSelect,
   OptionType,
-  isOptionNewUser,
+  isOptionNewMember,
 } from '../types';
 
 import { ChooseRole } from './ChooseRole';
@@ -38,17 +38,17 @@ type APIErrorUser = APIError<{
   type: OptionType;
 }>;
 
-interface ModalAddUsersProps {
+interface ModalAddMembersProps {
   currentRole: Role;
   onClose: () => void;
   doc: Pad;
 }
 
-export const ModalAddUsers = ({
+export const ModalAddMembers = ({
   currentRole,
   onClose,
   doc,
-}: ModalAddUsersProps) => {
+}: ModalAddMembersProps) => {
   const { colorsTokens } = useCunninghamTheme();
   const { t } = useTranslation();
   const [selectedUsers, setSelectedUsers] = useState<OptionsSelect>([]);
@@ -70,11 +70,11 @@ export const ModalAddUsers = ({
           });
           break;
 
-        case OptionType.NEW_USER:
+        case OptionType.NEW_MEMBER:
           await createDocAccess({
             role: selectedRole,
             docId: doc.id,
-            userId: selectedUser.value.id,
+            memberId: selectedUser.value.id,
           });
           break;
       }
@@ -92,13 +92,13 @@ export const ModalAddUsers = ({
         ? t(`Failed to create the invitation for {{email}}.`, {
             email: dataError?.value,
           })
-        : t(`Failed to add the user in the document.`);
+        : t(`Failed to add the member in the document.`);
 
     toast(messageError, VariantType.ERROR, toastOptions);
   };
 
   const onSuccess = (option: OptionSelect) => {
-    const message = !isOptionNewUser(option)
+    const message = !isOptionNewMember(option)
       ? t('Invitation sent to {{email}}.', {
           email: option.value.email,
         })
@@ -111,7 +111,7 @@ export const ModalAddUsers = ({
     setIsPending(true);
 
     const settledPromises = await Promise.allSettled<
-      OptionInvitation | OptionNewUser
+      OptionInvitation | OptionNewMember
     >(switchActions(selectedUsers));
 
     onClose();
@@ -161,7 +161,7 @@ export const ModalAddUsers = ({
         <Box $align="center" $gap="1rem">
           <IconAddUser width={48} color={colorsTokens()['primary-text']} />
           <Text $size="h3" $margin="none">
-            {t('Add users to the document')}
+            {t('Add members to the document')}
           </Text>
         </Box>
       }

src/frontend/apps/impress/src/features/pads/members/members-add/components/SearchUsers.tsx

@@ -55,7 +55,7 @@ export const SearchUsers = ({
     let users: OptionsSelect = optionsFiltered.map((user) => ({
       value: user,
       label: user.email,
-      type: OptionType.NEW_USER,
+      type: OptionType.NEW_MEMBER,
     }));
 
     if (userQuery && isValidEmail(userQuery)) {
@@ -103,17 +103,17 @@ export const SearchUsers = ({
   return (
     <AsyncSelect
       isDisabled={disabled}
-      aria-label={t('Find a user to add to the document')}
+      aria-label={t('Find a member to add to the document')}
       isMulti
       loadOptions={loadOptions}
       defaultOptions={[]}
       onInputChange={onInputChangeHandle}
       inputValue={input}
-      placeholder={t('Search new users by email')}
+      placeholder={t('Search new members by email')}
       noOptionsMessage={() =>
         input
-          ? t("We didn't find something matching, try to be more accurate")
-          : t('Invite new users to {{title}}', { title: doc.title })
+          ? t("We didn't find a mail matching, try to be more accurate")
+          : t('Invite new members to {{title}}', { title: doc.title })
       }
       onChange={(value) => {
         setInput('');

src/frontend/apps/impress/src/features/pads/members/members-add/index.ts

@@ -0,0 +1 @@
+export * from './components/ModalAddMembers';

src/frontend/apps/impress/src/features/pads/members/members-add/types.tsx

@@ -1,13 +1,14 @@
 import { User } from '@/core/auth';
-
-import { Pad, Role } from '../pad-management';
+import { Pad, Role } from '@/features/pads/pad-management';
 
 export enum OptionType {
   INVITATION = 'invitation',
-  NEW_USER = 'new_user',
+  NEW_MEMBER = 'new_member',
 }
 
-export const isOptionNewUser = (data: OptionSelect): data is OptionNewUser => {
+export const isOptionNewMember = (
+  data: OptionSelect,
+): data is OptionNewMember => {
   return 'id' in data.value;
 };
 
@@ -17,13 +18,13 @@ export interface OptionInvitation {
   type: OptionType.INVITATION;
 }
 
-export interface OptionNewUser {
+export interface OptionNewMember {
   value: User;
   label: string;
-  type: OptionType.NEW_USER;
+  type: OptionType.NEW_MEMBER;
 }
 
-export type OptionSelect = OptionNewUser | OptionInvitation;
+export type OptionSelect = OptionNewMember | OptionInvitation;
 
 export interface DocInvitation {
   id: string;

src/frontend/apps/impress/src/features/pads/pad-tools/components/PadToolBox.tsx

@@ -3,6 +3,7 @@ import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { Box, DropButton, IconOptions, Text } from '@/components';
+import { ModalAddMembers } from '@/features/pads/members/members-add';
 import {
   ModalRemovePad,
   ModalUpdatePad,
@@ -10,7 +11,6 @@ import {
   currentDocRole,
 } from '@/features/pads/pad-management';
 
-import { ModalAddUsers } from '../../addUsers';
 import { TemplatesOrdering, useTemplates } from '../api/useTemplates';
 
 import { ModalPDF } from './ModalPDF';
@@ -24,7 +24,7 @@ export const PadToolBox = ({ pad }: PadToolBoxProps) => {
   const { data: templates } = useTemplates({
     ordering: TemplatesOrdering.BY_CREATED_ON_DESC,
   });
-  const [isModalAddUserOpen, setIsModalAddUserOpen] = useState(false);
+  const [isModalAddMembersOpen, setIsModalAddMembersOpen] = useState(false);
   const [isModalUpdateOpen, setIsModalUpdateOpen] = useState(false);
   const [isModalRemoveOpen, setIsModalRemoveOpen] = useState(false);
   const [isModalPDFOpen, setIsModalPDFOpen] = useState(false);
@@ -63,13 +63,13 @@ export const PadToolBox = ({ pad }: PadToolBoxProps) => {
           {pad.abilities.manage_accesses && (
             <Button
               onClick={() => {
-                setIsModalAddUserOpen(true);
+                setIsModalAddMembersOpen(true);
                 setIsDropOpen(false);
               }}
               color="primary-text"
               icon={<span className="material-icons">person_add</span>}
             >
-              <Text $theme="primary">{t('Add a user')}</Text>
+              <Text $theme="primary">{t('Add members')}</Text>
             </Button>
           )}
           {pad.abilities.partial_update && (
@@ -108,9 +108,9 @@ export const PadToolBox = ({ pad }: PadToolBoxProps) => {
           </Button>
         </Box>
       </DropButton>
-      {isModalAddUserOpen && (
-        <ModalAddUsers
-          onClose={() => setIsModalAddUserOpen(false)}
+      {isModalAddMembersOpen && (
+        <ModalAddMembers
+          onClose={() => setIsModalAddMembersOpen(false)}
           doc={pad}
           currentRole={currentDocRole(pad)}
         />