Merge branch 'main' into accessibility

README.md

@@ -179,5 +179,5 @@ We are proud sponsors of [BlockNotejs](https://www.blocknotejs.org/) and [Yjs](h
 We are always looking for new public partners (we are currently onboarding the Netherlands 🇳🇱🧀), feel free to [reach out](https://matrix.to/#/#docs-official:matrix.org) if you are interested in using or contributing to Docs.
 
 <p align="center">
-  <img src="/docs/assets/europe<3opensource.png" width="50%"/>
-</p>
+  <img src="/docs/assets/europe_opensource.png" width="50%"/>
+</p>

src/frontend/apps/e2e/__tests__/app-impress/doc-editor.spec.ts

@@ -14,29 +14,6 @@ test.beforeEach(async ({ page }) => {
 });
 
 test.describe('Doc Editor', () => {
-  test('it saves the doc when we quit pages', async ({ page, browserName }) => {
-    // eslint-disable-next-line playwright/no-skipped-test
-    test.skip(browserName === 'webkit', 'This test is very flaky with webkit');
-
-    // Check the first doc
-    const doc = await goToGridDoc(page);
-
-    await verifyDocName(page, doc);
-
-    const editor = page.locator('.ProseMirror');
-    await editor.click();
-    await editor.fill('Hello World Doc persisted 2');
-    await expect(editor.getByText('Hello World Doc persisted 2')).toBeVisible();
-
-    await page.goto('/');
-
-    await goToGridDoc(page, {
-      title: doc,
-    });
-
-    await expect(editor.getByText('Hello World Doc persisted 2')).toBeVisible();
-  });
-
   test('it check translations of the slash menu when changing language', async ({
     page,
     browserName,
@@ -264,6 +241,29 @@ test.describe('Doc Editor', () => {
     await expect(editor.getByText('Hello World Doc persisted 1')).toBeVisible();
   });
 
+  test('it saves the doc when we quit pages', async ({ page, browserName }) => {
+    // eslint-disable-next-line playwright/no-skipped-test
+    test.skip(browserName === 'webkit', 'This test is very flaky with webkit');
+
+    // Check the first doc
+    const doc = await goToGridDoc(page);
+
+    await verifyDocName(page, doc);
+
+    const editor = page.locator('.ProseMirror');
+    await editor.click();
+    await editor.fill('Hello World Doc persisted 2');
+    await expect(editor.getByText('Hello World Doc persisted 2')).toBeVisible();
+
+    await page.goto('/');
+
+    await goToGridDoc(page, {
+      title: doc,
+    });
+
+    await expect(editor.getByText('Hello World Doc persisted 2')).toBeVisible();
+  });
+
   test('it cannot edit if viewer', async ({ page }) => {
     await mockedDocument(page, {
       abilities: {

src/frontend/apps/e2e/__tests__/app-impress/doc-visibility.spec.ts

@@ -67,53 +67,6 @@ test.describe('Doc Visibility', () => {
 test.describe('Doc Visibility: Restricted', () => {
   test.use({ storageState: { cookies: [], origins: [] } });
 
-  test('A doc is accessible when member.', async ({ page, browserName }) => {
-    test.slow();
-    await page.goto('/');
-    await keyCloakSignIn(page, browserName);
-
-    const [docTitle] = await createDoc(page, 'Restricted auth', browserName, 1);
-
-    await verifyDocName(page, docTitle);
-
-    await page.getByRole('button', { name: 'Share' }).click();
-
-    const inputSearch = page.getByRole('combobox', {
-      name: 'Quick search input',
-    });
-
-    const otherBrowser = browsersName.find((b) => b !== browserName);
-    const username = `user@${otherBrowser}.e2e`;
-    await inputSearch.fill(username);
-    await page.getByRole('option', { name: username }).first().click();
-
-    // Choose a role
-    const container = page.getByTestId('doc-share-add-member-list');
-    await container.getByLabel('doc-role-dropdown').click();
-    await page.getByRole('button', { name: 'Administrator' }).click();
-
-    await page.getByRole('button', { name: 'Invite' }).click();
-
-    await page.locator('.c__modal__backdrop').click({
-      position: { x: 0, y: 0 },
-    });
-
-    const urlDoc = page.url();
-
-    await page
-      .getByRole('button', {
-        name: 'Logout',
-      })
-      .click();
-
-    await keyCloakSignIn(page, otherBrowser!);
-
-    await page.goto(urlDoc);
-
-    await verifyDocName(page, docTitle);
-    await expect(page.getByLabel('Share button')).toBeVisible();
-  });
-
   test('A doc is not accessible when not authentified.', async ({
     page,
     browserName,
@@ -174,6 +127,53 @@ test.describe('Doc Visibility: Restricted', () => {
       page.getByText('You do not have permission to perform this action.'),
     ).toBeVisible();
   });
+
+  test('A doc is accessible when member.', async ({ page, browserName }) => {
+    test.slow();
+    await page.goto('/');
+    await keyCloakSignIn(page, browserName);
+
+    const [docTitle] = await createDoc(page, 'Restricted auth', browserName, 1);
+
+    await verifyDocName(page, docTitle);
+
+    await page.getByRole('button', { name: 'Share' }).click();
+
+    const inputSearch = page.getByRole('combobox', {
+      name: 'Quick search input',
+    });
+
+    const otherBrowser = browsersName.find((b) => b !== browserName);
+    const username = `user@${otherBrowser}.e2e`;
+    await inputSearch.fill(username);
+    await page.getByRole('option', { name: username }).click();
+
+    // Choose a role
+    const container = page.getByTestId('doc-share-add-member-list');
+    await container.getByLabel('doc-role-dropdown').click();
+    await page.getByRole('button', { name: 'Administrator' }).click();
+
+    await page.getByRole('button', { name: 'Invite' }).click();
+
+    await page.locator('.c__modal__backdrop').click({
+      position: { x: 0, y: 0 },
+    });
+
+    const urlDoc = page.url();
+
+    await page
+      .getByRole('button', {
+        name: 'Logout',
+      })
+      .click();
+
+    await keyCloakSignIn(page, otherBrowser!);
+
+    await page.goto(urlDoc);
+
+    await verifyDocName(page, docTitle);
+    await expect(page.getByLabel('Share button')).toBeVisible();
+  });
 });
 
 test.describe('Doc Visibility: Public', () => {

src/frontend/apps/impress/.env

@@ -0,0 +1,2 @@
+NEXT_PUBLIC_API_ORIGIN=
+NEXT_PUBLIC_SW_DEACTIVATED=

src/frontend/apps/impress/src/features/docs/doc-share/components/DocShareModal.tsx

@@ -137,17 +137,20 @@ export const DocShareModal = ({ doc, onClose }: Props) => {
       short_name: '',
     };
 
+    const hasEmailInUsers = users.some((user) => user.email === userQuery);
+
     return {
       groupName: t('Search user result'),
       elements: users,
-      endActions: isEmail
-        ? [
-            {
-              content: <DocShareModalInviteUserRow user={newUser} />,
-              onSelect: () => void onSelect(newUser),
-            },
-          ]
-        : undefined,
+      endActions:
+        isEmail && !hasEmailInUsers
+          ? [
+              {
+                content: <DocShareModalInviteUserRow user={newUser} />,
+                onSelect: () => void onSelect(newUser),
+              },
+            ]
+          : undefined,
     };
   }, [searchUsersQuery.data, t, userQuery]);