Apply filter rules to refine the table view
- All services are - disabled. -
+ All services are + disabled. +
Are you sure you want to delete the document from {$collection.name} (showDelete = false)}>Cancel
- Are you sure you want to delete {$database.name}? -
+ Are you sure you want to delete {$database.name}? +
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte index 6457b1354..a3ea156e8 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte @@ -12,7 +12,7 @@ (showCreate = true)} event="collection"> diff --git a/src/routes/(console)/project-[project]/databases/grid.svelte b/src/routes/(console)/project-[project]/databases/grid.svelte index 17a1b5435..2045fcde8 100644 --- a/src/routes/(console)/project-[project]/databases/grid.svelte +++ b/src/routes/(console)/project-[project]/databases/grid.svelte @@ -10,7 +10,7 @@ (showCreate = true)} event="database" diff --git a/src/routes/(console)/project-[project]/functions/+page.svelte b/src/routes/(console)/project-[project]/functions/+page.svelte index fd916a02c..db6eb692d 100644 --- a/src/routes/(console)/project-[project]/functions/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/+page.svelte @@ -77,7 +77,7 @@ - + @@ -88,12 +88,12 @@ {#if data.functions.total} goto(`${base}/project-${project}/functions/create-function`)}> - {#each data.functions.functions as func} + {#each data.functions.functions as func (func.$id)} diff --git a/src/routes/(console)/project-[project]/functions/create-function/+page.svelte b/src/routes/(console)/project-[project]/functions/create-function/+page.svelte index f4faa7d03..829fcdb15 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/+page.svelte @@ -33,7 +33,6 @@ previousPage = from?.url?.pathname || previousPage; }); - let hasInstallations: boolean; let selectedRepository: string; const featuredTemplatesList = data.templatesList.templates @@ -57,12 +56,10 @@ baseRuntimesList.some((base) => base.$id === r.name) ); - function connect(e: CustomEvent) { + function connect(e: Models.ProviderRepository) { trackEvent(Click.ConnectRepositoryClick, { from: 'cover' }); - repository.set(e.detail); - goto( - `${wizardBase}/create-function/repository-${e.detail.id}?installation=${$installation.$id}` - ); + repository.set(e); + goto(`${wizardBase}/create-function/repository-${e.id}?installation=${$installation.$id}`); } @@ -103,16 +100,15 @@ Connect Git repository + {connect} /> - {#if hasInstallations} + {#if data.installations.total} diff --git a/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte b/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte index d925ef4e8..05e70a1d8 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte @@ -48,28 +48,26 @@ let runtime: Runtime; let entrypoint = ''; let buildCommand = ''; - let scopes: string[] = []; + let roles: string[] = []; let variables: Partial[] = []; let files: FileList; let specification = specificationOptions[0].value; async function create() { try { - console.log(runtime); - const func = await sdk.forProject.functions.create( id || ID.unique(), name, runtime, - undefined, + roles?.length ? roles : undefined, undefined, undefined, undefined, true, undefined, entrypoint, + buildCommand, undefined, - scopes, undefined, undefined, undefined, @@ -99,8 +97,8 @@ func.$id, files[0], true, - entrypoint, - buildCommand + undefined, + undefined ); trackEvent(Submit.FunctionCreate, { @@ -188,7 +186,7 @@ options={runtimeOptions} showEntrypoint /> - + diff --git a/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte b/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte index 8487e6759..8f3091f39 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte @@ -5,7 +5,7 @@ import { Accordion, Fieldset, Layout } from '@appwrite.io/pink-svelte'; export let buildCommand = ''; - export let scopes: string[] = []; + export let roles: string[] = []; @@ -28,7 +28,7 @@ >Learn more - + diff --git a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/repoCard.svelte b/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/repoCard.svelte index 65d24064c..4612fe685 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/repoCard.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/repoCard.svelte @@ -17,9 +17,7 @@ {repository?.organization}/{repository?.name} - + Change diff --git a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte b/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte index 4da0fc2f8..62f0c459b 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte @@ -44,7 +44,6 @@ let showExitModal = false; let isCreatingRepository = false; - let hasInstallations = !!data?.installations?.total; let formComponent: Form; let isSubmitting = writable(false); @@ -69,9 +68,6 @@ let specification = specificationOptions[0].value; onMount(async () => { - if (page.url.searchParams.has('runtime')) { - runtime = page.url.searchParams.get('runtime') as Runtime; - } if (!$installation?.$id) { $installation = data.installations.installations[0]; } @@ -87,7 +83,11 @@ const versionB = b.split('-')[1]; return versionB.localeCompare(versionA, undefined, { numeric: true }); }); - runtime = matchingRuntimes[0]; + if (page.url.searchParams.has('runtime')) { + runtime = page.url.searchParams.get('runtime') as Runtime; + } else { + runtime = matchingRuntimes[0]; + } } }); @@ -133,8 +133,8 @@ data.template.timeout ? data.template.timeout : undefined, undefined, undefined, - entrypoint || rt.entrypoint, - undefined, + entrypoint || rt?.entrypoint || undefined, + rt?.commands || undefined, selectedScopes?.length ? selectedScopes : undefined, connectBehaviour === 'later' ? undefined : $installation?.$id || undefined, connectBehaviour === 'later' ? undefined : $repository?.id || undefined, @@ -150,8 +150,6 @@ func.$id ); - console.log(variables); - // Add variables const promises = variables.map((variable) => sdk.forProject.functions.createVariable( @@ -249,7 +247,6 @@ bind:specification {specificationOptions} {options} /> - {#if connectBehaviour === 'now'} - {#if hasInstallations} + {#if !!data?.installations?.total} @@ -285,16 +282,15 @@ {:else} { + connect={(e) => { trackEvent(Click.ConnectRepositoryClick, { from: 'template-wizard' }); - repository.set(e.detail); - repositoryName = e.detail.name; - selectedRepository = e.detail.id; + repository.set(e); + repositoryName = e.name; + selectedRepository = e.id; showConfig = true; }} /> {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(components)/deploymentCard.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/(components)/deploymentCard.svelte index d889f7c52..b131983ca 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(components)/deploymentCard.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/(components)/deploymentCard.svelte @@ -13,20 +13,70 @@ Typography } from '@appwrite.io/pink-svelte'; import { DeploymentSource, DeploymentCreatedBy, DeploymentDomains } from '$lib/components/git'; - import { func } from '../store'; import { capitalize } from '$lib/helpers/string'; import { isCloud } from '$lib/system'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; + import Link from '$lib/elements/link.svelte'; + import { base } from '$app/paths'; + import { page } from '$app/state'; + import type { Snippet } from 'svelte'; - export let deployment: Models.Deployment; - export let proxyRuleList: Models.ProxyRuleList; - export let variant: 'primary' | 'secondary' = 'primary'; - export let activeDeployment = false; + let { + deployment, + proxyRuleList, + variant = 'primary', + activeDeployment = false, + footer + }: { + deployment: Models.Deployment; + proxyRuleList: Models.ProxyRuleList; + variant?: 'primary' | 'secondary'; + activeDeployment?: boolean; + footer?: Snippet; + } = $props(); - $: totalSize = humanFileSize(deployment?.totalSize ?? 0); + let totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0)); +{#snippet titleSnippet(title: string)} + + {title} + +{/snippet} + +{#snippet textGroup(title: string, text: string)} + + {@render titleSnippet(title)} + + {text} + + +{/snippet} + +{#snippet protection(text: string, tooltip: string)} + + + + {text} + + + + {tooltip} + + + + + + + + +{/snippet} + @@ -57,20 +107,24 @@ - - Domains - + {@render titleSnippet('Domains')} - + {#if $func.deploymentId === deployment.$id} + + {:else} + + Only the active deployment has a domain. + + {/if} {#if deployment.status === 'failed'} - - Status - + {@render titleSnippet('Status')} @@ -90,27 +144,15 @@ {#if deployment?.buildDuration} - - - Build duration - - - {formatTimeDetailed(deployment.buildDuration)} - - + {@render textGroup( + 'Build duration', + formatTimeDetailed(deployment.buildDuration) + )} {/if} + {@render textGroup('Total size', `${totalSize.value} ${totalSize.unit}`)} + - - Total size - - - {totalSize.value}{totalSize.unit} - - - - - Runtime - + {@render titleSnippet('Runtime')} - - - - - Global CDN - - - Optimized speed by caching content on servers closer to - users. - - - - - - - - - - - - DDoS protection - - - Safeguards your site by detecting and blocking malicious - traffic. - - - - - - - - - + + {@render protection( + 'Global CDN', + 'Optimized speed by caching content on servers closer to users.' + )} + {@render protection( + 'DDoS protection', + 'Safeguards your site by detecting and blocking malicious traffic.' + )} - - Source - + {@render titleSnippet('Source')} @@ -178,13 +185,13 @@ - {#if $$slots.footer} + {#if footer} - + {@render footer()} {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/connectRepoModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/connectRepoModal.svelte deleted file mode 100644 index 2df35af1f..000000000 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/connectRepoModal.svelte +++ /dev/null @@ -1,148 +0,0 @@ - - - - - Connect your function to an existing repository or create a new one. - - {#if hasInstallations} - - - {#if repositoryBehaviour === 'new'} - - {:else} - { - trackEvent(Click.ConnectRepositoryClick, { - from: 'functions' - }); - repository.set(e.detail); - repositoryName = e.detail.name; - selectedRepository = e.detail.id; - connectRepo(); - }} /> - {/if} - - {:else} - - {/if} - - {#if repositoryBehaviour === 'existing'} - - - - Missing a repository? check your permissions - - - - {:else if repositoryBehaviour === 'new'} - (show = false)}>Cancel - - Create - - {/if} - - diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createGit.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createGit.svelte index 897eca73e..19d81e0ca 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createGit.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createGit.svelte @@ -209,8 +209,8 @@ callbackState={{ createDeployment: 'true' }} - on:connect={(e) => { - repository.set(e.detail); + connect={(e) => { + repository.set(e); hasRepository = true; }} /> {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createManual.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createManual.svelte index 55d9c2445..ea04fbb5b 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createManual.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/createManual.svelte @@ -21,7 +21,7 @@ await sdk.forProject.functions.createDeployment( $func.$id, files[0], - undefined, + true, undefined, undefined ); 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 a4254aedd..ff3336871 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte @@ -74,7 +74,7 @@ deployment={activeDeployment} proxyRuleList={data.proxyRuleList} activeDeployment> - + {#snippet footer()} @@ -112,7 +112,7 @@ Execute - + {/snippet} {:else if data.activeDeployment?.status === 'building'} @@ -171,9 +171,7 @@ - {#if data.deploymentList.total} - - {/if} + {#if data.deploymentList.total} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte index 16ea96458..1416f679f 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte @@ -72,7 +72,7 @@ - + {#snippet footer()} {#if data.deployment.status === 'processing' || data.deployment.status === 'building' || data.deployment.status === 'waiting'} Activate {/if} - + {/snippet} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte index fc9cbe02f..467edc314 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte @@ -3,148 +3,40 @@ import { page } from '$app/state'; import { EmptySearch, PaginationWithLimit } from '$lib/components/index.js'; import { Button } from '$lib/elements/forms'; - import Link from '$lib/elements/link.svelte'; import Container from '$lib/layout/container.svelte'; - import { protocol } from '$routes/(console)/store.js'; import type { Models } from '@appwrite.io/console'; - import { - IconDotsHorizontal, - IconExternalLink, - IconPlus, - IconRefresh, - IconTrash - } from '@appwrite.io/pink-icons-svelte'; - import { - ActionMenu, - Card, - Empty, - Icon, - Layout, - Popover, - Table - } from '@appwrite.io/pink-svelte'; + import { IconPlus } from '@appwrite.io/pink-icons-svelte'; + import { Card, Empty, Icon, Layout } from '@appwrite.io/pink-svelte'; import DeleteDomainModal from './deleteDomainModal.svelte'; import RetryDomainModal from './retryDomainModal.svelte'; import SearchQuery from '$lib/components/searchQuery.svelte'; import { app } from '$lib/stores/app'; import { Click, trackEvent } from '$lib/actions/analytics'; - import CreatePreviewDomainModal from './createPreviewDomainModal.svelte'; + import Table from './table.svelte'; - export let data; + let { data } = $props(); - let showDelete = false; - let showRetry = false; + let showDelete = $state(false); + let showRetry = $state(false); let selectedDomain: Models.ProxyRule = null; - let showPreviewDomainModal = false; - - - { - toggle(event); - trackEvent(Click.DomainCreateClick, { - source: 'functions_domain_overview' - }); - }}> - - Add domain - - - - - Custom domain - - (showPreviewDomainModal = true)}> - Preview domain - - - - + + { + trackEvent(Click.DomainCreateClick, { + source: 'functions_domain_overview' + }); + }}> + + Add domain + - {#if data.domains.total} - - - Domain - Redirect to - Production branch - - - {#each data.domains.rules as domain} - - - - - {domain.domain} - - - - - - {domain?.redirectUrl || 'No redirect'} - {domain?.redirectStatusCode ? `(${domain.redirectStatusCode})` : ''} - - - {domain.deploymentVcsProviderBranch || '-'} - - - - { - e.preventDefault(); - toggle(e); - }}> - - - - - - {#if domain.status !== 'verified'} - { - e.preventDefault(); - selectedDomain = domain; - showRetry = true; - toggle(e); - }}> - Retry - - {/if} - { - e.preventDefault(); - selectedDomain = domain; - showDelete = true; - toggle(e); - trackEvent(Click.DomainDeleteClick, { - source: 'functions_domain_overview' - }); - }}> - Delete - - - - - - - {/each} - + {/if} - -{#if showPreviewDomainModal} - -{/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.svelte index 962006783..e6fdb78f9 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.svelte @@ -1,68 +1,36 @@ - + - + {:else if behaviour === 'REDIRECT'} - + - - - Redirect this domain. Domains added to your project will be - listed here. - + Redirect your domain to this URL. - + + - Cancel + Cancel formComponent.triggerSubmit()} bind:disabled={$isSubmitting}> Add @@ -291,6 +236,8 @@ {#if showConnectRepo} {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.ts index b233e47dc..e89c914b0 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.ts +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.ts @@ -1,9 +1,11 @@ import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; import { RuleTrigger, RuleType } from '$lib/stores/sdk'; +import { Dependencies } from '$lib/constants'; -export const load = async ({ parent }) => { +export const load = async ({ parent, depends }) => { const { function: func } = await parent(); + depends(Dependencies.DOMAINS, Dependencies.FUNCTION_DOMAINS); const [domains, installations] = await Promise.all([ sdk.forProject.proxy.listRules([ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte new file mode 100644 index 000000000..16902325e --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte @@ -0,0 +1,160 @@ + + + + + + + + + + + + {page.params.domain} + + + Change + + + + + + + + {#if isSubDomain && !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && $consoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} + (selectedTab = 'cname')} + active={selectedTab === 'cname'}> + CNAME + + {/if} + {#if isCloud} + (selectedTab = 'nameserver')} + active={selectedTab === 'nameserver'}> + Nameservers + + {/if} + {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + (selectedTab = 'a')} + active={selectedTab === 'a'}> + A + + {/if} + {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + (selectedTab = 'aaaa')} + active={selectedTab === 'aaaa'}> + AAAA + + {/if} + + + + {#if selectedTab === 'nameserver'} + + {:else} + + {/if} + + + + Verify + + + + + + + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts new file mode 100644 index 000000000..dfaaa1a60 --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts @@ -0,0 +1,22 @@ +import { sdk } from '$lib/stores/sdk'; +import { Dependencies } from '$lib/constants.js'; +import { isCloud } from '$lib/system'; +import type { Domain, DomainsList } from '$lib/sdk/domains.js'; + +export const load = async ({ parent, depends, params }) => { + depends(Dependencies.DOMAINS); + + let domain: Domain; + let domainsList: DomainsList; + if (isCloud) { + [domain, domainsList] = await Promise.all([ + sdk.forConsole.domains.get(params.domain), + sdk.forConsole.domains.list() + ]); + } + + return { + domain, + domainsList + }; +}; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.svelte deleted file mode 100644 index 6034860c4..000000000 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.svelte +++ /dev/null @@ -1,182 +0,0 @@ - - - - {#if isVerified} - - - {data.domain.domain} - - - - {:else} - - - - - (selectedTab = 'cname')} - active={selectedTab === 'cname'}> - CNAME - - (selectedTab = 'nameserver')} - active={selectedTab === 'nameserver'}> - Nameservers - - - - - {#if selectedTab === 'cname'} - - - {data.domain?.domain} - {#if isVerified} - - {:else} - - {/if} - - - Add the following record on your DNS provider. Note that DNS changes may - take time to propagate fully. - - - - - - Type - Name - Value - - - CNAME - {data.domain?.domain} - - - {globalThis?.location?.origin} - - - - - - - A list of all domain providers and their DNS setting is available here. - - - - - - Verify - - {:else} - - - {data.domain?.domain} - - - - Add the following nameservers on your DNS provider. Note that DNS - changes may take time to propagate fully. - - - - - - Type - Value - - {#each nameservers as nameserver} - - NS - - - {nameserver} - - - {/each} - - - - - - Verify - - {/if} - - - {/if} - diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.ts deleted file mode 100644 index 13d1680f5..000000000 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.ts +++ /dev/null @@ -1,16 +0,0 @@ -// import { sdk } from '$lib/stores/sdk'; -import { isCloud } from '$lib/system'; - -export const load = async (/*{ params }*/) => { - if (isCloud) { - // if (params?.id) { - // return { - // domain: await sdk.forConsole.domains.get(params.id) - // }; - // } - } else { - return { - domain: undefined - }; - } -}; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/createPreviewDomainModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/createPreviewDomainModal.svelte deleted file mode 100644 index af7c37ee9..000000000 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/createPreviewDomainModal.svelte +++ /dev/null @@ -1,104 +0,0 @@ - - - - - Get an auto-generated domain to quickly access your project. You can customize its prefix. - - - - - - - - .{$consoleVariables._APP_DOMAIN_FUNCTIONS} - - - - - - - - - (show = false)}>Cancel - Add - - diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/store.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/store.ts new file mode 100644 index 000000000..902fb3e3e --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/store.ts @@ -0,0 +1,19 @@ +import type { Column } from '$lib/helpers/types'; +import { writable } from 'svelte/store'; + +export const columns = writable([ + { + id: 'domain', + title: 'Domain', + type: 'string', + format: 'string', + width: { min: 200 } + }, + + { + id: 'target', + title: 'Target', + type: 'string', + width: { min: 120, max: 400 } + } +]); diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/table.svelte new file mode 100644 index 000000000..4fe75d81a --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/table.svelte @@ -0,0 +1,121 @@ + + + + + {#each $columns as { id, title }} + + {title} + + {/each} + + + {#each domains.rules as domain} + + {#each $columns as column} + + {#if column.id === 'domain'} + + + {domain.domain} + {#if domain.status !== 'verified'} + + {/if} + + + {:else if column.id === 'target'} + {domain?.redirectUrl + ? 'Redirect to ' + domain.redirectUrl + : domain?.deploymentVcsProviderBranch + ? 'Deployed from' + domain.deploymentVcsProviderBranch + : '-'} + {/if} + + {/each} + + + + { + e.preventDefault(); + toggle(e); + }}> + + + + + + {#if domain.status !== 'verified'} + { + selectedDomain = domain; + showRetry = true; + toggle(e); + }}> + Retry + + {/if} + { + selectedDomain = domain; + showDelete = true; + toggle(e); + trackEvent(Click.DomainDeleteClick, { + source: 'sites_domain_overview' + }); + }}> + Delete + + + + + + + + {/each} + + +{#if showDelete} + +{/if} + +{#if showRetry} + +{/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte index 42248ac4a..ee525786a 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte @@ -21,10 +21,10 @@ import { logStatusConverter } from './store'; import { LogsRequest, LogsResponse } from '$lib/components/logs'; - export let open = false; export let selectedLogId: string; export let logs: Models.Execution[]; export let logging: boolean; + export let open = false; function nextLog() { const currentIndex = logs.findIndex((log) => log.$id === selectedLogId); @@ -38,6 +38,7 @@ selectedLogId = logs[currentIndex - 1].$id; } } + $: if (!open) { selectedLogId = null; } @@ -47,7 +48,9 @@ $: isLastLog = logs.findIndex((log) => log.$id === selectedLogId) === logs.length - 1; - + (open = false)} /> + + @@ -107,7 +110,6 @@ - {capitalize(selectedLog.status)} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte index 3d82af0c9..fb0d8bf4c 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte @@ -14,8 +14,8 @@ export let columns: Column[]; export let logs: Models.ExecutionList; - let openSheet = false; let selectedLogId: string = null; + let open = false; @@ -27,8 +27,9 @@ {#each logs.executions as log} { - openSheet = true; + on:click={(e) => { + e.stopPropagation(); + open = true; selectedLogId = log.$id; }}> {#each columns as column} @@ -67,7 +68,6 @@ - {status} @@ -83,4 +83,4 @@ {/each} - + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte index cbedc4de8..20f3bc670 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte @@ -26,12 +26,7 @@ Updated - - {capitalize(timeFromNow($func.$updatedAt))} - - {toLocaleDateTime($func.$updatedAt)} - - + {toLocaleDateTime($func.$updatedAt)} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte index e851f0a73..5e3240fa0 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte @@ -22,9 +22,8 @@ } from '@appwrite.io/pink-svelte'; import Card from '$lib/components/card.svelte'; import { IconGithub } from '@appwrite.io/pink-icons-svelte'; - import { ConnectGit, RepositoryCard } from '$lib/components/git'; + import { ConnectGit, ConnectRepoModal, RepositoryCard } from '$lib/components/git'; import { isValueOfStringEnum } from '$lib/helpers/types'; - import ConnectRepoModal from '../(modals)/connectRepoModal.svelte'; export let func: Models.Function; export let installations: Models.InstallationList; @@ -114,6 +113,37 @@ selectedBranch !== func?.providerBranch || silentMode !== func?.providerSilentMode || selectedDir !== func?.providerRootDirectory; + + async function connect(selectedInstallationId: string, selectedRepository: string) { + try { + if (!isValueOfStringEnum(Runtime, func.runtime)) { + throw new Error(`Invalid runtime: ${func.runtime}`); + } + await sdk.forProject.functions.update( + func.$id, + func.name, + func.runtime as Runtime, + func.execute || undefined, + func.events || undefined, + func.schedule || undefined, + func.timeout || undefined, + func.enabled || undefined, + func.logging || undefined, + func.entrypoint, + func.commands || undefined, + func.scopes || undefined, + selectedInstallationId, + selectedRepository, + 'main', + undefined, + undefined, + undefined + ); + await invalidate(Dependencies.FUNCTION); + } catch (error) { + console.log(error); + } + } @@ -224,7 +254,7 @@ {#if showConnectRepo} - + {/if} {#if showDisconnect} diff --git a/src/routes/(console)/project-[project]/functions/templates/+page.svelte b/src/routes/(console)/project-[project]/functions/templates/+page.svelte index 007ae8d56..4d7a3053c 100644 --- a/src/routes/(console)/project-[project]/functions/templates/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/templates/+page.svelte @@ -82,7 +82,7 @@ - + @@ -140,86 +140,88 @@ {#if data.templates?.length > 0} - - - {#each paginatedItems as template} - {@const baseRuntimes = getBaseRuntimes(template.runtimes)} - {@const displayed = baseRuntimes.slice(0, 2)} - {@const hidden = baseRuntimes.slice(1, -1)} - - - - - {template.name} - - - - {template.tagline} - - - + + {#snippet children(paginatedItems: typeof data.templates)} + + {#each paginatedItems as template} + {@const baseRuntimes = getBaseRuntimes(template.runtimes)} + {@const displayed = baseRuntimes.slice(0, 2)} + {@const hidden = baseRuntimes.slice(1, -1)} + - - {#each displayed as runtime} - {@const icon = getIconFromRuntime(runtime.name)} - {#if icon} - - - - {/if} - {/each} - {#if hidden.length} - - - - +{hidden.length} - - - - {hidden.map((n) => n.name).join(', ')} - - - {/if} - + gap="xl"> + + + {template.name} + + + + {template.tagline} + + + - - Details - - {#if $canWriteFunctions} - - {/if} + justifyContent="space-between" + alignItems="center"> + + {#each displayed as runtime} + {@const icon = getIconFromRuntime(runtime.name)} + {#if icon} + + + + {/if} + {/each} + {#if hidden.length} + + + + +{hidden.length} + + + + {hidden.map((n) => n.name).join(', ')} + + + {/if} + + + + Details + + {#if $canWriteFunctions} + + {/if} + - - - {/each} - + + {/each} + + {/snippet} {:else if data?.search} diff --git a/src/routes/(console)/project-[project]/messaging/+page.svelte b/src/routes/(console)/project-[project]/messaging/+page.svelte index 34445fdd2..a55584536 100644 --- a/src/routes/(console)/project-[project]/messaging/+page.svelte +++ b/src/routes/(console)/project-[project]/messaging/+page.svelte @@ -90,11 +90,11 @@ + placeholder="Search by description, type, status, or ID" /> - + {#if $canWriteMessages} {/if} diff --git a/src/routes/(console)/project-[project]/messaging/create-[type]/(type)/email.svelte b/src/routes/(console)/project-[project]/messaging/create-[type]/(type)/email.svelte index 78fb352f9..8d621c4e8 100644 --- a/src/routes/(console)/project-[project]/messaging/create-[type]/(type)/email.svelte +++ b/src/routes/(console)/project-[project]/messaging/create-[type]/(type)/email.svelte @@ -89,6 +89,7 @@ = writable([]); + let data: Writable<[string, string][]> = writable([['', '']]); let title: string; let body: string; let topics: string[]; @@ -135,51 +135,53 @@ - + A key/value payload of additional metadata that's hidden from users. Use this to include information to support logic such as redirection and routing. - {#each $data as [key, value], index} - - - + + {#each $data as [key, value], index} + - { - if (index === 0 && $data?.length === 1) { - $data = [['', '']]; - } else { - $data.splice(index, 1); - $data = $data; - } - }}> - - + id={`key-${index}`} + bind:value={key} + placeholder="Enter key" + label={index === 0 ? 'Key' : undefined} /> + + + { + if (index === 0 && $data?.length === 1) { + $data = [['', '']]; + } else { + $data.splice(index, 1); + $data = $data; + } + }}> + + + - - {/each} - - 0 && $data[$data.length - 1][0] === ''} - on:click={() => ($data = [...$data, ['', '']])}> - - Add data - - + {/each} + + 0 && $data[$data.length - 1][0] === ''} + on:click={() => ($data = [...$data, ['', '']])}> + + Add data + + + diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte index 844c9f4c2..63c10d664 100644 --- a/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte +++ b/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte @@ -114,7 +114,7 @@ bind:value={file} label="Media" optionalText="(Optional)" /> - + {#each customData || [] as [key, value], index} 0 && customData[customData.length - 1][0] === ''} on:click={() => (customData = [...customData, ['', '']])}> diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/scheduleModal.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/scheduleModal.svelte index a6ccd2205..f9f0677a1 100644 --- a/src/routes/(console)/project-[project]/messaging/message-[message]/scheduleModal.svelte +++ b/src/routes/(console)/project-[project]/messaging/message-[message]/scheduleModal.svelte @@ -98,6 +98,7 @@ }); show = false; } catch (error) { + show = false; addNotification({ message: error.message, type: 'error' diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/sendModal.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/sendModal.svelte index a32ff96d6..256a95270 100644 --- a/src/routes/(console)/project-[project]/messaging/message-[message]/sendModal.svelte +++ b/src/routes/(console)/project-[project]/messaging/message-[message]/sendModal.svelte @@ -7,6 +7,7 @@ import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { MessagingProviderType, type Models } from '@appwrite.io/console'; import { Dependencies } from '$lib/constants'; + import { Dialog, Layout } from '@appwrite.io/pink-svelte'; export let show = false; export let message: Models.Message & { data: Record }; @@ -75,6 +76,7 @@ }); show = false; } catch (error) { + show = false; addNotification({ message: error.message, type: 'error' @@ -84,7 +86,7 @@ }; - + You are about to send a message to an estimated This action is irreversible. - (show = false)}>Cancel - Send + + (show = false)}>Cancel + Send + - + diff --git a/src/routes/(console)/project-[project]/messaging/providers/+page.svelte b/src/routes/(console)/project-[project]/messaging/providers/+page.svelte index 0ab4c0099..1521b23b7 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/+page.svelte +++ b/src/routes/(console)/project-[project]/messaging/providers/+page.svelte @@ -30,7 +30,7 @@ - + {#if $canWriteProviders} diff --git a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte b/src/routes/(console)/project-[project]/messaging/topics/+page.svelte index 6c3cdddc6..1318a583e 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte +++ b/src/routes/(console)/project-[project]/messaging/topics/+page.svelte @@ -75,7 +75,7 @@ - + {#if $canWriteTopics} { diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte index a03180e6c..86044d589 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte +++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte @@ -34,11 +34,11 @@ let subscribersByTargetId: Record = {}; const columns = writable([ { id: '$id', title: 'Subscriber ID', type: 'string', width: 200 }, - { id: 'userName', title: 'Name', type: 'string', filter: false, width: 100 }, - { id: 'targetId', title: 'Target ID', type: 'string', width: 140 }, - { id: 'target', title: 'Target', type: 'string', filter: false, width: 140 }, - { id: 'type', title: 'Type', type: 'string', width: 80 }, - { id: '$createdAt', title: 'Created', type: 'datetime', width: 100 } + { id: 'userName', title: 'Name', type: 'string', filter: false, width: { min: 80 } }, + { id: 'targetId', title: 'Target ID', type: 'string', width: { min: 200 } }, + { id: 'target', title: 'Target', type: 'string', filter: false, width: { min: 140 } }, + { id: 'type', title: 'Type', type: 'string', width: { min: 80 } }, + { id: '$createdAt', title: 'Created', type: 'datetime', width: { min: 100 } } ]); onMount(() => { @@ -89,7 +89,6 @@ - Subscribers { @@ -103,12 +102,10 @@ - + - + (showAdd = true)} event="create_subscriber"> Add subscriber @@ -118,7 +115,7 @@ - + diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte index a1db8cea0..a6309dff8 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte +++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte @@ -102,7 +102,7 @@ {target.identifier} {/if} {:else if column.id === 'type'} - + {:else if column.id === '$createdAt'} {toLocaleDateTime(subscriber[column.id])} {:else} diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte index 6cafa59c5..d5aaed10d 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte @@ -22,12 +22,21 @@ import { Badge, Card, Layout, Logs, Spinner, Typography } from '@appwrite.io/pink-svelte'; import LogsTimer from './logsTimer.svelte'; - export let deployment: Models.Deployment; - export let hideTitle = false; - export let hideScrollButtons = false; - export let height = 'auto'; - export let fullHeight = false; - export let emptyCopy = 'No logs available'; + let { + deployment = $bindable(), + hideTitle = false, + hideScrollButtons = false, + height = 'auto', + fullHeight = false, + emptyCopy = 'No logs available' + }: { + deployment: Models.Deployment; + hideTitle?: boolean; + hideScrollButtons?: boolean; + height?: string; + fullHeight?: boolean; + emptyCopy?: string; + } = $props(); function setCopy() { if (deployment.status === 'failed') { @@ -62,7 +71,7 @@ {/if} - {#if ['waiting', 'processing'].includes(deployment.status)} + {#if ['waiting', 'processing'].includes(deployment.status) || (deployment.status === 'building' && !deployment?.buildLogs?.length)} Waiting for build to start... diff --git a/src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte b/src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte index 7eb75448c..70af02974 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte @@ -1,37 +1,70 @@ Open the preview of your site on any mobile or tablet device. + + + + + + + { + copy(url); + tooltipMessage = 'Copied'; + setTimeout(() => { + tooltipMessage = 'Copy'; + }, 1000); + }}> + + + + {tooltipMessage} + + - + - - - copy(url)} /> - - diff --git a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte b/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte index 98d5d07ab..a298df23c 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte @@ -72,7 +72,7 @@ (show = !show)} /> + showQR={() => (show = !show)} /> @@ -186,8 +186,8 @@ -{#if show && siteUrl} - +{#if show && proxyRuleList.total} + {/if}
You are about to send a message to an estimated This action is irreversible.