From fe90912a29700ce5df015f8f30f77951fdb8281e Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Mon, 24 Jul 2023 11:24:00 +0100 Subject: [PATCH] fix: report --- src/lib/stores/migration.ts | 8 ++++---- .../(migration-wizard)/resource-form.svelte | 17 ++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/lib/stores/migration.ts b/src/lib/stores/migration.ts index 4932b8682..1af31f2f0 100644 --- a/src/lib/stores/migration.ts +++ b/src/lib/stores/migration.ts @@ -126,7 +126,7 @@ export const isVersionAtLeast = (version: string, atLeast: string) => { export const resourcesToMigrationForm = ( resources: Resource[], - version = '1.4' + version = '0.0.0' ): MigrationFormData => { const formData = { ...initialFormData }; if (resources.includes('user')) { @@ -141,13 +141,13 @@ export const resourcesToMigrationForm = ( if (includesAll(resources, ['collection', 'attribute', 'index', 'document'])) { formData.databases.documents = true; } - if (resources.includes('function') && isVersionAtLeast(version, '1.4')) { + if (resources.includes('function') && isVersionAtLeast(version, '1.4.0')) { formData.functions.root = true; } - if (resources.includes('envVar') && isVersionAtLeast(version, '1.4')) { + if (resources.includes('envVar') && isVersionAtLeast(version, '1.4.0')) { formData.functions.env = true; } - if (resources.includes('deployment') && isVersionAtLeast(version, '1.4')) { + if (resources.includes('deployment') && isVersionAtLeast(version, '1.4.0')) { formData.functions.inactive = true; } if (includesAll(resources, ['bucket', 'file'])) { diff --git a/src/routes/console/(migration-wizard)/resource-form.svelte b/src/routes/console/(migration-wizard)/resource-form.svelte index 7fed1ee2e..b6af8b3f0 100644 --- a/src/routes/console/(migration-wizard)/resource-form.svelte +++ b/src/routes/console/(migration-wizard)/resource-form.svelte @@ -14,6 +14,7 @@ providerResources, resourcesToMigrationForm } from '$lib/stores/migration'; + import { wizard } from '$lib/stores/wizard'; export let formData: ReturnType; export let provider: ReturnType; @@ -66,12 +67,12 @@ } let report: any; - $: version = report?.version || '0.0'; + $: version = report?.version || '0.0.0'; onMount(async () => { switch ($provider.provider) { case 'appwrite': { - const res = await sdk.forProject.migrations.generateAppwriteReport( + const res = await sdk.forProject.migrations.getAppwriteReport( providerResources.appwrite, $provider.endpoint, $provider.projectID, @@ -81,7 +82,7 @@ break; } case 'supabase': { - const res = await sdk.forProject.migrations.generateSupabaseReport( + const res = await sdk.forProject.migrations.getSupabaseReport( providerResources.supabase, $provider.endpoint, $provider.apiKey, @@ -94,7 +95,7 @@ break; } case 'nhost': { - const res = await sdk.forProject.migrations.generateNHostReport( + const res = await sdk.forProject.migrations.getNHostReport( providerResources.nhost, $provider.subdomain, $provider.region, @@ -108,12 +109,10 @@ } }); - // $: { - // wizard.setNextDisabled(!report); - // } - $: console.log(report); $: resources = providerResources[$provider.provider]; + + $: wizard.setNextDisabled(!report);
@@ -225,7 +224,7 @@ {/if} - {#if resources.includes('function') && isVersionAtLeast(version, '1.4')} + {#if resources.includes('function') && isVersionAtLeast(version, '1.4.0')}