diff --git a/CHANGELOG.md b/CHANGELOG.md index 2886f18b..eae96596 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,6 @@ and this project adheres to ## Added - 🎨(frontend) better conversion editor to pdf #151 -- ✨(frontend) Versioning #147 - ✨Export docx (word) #161 - 🌐Internationalize invitation email #167 - ✨(frontend) White branding #164 diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-version.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-version.spec.ts deleted file mode 100644 index 67291a12..00000000 --- a/src/frontend/apps/e2e/__tests__/app-impress/doc-version.spec.ts +++ /dev/null @@ -1,109 +0,0 @@ -import { expect, test } from '@playwright/test'; - -import { createDoc, goToGridDoc, mockedDocument } from './common'; - -test.beforeEach(async ({ page }) => { - await page.goto('/'); -}); - -test.describe('Doc Version', () => { - test('it displays the doc versions', async ({ page, browserName }) => { - const [randomDoc] = await createDoc(page, 'doc-version', browserName, 1); - - await expect(page.locator('h2').getByText(randomDoc)).toBeVisible(); - - const panel = page.getByLabel('Document version panel'); - - await expect(panel.getByText('Current version')).toBeVisible(); - expect(await panel.locator('li').count()).toBe(1); - - await page.locator('.ProseMirror.bn-editor').click(); - await page.locator('.ProseMirror.bn-editor').last().fill('Hello World'); - - await goToGridDoc(page, { - title: randomDoc, - }); - - await expect(page.getByText('Hello World')).toBeVisible(); - - await page - .locator('.ProseMirror .bn-block') - .getByText('Hello World') - .fill('It will create a version'); - - await goToGridDoc(page, { - title: randomDoc, - }); - - await expect(page.getByText('Hello World')).toBeHidden(); - await expect(page.getByText('It will create a version')).toBeVisible(); - - await expect(panel.getByText('Current version')).toBeVisible(); - expect(await panel.locator('li').count()).toBe(2); - - await panel.locator('li').nth(1).click(); - await expect( - page.getByText('Read only, you cannot edit document versions.'), - ).toBeVisible(); - await expect(page.getByText('Hello World')).toBeVisible(); - await expect(page.getByText('It will create a version')).toBeHidden(); - - await panel.getByText('Current version').click(); - await expect(page.getByText('Hello World')).toBeHidden(); - await expect(page.getByText('It will create a version')).toBeVisible(); - }); - - test('it does not display the doc versions if not allowed', async ({ - page, - }) => { - await mockedDocument(page, { - abilities: { - versions_list: false, - partial_update: true, - }, - }); - - await goToGridDoc(page); - - await expect(page.locator('h2').getByText('Mocked document')).toBeVisible(); - - await expect(page.getByLabel('Document version panel')).toBeHidden(); - }); - - test('it restores the doc version', async ({ page, browserName }) => { - const [randomDoc] = await createDoc(page, 'doc-version', browserName, 1); - - await expect(page.locator('h2').getByText(randomDoc)).toBeVisible(); - - await page.locator('.bn-block-outer').last().click(); - await page.locator('.bn-block-outer').last().fill('Hello'); - - await goToGridDoc(page, { - title: randomDoc, - }); - - await expect(page.getByText('Hello')).toBeVisible(); - await page.locator('.bn-block-outer').last().click(); - await page.keyboard.press('Enter'); - await page.locator('.bn-block-outer').last().fill('World'); - - await goToGridDoc(page, { - title: randomDoc, - }); - - await expect(page.getByText('World')).toBeVisible(); - - const panel = page.getByLabel('Document version panel'); - await panel.locator('li').nth(1).click(); - await expect(page.getByText('World')).toBeHidden(); - - await panel.getByLabel('Open the version options').click(); - await page.getByText('Restore the version').click(); - - await expect(panel.locator('li')).toHaveCount(3); - - await panel.getByText('Current version').click(); - await expect(page.getByText('Hello')).toBeVisible(); - await expect(page.getByText('World')).toBeHidden(); - }); -}); diff --git a/src/frontend/apps/impress/src/features/docs/doc-editor/components/DocEditor.tsx b/src/frontend/apps/impress/src/features/docs/doc-editor/components/DocEditor.tsx index 085ad6e1..1d8d2428 100644 --- a/src/frontend/apps/impress/src/features/docs/doc-editor/components/DocEditor.tsx +++ b/src/frontend/apps/impress/src/features/docs/doc-editor/components/DocEditor.tsx @@ -8,11 +8,7 @@ import { Box, Card, Text, TextErrors } from '@/components'; import { useCunninghamTheme } from '@/cunningham'; import { DocHeader } from '@/features/docs/doc-header'; import { Doc } from '@/features/docs/doc-management'; -import { - Panel, - Versions, - useDocVersion, -} from '@/features/docs/doc-versioning/'; +import { Versions, useDocVersion } from '@/features/docs/doc-versioning/'; import { BlockNoteEditor } from './BlockNoteEditor'; @@ -62,7 +58,6 @@ export const DocEditor = ({ doc }: DocEditorProps) => { )} - {doc.abilities.versions_list && } );