diff --git a/package-lock.json b/package-lock.json index 3de85d2d0..ec829eefd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "@appwrite/console", "dependencies": { - "@appwrite.io/console": "npm:khushboo-console@0.0.3", + "@appwrite.io/console": "npm:matej-appwrite-console-16x@0.6.4", "@appwrite.io/pink": "0.23.0", "@appwrite.io/pink-icons": "0.23.0", "@popperjs/core": "^2.11.8", @@ -149,10 +149,10 @@ "integrity": "sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==" }, "node_modules/@appwrite.io/console": { - "name": "khushboo-console", - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/khushboo-console/-/khushboo-console-0.0.3.tgz", - "integrity": "sha512-9NzonFdptH/UF65ZNg/zmX1fWvONLUvXNIDKWpvjcwNlhlHoAlT2+uQIBxDuAzECTuXlwpszPeHOgUnhgp9fFQ==" + "name": "matej-appwrite-console-16x", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/matej-appwrite-console-16x/-/matej-appwrite-console-16x-0.6.4.tgz", + "integrity": "sha512-hovc+6HFyC20lUmlD0R5kAsDMBLXXJWEES2mUAaKG56aQ1wOwQRhVOIUGmvX/1EasiUOq5dH/5uzrU+fl5C+Dw==" }, "node_modules/@appwrite.io/pink": { "version": "0.23.0", diff --git a/package.json b/package.json index 0c931eee5..cf05a91e8 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "e2e:ui": "playwright test tests/e2e --ui" }, "dependencies": { - "@appwrite.io/console": "npm:khushboo-console@0.0.3", + "@appwrite.io/console": "npm:matej-appwrite-console-16x@0.6.4", "@appwrite.io/pink": "0.23.0", "@appwrite.io/pink-icons": "0.23.0", "@popperjs/core": "^2.11.8", diff --git a/src/lib/wizards/functions/connectExisting.svelte b/src/lib/wizards/functions/connectExisting.svelte index 7d097f773..f28cc8555 100644 --- a/src/lib/wizards/functions/connectExisting.svelte +++ b/src/lib/wizards/functions/connectExisting.svelte @@ -31,6 +31,7 @@ $func.logging || undefined, $func.entrypoint || undefined, $func.commands || undefined, + $func.scopes || undefined, $installation.$id, $repository.id, $choices.branch, diff --git a/src/lib/wizards/functions/createGit.svelte b/src/lib/wizards/functions/createGit.svelte index cf8a4b748..d19806be3 100644 --- a/src/lib/wizards/functions/createGit.svelte +++ b/src/lib/wizards/functions/createGit.svelte @@ -32,6 +32,7 @@ undefined, $createFunction.entrypoint, $createFunction.commands || undefined, + undefined, //TODO: SCOPES!!! $installation.$id, $repository.id, $choices.branch, diff --git a/src/lib/wizards/functions/createTemplate.svelte b/src/lib/wizards/functions/createTemplate.svelte index 7d0d4958f..bb5e74295 100644 --- a/src/lib/wizards/functions/createTemplate.svelte +++ b/src/lib/wizards/functions/createTemplate.svelte @@ -49,6 +49,7 @@ undefined, runtimeDetail.entrypoint, runtimeDetail.commands || undefined, + undefined, //TODO: scopes $installation.$id, $repository.id, $choices.branch, diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte index 25a582ebb..a53afac58 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte @@ -14,7 +14,6 @@ import { Container, ContainerHeader } from '$lib/layout'; import type { Models } from '@appwrite.io/console'; import Create from './create.svelte'; - import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system'; import { readOnly } from '$lib/stores/billing'; import { project } from '../../store'; @@ -25,6 +24,7 @@ import { queries, tags } from '$lib/components/filters/store'; import { View } from '$lib/helpers/load'; import DeploymentCard from './deploymentCard.svelte'; + import RedeployModal from './redeployModal.svelte'; export let data; @@ -292,3 +292,7 @@ offset={data.offset} total={$deploymentList?.total} /> + +{#if selectedDeployment} + +{/if} diff --git a/src/routes/console/project-[project]/functions/function-[function]/cancel.svelte b/src/routes/console/project-[project]/functions/function-[function]/cancel.svelte index 5c4c4ecd8..77f91bca2 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/cancel.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/cancel.svelte @@ -13,9 +13,7 @@ async function handleSubmit() { try { - // TODO: update SDK - // @ts-expect-error - await sdk.forProject.functions.cancelDeployment( + await sdk.forProject.functions.updateDeploymentBuild( selectedDeployment.resourceId, selectedDeployment.$id ); diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/delete.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/delete.svelte index 2ddfa9dbe..b05f59fb7 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/delete.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/delete.svelte @@ -5,16 +5,16 @@ import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - // import { sdk } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@appwrite.io/console'; + import { func } from '../store'; export let showDelete = false; export let selectedExecution: Models.Execution; async function handleSubmit() { try { - // TODO: update SDK to use the new function - /// await sdk.forProject.functions.deleteExecution(selectedExecution.$id); + await sdk.forProject.functions.deleteExecution($func.$id, selectedExecution.$id); await invalidate(Dependencies.FUNCTION); showDelete = false; addNotification({ diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte index 5689da5ec..743aa924d 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte @@ -101,7 +101,7 @@ path, method, headersObject, - isScheduled ? dateTime : null + isScheduled ? dateTime.toString() : undefined ); await goto( `${base}/console/project-${$page.params.project}/functions/function-${func.$id}/executions` 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 c8769402c..699aebab2 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 @@ -35,6 +35,7 @@ $func.logging || undefined, $func.entrypoint, $func.commands || undefined, + $func.scopes || undefined, '', '', '', 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 6a8dc10d4..cd43beb40 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 @@ -64,6 +64,7 @@ $func.logging || undefined, $func.entrypoint, $func.commands || undefined, + $func.scopes || undefined, 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 df247fcc8..132520cf3 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 @@ -130,6 +130,7 @@ $func.logging || undefined, entrypoint, commands, + $func.scopes || undefined, $func.installationId || undefined, $func.providerRepositoryId || undefined, selectedBranch, 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 c2c359bfd..fe63e7726 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 @@ -46,6 +46,7 @@ $func.logging || undefined, $func.entrypoint || undefined, $func.commands || undefined, + $func.scopes || undefined, $func.installationId || undefined, $func.providerRepositoryId || undefined, $func.providerBranch || undefined, 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 2f6e4afb8..59a722f0c 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 @@ -38,6 +38,7 @@ functionLogging, $func.entrypoint || undefined, $func.commands || undefined, + $func.scopes || undefined, $func.installationId || undefined, $func.providerRepositoryId || undefined, $func.providerBranch || undefined, 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 8f44fd549..3051debe4 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 @@ -36,6 +36,7 @@ $func.logging || undefined, $func.entrypoint || undefined, $func.commands || undefined, + $func.scopes || undefined, $func.installationId || undefined, $func.providerRepositoryId || undefined, $func.providerBranch || undefined, 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 8af6ef6e3..41a8ecbe3 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 @@ -40,6 +40,7 @@ $func.logging || undefined, $func.entrypoint || undefined, $func.commands || undefined, + $func.scopes || undefined, $func.installationId || undefined, $func.providerRepositoryId || undefined, $func.providerBranch || undefined, diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateRuntime.svelte index a4a2f806c..4d9c7da6d 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateRuntime.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateRuntime.svelte @@ -46,6 +46,7 @@ $func.logging || undefined, $func.entrypoint || undefined, $func.commands || undefined, + $func.scopes || undefined, $func.installationId || undefined, $func.providerRepositoryId || undefined, $func.providerBranch || undefined, 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 ecd707039..d59ccecf8 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 @@ -36,6 +36,7 @@ $func.logging || undefined, $func.entrypoint || undefined, $func.commands || undefined, + $func.scopes || undefined, $func.installationId || undefined, $func.providerRepositoryId || undefined, $func.providerBranch || undefined, diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateScopes.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateScopes.svelte index 9679d08b6..a968e3be3 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateScopes.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateScopes.svelte @@ -38,13 +38,12 @@ $func.logging || undefined, $func.entrypoint || undefined, $func.commands || undefined, + functionScopes, $func.installationId || undefined, $func.providerRepositoryId || undefined, $func.providerBranch || undefined, $func.providerSilentMode || undefined, - $func.providerRootDirectory || undefined, - // TODO: use updated SDK - functionScopes + $func.providerRootDirectory || undefined ); await invalidate(Dependencies.FUNCTION); addNotification({ 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 c36303279..9c4f07753 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 @@ -36,6 +36,7 @@ $func.logging || undefined, $func.entrypoint || undefined, $func.commands || undefined, + $func.scopes || undefined, $func.installationId || undefined, $func.providerRepositoryId || undefined, $func.providerBranch || undefined, diff --git a/static/icons/dark/color/go.svg b/static/icons/dark/color/go.svg new file mode 100644 index 000000000..ec7ff2412 --- /dev/null +++ b/static/icons/dark/color/go.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/static/icons/dark/grayscale/go.svg b/static/icons/dark/grayscale/go.svg new file mode 100644 index 000000000..245dc1c89 --- /dev/null +++ b/static/icons/dark/grayscale/go.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/static/icons/light/color/go.svg b/static/icons/light/color/go.svg new file mode 100644 index 000000000..ec7ff2412 --- /dev/null +++ b/static/icons/light/color/go.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/static/icons/light/grayscale/go.svg b/static/icons/light/grayscale/go.svg new file mode 100644 index 000000000..245dc1c89 --- /dev/null +++ b/static/icons/light/grayscale/go.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + +