From ae54e3c48e53983972a784a7b8c69b97dd45701b Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 7 Feb 2023 17:09:56 +0000 Subject: [PATCH 1/3] fix: flutter platform persistence --- .../overview/platforms/wizard/flutter/step1.svelte | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte index c804b2f57..69ca7793b 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte @@ -23,7 +23,13 @@ Web = 'flutter-web' } - let platform: Platform = Platform.Android; + function isPlatform(value: string): value is Platform { + return Object.values(Platform).includes(value as Platform); + } + + let platform: Platform = isPlatform($createPlatform.type) + ? $createPlatform.type + : Platform.Android; const projectId = $page.params.project; const suggestions = ['*.vercel.app', '*.netlify.app', '*.gitpod.io']; @@ -108,6 +114,7 @@ }); $createPlatform.$id = response.$id; + $createPlatform.type = platform; } From 6b1c63a96687aebea56b12e18dc25153b96ade18 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 14 Feb 2023 15:04:50 +0000 Subject: [PATCH 2/3] fix: flutter only persisting once --- .../platforms/wizard/flutter/step1.svelte | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte index 69ca7793b..675071ef7 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte @@ -96,24 +96,23 @@ $createPlatform.store, $createPlatform.hostname ); + } else { + const response = await sdkForConsole.projects.createPlatform( + projectId, + platform, + $createPlatform.name, + platform !== Platform.Web ? $createPlatform.key : undefined, + undefined, + platform === Platform.Web ? $createPlatform.hostname : undefined + ); - return; + trackEvent('submit_platform_create', { + type: platform + }); + + $createPlatform.$id = response.$id; } - const response = await sdkForConsole.projects.createPlatform( - projectId, - platform, - $createPlatform.name, - platform !== Platform.Web ? $createPlatform.key : undefined, - undefined, - platform === Platform.Web ? $createPlatform.hostname : undefined - ); - - trackEvent('submit_platform_create', { - type: platform - }); - - $createPlatform.$id = response.$id; $createPlatform.type = platform; } From 30a5bab39542987136b1d84c79a8037e9490177a Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 14 Feb 2023 15:50:08 +0000 Subject: [PATCH 3/3] fix: persistence across flutter and apple platform creation --- .../platforms/wizard/apple/step1.svelte | 12 +----- .../platforms/wizard/flutter/step1.svelte | 38 ++++++++----------- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte index b472fc121..521048d75 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte @@ -26,16 +26,7 @@ async function beforeSubmit() { if ($createPlatform.$id) { - await sdkForConsole.projects.updatePlatform( - projectId, - $createPlatform.$id, - $createPlatform.name, - $createPlatform.key, - $createPlatform.store, - $createPlatform.hostname - ); - - return; + await sdkForConsole.projects.deletePlatform(projectId, $createPlatform.$id); } const response = await sdkForConsole.projects.createPlatform( @@ -52,6 +43,7 @@ }); $createPlatform.$id = response.$id; + $createPlatform.type = platform; } diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte index 675071ef7..ea739c68a 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte @@ -88,31 +88,23 @@ async function beforeSubmit() { if ($createPlatform.$id) { - await sdkForConsole.projects.updatePlatform( - projectId, - $createPlatform.$id, - $createPlatform.name, - $createPlatform.key, - $createPlatform.store, - $createPlatform.hostname - ); - } else { - const response = await sdkForConsole.projects.createPlatform( - projectId, - platform, - $createPlatform.name, - platform !== Platform.Web ? $createPlatform.key : undefined, - undefined, - platform === Platform.Web ? $createPlatform.hostname : undefined - ); - - trackEvent('submit_platform_create', { - type: platform - }); - - $createPlatform.$id = response.$id; + await sdkForConsole.projects.deletePlatform(projectId, $createPlatform.$id); } + const response = await sdkForConsole.projects.createPlatform( + projectId, + platform, + $createPlatform.name, + platform !== Platform.Web ? $createPlatform.key : undefined, + undefined, + platform === Platform.Web ? $createPlatform.hostname : undefined + ); + + trackEvent('submit_platform_create', { + type: platform + }); + + $createPlatform.$id = response.$id; $createPlatform.type = platform; }