diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-member-create.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-member-create.spec.ts
index 79cf6aa2..1b9867dd 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-member-create.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-member-create.spec.ts
@@ -84,7 +84,7 @@ test.describe('Document create member', () => {
// Validate
await page.getByRole('menuitem', { name: 'Administrator' }).click();
- await page.getByRole('button', { name: /^Invite / }).click();
+ await page.getByTestId('doc-share-invite-button').click();
// Check invitation added
await expect(
@@ -135,7 +135,7 @@ test.describe('Document create member', () => {
(response) =>
response.url().includes('/invitations/') && response.status() === 201,
);
- await page.getByRole('button', { name: /^Invite / }).click();
+ await page.getByTestId('doc-share-invite-button').click();
// Check invitation sent
@@ -154,7 +154,7 @@ test.describe('Document create member', () => {
response.url().includes('/invitations/') && response.status() === 400,
);
- await page.getByRole('button', { name: /^Invite / }).click();
+ await page.getByTestId('doc-share-invite-button').click();
await expect(
page.getByText(`"${email}" is already invited to the document.`),
).toBeVisible();
@@ -191,7 +191,7 @@ test.describe('Document create member', () => {
response.url().includes('/invitations/') && response.status() === 201,
);
- await page.getByRole('button', { name: /^Invite / }).click();
+ await page.getByTestId('doc-share-invite-button').click();
// Check invitation sent
const responseCreateInvitation = await responsePromiseCreateInvitation;
@@ -216,12 +216,8 @@ test.describe('Document create member', () => {
const responsePatchInvitation = await responsePromisePatchInvitation;
expect(responsePatchInvitation.ok()).toBeTruthy();
- const moreActions = userInvitation.getByRole('button', {
- name: 'Open invitation actions menu',
- });
- await moreActions.click();
-
- await page.getByRole('menuitem', { name: 'Delete' }).click();
+ await userInvitation.getByTestId('doc-role-dropdown').click();
+ await page.getByRole('menuitem', { name: 'Remove access' }).click();
await expect(userInvitation).toBeHidden();
});
diff --git a/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareInvitation.tsx b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareInvitation.tsx
index 42afae48..05051fcf 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareInvitation.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareInvitation.tsx
@@ -3,25 +3,13 @@ import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { css } from 'styled-components';
-import {
- Box,
- DropdownMenu,
- DropdownMenuOption,
- Icon,
- IconOptions,
- LoadMoreText,
- Text,
-} from '@/components';
+import { Box, BoxButton, Icon, LoadMoreText, Text } from '@/components';
import { QuickSearchData, QuickSearchGroup } from '@/components/quick-search';
import { useCunninghamTheme } from '@/cunningham';
import { Doc, Role } from '@/docs/doc-management';
import { User } from '@/features/auth';
-import {
- useDeleteDocInvitation,
- useDocInvitationsInfinite,
- useUpdateDocInvitation,
-} from '../api';
+import { useDocInvitationsInfinite, useUpdateDocInvitation } from '../api';
import { Invitation } from '../types';
import { DocRoleDropdown } from './DocRoleDropdown';
@@ -61,18 +49,6 @@ export const DocShareInvitationItem = ({
},
});
- const { mutate: removeDocInvitation } = useDeleteDocInvitation({
- onError: (error) => {
- toast(
- error?.data?.role?.[0] ?? t('Error during delete invitation'),
- VariantType.ERROR,
- {
- duration: 4000,
- },
- );
- },
- });
-
const onUpdate = (newRole: Role) => {
updateDocInvitation({
docId: doc.id,
@@ -81,19 +57,6 @@ export const DocShareInvitationItem = ({
});
};
- const onRemove = () => {
- removeDocInvitation({ invitationId: invitation.id, docId: doc.id });
- };
-
- const moreActions: DropdownMenuOption[] = [
- {
- label: t('Delete'),
- icon: 'delete',
- callback: onRemove,
- disabled: !canUpdate,
- },
- ];
-
return (
-
- {canUpdate && (
-
-
-
- )}
}
/>
@@ -149,26 +102,22 @@ export const DocShareModalInviteUserRow = ({
-
+
{t('Add')}
-
-
+
+
}
/>