From bf3a3379ae597906f24a09d3792e9fcca45fe80d Mon Sep 17 00:00:00 2001
From: Peng Xiao <pengxiao@outlook.com>
Date: Fri, 8 Sep 2023 01:41:27 +0800
Subject: [PATCH] fix: disable set-db-location step (#4263)

---
 .../affine/create-workspace-modal/index.tsx           |  6 +-----
 apps/electron/e2e/basic.spec.ts                       |  3 ---
 apps/electron/e2e/fixture.ts                          |  4 +++-
 apps/electron/e2e/tsconfig.json                       | 11 -----------
 apps/electron/tsconfig.json                           |  3 ---
 apps/electron/tsconfig.tests.json                     |  2 +-
 6 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 apps/electron/e2e/tsconfig.json

diff --git a/apps/core/src/components/affine/create-workspace-modal/index.tsx b/apps/core/src/components/affine/create-workspace-modal/index.tsx
index e896f383d9..871159be1b 100644
--- a/apps/core/src/components/affine/create-workspace-modal/index.tsx
+++ b/apps/core/src/components/affine/create-workspace-modal/index.tsx
@@ -290,11 +290,7 @@ export const CreateWorkspaceModal = ({
         console.error(err);
       });
     } else if (mode === 'new') {
-      setStep(
-        environment.isDesktop && runtimeConfig.enableSQLiteProvider
-          ? 'set-db-location'
-          : 'name-workspace'
-      );
+      setStep('name-workspace');
     } else {
       setStep(undefined);
     }
diff --git a/apps/electron/e2e/basic.spec.ts b/apps/electron/e2e/basic.spec.ts
index b68a56ae79..96f37c4a6d 100644
--- a/apps/electron/e2e/basic.spec.ts
+++ b/apps/electron/e2e/basic.spec.ts
@@ -156,9 +156,6 @@ test('windows only check', async ({ page }) => {
 test('delete workspace', async ({ page }) => {
   await page.getByTestId('current-workspace').click();
   await page.getByTestId('new-workspace').click();
-  await page.getByTestId('create-workspace-default-location-button').click({
-    delay: 100,
-  });
   await page.getByTestId('create-workspace-input').type('Delete Me', {
     delay: 100,
   });
diff --git a/apps/electron/e2e/fixture.ts b/apps/electron/e2e/fixture.ts
index 243c9ad0b3..9868bcccbc 100644
--- a/apps/electron/e2e/fixture.ts
+++ b/apps/electron/e2e/fixture.ts
@@ -13,6 +13,8 @@ import fs from 'fs-extra';
 import type { ElectronApplication } from 'playwright';
 import { _electron as electron } from 'playwright';
 
+import { removeWithRetry } from '../tests/utils';
+
 function generateUUID() {
   return crypto.randomUUID();
 }
@@ -102,7 +104,7 @@ export const test = base.extend<{
     });
     await use(electronApp);
     try {
-      await fs.rm(clonedDist, { recursive: true, force: true });
+      await removeWithRetry(clonedDist);
     } catch (error) {
       console.log(error);
     }
diff --git a/apps/electron/e2e/tsconfig.json b/apps/electron/e2e/tsconfig.json
deleted file mode 100644
index ce09ef9b86..0000000000
--- a/apps/electron/e2e/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./lib",
-    "baseUrl": ".",
-    "target": "ESNext"
-  },
-  "references": [{ "path": "../../../tests/kit" }],
-  "include": ["**.spec.ts", "**.test.ts", "fixture.ts"],
-  "exclude": ["lib"]
-}
diff --git a/apps/electron/tsconfig.json b/apps/electron/tsconfig.json
index e87bb8b12a..bb2f2d3d95 100644
--- a/apps/electron/tsconfig.json
+++ b/apps/electron/tsconfig.json
@@ -33,9 +33,6 @@
     {
       "path": "./tsconfig.node.json"
     },
-    {
-      "path": "./e2e/tsconfig.json"
-    },
     { "path": "../../tests/kit" }
   ],
   "ts-node": {
diff --git a/apps/electron/tsconfig.tests.json b/apps/electron/tsconfig.tests.json
index 4af2e315d8..4123c61bc1 100644
--- a/apps/electron/tsconfig.tests.json
+++ b/apps/electron/tsconfig.tests.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true
   },
-  "include": ["**/__tests__/**/*", "./tests"],
+  "include": ["**/__tests__/**/*", "./tests", "./e2e"],
   "references": [
     {
       "path": "./tsconfig.json"