From 78fddeca76d62d38f4033e1f2e5138982b6f3f67 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Wed, 4 Oct 2023 10:23:25 +0100
Subject: [PATCH 1/3] attempt includes fix

---
 .../(migration-wizard)/resource-form.svelte      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/routes/console/(migration-wizard)/resource-form.svelte b/src/routes/console/(migration-wizard)/resource-form.svelte
index 0831358805..3524d583a0 100644
--- a/src/routes/console/(migration-wizard)/resource-form.svelte
+++ b/src/routes/console/(migration-wizard)/resource-form.svelte
@@ -243,7 +243,7 @@
 </ul>
 
 <ul class="u-flex u-flex-vertical u-margin-block-start-16">
-    {#if resources.includes('user')}
+    {#if resources?.includes('user')}
         <li class="checkbox-field">
             <input
                 type="checkbox"
@@ -263,7 +263,7 @@
             <div />
             <span>Import all users</span>
 
-            {#if resources.includes('team')}
+            {#if resources?.includes('team')}
                 <ul>
                     <li class="checkbox-field">
                         <input
@@ -288,7 +288,7 @@
         </li>
     {/if}
 
-    {#if resources.includes('database')}
+    {#if resources?.includes('database')}
         <li class="checkbox-field">
             <input
                 type="checkbox"
@@ -307,7 +307,7 @@
             <div />
             <span>Import all databases, including collections, indexes and attributes</span>
 
-            {#if resources.includes('document')}
+            {#if resources?.includes('document')}
                 <ul>
                     <li class="checkbox-field">
                         <input
@@ -332,7 +332,7 @@
         </li>
     {/if}
 
-    {#if resources.includes('function') && isVersionAtLeast(version, '1.4.0')}
+    {#if resources?.includes('function') && isVersionAtLeast(version, '1.4.0')}
         <li class="checkbox-field">
             <input
                 type="checkbox"
@@ -351,7 +351,7 @@
             <div />
             <span>Import all functions and their active deployment</span>
             <ul>
-                {#if resources.includes('envVar')}
+                {#if resources?.includes('envVar')}
                     <li class="checkbox-field">
                         <input
                             type="checkbox"
@@ -364,7 +364,7 @@
                         <span>Import all environment variables</span>
                     </li>
                 {/if}
-                {#if resources.includes('deployment')}
+                {#if resources?.includes('deployment')}
                     <li class="checkbox-field">
                         <input
                             type="checkbox"
@@ -381,7 +381,7 @@
         </li>
     {/if}
 
-    {#if resources.includes('bucket') && resources.includes('file')}
+    {#if resources?.includes('bucket') && resources?.includes('file')}
         <li class="checkbox-field">
             <input
                 type="checkbox"

From 55110887b836c93113177d2e9d4aacd08276bee3 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Wed, 4 Oct 2023 10:53:55 +0100
Subject: [PATCH 2/3] fix migration from cloud to self-hosted

---
 src/lib/stores/migration.ts                   |  2 +-
 .../console/(migration-wizard)/wizard.svelte  |  2 +-
 ....timestamp-1696412819609-90379a5cd3c4b.mjs | 52 +++++++++++++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 vite.config.ts.timestamp-1696412819609-90379a5cd3c4b.mjs

diff --git a/src/lib/stores/migration.ts b/src/lib/stores/migration.ts
index 857e09f1a4..dd794ccdf7 100644
--- a/src/lib/stores/migration.ts
+++ b/src/lib/stores/migration.ts
@@ -71,7 +71,7 @@ export const providerResources: Record<Provider, Resource[]> = {
 
 export const migrationFormToResources = (
     formData: MigrationFormData,
-    provider?: Provider
+    provider: Provider
 ): Resource[] => {
     const resources: Resource[] = [];
     const addResource = (resource: Resource) => {
diff --git a/src/routes/console/(migration-wizard)/wizard.svelte b/src/routes/console/(migration-wizard)/wizard.svelte
index cb93862dd5..7123309e20 100644
--- a/src/routes/console/(migration-wizard)/wizard.svelte
+++ b/src/routes/console/(migration-wizard)/wizard.svelte
@@ -17,8 +17,8 @@
     };
 
     const onFinish = async () => {
-        const resources = migrationFormToResources($formData);
         if ($provider.provider !== 'appwrite') return;
+        const resources = migrationFormToResources($formData, $provider.provider);
 
         await getSdkForProject($selectedProject).migrations.createAppwriteMigration(
             resources,
diff --git a/vite.config.ts.timestamp-1696412819609-90379a5cd3c4b.mjs b/vite.config.ts.timestamp-1696412819609-90379a5cd3c4b.mjs
new file mode 100644
index 0000000000..7433023b93
--- /dev/null
+++ b/vite.config.ts.timestamp-1696412819609-90379a5cd3c4b.mjs
@@ -0,0 +1,52 @@
+// vite.config.ts
+import { defineConfig } from "file:///home/thomas/Programming/Work/Appwrite/console/node_modules/vitest/dist/config.js";
+import { sveltekit } from "file:///home/thomas/Programming/Work/Appwrite/console/node_modules/@sveltejs/kit/src/exports/vite/index.js";
+var config = defineConfig({
+  plugins: [sveltekit()],
+  optimizeDeps: {
+    include: ["echarts", "prismjs"]
+  },
+  ssr: {
+    noExternal: [
+      "echarts",
+      "prismjs",
+      "@analytics/google-analytics",
+      "analytics",
+      "dayjs",
+      "dotenv"
+    ]
+  },
+  define: {
+    "import.meta.env.VERCEL_ANALYTICS_ID": JSON.stringify(process.env.VERCEL_ANALYTICS_ID)
+  },
+  legacy: {
+    buildSsrCjsExternalHeuristics: true
+  },
+  server: {
+    port: 3e3
+  }
+});
+var testConfig = defineConfig({
+  resolve: {
+    // hotfix for https://github.com/vitest-dev/vitest/issues/2834
+    conditions: ["browser"]
+  },
+  test: {
+    include: ["tests/unit/**/*.test.ts"],
+    environment: "jsdom",
+    globals: true,
+    threads: true,
+    setupFiles: ["./tests/unit/setup.ts"],
+    deps: {
+      inline: ["@analytics/type-utils"]
+    }
+  }
+});
+var vite_config_default = process.env.VITEST ? {
+  ...config,
+  ...testConfig
+} : config;
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvaG9tZS90aG9tYXMvUHJvZ3JhbW1pbmcvV29yay9BcHB3cml0ZS9jb25zb2xlXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCIvaG9tZS90aG9tYXMvUHJvZ3JhbW1pbmcvV29yay9BcHB3cml0ZS9jb25zb2xlL3ZpdGUuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9ob21lL3Rob21hcy9Qcm9ncmFtbWluZy9Xb3JrL0FwcHdyaXRlL2NvbnNvbGUvdml0ZS5jb25maWcudHNcIjtpbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tICd2aXRlc3QvY29uZmlnJztcbmltcG9ydCB7IHN2ZWx0ZWtpdCB9IGZyb20gJ0BzdmVsdGVqcy9raXQvdml0ZSc7XG5cbmNvbnN0IGNvbmZpZyA9IGRlZmluZUNvbmZpZyh7XG4gICAgcGx1Z2luczogW3N2ZWx0ZWtpdCgpXSxcbiAgICBvcHRpbWl6ZURlcHM6IHtcbiAgICAgICAgaW5jbHVkZTogWydlY2hhcnRzJywgJ3ByaXNtanMnXVxuICAgIH0sXG4gICAgc3NyOiB7XG4gICAgICAgIG5vRXh0ZXJuYWw6IFtcbiAgICAgICAgICAgICdlY2hhcnRzJyxcbiAgICAgICAgICAgICdwcmlzbWpzJyxcbiAgICAgICAgICAgICdAYW5hbHl0aWNzL2dvb2dsZS1hbmFseXRpY3MnLFxuICAgICAgICAgICAgJ2FuYWx5dGljcycsXG4gICAgICAgICAgICAnZGF5anMnLFxuICAgICAgICAgICAgJ2RvdGVudidcbiAgICAgICAgXVxuICAgIH0sXG4gICAgZGVmaW5lOiB7XG4gICAgICAgICdpbXBvcnQubWV0YS5lbnYuVkVSQ0VMX0FOQUxZVElDU19JRCc6IEpTT04uc3RyaW5naWZ5KHByb2Nlc3MuZW52LlZFUkNFTF9BTkFMWVRJQ1NfSUQpXG4gICAgfSxcbiAgICBsZWdhY3k6IHtcbiAgICAgICAgYnVpbGRTc3JDanNFeHRlcm5hbEhldXJpc3RpY3M6IHRydWVcbiAgICB9LFxuICAgIHNlcnZlcjoge1xuICAgICAgICBwb3J0OiAzMDAwXG4gICAgfVxufSk7XG5cbmNvbnN0IHRlc3RDb25maWcgPSBkZWZpbmVDb25maWcoe1xuICAgIHJlc29sdmU6IHtcbiAgICAgICAgLy8gaG90Zml4IGZvciBodHRwczovL2dpdGh1Yi5jb20vdml0ZXN0LWRldi92aXRlc3QvaXNzdWVzLzI4MzRcbiAgICAgICAgY29uZGl0aW9uczogWydicm93c2VyJ11cbiAgICB9LFxuICAgIHRlc3Q6IHtcbiAgICAgICAgaW5jbHVkZTogWyd0ZXN0cy91bml0LyoqLyoudGVzdC50cyddLFxuICAgICAgICBlbnZpcm9ubWVudDogJ2pzZG9tJyxcbiAgICAgICAgZ2xvYmFsczogdHJ1ZSxcbiAgICAgICAgdGhyZWFkczogdHJ1ZSxcbiAgICAgICAgc2V0dXBGaWxlczogWycuL3Rlc3RzL3VuaXQvc2V0dXAudHMnXSxcbiAgICAgICAgZGVwczoge1xuICAgICAgICAgICAgaW5saW5lOiBbJ0BhbmFseXRpY3MvdHlwZS11dGlscyddXG4gICAgICAgIH1cbiAgICB9XG59KTtcblxuZXhwb3J0IGRlZmF1bHQgcHJvY2Vzcy5lbnYuVklURVNUXG4gICAgPyB7XG4gICAgICAgICAgLi4uY29uZmlnLFxuICAgICAgICAgIC4uLnRlc3RDb25maWdcbiAgICAgIH1cbiAgICA6IGNvbmZpZztcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFBNFQsU0FBUyxvQkFBb0I7QUFDelYsU0FBUyxpQkFBaUI7QUFFMUIsSUFBTSxTQUFTLGFBQWE7QUFBQSxFQUN4QixTQUFTLENBQUMsVUFBVSxDQUFDO0FBQUEsRUFDckIsY0FBYztBQUFBLElBQ1YsU0FBUyxDQUFDLFdBQVcsU0FBUztBQUFBLEVBQ2xDO0FBQUEsRUFDQSxLQUFLO0FBQUEsSUFDRCxZQUFZO0FBQUEsTUFDUjtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsSUFDSjtBQUFBLEVBQ0o7QUFBQSxFQUNBLFFBQVE7QUFBQSxJQUNKLHVDQUF1QyxLQUFLLFVBQVUsUUFBUSxJQUFJLG1CQUFtQjtBQUFBLEVBQ3pGO0FBQUEsRUFDQSxRQUFRO0FBQUEsSUFDSiwrQkFBK0I7QUFBQSxFQUNuQztBQUFBLEVBQ0EsUUFBUTtBQUFBLElBQ0osTUFBTTtBQUFBLEVBQ1Y7QUFDSixDQUFDO0FBRUQsSUFBTSxhQUFhLGFBQWE7QUFBQSxFQUM1QixTQUFTO0FBQUE7QUFBQSxJQUVMLFlBQVksQ0FBQyxTQUFTO0FBQUEsRUFDMUI7QUFBQSxFQUNBLE1BQU07QUFBQSxJQUNGLFNBQVMsQ0FBQyx5QkFBeUI7QUFBQSxJQUNuQyxhQUFhO0FBQUEsSUFDYixTQUFTO0FBQUEsSUFDVCxTQUFTO0FBQUEsSUFDVCxZQUFZLENBQUMsdUJBQXVCO0FBQUEsSUFDcEMsTUFBTTtBQUFBLE1BQ0YsUUFBUSxDQUFDLHVCQUF1QjtBQUFBLElBQ3BDO0FBQUEsRUFDSjtBQUNKLENBQUM7QUFFRCxJQUFPLHNCQUFRLFFBQVEsSUFBSSxTQUNyQjtBQUFBLEVBQ0ksR0FBRztBQUFBLEVBQ0gsR0FBRztBQUNQLElBQ0E7IiwKICAibmFtZXMiOiBbXQp9Cg==

From f192c60d6ee5fde214fb00d898b2f0a0e73bab61 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Wed, 4 Oct 2023 10:54:43 +0100
Subject: [PATCH 3/3] remove timestamp

---
 ....timestamp-1696412819609-90379a5cd3c4b.mjs | 52 -------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 vite.config.ts.timestamp-1696412819609-90379a5cd3c4b.mjs

diff --git a/vite.config.ts.timestamp-1696412819609-90379a5cd3c4b.mjs b/vite.config.ts.timestamp-1696412819609-90379a5cd3c4b.mjs
deleted file mode 100644
index 7433023b93..0000000000
--- a/vite.config.ts.timestamp-1696412819609-90379a5cd3c4b.mjs
+++ /dev/null
@@ -1,52 +0,0 @@
-// vite.config.ts
-import { defineConfig } from "file:///home/thomas/Programming/Work/Appwrite/console/node_modules/vitest/dist/config.js";
-import { sveltekit } from "file:///home/thomas/Programming/Work/Appwrite/console/node_modules/@sveltejs/kit/src/exports/vite/index.js";
-var config = defineConfig({
-  plugins: [sveltekit()],
-  optimizeDeps: {
-    include: ["echarts", "prismjs"]
-  },
-  ssr: {
-    noExternal: [
-      "echarts",
-      "prismjs",
-      "@analytics/google-analytics",
-      "analytics",
-      "dayjs",
-      "dotenv"
-    ]
-  },
-  define: {
-    "import.meta.env.VERCEL_ANALYTICS_ID": JSON.stringify(process.env.VERCEL_ANALYTICS_ID)
-  },
-  legacy: {
-    buildSsrCjsExternalHeuristics: true
-  },
-  server: {
-    port: 3e3
-  }
-});
-var testConfig = defineConfig({
-  resolve: {
-    // hotfix for https://github.com/vitest-dev/vitest/issues/2834
-    conditions: ["browser"]
-  },
-  test: {
-    include: ["tests/unit/**/*.test.ts"],
-    environment: "jsdom",
-    globals: true,
-    threads: true,
-    setupFiles: ["./tests/unit/setup.ts"],
-    deps: {
-      inline: ["@analytics/type-utils"]
-    }
-  }
-});
-var vite_config_default = process.env.VITEST ? {
-  ...config,
-  ...testConfig
-} : config;
-export {
-  vite_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvaG9tZS90aG9tYXMvUHJvZ3JhbW1pbmcvV29yay9BcHB3cml0ZS9jb25zb2xlXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCIvaG9tZS90aG9tYXMvUHJvZ3JhbW1pbmcvV29yay9BcHB3cml0ZS9jb25zb2xlL3ZpdGUuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9ob21lL3Rob21hcy9Qcm9ncmFtbWluZy9Xb3JrL0FwcHdyaXRlL2NvbnNvbGUvdml0ZS5jb25maWcudHNcIjtpbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tICd2aXRlc3QvY29uZmlnJztcbmltcG9ydCB7IHN2ZWx0ZWtpdCB9IGZyb20gJ0BzdmVsdGVqcy9raXQvdml0ZSc7XG5cbmNvbnN0IGNvbmZpZyA9IGRlZmluZUNvbmZpZyh7XG4gICAgcGx1Z2luczogW3N2ZWx0ZWtpdCgpXSxcbiAgICBvcHRpbWl6ZURlcHM6IHtcbiAgICAgICAgaW5jbHVkZTogWydlY2hhcnRzJywgJ3ByaXNtanMnXVxuICAgIH0sXG4gICAgc3NyOiB7XG4gICAgICAgIG5vRXh0ZXJuYWw6IFtcbiAgICAgICAgICAgICdlY2hhcnRzJyxcbiAgICAgICAgICAgICdwcmlzbWpzJyxcbiAgICAgICAgICAgICdAYW5hbHl0aWNzL2dvb2dsZS1hbmFseXRpY3MnLFxuICAgICAgICAgICAgJ2FuYWx5dGljcycsXG4gICAgICAgICAgICAnZGF5anMnLFxuICAgICAgICAgICAgJ2RvdGVudidcbiAgICAgICAgXVxuICAgIH0sXG4gICAgZGVmaW5lOiB7XG4gICAgICAgICdpbXBvcnQubWV0YS5lbnYuVkVSQ0VMX0FOQUxZVElDU19JRCc6IEpTT04uc3RyaW5naWZ5KHByb2Nlc3MuZW52LlZFUkNFTF9BTkFMWVRJQ1NfSUQpXG4gICAgfSxcbiAgICBsZWdhY3k6IHtcbiAgICAgICAgYnVpbGRTc3JDanNFeHRlcm5hbEhldXJpc3RpY3M6IHRydWVcbiAgICB9LFxuICAgIHNlcnZlcjoge1xuICAgICAgICBwb3J0OiAzMDAwXG4gICAgfVxufSk7XG5cbmNvbnN0IHRlc3RDb25maWcgPSBkZWZpbmVDb25maWcoe1xuICAgIHJlc29sdmU6IHtcbiAgICAgICAgLy8gaG90Zml4IGZvciBodHRwczovL2dpdGh1Yi5jb20vdml0ZXN0LWRldi92aXRlc3QvaXNzdWVzLzI4MzRcbiAgICAgICAgY29uZGl0aW9uczogWydicm93c2VyJ11cbiAgICB9LFxuICAgIHRlc3Q6IHtcbiAgICAgICAgaW5jbHVkZTogWyd0ZXN0cy91bml0LyoqLyoudGVzdC50cyddLFxuICAgICAgICBlbnZpcm9ubWVudDogJ2pzZG9tJyxcbiAgICAgICAgZ2xvYmFsczogdHJ1ZSxcbiAgICAgICAgdGhyZWFkczogdHJ1ZSxcbiAgICAgICAgc2V0dXBGaWxlczogWycuL3Rlc3RzL3VuaXQvc2V0dXAudHMnXSxcbiAgICAgICAgZGVwczoge1xuICAgICAgICAgICAgaW5saW5lOiBbJ0BhbmFseXRpY3MvdHlwZS11dGlscyddXG4gICAgICAgIH1cbiAgICB9XG59KTtcblxuZXhwb3J0IGRlZmF1bHQgcHJvY2Vzcy5lbnYuVklURVNUXG4gICAgPyB7XG4gICAgICAgICAgLi4uY29uZmlnLFxuICAgICAgICAgIC4uLnRlc3RDb25maWdcbiAgICAgIH1cbiAgICA6IGNvbmZpZztcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFBNFQsU0FBUyxvQkFBb0I7QUFDelYsU0FBUyxpQkFBaUI7QUFFMUIsSUFBTSxTQUFTLGFBQWE7QUFBQSxFQUN4QixTQUFTLENBQUMsVUFBVSxDQUFDO0FBQUEsRUFDckIsY0FBYztBQUFBLElBQ1YsU0FBUyxDQUFDLFdBQVcsU0FBUztBQUFBLEVBQ2xDO0FBQUEsRUFDQSxLQUFLO0FBQUEsSUFDRCxZQUFZO0FBQUEsTUFDUjtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsTUFDQTtBQUFBLE1BQ0E7QUFBQSxNQUNBO0FBQUEsSUFDSjtBQUFBLEVBQ0o7QUFBQSxFQUNBLFFBQVE7QUFBQSxJQUNKLHVDQUF1QyxLQUFLLFVBQVUsUUFBUSxJQUFJLG1CQUFtQjtBQUFBLEVBQ3pGO0FBQUEsRUFDQSxRQUFRO0FBQUEsSUFDSiwrQkFBK0I7QUFBQSxFQUNuQztBQUFBLEVBQ0EsUUFBUTtBQUFBLElBQ0osTUFBTTtBQUFBLEVBQ1Y7QUFDSixDQUFDO0FBRUQsSUFBTSxhQUFhLGFBQWE7QUFBQSxFQUM1QixTQUFTO0FBQUE7QUFBQSxJQUVMLFlBQVksQ0FBQyxTQUFTO0FBQUEsRUFDMUI7QUFBQSxFQUNBLE1BQU07QUFBQSxJQUNGLFNBQVMsQ0FBQyx5QkFBeUI7QUFBQSxJQUNuQyxhQUFhO0FBQUEsSUFDYixTQUFTO0FBQUEsSUFDVCxTQUFTO0FBQUEsSUFDVCxZQUFZLENBQUMsdUJBQXVCO0FBQUEsSUFDcEMsTUFBTTtBQUFBLE1BQ0YsUUFBUSxDQUFDLHVCQUF1QjtBQUFBLElBQ3BDO0FBQUEsRUFDSjtBQUNKLENBQUM7QUFFRCxJQUFPLHNCQUFRLFFBQVEsSUFBSSxTQUNyQjtBQUFBLEVBQ0ksR0FBRztBQUFBLEVBQ0gsR0FBRztBQUNQLElBQ0E7IiwKICAibmFtZXMiOiBbXQp9Cg==