From a013de8adf40f83f321326091adee56664064345 Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Mon, 6 Feb 2023 15:35:15 +0800
Subject: [PATCH 1/6] fix: retrieve lost quick search entries

---
 packages/app/src/components/header/PageListHeader.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/components/header/PageListHeader.tsx b/packages/app/src/components/header/PageListHeader.tsx
index 99efff25de..5e4a1363bf 100644
--- a/packages/app/src/components/header/PageListHeader.tsx
+++ b/packages/app/src/components/header/PageListHeader.tsx
@@ -1,6 +1,10 @@
 import { PropsWithChildren, ReactNode } from 'react';
 import Header from './Header';
-import { StyledPageListTittleWrapper } from './styles';
+import QuickSearchButton from './QuickSearchButton';
+import {
+  StyledPageListTittleWrapper,
+  StyledSearchArrowWrapper,
+} from './styles';
 // import QuickSearchButton from './QuickSearchButton';
 
 export type PageListHeaderProps = PropsWithChildren<{
@@ -12,7 +16,7 @@ export const PageListHeader = ({ icon, children }: PageListHeaderProps) => {
       <StyledPageListTittleWrapper>
         {icon}
         {children}
-        {/* <QuickSearchButton style={{ marginLeft: '5px' }} /> */}
+        <QuickSearchButton />
       </StyledPageListTittleWrapper>
     </Header>
   );

From 2a17c327790c5734b189c1bf924bef6763855ab0 Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Mon, 6 Feb 2023 15:45:20 +0800
Subject: [PATCH 2/6] fix: find the lost setting entry of quick search

---
 packages/app/src/components/quick-search/config.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/app/src/components/quick-search/config.ts b/packages/app/src/components/quick-search/config.ts
index 4738e93554..9aa284558e 100644
--- a/packages/app/src/components/quick-search/config.ts
+++ b/packages/app/src/components/quick-search/config.ts
@@ -1,5 +1,10 @@
 import { FC, SVGProps } from 'react';
-import { AllPagesIcon, FavouritesIcon, TrashIcon } from '@blocksuite/icons';
+import {
+  AllPagesIcon,
+  FavouritesIcon,
+  TrashIcon,
+  SettingsIcon,
+} from '@blocksuite/icons';
 import { useTranslation } from '@affine/i18n';
 
 export const useSwitchToConfig = (
@@ -23,6 +28,13 @@ export const useSwitchToConfig = (
         : '',
       icon: FavouritesIcon,
     },
+    {
+      title: t('Settings'),
+      href: currentWorkspaceId
+        ? `/workspace/${currentWorkspaceId}/setting`
+        : '',
+      icon: SettingsIcon,
+    },
     {
       title: t('Trash'),
       href: currentWorkspaceId ? `/workspace/${currentWorkspaceId}/trash` : '',

From 010c7b68d4483de3bfa269521643127060da7200 Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Mon, 6 Feb 2023 15:50:53 +0800
Subject: [PATCH 3/6] chore: remove unused import

---
 packages/app/src/components/header/PageListHeader.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/app/src/components/header/PageListHeader.tsx b/packages/app/src/components/header/PageListHeader.tsx
index 5e4a1363bf..976c86b50d 100644
--- a/packages/app/src/components/header/PageListHeader.tsx
+++ b/packages/app/src/components/header/PageListHeader.tsx
@@ -1,10 +1,7 @@
 import { PropsWithChildren, ReactNode } from 'react';
 import Header from './Header';
 import QuickSearchButton from './QuickSearchButton';
-import {
-  StyledPageListTittleWrapper,
-  StyledSearchArrowWrapper,
-} from './styles';
+import { StyledPageListTittleWrapper } from './styles';
 // import QuickSearchButton from './QuickSearchButton';
 
 export type PageListHeaderProps = PropsWithChildren<{

From 66d2033cdab086e73f633f5d2b2eb8b7ff7def84 Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Mon, 6 Feb 2023 17:00:21 +0800
Subject: [PATCH 4/6] test: update visit 404 page test case

---
 packages/app/src/components/404/index.tsx | 2 +-
 tests/exception-page.spec.ts              | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/app/src/components/404/index.tsx b/packages/app/src/components/404/index.tsx
index 0a06467afa..ffba2a08d2 100644
--- a/packages/app/src/components/404/index.tsx
+++ b/packages/app/src/components/404/index.tsx
@@ -7,7 +7,7 @@ export const NotfoundPage = () => {
   const router = useRouter();
   return (
     <PageContainer>
-      <NotFoundTitle>
+      <NotFoundTitle data-testid="notFound">
         {t('404 - Page Not Found')}
         <p>
           <Button
diff --git a/tests/exception-page.spec.ts b/tests/exception-page.spec.ts
index dfc1a6d7b2..b7746fe861 100644
--- a/tests/exception-page.spec.ts
+++ b/tests/exception-page.spec.ts
@@ -8,8 +8,7 @@ loadPage();
 test.describe('exception page', () => {
   test('visit 404 page', async ({ page }) => {
     await page.goto('http://localhost:8080/404');
-    await page.waitForTimeout(1000);
-    const notFoundTip = page.getByText('404 - Page Not Found');
-    expect(await notFoundTip.isVisible()).toBe(true);
+    const notFoundTip = page.locator('[data-testid=notFound]');
+    await expect(notFoundTip).toBeVisible();
   });
 });

From dd127bc68d9cca6333573d0a5299afba352d1707 Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Mon, 6 Feb 2023 17:24:30 +0800
Subject: [PATCH 5/6] test: update quick-search test case

---
 tests/quick-search.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/quick-search.spec.ts b/tests/quick-search.spec.ts
index b45e66ff94..2a9c7408de 100644
--- a/tests/quick-search.spec.ts
+++ b/tests/quick-search.spec.ts
@@ -81,6 +81,7 @@ test.describe('Search and select', () => {
     const addNewPage = page.locator('[data-testid=quickSearch-addNewPage]');
     await addNewPage.click();
     await page.waitForTimeout(200);
+    await assertTitleTexts(page, 'test123456');
     await openQuickSearchByShortcut(page);
     await page.keyboard.insertText('test123456');
     await assertResultList(page, ['test123456']);

From 6bdaee66cf4b0667511582d829e43f2003201624 Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Mon, 6 Feb 2023 18:06:30 +0800
Subject: [PATCH 6/6] test: fix quick search test case

---
 tests/quick-search.spec.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/quick-search.spec.ts b/tests/quick-search.spec.ts
index 2a9c7408de..5bf112e2c3 100644
--- a/tests/quick-search.spec.ts
+++ b/tests/quick-search.spec.ts
@@ -9,6 +9,7 @@ const openQuickSearchByShortcut = async (page: Page) =>
   await withCtrlOrMeta(page, () => page.keyboard.press('k', { delay: 50 }));
 
 async function assertTitleTexts(page: Page, texts: string) {
+  await page.title();
   const actual = await page.evaluate(() => {
     const titleElement = <HTMLTextAreaElement>(
       document.querySelector('.affine-default-page-block-title')
@@ -58,7 +59,7 @@ test.describe('Add new page in quick search', () => {
     await openQuickSearchByShortcut(page);
     const addNewPage = page.locator('[data-testid=quickSearch-addNewPage]');
     await addNewPage.click();
-    await page.waitForTimeout(200);
+    await page.waitForTimeout(300);
     await assertTitleTexts(page, '');
   });
 
@@ -68,7 +69,7 @@ test.describe('Add new page in quick search', () => {
     await page.keyboard.insertText('test123456');
     const addNewPage = page.locator('[data-testid=quickSearch-addNewPage]');
     await addNewPage.click();
-    await page.waitForTimeout(200);
+    await page.waitForTimeout(300);
     await assertTitleTexts(page, 'test123456');
   });
 });
@@ -80,10 +81,11 @@ test.describe('Search and select', () => {
     await page.keyboard.insertText('test123456');
     const addNewPage = page.locator('[data-testid=quickSearch-addNewPage]');
     await addNewPage.click();
-    await page.waitForTimeout(200);
+    await page.waitForTimeout(300);
     await assertTitleTexts(page, 'test123456');
+    await page.waitForTimeout(100);
     await openQuickSearchByShortcut(page);
-    await page.keyboard.insertText('test123456');
+    await page.keyboard.type('test123456');
     await assertResultList(page, ['test123456']);
     await page.keyboard.press('Enter', { delay: 50 });
     await assertTitleTexts(page, 'test123456');