From d358c7df6e0cb2e6826d519dc7b069da9a6f84b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Fri, 21 Jul 2023 13:51:32 +0200 Subject: [PATCH] Apply commands params changes --- package-lock.json | 8 +++---- package.json | 2 +- .../wizards/functions/connectExisting.svelte | 3 +-- src/lib/wizards/functions/createGit.svelte | 3 +-- src/lib/wizards/functions/createManual.svelte | 2 +- .../wizards/functions/createStarter.svelte | 3 +-- .../functions/steps/configuration.svelte | 4 ++-- .../steps/functionConfiguration.svelte | 4 ++-- src/lib/wizards/functions/store.ts | 2 +- .../function-[function]/createManual.svelte | 2 +- .../settings/disconnectRepo.svelte | 3 +-- .../settings/gitConfigurationModal.svelte | 3 +-- .../settings/updateConfiguration.svelte | 21 ++++++------------- .../settings/updateEvents.svelte | 3 +-- .../settings/updateLogging.svelte | 3 +-- .../settings/updateName.svelte | 3 +-- .../settings/updatePermissions.svelte | 3 +-- .../settings/updateSchedule.svelte | 3 +-- .../settings/updateTimeout.svelte | 3 +-- 19 files changed, 29 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index e982664a2..c6b68ff0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "name": "@appwrite/console", "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/console": "npm:matej-appwrite-console@7.1.101", + "@appwrite.io/console": "npm:matej-appwrite-console@7.1.102", "@appwrite.io/pink": "0.0.6-rc.10", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", @@ -158,9 +158,9 @@ }, "node_modules/@appwrite.io/console": { "name": "matej-appwrite-console", - "version": "7.1.101", - "resolved": "https://registry.npmjs.org/matej-appwrite-console/-/matej-appwrite-console-7.1.101.tgz", - "integrity": "sha512-x6vFOVW/qfuXtVvI6S6342J6oxSSQO2fajnGjFhH+hYcAOEkklxtxrqp3dkIcKq71XNcegvrQo22uk/QlcMrPw==", + "version": "7.1.102", + "resolved": "https://registry.npmjs.org/matej-appwrite-console/-/matej-appwrite-console-7.1.102.tgz", + "integrity": "sha512-VtN6fEgMbRYV4an3stb+TA21e04v8UYeB8g9COrQfhsdX+yccmJR+05wVJ7kdsva1IE02HqT7UhrvNS/bezdaQ==", "dependencies": { "cross-fetch": "3.1.5", "isomorphic-form-data": "2.0.0" diff --git a/package.json b/package.json index 049278ab6..75250af25 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/console": "npm:matej-appwrite-console@7.1.101", + "@appwrite.io/console": "npm:matej-appwrite-console@7.1.102", "@appwrite.io/pink": "0.0.6-rc.10", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", diff --git a/src/lib/wizards/functions/connectExisting.svelte b/src/lib/wizards/functions/connectExisting.svelte index 7e231ca0a..9eca81990 100644 --- a/src/lib/wizards/functions/connectExisting.svelte +++ b/src/lib/wizards/functions/connectExisting.svelte @@ -21,8 +21,7 @@ $func.timeout || undefined, $func.enabled, $func.logging, - $func.buildCommand || undefined, - $func.installCommand || undefined, + $func.commands || undefined, $installation.$id, $repository.id, $choices.branch, diff --git a/src/lib/wizards/functions/createGit.svelte b/src/lib/wizards/functions/createGit.svelte index b5cbbc4d4..4d665d76a 100644 --- a/src/lib/wizards/functions/createGit.svelte +++ b/src/lib/wizards/functions/createGit.svelte @@ -27,8 +27,7 @@ undefined, undefined, undefined, - $createFunction.buildCommand, - undefined, + $createFunction.commands, $installation.$id, $repository.id, $choices.branch, diff --git a/src/lib/wizards/functions/createManual.svelte b/src/lib/wizards/functions/createManual.svelte index 53c58babf..66075f2da 100644 --- a/src/lib/wizards/functions/createManual.svelte +++ b/src/lib/wizards/functions/createManual.svelte @@ -32,7 +32,7 @@ undefined, undefined, undefined, - $createFunction.buildCommand + $createFunction.commands ); await sdk.forProject.functions.createDeployment( response.$id, diff --git a/src/lib/wizards/functions/createStarter.svelte b/src/lib/wizards/functions/createStarter.svelte index b5cbbc4d4..4d665d76a 100644 --- a/src/lib/wizards/functions/createStarter.svelte +++ b/src/lib/wizards/functions/createStarter.svelte @@ -27,8 +27,7 @@ undefined, undefined, undefined, - $createFunction.buildCommand, - undefined, + $createFunction.commands, $installation.$id, $repository.id, $choices.branch, diff --git a/src/lib/wizards/functions/steps/configuration.svelte b/src/lib/wizards/functions/steps/configuration.svelte index 4804322e1..e24a9e99b 100644 --- a/src/lib/wizards/functions/steps/configuration.svelte +++ b/src/lib/wizards/functions/steps/configuration.svelte @@ -30,9 +30,9 @@ + bind:value={$createFunction.commands} /> diff --git a/src/lib/wizards/functions/steps/functionConfiguration.svelte b/src/lib/wizards/functions/steps/functionConfiguration.svelte index 6b0c13b5a..dfbf941dd 100644 --- a/src/lib/wizards/functions/steps/functionConfiguration.svelte +++ b/src/lib/wizards/functions/steps/functionConfiguration.svelte @@ -62,9 +62,9 @@ + bind:value={$createFunction.commands} /> diff --git a/src/lib/wizards/functions/store.ts b/src/lib/wizards/functions/store.ts index f1578b079..e3c1cd696 100644 --- a/src/lib/wizards/functions/store.ts +++ b/src/lib/wizards/functions/store.ts @@ -25,7 +25,7 @@ export const createFunction = writable>({ entrypoint: null, execute: [], runtime: null, - buildCommand: null + commands: null }); export const createFunctionDeployment = writable(); diff --git a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte b/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte index 550ec92c3..f0d8249bf 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte @@ -69,7 +69,7 @@ diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte index 132c8aeee..e90580e25 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte @@ -24,8 +24,7 @@ $func.timeout || undefined, $func.enabled, $func.logging, - $func.buildCommand, - $func.installCommand, + $func.commands, $func.vcsInstallationId, '', '', diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte index 30ab5f35c..9080761ae 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte @@ -62,8 +62,7 @@ $func.timeout || undefined, $func.enabled, $func.logging, - $func.buildCommand, - $func.installCommand, + $func.commands, selectedInstallationId, selectedRepoId, selectedBranch, diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte index 64f328bb4..aad15b072 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte @@ -30,8 +30,7 @@ const functionId = $page.params.function; let entrypoint: string; - let installCmd: string; - let buildCmd: string; + let commands: string; let showGit = false; let branchesList: Models.BranchList; let selectedBranch: string; @@ -41,8 +40,7 @@ onMount(() => { entrypoint = $func?.entrypoint; - installCmd = $func?.installCommand; - buildCmd = $func?.buildCommand; + commands = $func?.commands; selectedBranch = $func?.vcsBranch; silentMode = $func?.vcsSilentMode ?? false; selectedDir = $func?.vcsRootDirectory; @@ -88,8 +86,7 @@ $func.timeout || undefined, $func.enabled, $func.logging, - buildCmd, - installCmd, + commands, $func.vcsInstallationId, $func.vcsRepositoryId, selectedBranch, @@ -130,8 +127,7 @@ $: isUpdateButtonEnabled = entrypoint !== $func?.entrypoint || - installCmd !== $func?.installCommand || - buildCmd !== $func?.buildCommand || + commands !== $func?.commands || selectedBranch !== $func?.vcsBranch || silentMode !== $func?.vcsSilentMode || selectedDir !== $func?.vcsRootDirectory; @@ -226,15 +222,10 @@ Build settings - + bind:value={commands} /> diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte index b27e64574..64e8264e2 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte @@ -39,8 +39,7 @@ $func.timeout || undefined, $func.enabled, $func.logging, - $func.buildCommand, - $func.installCommand, + $func.commands, $func.vcsInstallationId, $func.vcsRepositoryId, $func.vcsBranch, diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateLogging.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateLogging.svelte index 2c7143a5c..34835a63b 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateLogging.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateLogging.svelte @@ -31,8 +31,7 @@ $func.timeout || undefined, $func.enabled, functionLogging, - $func.buildCommand, - $func.installCommand, + $func.commands, $func.vcsInstallationId, $func.vcsRepositoryId, $func.vcsBranch, diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateName.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateName.svelte index 33c225a87..ac3839c52 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateName.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateName.svelte @@ -29,8 +29,7 @@ $func.timeout || undefined, $func.enabled, $func.logging, - $func.buildCommand, - $func.installCommand, + $func.commands, $func.vcsInstallationId, $func.vcsRepositoryId, $func.vcsBranch, diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updatePermissions.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updatePermissions.svelte index feb9ae14b..686c248e0 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updatePermissions.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updatePermissions.svelte @@ -33,8 +33,7 @@ $func.timeout || undefined, $func.enabled, $func.logging, - $func.buildCommand, - $func.installCommand, + $func.commands, $func.vcsInstallationId, $func.vcsRepositoryId, $func.vcsBranch, diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateSchedule.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateSchedule.svelte index 80f47a7e3..b0361c2cd 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateSchedule.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateSchedule.svelte @@ -29,8 +29,7 @@ $func.timeout || undefined, $func.enabled, $func.logging, - $func.buildCommand, - $func.installCommand, + $func.commands, $func.vcsInstallationId, $func.vcsRepositoryId, $func.vcsBranch, diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateTimeout.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateTimeout.svelte index b4a972bc6..b5199dc63 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateTimeout.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateTimeout.svelte @@ -29,8 +29,7 @@ timeout, $func.enabled, $func.logging, - $func.buildCommand, - $func.installCommand, + $func.commands, $func.vcsInstallationId, $func.vcsRepositoryId, $func.vcsBranch,