From a013de8adf40f83f321326091adee56664064345 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Mon, 6 Feb 2023 15:35:15 +0800 Subject: [PATCH 01/25] 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 99efff25d..5e4a1363b 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) => { {icon} {children} - {/* */} + ); From 2a17c327790c5734b189c1bf924bef6763855ab0 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Mon, 6 Feb 2023 15:45:20 +0800 Subject: [PATCH 02/25] 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 4738e9355..9aa284558 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 Date: Mon, 6 Feb 2023 15:50:53 +0800 Subject: [PATCH 03/25] 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 5e4a1363b..976c86b50 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 ebca34c9e5bef7061ac81d311e4a1b485a634314 Mon Sep 17 00:00:00 2001 From: DiamondThree <857159145@qq.com> Date: Mon, 6 Feb 2023 16:33:07 +0800 Subject: [PATCH 04/25] fix: workspace owner will delete himself --- .../workspace-setting/member/MembersPage.tsx | 73 ++++++++++--------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/packages/app/src/components/workspace-setting/member/MembersPage.tsx b/packages/app/src/components/workspace-setting/member/MembersPage.tsx index caa604777..f7dec5cd3 100644 --- a/packages/app/src/components/workspace-setting/member/MembersPage.tsx +++ b/packages/app/src/components/workspace-setting/member/MembersPage.tsx @@ -32,7 +32,6 @@ import { EnableWorkspaceButton } from '@/components/enable-workspace'; export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => { const [isInviteModalShow, setIsInviteModalShow] = useState(false); const { members, removeMember, loaded } = useMembers(); - const { t } = useTranslation(); const { confirm } = useConfirm(); @@ -94,41 +93,45 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => { : t('Pending')} - - { - const confirmRemove = await confirm({ - title: t('Delete Member?'), - content: t('will delete member'), - confirmText: t('Delete'), - confirmType: 'danger', - }); + {member.type === 99 ? ( + <> + ) : ( + + { + const confirmRemove = await confirm({ + title: t('Delete Member?'), + content: t('will delete member'), + confirmText: t('Delete'), + confirmType: 'danger', + }); - if (!confirmRemove) { - return; - } - await removeMember(member.id); - toast( - t('Member has been removed', { - name: user.name, - }) - ); - }} - icon={} - > - {t('Delete')} - - - } - placement="bottom-end" - disablePortal={true} - > - - - - + if (!confirmRemove) { + return; + } + await removeMember(member.id); + toast( + t('Member has been removed', { + name: user.name, + }) + ); + }} + icon={} + > + {t('Delete')} + + + } + placement="bottom-end" + disablePortal={true} + > + + + + + )} ); From b0e586d02be65e3bccf1b5c4447fb8336945d517 Mon Sep 17 00:00:00 2001 From: DarkSky Date: Mon, 6 Feb 2023 16:51:35 +0800 Subject: [PATCH 05/25] fix: use self hosted runner --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d0c26263..8f4319f95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,7 +67,7 @@ jobs: lint: name: Lint and E2E Test - runs-on: ubuntu-latest + runs-on: self-hosted environment: development needs: build From 66d2033cdab086e73f633f5d2b2eb8b7ff7def84 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Mon, 6 Feb 2023 17:00:21 +0800 Subject: [PATCH 06/25] 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 0a06467af..ffba2a08d 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 ( - + {t('404 - Page Not Found')}