Merge branch 'master' into fix/lost-entrance-of-quick-search

packages/app/src/components/page-list/Empty.tsx

@@ -14,7 +14,6 @@ export const PageListEmpty = (props: { listType?: string }) => {
       {listType === 'all' && <p>{t('emptyAllPages')}</p>}
       {listType === 'favorite' && <p>{t('emptyFavourite')}</p>}
       {listType === 'trash' && <p>{t('emptyTrash')}</p>}
-      <p>{t('still designed')}</p>
     </div>
   );
 };

packages/app/src/components/workspace-modal/WorkspaceCard.tsx

@@ -23,6 +23,7 @@ export const WorkspaceCard = ({
   const { t } = useTranslation();
   return (
     <StyledCard
+      data-testid="workspace-card"
       onClick={() => {
         onClick(workspaceData);
       }}

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')}
                     </StyledMemberRoleContainer>
                     <StyledMoreVerticalButton>
-                      <Menu
-                        content={
-                          <>
-                            <MenuItem
-                              onClick={async () => {
-                                const confirmRemove = await confirm({
-                                  title: t('Delete Member?'),
-                                  content: t('will delete member'),
-                                  confirmText: t('Delete'),
-                                  confirmType: 'danger',
-                                });
+                      {member.type === 99 ? (
+                        <></>
+                      ) : (
+                        <Menu
+                          content={
+                            <>
+                              <MenuItem
+                                onClick={async () => {
+                                  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={<TrashIcon />}
-                            >
-                              {t('Delete')}
-                            </MenuItem>
-                          </>
-                        }
-                        placement="bottom-end"
-                        disablePortal={true}
-                      >
-                        <IconButton>
-                          <MoreVerticalIcon />
-                        </IconButton>
-                      </Menu>
+                                  if (!confirmRemove) {
+                                    return;
+                                  }
+                                  await removeMember(member.id);
+                                  toast(
+                                    t('Member has been removed', {
+                                      name: user.name,
+                                    })
+                                  );
+                                }}
+                                icon={<TrashIcon />}
+                              >
+                                {t('Delete')}
+                              </MenuItem>
+                            </>
+                          }
+                          placement="bottom-end"
+                          disablePortal={true}
+                        >
+                          <IconButton>
+                            <MoreVerticalIcon />
+                          </IconButton>
+                        </Menu>
+                      )}
                     </StyledMoreVerticalButton>
                   </StyledMemberListItem>
                 );

packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx

@@ -32,13 +32,13 @@ export const WorkspaceSelector = () => {
           >
             <WorkspaceUnitAvatar
               size={28}
-              name={currentWorkspace?.name ?? 'AFFiNE'}
+              name={currentWorkspace?.name ?? 'AFFiNE Test'}
               workspaceUnit={currentWorkspace}
             />
           </div>
         </Avatar>
         <WorkspaceName data-testid="workspace-name">
-          {currentWorkspace?.name ?? 'AFFiNE'}
+          {currentWorkspace?.name ?? 'AFFiNE Test'}
         </WorkspaceName>
       </SelectorWrapper>
       <WorkspaceModal