diff --git a/packages/frontend/core/src/components/affine/page-properties/property-row-value-renderer.tsx b/packages/frontend/core/src/components/affine/page-properties/property-row-value-renderer.tsx index 24dd60e5d5..ecee734ff9 100644 --- a/packages/frontend/core/src/components/affine/page-properties/property-row-value-renderer.tsx +++ b/packages/frontend/core/src/components/affine/page-properties/property-row-value-renderer.tsx @@ -1,5 +1,5 @@ import { Checkbox, DatePicker, Menu } from '@affine/component'; -import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; +import { useAllBlockSuitePageMeta } from '@affine/core/hooks/use-all-block-suite-page-meta'; import { WorkspaceLegacyProperties } from '@affine/core/modules/workspace'; import type { PageInfoCustomProperty, @@ -117,7 +117,7 @@ export const TagsValue = () => { const workspace = useService(Workspace); const page = useService(Page); const blockSuiteWorkspace = workspace.blockSuiteWorkspace; - const pageMetas = useBlockSuitePageMeta(blockSuiteWorkspace); + const pageMetas = useAllBlockSuitePageMeta(blockSuiteWorkspace); const legacyProperties = useService(WorkspaceLegacyProperties); const options = useLiveData(legacyProperties.tagOptions$); diff --git a/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx b/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx index b53c3c3eef..cd0d1afb18 100644 --- a/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx +++ b/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx @@ -37,7 +37,12 @@ export const AppSidebarJournalButton = ({ : TodayIcon; return ( - }> + } + > {t['com.affine.journal.app-sidebar-title']()} ); diff --git a/tests/affine-local/e2e/page-properties.spec.ts b/tests/affine-local/e2e/page-properties.spec.ts index 42672fe437..9f5c278a3b 100644 --- a/tests/affine-local/e2e/page-properties.spec.ts +++ b/tests/affine-local/e2e/page-properties.spec.ts @@ -1,7 +1,10 @@ /* eslint-disable unicorn/prefer-dom-node-dataset */ import { test } from '@affine-test/kit/playwright'; import { clickPageModeButton } from '@affine-test/kit/utils/editor'; -import { openHomePage } from '@affine-test/kit/utils/load-page'; +import { + openHomePage, + openJournalsPage, +} from '@affine-test/kit/utils/load-page'; import { dragTo, waitForEditorLoad } from '@affine-test/kit/utils/page-logic'; import { addCustomProperty, @@ -36,6 +39,20 @@ test('allow create tag', async ({ page }) => { await expectTagsVisible(page, ['Test2']); }); +test('allow create tag on journals page', async ({ page }) => { + await openJournalsPage(page); + await openTagsEditor(page); + await searchAndCreateTag(page, 'Test1'); + await searchAndCreateTag(page, 'Test2'); + await closeTagsEditor(page); + await expectTagsVisible(page, ['Test1', 'Test2']); + + await openTagsEditor(page); + await removeSelectedTag(page, 'Test1'); + await closeTagsEditor(page); + await expectTagsVisible(page, ['Test2']); +}); + test('add custom property', async ({ page }) => { await addCustomProperty(page, 'Text'); await addCustomProperty(page, 'Number'); diff --git a/tests/kit/utils/load-page.ts b/tests/kit/utils/load-page.ts index 2f621d2ee6..ec65fcffdd 100644 --- a/tests/kit/utils/load-page.ts +++ b/tests/kit/utils/load-page.ts @@ -1,4 +1,4 @@ -import type { Page } from '@playwright/test'; +import { expect, type Page } from '@playwright/test'; export const coreUrl = 'http://localhost:8080'; @@ -9,3 +9,10 @@ export async function openHomePage(page: Page) { export async function open404Page(page: Page) { await page.goto(`${coreUrl}/404`); } + +export async function openJournalsPage(page: Page) { + await page.getByTestId('slider-bar-journals-button').click(); + await expect( + page.locator('.doc-title-container:has-text("Today")') + ).toBeVisible(); +}