diff --git a/package.json b/package.json index f5877e2c0..18c436b2c 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7e2b51ac4..662342205 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,8 +27,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -258,14 +258,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3e919207fc3d85d493e494e72205f7488858358f': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3e919207fc3d85d493e494e72205f7488858358f} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@cbf05a106412315e451530f8384924da515b10c8': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@cbf05a106412315e451530f8384924da515b10c8} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -279,8 +279,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -3627,11 +3627,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3e919207fc3d85d493e494e72205f7488858358f(svelte@5.25.3)': dependencies: svelte: 5.25.3 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@cbf05a106412315e451530f8384924da515b10c8(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f(svelte@5.25.3)': dependencies: svelte: 5.25.3 @@ -3644,9 +3644,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@cbf05a106412315e451530f8384924da515b10c8(svelte@5.25.3) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3e919207fc3d85d493e494e72205f7488858358f(svelte@5.25.3) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.6(svelte@5.25.3))(svelte@5.25.3) '@melt-ui/svelte': 0.86.6(svelte@5.25.3) diff --git a/src/lib/components/filters/quickfiltersSubMenu.svelte b/src/lib/components/filters/quickfiltersSubMenu.svelte index ee8fe67f4..9b4c3275c 100644 --- a/src/lib/components/filters/quickfiltersSubMenu.svelte +++ b/src/lib/components/filters/quickfiltersSubMenu.svelte @@ -34,7 +34,7 @@
- + {filter.title} diff --git a/src/lib/components/git/deploymentDomains.svelte b/src/lib/components/git/deploymentDomains.svelte index bb6ed3942..f588cc57c 100644 --- a/src/lib/components/git/deploymentDomains.svelte +++ b/src/lib/components/git/deploymentDomains.svelte @@ -42,12 +42,12 @@ {#if sortedDomains.length > 1} - + +{sortedDomains.length - 1} - + {#each sortedDomains as rule, i} {#if i !== 0} - + {/await} @@ -266,7 +270,7 @@ {/snippet} - {:else} + {:else if search} {#if search} @@ -276,6 +280,14 @@ {/if} + {:else} + + + + No repositories available + + + {/if} {/await} {/if} diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/configuration.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/configuration.svelte index 1dfb58659..34f815e6e 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/configuration.svelte @@ -9,7 +9,14 @@ InputURL } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; - import { Fieldset, Layout, Popover, Icon, Accordion } from '@appwrite.io/pink-svelte'; + import { + Fieldset, + Layout, + Popover, + Icon, + Accordion, + ActionMenu + } from '@appwrite.io/pink-svelte'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import type { Component } from 'svelte'; import { getApiEndpoint } from '$lib/stores/sdk'; @@ -93,7 +100,7 @@ bind:value={variable.value} /> - + -

{@html variable.description}

+ + +

{@html variable.description}

+
@@ -134,7 +143,7 @@ bind:value={variable.value} /> - + -

{@html variable.description}

+ +

{@html variable.description}

+
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte index 51228b158..b91ee6d6f 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte @@ -16,7 +16,7 @@ Download
- + diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte index 1416f679f..150851a95 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte @@ -15,6 +15,7 @@ Accordion, ActionMenu, Card, + Icon, Layout, Logs, Popover, @@ -25,13 +26,23 @@ import { formatTimeDetailed } from '$lib/helpers/timeConversion'; import { timer } from '$lib/actions/timer'; import { app } from '$lib/stores/app'; - import { getOutputDownload, getSourceDownload } from '../store'; + import { getOutputDownload, getSourceDownload, showCreateDeployment } from '../store'; + import { IconDotsHorizontal, IconRefresh, IconTerminal } from '@appwrite.io/pink-icons-svelte'; + import { Menu } from '$lib/components/menu'; + import { canWriteFunctions } from '$lib/stores/roles'; + import { Click, trackEvent } from '$lib/actions/analytics'; + import DownloadActionMenuItem from '../(components)/downloadActionMenuItem.svelte'; + import { base } from '$app/paths'; + import { isCloud } from '$lib/system'; + import { readOnly } from '$lib/stores/billing'; + import RedeployModal from '../(modals)/redeployModal.svelte'; export let data; let showDelete = false; let showCancel = false; let showActivate = false; + let showRedeploy = false; onMount(() => { const unsubscribe = sdk.forConsole.client.subscribe( @@ -73,7 +84,7 @@ {#snippet footer()} - + {#if data.deployment.status === 'processing' || data.deployment.status === 'building' || data.deployment.status === 'waiting'} {/if} - {#if !!data.deployment?.sourceSize || !!data.deployment?.sourceSize} - - - - - - Download source - - - - Download output - - - - + + + + + {#if $canWriteFunctions} + { + showRedeploy = true; + trackEvent(Click.FunctionsRedeployClick); + toggle(); + }}> + Redeploy + + {/if} + {#if !!data.deployment?.sourceSize || !!data.deployment?.sourceSize} + + {/if} + + + + {#if data.func.deploymentId === data.deployment.$id && data.deployment.status === 'ready'} + {/if} {#if data.func.deploymentId !== data.deployment.$id && data.deployment.status === 'ready'} @@ -165,3 +177,7 @@ selectedDeployment={data.deployment} bind:showActivate on:activated={() => invalidate(Dependencies.DEPLOYMENTS)} /> + +{#if showRedeploy} + +{/if} diff --git a/src/routes/(console)/project-[region]-[project]/sites/(components)/deploymentActionMenu.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/deploymentActionMenu.svelte index 5f3a8b003..b30bd56ae 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/(components)/deploymentActionMenu.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/(components)/deploymentActionMenu.svelte @@ -89,7 +89,7 @@ - + - Check your permissions in GitHub, your repository might be set to - private. + Make sure Appwrite has access to your GitHub repositories. If you chose + specific repos, you may need to update your permissions to include the + missing one. diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte index de405dca8..188476e97 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte @@ -9,7 +9,14 @@ InputURL } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; - import { Fieldset, Layout, Popover, Icon, Accordion } from '@appwrite.io/pink-svelte'; + import { + Fieldset, + Layout, + Popover, + Icon, + Accordion, + ActionMenu + } from '@appwrite.io/pink-svelte'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import { type Component } from 'svelte'; import { getApiEndpoint } from '$lib/stores/sdk'; @@ -100,8 +107,10 @@ e.preventDefault(); toggle(e); }}> - -

{variable.description}

+ + +

{variable.description}

+
@@ -140,8 +149,10 @@ e.preventDefault(); toggle(e); }}> - -

{variable.description}

+ + +

{variable.description}

+
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte index 0d7ec3301..de83fab06 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte @@ -84,7 +84,7 @@ hasFilters analyticsSource="site_deployments" hideView> - + - +