Merge pull request #577 from appwrite/fix/potential-includes-error

Migrations: Fix migration from Cloud to Self-Hosted
appwrite · Oct 4, 2023 · ffb7476 · ffb7476 · vercel · Oct 4, 2023
2 parents af8453d + f192c60
commit ffb7476
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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)/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"

diff --git 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,