fix: login when no user. enabled on member

This commit is contained in:
DiamondThree
2023-01-12 11:50:49 +08:00
parent 753c59b534
commit 1b544463c2
2 changed files with 5 additions and 20 deletions

View File

@@ -26,13 +26,12 @@ import { toast } from '@/ui/toast';
import useMembers from '@/hooks/use-members'; import useMembers from '@/hooks/use-members';
import Loading from '@/components/loading'; import Loading from '@/components/loading';
import { Wrapper } from '@/ui/layout'; import { Wrapper } from '@/ui/layout';
import { useWorkspaceHelper } from '@/hooks/use-workspace-helper';
export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => { export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
const [isInviteModalShow, setIsInviteModalShow] = useState(false); const [isInviteModalShow, setIsInviteModalShow] = useState(false);
const { members, removeMember, loaded } = useMembers(); const { members, removeMember, loaded } = useMembers();
const { enableWorkspace } = useWorkspaceHelper();
// FIXME: DELETE THIS
const { user, login, updateWorkspaceMeta } = useTemporaryHelper();
const { confirm } = useConfirm(); const { confirm } = useConfirm();
if (workspace.provider === 'affine') { if (workspace.provider === 'affine') {
@@ -163,22 +162,8 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
<Button <Button
type="primary" type="primary"
shape="circle" shape="circle"
onClick={() => { onClick={async () => {
confirm({ await enableWorkspace();
title: 'Enable AFFiNE Cloud?',
content: `If enabled, the data in this workspace will be backed up and synchronized via AFFiNE Cloud.`,
confirmText: user ? 'Enable' : 'Sign in and Enable',
cancelText: 'Skip',
}).then(confirm => {
if (confirm) {
if (user) {
updateWorkspaceMeta(workspace.id, { isPublish: true });
} else {
login();
updateWorkspaceMeta(workspace.id, { isPublish: true });
}
}
});
}} }}
> >
Enable AFFiNE Cloud Enable AFFiNE Cloud

View File

@@ -44,7 +44,7 @@ export const useWorkspaceHelper = () => {
cancelText: 'Skip', cancelText: 'Skip',
}).then(async confirm => { }).then(async confirm => {
if (confirm && currentWorkspace) { if (confirm && currentWorkspace) {
if (user) { if (!user) {
await login(); await login();
} }
const newWorkspaceId = await dataCenter.enableWorkspaceCloud( const newWorkspaceId = await dataCenter.enableWorkspaceCloud(