toeverything/AFFiNE
1
1
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2024-12-23 13:01:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore(core): temporarily remove set-syncing-mode (#4489)

Browse Source
This commit is contained in:
JimmFly 2023-09-26 22:11:04 +08:00 committed by GitHub
parent 29fa237dfb
commit 1b6cd70247
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/core/src/components/affine/create-workspace-modal/index.tsx
View File

@ -269,7 +269,8 @@ export const CreateWorkspaceModal = ({
const result: LoadDBFileResult = await window.apis.dialog.loadDBFile(); const result: LoadDBFileResult = await window.apis.dialog.loadDBFile();
if (result.workspaceId && !canceled) { if (result.workspaceId && !canceled) {
setAddedId(result.workspaceId); setAddedId(result.workspaceId);
setStep('set-syncing-mode'); const newWorkspaceId = await addLocalWorkspace(result.workspaceId);
onCreate(newWorkspaceId);
} else if (result.error || result.canceled) { } else if (result.error || result.canceled) {
if (result.error) { if (result.error) {
toast(t[result.error]()); toast(t[result.error]());
@ -287,7 +288,7 @@ export const CreateWorkspaceModal = ({
return () => { return () => {
canceled = true; canceled = true;
}; };
}, [mode, onClose, t]); }, [addLocalWorkspace, mode, onClose, onCreate, t]);
const onConfirmEnableCloudSyncing = useCallback( const onConfirmEnableCloudSyncing = useCallback(
(enableCloudSyncing: boolean) => { (enableCloudSyncing: boolean) => {
@ -332,19 +333,11 @@ export const CreateWorkspaceModal = ({
const onConfirmName = useCallback( const onConfirmName = useCallback(
(name: string) => { (name: string) => {
setWorkspaceName(name); setWorkspaceName(name);
if (environment.isDesktop && runtimeConfig.enableSQLiteProvider) {
setStep('set-syncing-mode');
} else {
// this will be the last step for web for now // this will be the last step for web for now
// fix me later // fix me later
createLocalWorkspace(name) createLocalWorkspace(name).then(id => {
.then(id => {
onCreate(id); onCreate(id);
})
.catch(err => {
logger.error(err);
}); });
}
}, },
[createLocalWorkspace, onCreate] [createLocalWorkspace, onCreate]
); );

6
tests/affine-desktop/e2e/basic.spec.ts
View File

@ -161,9 +161,9 @@ test('delete workspace', async ({ page }) => {
await page.getByTestId('create-workspace-create-button').click({ await page.getByTestId('create-workspace-create-button').click({
delay: 100, delay: 100,
}); });
await page.getByTestId('create-workspace-continue-button').click({ // await page.getByTestId('create-workspace-continue-button').click({
delay: 100, // delay: 100,
}); // });
await page.waitForTimeout(1000); await page.waitForTimeout(1000);
await clickSideBarSettingButton(page); await clickSideBarSettingButton(page);
await page.getByTestId('current-workspace-label').click(); await page.getByTestId('current-workspace-label').click();

4
tests/affine-desktop/e2e/workspace.spec.ts
View File

@ -98,8 +98,8 @@ test.fixme('export then add', async ({ page, appInfo, workspace }) => {
await page.getByTestId('add-workspace').click(); await page.getByTestId('add-workspace').click();
// should show "Added Successfully" dialog // should show "Added Successfully" dialog
await page.waitForSelector('text="Added Successfully"'); // await page.waitForSelector('text="Added Successfully"');
await page.getByTestId('create-workspace-continue-button').click(); // await page.getByTestId('create-workspace-continue-button').click();
// sleep for a while to wait for the workspace to be added :D // sleep for a while to wait for the workspace to be added :D
await page.waitForTimeout(2000); await page.waitForTimeout(2000);

12
tests/kit/utils/workspace.ts
View File

@ -19,9 +19,9 @@ export async function createLocalWorkspace(
// open create workspace modal // open create workspace modal
await page.getByTestId('new-workspace').click(); await page.getByTestId('new-workspace').click();
const isDesktop: boolean = await page.evaluate(() => { // const isDesktop: boolean = await page.evaluate(() => {
return !!window.appInfo?.electron; // return !!window.appInfo?.electron;
}, []); // }, []);
// input workspace name // input workspace name
await page.getByPlaceholder('Set a Workspace name').click(); await page.getByPlaceholder('Set a Workspace name').click();
@ -32,7 +32,7 @@ export async function createLocalWorkspace(
delay: 500, delay: 500,
}); });
if (isDesktop) { // if (isDesktop) {
await page.getByTestId('create-workspace-continue-button').click(); // await page.getByTestId('create-workspace-continue-button').click();
} // }
} }