diff --git a/packages/frontend/core/src/components/page-list/collections/collection-list-header.tsx b/packages/frontend/core/src/components/page-list/collections/collection-list-header.tsx index ec0bdd5edf..a7249a41d1 100644 --- a/packages/frontend/core/src/components/page-list/collections/collection-list-header.tsx +++ b/packages/frontend/core/src/components/page-list/collections/collection-list-header.tsx @@ -19,7 +19,11 @@ export const CollectionListHeader = ({
{t['com.affine.collections.header']()}
- diff --git a/packages/frontend/core/src/components/page-list/operation-cell.tsx b/packages/frontend/core/src/components/page-list/operation-cell.tsx index a61c7a5ed0..29612031e4 100644 --- a/packages/frontend/core/src/components/page-list/operation-cell.tsx +++ b/packages/frontend/core/src/components/page-list/operation-cell.tsx @@ -481,6 +481,7 @@ export const CollectionOperationCell = ({ } type="danger" + data-testid="delete-collection" > {t['Delete']()} @@ -490,7 +491,7 @@ export const CollectionOperationCell = ({ align: 'end', }} > - + @@ -560,6 +561,7 @@ export const TagOperationCell = ({ } type="danger" onSelect={handleDelete} + data-testid="delete-tag" > {t['Delete']()} @@ -568,7 +570,7 @@ export const TagOperationCell = ({ align: 'end', }} > - + diff --git a/packages/frontend/core/src/components/page-list/tags/create-tag.tsx b/packages/frontend/core/src/components/page-list/tags/create-tag.tsx index be58c36222..c1f2fb7217 100644 --- a/packages/frontend/core/src/components/page-list/tags/create-tag.tsx +++ b/packages/frontend/core/src/components/page-list/tags/create-tag.tsx @@ -134,7 +134,11 @@ export const CreateOrEditTag = ({ } return ( -
+
-
diff --git a/packages/frontend/core/src/components/page-list/tags/tag-list-header.tsx b/packages/frontend/core/src/components/page-list/tags/tag-list-header.tsx index 51cbd816bc..08fa97dde1 100644 --- a/packages/frontend/core/src/components/page-list/tags/tag-list-header.tsx +++ b/packages/frontend/core/src/components/page-list/tags/tag-list-header.tsx @@ -8,7 +8,11 @@ export const TagListHeader = ({ onOpen }: { onOpen: () => void }) => { return (
{t['Tags']()}
-
diff --git a/packages/frontend/core/src/components/page-list/view/create-collection.tsx b/packages/frontend/core/src/components/page-list/view/create-collection.tsx index 90996f0077..d57ed246ea 100644 --- a/packages/frontend/core/src/components/page-list/view/create-collection.tsx +++ b/packages/frontend/core/src/components/page-list/view/create-collection.tsx @@ -88,7 +88,7 @@ export const CreateCollection = ({ [isNameEmpty] ); return ( -
+
{t['com.affine.editCollectionName.name']()} diff --git a/tests/affine-local/e2e/all-page.spec.ts b/tests/affine-local/e2e/all-page.spec.ts index 6913f424ad..3b03638739 100644 --- a/tests/affine-local/e2e/all-page.spec.ts +++ b/tests/affine-local/e2e/all-page.spec.ts @@ -404,3 +404,68 @@ test('select three pages with shiftKey and delete', async ({ page }) => { expect(await getPagesCount(page)).toBe(pageCount - 3); }); + +test('create a collection and delete it', async ({ page }) => { + await openHomePage(page); + await waitForEditorLoad(page); + await clickNewPageButton(page); + await clickSideBarAllPageButton(page); + await waitForAllPagesLoad(page); + await page.getByTestId('workspace-collections-button').click(); + + // create a collection + await page.getByTestId('all-collection-new-button').click(); + await expect(page.getByTestId('edit-collection-modal')).toBeVisible(); + await page.getByTestId('input-collection-title').fill('test collection'); + await page.getByTestId('save-collection').click(); + + // check the collection is created + await clickSideBarAllPageButton(page); + await waitForAllPagesLoad(page); + await page.getByTestId('workspace-collections-button').click(); + const cell = page + .getByTestId('collection-list-item') + .getByText('test collection'); + await expect(cell).toBeVisible(); + + // delete the collection + await page.getByTestId('collection-item-operation-button').click(); + await page.getByTestId('delete-collection').click(); + await page.waitForURL(url => url.pathname.endsWith('collection')); + + const newCell = page + .getByTestId('collection-list-item') + .getByText('test collection'); + await expect(newCell).not.toBeVisible(); +}); + +test('create a tag and delete it', async ({ page }) => { + await openHomePage(page); + await waitForEditorLoad(page); + await clickNewPageButton(page); + await clickSideBarAllPageButton(page); + await waitForAllPagesLoad(page); + await page.getByTestId('workspace-tags-button').click(); + + // create a tag + await page.getByTestId('all-tags-new-button').click(); + await expect(page.getByTestId('edit-tag-modal')).toBeVisible(); + await page.getByTestId('edit-tag-input').fill('test-tag'); + await page.getByTestId('save-tag').click(); + + // check the tag is created + await clickSideBarAllPageButton(page); + await waitForAllPagesLoad(page); + await page.getByTestId('workspace-tags-button').click(); + const cell = page.getByTestId('tag-list-item').getByText('test-tag'); + await expect(cell).toBeVisible(); + + // delete the tag + await page.getByTestId('tag-item-operation-button').click(); + await page.getByTestId('delete-tag').click(); + await page.getByTestId('confirm-modal-confirm').getByText('Delete').click(); + await page.waitForURL(url => url.pathname.endsWith('tag')); + + const newCell = page.getByTestId('tag-list-item').getByText('test-tag'); + await expect(newCell).not.toBeVisible(); +});