diff --git a/package.json b/package.json index 2671ca225..48ecacba4 100644 --- a/package.json +++ b/package.json @@ -21,18 +21,18 @@ "e2e:ui": "playwright test --ui" }, "dependencies": { - "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e", + "@ai-sdk/svelte": "^1.1.22", + "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1", "@appwrite.io/pink": "0.25.0", "@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@de27ca4", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", "ai": "^2.2.37", "analytics": "^0.8.16", - "@ai-sdk/svelte": "^1.1.22", "cron-parser": "^4.9.0", "dayjs": "^1.11.13", "deep-equal": "^2.2.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 814508c4d..7307f4b8c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^1.1.22 version: 1.1.24(svelte@5.25.3)(zod@3.24.3) '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e - version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e + specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1 + version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1 '@appwrite.io/pink': specifier: 0.25.0 version: 0.25.0 @@ -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@de27ca4 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@de27ca4(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -272,8 +272,8 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e': - resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e} + '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1': + 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': @@ -282,8 +282,8 @@ packages: 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@de27ca407599e51b378814b421fb63625cb98c10': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@de27ca407599e51b378814b421fb63625cb98c10} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -297,8 +297,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@de27ca4': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@de27ca4} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -3830,13 +3830,13 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e': {} + '@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)': 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@de27ca407599e51b378814b421fb63625cb98c10(svelte@5.25.3)': dependencies: svelte: 5.25.3 @@ -3849,9 +3849,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@de27ca4(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@de27ca407599e51b378814b421fb63625cb98c10(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/actions/analytics.ts b/src/lib/actions/analytics.ts index 78e7551b7..1655166df 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -346,6 +346,9 @@ export enum Submit { FileCreate = 'submit_file_create', FileDelete = 'submit_file_delete', FileUpdatePermissions = 'submit_file_update_permissions', + FileTokenCreate = 'submit_file_token', + FileTokenDelete = 'submit_file_delete', + FileTokenUpdate = 'submit_file_update_expiry', BudgetCapUpdate = 'submit_budget_cap_update', BudgetAlertsUpdate = 'submit_budget_alert_conditions_update', CreditRedeem = 'submit_credit_redeem', diff --git a/src/routes/(console)/project-[project]/overview/keys/expirationInput.svelte b/src/lib/components/expirationInput.svelte similarity index 77% rename from src/routes/(console)/project-[project]/overview/keys/expirationInput.svelte rename to src/lib/components/expirationInput.svelte index cafc292c6..3e8286e04 100644 --- a/src/routes/(console)/project-[project]/overview/keys/expirationInput.svelte +++ b/src/lib/components/expirationInput.svelte @@ -1,5 +1,5 @@ - - - {#if expirationSelect !== 'custom' && expirationSelect !== null} - Your key will expire in {toLocaleDate(value)} - {/if} - + {#if expirationSelect === 'custom'} - + {/if} diff --git a/src/lib/components/filters/customFilters.svelte b/src/lib/components/filters/customFilters.svelte index 09ff475fb..8fd765f27 100644 --- a/src/lib/components/filters/customFilters.svelte +++ b/src/lib/components/filters/customFilters.svelte @@ -12,7 +12,9 @@ { show = true; - }}>Custom filters + }}> + Custom filters + {#if show} diff --git a/src/lib/components/filters/filtersModal.svelte b/src/lib/components/filters/filtersModal.svelte index aebb86f76..a192a60ea 100644 --- a/src/lib/components/filters/filtersModal.svelte +++ b/src/lib/components/filters/filtersModal.svelte @@ -11,11 +11,19 @@ } from '$lib/elements/forms'; import type { Writable } from 'svelte/store'; import Modal from '../modal.svelte'; - import { addFilter, generateTag, operators, queries, type TagValue } from './store'; + import { + addFilter, + generateTag, + operators, + queries, + ValidOperators, + type TagValue + } from './store'; import type { Column } from '$lib/helpers/types'; import { TagList } from '.'; import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; + import { addFilterAndApply } from './quickFilters'; export let show = false; export let columns: Writable; @@ -35,9 +43,17 @@ function apply() { localQueries.forEach((query) => { - addFilter($columns, query.id, query.operator, query.value, query.arrayValues); + addFilterAndApply( + query.id, + $columns.find((c) => c.id === query.id).title, + query.operator as ValidOperators, + query.value, + query.arrayValues, + $columns, + analyticsSource + ); }); - queries.apply(); + localTags = []; localQueries = []; trackEvent(Submit.FilterApply, { @@ -48,7 +64,7 @@ } function addCondition() { - const newTag = generateTag(selectedColumn, operatorKey, value, arrayValues); + const newTag = generateTag(selectedColumn, operatorKey, value || arrayValues); if (localTags.some((t) => t.tag === newTag.tag && t.value === newTag.value)) { return; } else { diff --git a/src/lib/components/filters/quickFilters.svelte b/src/lib/components/filters/quickFilters.svelte index 143fe5c73..c00316154 100644 --- a/src/lib/components/filters/quickFilters.svelte +++ b/src/lib/components/filters/quickFilters.svelte @@ -1,107 +1,70 @@ -{#if $isSmallViewport} - {#if $parsedTags?.length} - - {:else} - - {/if} -{:else} - - {#if $parsedTags?.length} - - {:else} - - {/if} - - {#each filterCols as filter (filter.title + filter.id)} - {#if filter.options} - { - addFilterAndApply( - filter.id, - filter.title, - filter.operator, - e.detail.value, - filter?.array - ? (filter.options - .filter((opt) => opt.checked) - .map((opt) => opt.value) ?? []) - : [], - $columns, - analyticsSource - ); - }} - on:clear={() => { - addFilterAndApply( - filter.id, - filter.title, - filter.operator, - null, - [], - $columns, - analyticsSource - ); - }} /> - {/if} - {/each} - + + + + {#each filterCols.filter((f) => f?.options) as filter (filter.title + filter.id)} + {#if filter.options} + { + addFilterAndApply( + filter.id, + filter.title, + filter.operator, + e.detail.value, + filter?.array + ? (filter.options + .filter((opt) => opt.checked) + .map((opt) => opt.value) ?? []) + : [], + $columns, + analyticsSource + ); + }} + on:clear={() => { + addFilterAndApply( + filter.id, + filter.title, + filter.operator, + null, + [], + $columns, + analyticsSource + ); + }} /> + {/if} + {/each} + - - - - -{/if} - -{#if $isSmallViewport && openBottomSheet} - -{/if} + + + + diff --git a/src/lib/components/filters/quickfiltersSubMenu.svelte b/src/lib/components/filters/quickfiltersSubMenu.svelte index b49bef07e..9b4c3275c 100644 --- a/src/lib/components/filters/quickfiltersSubMenu.svelte +++ b/src/lib/components/filters/quickfiltersSubMenu.svelte @@ -34,9 +34,10 @@
- - {filter.title} + + + {filter.title} +
diff --git a/src/lib/components/filters/setFilters.ts b/src/lib/components/filters/setFilters.ts index 7c8d858d2..c59a2408c 100644 --- a/src/lib/components/filters/setFilters.ts +++ b/src/lib/components/filters/setFilters.ts @@ -9,17 +9,18 @@ export function setFilters(localTags: TagValue[], filterCols: FilterData[], $col if (!localTags?.length) { filterCols.forEach((filter) => { resetOptions(filter); - cleanOldTags(filter.title); + cleanOldTags(filter?.title); }); } else { filterCols.forEach((filter) => { - if (filter.id.toLowerCase().includes('duration')) { + const id = filter?.id?.toLowerCase(); + if (id?.includes('duration')) { setTimeFilter(filter, $columns); - } else if (filter.id.toLocaleLowerCase().includes('size')) { + } else if (id?.includes('size')) { setSizeFilter(filter, $columns); - } else if (filter.id.toLocaleLowerCase().includes('statuscode')) { + } else if (id?.includes('statuscode')) { setStatusCodeFilter(filter, $columns); - } else if (filter.id === '$createdAt' || filter.id === '$updatedAt') { + } else if (id === '$createdat' || id === '$updatedat') { setDateFilter(filter, $columns); } else { setFilterData(filter); @@ -40,7 +41,7 @@ export function setFilterData(filter: FilterData) { option.checked = values.includes(option.value); }); } - cleanOldTags(filter.title); + cleanOldTags(filter?.title); const newTag = { tag: tagData.tag.replace(',', ' or '), value: tagData.value @@ -52,7 +53,7 @@ export function setFilterData(filter: FilterData) { }); } else { resetOptions(filter); - cleanOldTags(filter.title); + cleanOldTags(filter?.title); } } @@ -76,7 +77,7 @@ export function setTimeFilter(filter: FilterData, columns: Column[]) { value: timeTag.value }; - cleanOldTags(filter.title); + cleanOldTags(filter?.title); parsedTags.update((tags) => { tags.push(newTag); @@ -84,7 +85,7 @@ export function setTimeFilter(filter: FilterData, columns: Column[]) { }); } } else { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); } } @@ -102,7 +103,7 @@ export function setSizeFilter(filter: FilterData, columns: Column[]) { return prev; }); if (sizeRange) { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); const newTag = { tag: `**${filter.title}** is **${sizeRange.label}**`, @@ -114,7 +115,7 @@ export function setSizeFilter(filter: FilterData, columns: Column[]) { }); } } else { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); } } @@ -127,7 +128,7 @@ export function setStatusCodeFilter(filter: FilterData, columns: Column[]) { const codeRange = ranges.find((c) => c?.value && c.value === statusCodeTag.value); if (codeRange) { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); const newTag = { tag: `**${filter.title}** is **${codeRange.label}**`, value: statusCodeTag.value @@ -139,7 +140,7 @@ export function setStatusCodeFilter(filter: FilterData, columns: Column[]) { }); } } else { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); } } @@ -158,7 +159,7 @@ export function setDateFilter(filter: FilterData, columns: Column[]) { return prev; }); if (dateRange) { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); const newTag = { tag: `**${filter.title}** is **${dateRange.label}**`, value: dateTag.value @@ -169,11 +170,12 @@ export function setDateFilter(filter: FilterData, columns: Column[]) { }); } } else { - cleanOldTags(filter.title); + cleanOldTags(filter?.title); } } function cleanOldTags(title: string) { + if (!title) return; parsedTags.update((tags) => { tags = tags.filter((tag) => !tag.tag.includes(`**${title}**`)); return tags; @@ -181,6 +183,7 @@ function cleanOldTags(title: string) { } export function resetOptions(filter: FilterData) { + if (!filter?.options) return; filter.options.forEach((option) => { option.checked = false; }); 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} - import { EmptySearch, Paginator } from '$lib/components'; + import { Empty, EmptySearch, Paginator } from '$lib/components'; import { Button, InputSearch, InputSelect } from '$lib/elements/forms'; import { timeFromNow } from '$lib/helpers/date'; import { sdk } from '$lib/stores/sdk'; @@ -20,6 +20,7 @@ import { VCSDetectionType, type Models } from '@appwrite.io/console'; import { getFrameworkIcon } from '$lib/stores/sites'; import { connectGitHub } from '$lib/stores/git'; + import Card from '../card.svelte'; let { action = $bindable('select'), @@ -147,7 +148,10 @@ ); }} bind:value={selectedInstallation} /> - + {/await} @@ -259,7 +263,7 @@ {/snippet} - {:else} + {:else if search} {#if search} @@ -269,6 +273,14 @@ {/if} + {:else} + + + + No repositories available + + + {/if} {/await} {/if} diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 0e077aedb..16855e8bc 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -83,3 +83,4 @@ export { default as Confirm } from './confirm.svelte'; export { default as UsageCard } from './usageCard.svelte'; export { default as ViewToggle } from './viewToggle.svelte'; export { default as Terminal } from './studio/terminal.svelte'; +export { default as ExpirationInput } from './expirationInput.svelte'; diff --git a/src/lib/components/labelCard.svelte b/src/lib/components/labelCard.svelte index 052e2ddd3..ffcd8474c 100644 --- a/src/lib/components/labelCard.svelte +++ b/src/lib/components/labelCard.svelte @@ -1,5 +1,5 @@ @@ -195,6 +196,7 @@ bind:showTeam bind:showUser {groups} + {hideOnClick} on:create={create} let:toggle> - - - +{#if loading} +
+
+

Loading template...

- +{/if} +
+
+ + + + + {#if $$slots.default} +

+ Click to copy variables for the fields below. Learn more here. +

+ + + + {/if} + + + + + + + Set up an SMTP server to edit the message body + + + + +
+
+ + +
+
+
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailVerificationTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/emailVerificationTemplate.svelte index 357e87bbb..0bc34c9b6 100644 --- a/src/routes/(console)/project-[project]/auth/templates/emailVerificationTemplate.svelte +++ b/src/routes/(console)/project-[project]/auth/templates/emailVerificationTemplate.svelte @@ -7,7 +7,7 @@ import { Id } from '$lib/components'; import { addNotification } from '$lib/stores/notifications'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; - import { Layout } from '@appwrite.io/pink-svelte'; + import { Layout, Card } from '@appwrite.io/pink-svelte'; const projectId = page.params.project; @@ -36,11 +36,13 @@ } - - - - {'{{user}}'} - {'{{project}}'} - {'{{redirect}}'} - - + + + + + {'{{user}}'} + {'{{project}}'} + {'{{redirect}}'} + + + diff --git a/src/routes/(console)/project-[project]/auth/templates/localeOptions.svelte b/src/routes/(console)/project-[project]/auth/templates/localeOptions.svelte index 403eb3b89..4c4c334ca 100644 --- a/src/routes/(console)/project-[project]/auth/templates/localeOptions.svelte +++ b/src/routes/(console)/project-[project]/auth/templates/localeOptions.svelte @@ -1,5 +1,5 @@ - - - + diff --git a/src/routes/(console)/project-[project]/auth/templates/resetEmail.svelte b/src/routes/(console)/project-[project]/auth/templates/resetEmail.svelte index d13aee6f8..ebf009cf4 100644 --- a/src/routes/(console)/project-[project]/auth/templates/resetEmail.svelte +++ b/src/routes/(console)/project-[project]/auth/templates/resetEmail.svelte @@ -8,6 +8,7 @@ import { project } from '../../store'; import { loadEmailTemplate } from './+page.svelte'; import { baseEmailTemplate, emailTemplate } from './store'; + import { Dialog, Layout, Alert } from '@appwrite.io/pink-svelte'; export let show = false; @@ -44,15 +45,24 @@ } - + Reset email template? -

- Are you sure you want to reset the email template? - Default values will be set in all inputs. -

+ + +

+ Are you sure you want to reset the email template? + Default values will be set in all inputs. +

+ + {#if error} + {error} + {/if} + - - + + + + - + diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte index 3e664bf31..b1c812919 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte @@ -324,7 +324,7 @@ variant="secondary" padding="s" --input-background-color="var(--bgcolor-neutral-primary)"> -
+
diff --git a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte b/src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte index 3282ff961..2c8c0d5f3 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte @@ -9,12 +9,20 @@ 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'; import { page } from '$app/state'; import { project } from '$routes/(console)/project-[project]/store'; + import Root from '$lib/commandCenter/panels/root.svelte'; export let variables: Partial[] = []; export let templateVariables: Models.TemplateVariable[] = []; @@ -93,7 +101,7 @@ bind:value={variable.value} /> - + -

{@html variable.description}

+ + +

{@html variable.description}

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

{@html variable.description}

+ +

{@html variable.description}

+ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte index 51228b158..b91ee6d6f 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/(components)/downloadActionMenuItem.svelte @@ -16,7 +16,7 @@ Download - + - Enter a valid commit reference to create a new deployment. Learn more + Enter a valid commit reference to create a new deployment. Learn more {#if hasRepository} {#await load()} 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 ff3336871..4390fb097 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte @@ -4,7 +4,7 @@ import { PaginationWithLimit, ViewSelector, EmptyFilter } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { columns, deploymentList, func } from './store'; - import { Container } from '$lib/layout'; + import { Container, ResponsiveContainerHeader } from '$lib/layout'; import type { Models } from '@appwrite.io/console'; import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system'; import { readOnly } from '$lib/stores/billing'; @@ -78,7 +78,7 @@ @@ -168,25 +168,18 @@ {/if} - - - - - - - {#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 1416f679f..150851a95 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 @@ -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-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte index 3111f513c..84f962e42 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte @@ -1,19 +1,17 @@ - - - - - - {#if data?.executions?.total} - - {/if} - -
- -
- - Execution cannot be created because there is no active deployment. - - - - - - + + +
+ +
+ + Execution cannot be created because there is no active deployment. + + + {#if data?.executions?.total}
diff --git a/src/routes/(console)/project-[project]/messaging/providers/create.svelte b/src/routes/(console)/project-[project]/messaging/providers/create.svelte index f5afa33bf..57c6fd29b 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/create.svelte +++ b/src/routes/(console)/project-[project]/messaging/providers/create.svelte @@ -1,5 +1,5 @@ - + +
+ +
+ +
+
+ +
+ + + + + + + + + Need a hand? + + {#if providers[$providerType].providers[$provider].needAHand} + {@const needAHand = providers[$providerType].providers[$provider].needAHand} + + + {#each needAHand as p} +

+ {@html p} +

+ {/each} + + + {/if} + + { + $newMemberModal = true; + }} + title="Invite a team member" + icon={IconUserGroup} /> + + + + + {#if $newMemberModal} + + {/if} + diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte index 573ee9d59..1d2344a40 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte +++ b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte @@ -29,5 +29,5 @@ - Are you sure you want to delete {$provider.name} from '{$project.name}'? + Are you sure you want to delete {$provider.name} from '{$project.name}'? diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte index 3968cf185..0d327972d 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte +++ b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte @@ -12,6 +12,7 @@ import { Button, Form } from '$lib/elements/forms'; import { onMount } from 'svelte'; import CreateMember from '$routes/(console)/organization-[organization]/createMember.svelte'; + import { Link } from '@appwrite.io/pink-svelte'; export let inputs: (ProviderInput | ProviderInput[])[]; export let providerType: MessagingProviderType; @@ -219,11 +220,11 @@
Settings - Configure the settings to to send {message}, or to complete the provider - settings. + >enable {displayName} to send {message}, or (newMemberModal = true)}>invite a team member to complete the + provider settings. {#if ready} diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte index e01c3e85a..80b1257b8 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte +++ b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte @@ -12,6 +12,7 @@ import { provider as providerData } from './store'; import { Typography } from '@appwrite.io/pink-svelte'; import { getProviderText } from '../../helper'; + import { Layout } from '@appwrite.io/pink-svelte'; let enabled: boolean = null; @@ -143,9 +144,9 @@ bind:value={enabled} />
-

- Provider: -

+ + Provider: +

Type: {getProviderText($providerData.type)}

Created: {toLocaleDateTime($providerData.$createdAt)}

diff --git a/src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte b/src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte index a1aabb69c..a32dafa17 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte +++ b/src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte @@ -25,8 +25,12 @@ APNSProviderParams } from './store'; import TooltipPopover from './tooltipPopover.svelte'; + import { Icon, Tooltip, Upload, Layout, Typography } from '@appwrite.io/pink-svelte'; + import { IconInfo } from '@appwrite.io/pink-icons-svelte'; + import { removeFile } from '$lib/helpers/files'; export let files: Record; + export let input: ProviderInput; export let params: Partial< | TwilioProviderParams @@ -100,14 +104,40 @@ {:else if input.type === 'file'} - + + + + + + Drag and drop service account JSON here or click to upload + + + + + + Only .json files allowed + + + Max file size 10MB + + + + {#if files[input.name]?.length} + (files[input.name] = removeFile(e.detail, files[input.name]))} /> + {/if} + + + + + + + + {:else if input.type === 'switch'} diff --git a/src/routes/(console)/project-[project]/messaging/providers/wizard/provider.svelte b/src/routes/(console)/project-[project]/messaging/providers/wizard/provider.svelte index 4273edc18..5bea03bd1 100644 --- a/src/routes/(console)/project-[project]/messaging/providers/wizard/provider.svelte +++ b/src/routes/(console)/project-[project]/messaging/providers/wizard/provider.svelte @@ -12,6 +12,14 @@ let showCustomId = false; let id: string = null; + $: { + name; + id; + $provider; + + beforeSubmit(); + } + async function beforeSubmit() { switch ($provider) { case Providers.Twilio: @@ -133,9 +141,6 @@ - Provider -
- = {}; - const inputs = providers[$providerType].providers[$provider].configure; - let open = false; + $: inputs = providers[$providerType].providers[$provider].configure; + $: { + files; + $providerType; + $provider; + + beforeSubmit(); + } onMount(() => { const flattened = []; for (const i of inputs) { @@ -29,7 +34,11 @@ } } for (const input of flattened) { - if (input.type === 'file' && $providerParams[$provider][input.name].length > 0) { + if ( + input.type === 'file' && + $providerParams[$provider] && + $providerParams[$provider][input.name].length > 0 + ) { const dataTransfer = new DataTransfer(); const f = new File( [$providerParams[$provider][input.name]], @@ -54,7 +63,6 @@ - Settings Set up the credentials below to enable {providers[$providerType].providers[$provider].title} for sending @@ -62,120 +70,4 @@ - -
-

Need a hand?

- -
- {#if providers[$providerType].providers[$provider].needAHand} - {@const needAHand = providers[$providerType].providers[$provider].needAHand} -
- - - -
-
- -
- How to enable {getProviderText($provider)} - {#if $providerType == MessagingProviderType.Push}notifications{:else}{getProviderText( - $provider - )}{/if} service? -
- -
- {#each needAHand as p} -

- {@html p} -

- {/each} -
- - -
-
- {/if} - - - -
-
-
- -
-

Read the full guide in the documentation

-
- -
- - ($newMemberModal = true)}> -
-
-
- -
-

Invite a team member to complete this step

-
- -
- - -
-
- - - - diff --git a/src/routes/(console)/project-[project]/overview/keys/[key]/updateExpirationDate.svelte b/src/routes/(console)/project-[project]/overview/keys/[key]/updateExpirationDate.svelte index 5595ea2b2..8a15fa347 100644 --- a/src/routes/(console)/project-[project]/overview/keys/[key]/updateExpirationDate.svelte +++ b/src/routes/(console)/project-[project]/overview/keys/[key]/updateExpirationDate.svelte @@ -9,7 +9,7 @@ import { sdk } from '$lib/stores/sdk'; import { Alert } from '@appwrite.io/pink-svelte'; import { project } from '../../../store'; - import ExpirationInput from '../expirationInput.svelte'; + import { ExpirationInput } from '$lib/components'; import { key } from './store'; let expiration = $key.expire; diff --git a/src/routes/(console)/project-[project]/overview/keys/create/+page.svelte b/src/routes/(console)/project-[project]/overview/keys/create/+page.svelte index cdc986601..68f04d424 100644 --- a/src/routes/(console)/project-[project]/overview/keys/create/+page.svelte +++ b/src/routes/(console)/project-[project]/overview/keys/create/+page.svelte @@ -4,7 +4,7 @@ import { InputText } from '$lib/elements/forms/index.js'; import { Wizard } from '$lib/layout'; import { Fieldset, Layout, Typography } from '@appwrite.io/pink-svelte'; - import ExpirationInput from '../expirationInput.svelte'; + import { ExpirationInput } from '$lib/components'; import Scopes from '../scopes.svelte'; import Button from '$lib/elements/forms/button.svelte'; import Form from '$lib/elements/forms/form.svelte'; diff --git a/src/routes/(console)/project-[project]/settings/domains/+page.svelte b/src/routes/(console)/project-[project]/settings/domains/+page.svelte index 5c8b43a11..431a02178 100644 --- a/src/routes/(console)/project-[project]/settings/domains/+page.svelte +++ b/src/routes/(console)/project-[project]/settings/domains/+page.svelte @@ -5,18 +5,21 @@ import { Button } from '$lib/elements/forms'; import Container from '$lib/layout/container.svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; - import { Card, Empty, Icon, Layout } from '@appwrite.io/pink-svelte'; - import SearchQuery from '$lib/components/searchQuery.svelte'; + import { Card, Empty, Icon } from '@appwrite.io/pink-svelte'; import { app } from '$lib/stores/app'; import { Click, trackEvent } from '$lib/actions/analytics'; import Table from './table.svelte'; + import { ResponsiveContainerHeader } from '$lib/layout'; let { data } = $props(); - - + - - + {#if data.rules.total}
diff --git a/src/routes/(console)/project-[project]/settings/domains/add-domain/+page.svelte b/src/routes/(console)/project-[project]/settings/domains/add-domain/+page.svelte index fc11c25ec..ea86dce94 100644 --- a/src/routes/(console)/project-[project]/settings/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[project]/settings/domains/add-domain/+page.svelte @@ -5,21 +5,27 @@ import { Wizard } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { Fieldset, Layout } from '@appwrite.io/pink-svelte'; + import { Fieldset } from '@appwrite.io/pink-svelte'; import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { writable } from 'svelte/store'; + import { onMount } from 'svelte'; const routeBase = `${base}/project-${page.params.project}/settings/domains`; - //TODO: enable once combo box is fixed // let { data } = $props(); let formComponent: Form; let isSubmitting = $state(writable(false)); - + let showConnectRepo = $state(false); let domainName = $state(''); + onMount(() => { + if (page.url.searchParams.has('domain')) { + domainName = page.url.searchParams.get('domain'); + } + }); + async function addDomain() { try { const rule = await sdk.forProject.proxy.createAPIRule(domainName); @@ -41,27 +47,12 @@ - -
- - -
- + diff --git a/src/routes/(console)/project-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte index b70833e06..9606b0f8e 100644 --- a/src/routes/(console)/project-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte @@ -1,7 +1,14 @@ - -
- -
- - {#if isSubDomain} - (selectedTab = 'cname')} - active={selectedTab === 'cname'}> - CNAME - - {/if} - {#if isCloud} - (selectedTab = 'nameserver')} - active={selectedTab === 'nameserver'}> - Nameservers - - {/if} - - -
- {#if selectedTab === 'cname' && isSubDomain} - - {:else if isCloud} - - {/if} - - -
diff --git a/src/routes/(console)/project-[project]/settings/domains/deleteDomainModal.svelte b/src/routes/(console)/project-[project]/settings/domains/deleteDomainModal.svelte index 3b2657c63..e2e937ff6 100644 --- a/src/routes/(console)/project-[project]/settings/domains/deleteDomainModal.svelte +++ b/src/routes/(console)/project-[project]/settings/domains/deleteDomainModal.svelte @@ -21,7 +21,7 @@ async function deleteDomain() { try { await sdk.forProject.proxy.deleteRule(selectedDomain.$id); - await invalidate(Dependencies.SITES_DOMAINS); + await invalidate(Dependencies.DOMAINS); show = false; addNotification({ type: 'success', @@ -38,11 +38,7 @@ {#if selectedDomain} - Are you sure you want to delete this domain? You will no longer be able to view your - site by visiting: - - - {selectedDomain.domain} + Are you sure you want to delete this domain? {/if} diff --git a/src/routes/(console)/project-[project]/settings/domains/retryDomainModal.svelte b/src/routes/(console)/project-[project]/settings/domains/retryDomainModal.svelte index 5f0845c30..b5f451d85 100644 --- a/src/routes/(console)/project-[project]/settings/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[project]/settings/domains/retryDomainModal.svelte @@ -21,7 +21,7 @@ async function retryDomain() { try { await sdk.forProject.proxy.updateRuleVerification(selectedDomain.$id); - await invalidate(Dependencies.SITES_DOMAINS); + await invalidate(Dependencies.DOMAINS); show = false; addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[project]/settings/domains/table.svelte b/src/routes/(console)/project-[project]/settings/domains/table.svelte index 8631c7c55..8529c72dc 100644 --- a/src/routes/(console)/project-[project]/settings/domains/table.svelte +++ b/src/routes/(console)/project-[project]/settings/domains/table.svelte @@ -5,7 +5,15 @@ import { protocol } from '$routes/(console)/store'; import type { Models } from '@appwrite.io/console'; import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte'; - import { ActionMenu, Icon, Layout, Popover, Table, Typography } from '@appwrite.io/pink-svelte'; + import { + ActionMenu, + Badge, + Icon, + Layout, + Popover, + Table, + Typography + } from '@appwrite.io/pink-svelte'; import DeleteDomainModal from './deleteDomainModal.svelte'; import RetryDomainModal from './retryDomainModal.svelte'; import { columns } from './store'; @@ -19,7 +27,6 @@ let showDelete = $state(false); let showRetry = $state(false); let selectedDomain: Models.ProxyRule = $state(null); - let showPreviewDomainModal = $state(false); @@ -39,14 +46,15 @@ {domain.domain} + {#if domain.status !== 'verified'} + + {/if} - {:else if column.id === 'redirectUrl'} - - {domain?.redirectUrl || 'No redirect'} - {domain?.redirectStatusCode ? `(${domain.redirectStatusCode})` : ''} - {:else if column.id === 'deploymentVcsProviderBranch'} - {domain.deploymentVcsProviderBranch || '-'} {/if} {/each} @@ -69,7 +77,6 @@ { - e.preventDefault(); selectedDomain = domain; showRetry = true; toggle(e); @@ -81,12 +88,11 @@ status="danger" leadingIcon={IconTrash} on:click={(e) => { - e.preventDefault(); selectedDomain = domain; showDelete = true; toggle(e); trackEvent(Click.DomainDeleteClick, { - source: 'sites_domain_overview' + source: 'settings_domain_overview' }); }}> Delete diff --git a/src/routes/(console)/project-[project]/settings/updateName.svelte b/src/routes/(console)/project-[project]/settings/updateName.svelte index f7a6a7c4f..ddd43bdd7 100644 --- a/src/routes/(console)/project-[project]/settings/updateName.svelte +++ b/src/routes/(console)/project-[project]/settings/updateName.svelte @@ -25,6 +25,7 @@ try { await sdk.forConsole.projects.update($project.$id, name); await invalidate(Dependencies.PROJECT); + await invalidate(Dependencies.ORGANIZATION); addNotification({ type: 'success', message: 'Project name has been updated' diff --git a/src/routes/(console)/project-[project]/sites/(components)/deploymentActionMenu.svelte b/src/routes/(console)/project-[project]/sites/(components)/deploymentActionMenu.svelte index 30c518c31..7cd9df5d1 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/deploymentActionMenu.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/deploymentActionMenu.svelte @@ -85,7 +85,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-[project]/sites/create-site/templates/template-[template]/configuration.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte index 9687ff888..1d50a71e3 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[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-[project]/sites/create-site/variableEditorModal.svelte b/src/routes/(console)/project-[project]/sites/create-site/variableEditorModal.svelte index 891679b1c..9d95f8665 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/variableEditorModal.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/variableEditorModal.svelte @@ -122,7 +122,11 @@ {#if secretVariables?.length > 0} {secretVariables.length} secret variables are hidden from the editor. Their values will - remain unchanged. Learn more. + remain unchanged. Learn more. {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte index 45f5d39eb..84bf92f15 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte @@ -75,7 +75,6 @@ - - +
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte index 0de8f95f4..d3308394f 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte @@ -36,6 +36,6 @@

Are you sure you want to cancel this deployment?

- + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte index 631342ac1..0b943ba9e 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte @@ -127,7 +127,9 @@ - Enter a valid commit reference to create a new deployment. Learn more + Enter a valid commit reference to create a new deployment. Learn more {#if hasRepository} {#await load()} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte index a14fb82e1..7e93abd7c 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte @@ -7,6 +7,8 @@ import { onMount } from 'svelte'; import { page } from '$app/state'; import { UsageCard } from '$lib/components'; + import { humanFileSize } from '$lib/helpers/sizeConvertion'; + import { formatTimeDetailed } from '$lib/helpers/timeConversion'; const now = new Date(); const rangeOptions = [ @@ -33,17 +35,17 @@ description: 'Total builds time' }, { - id: 'avgTime', + id: 'buildsTimeAverage', value: null, description: 'Avg. builds time' }, { - id: 'success', + id: 'buildsSuccessTotal', value: null, description: 'Successful' }, { - id: 'failed', + id: 'buildsFailedTotal', value: null, description: 'Failed ' } @@ -63,7 +65,21 @@ try { const usage = await sdk.forProject.sites.getUsage(page.params.site, range); metrics = metrics.map((metric) => { - metric.value = usage[metric.id] ?? '-'; + if (metric.id === 'buildsStorageTotal') { + const size = humanFileSize(usage[metric.id]); + + metric.value = parseInt(size?.value) > 0 ? size.value + size.unit : '-'; + } else if ( + metric.id === 'buildsTimeTotal' || + metric.id === 'buildsTimeAverage' + ) { + const seconds = usage[metric.id] > 0 ? usage[metric.id] / 1000 : 0; + const time = formatTimeDetailed(seconds); + + metric.value = time !== '0s' ? time : '-'; + } else { + metric.value = usage[metric.id] ?? '-'; + } return metric; }); metrics = metrics; diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte index 343292e19..50fbd7359 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte @@ -58,7 +58,7 @@
@@ -55,7 +47,7 @@ + + + + + {#each $columns as { id, title } (id)} + {title} + {/each} + + + {#each $tokens.tokens as token} + + {toLocaleDate(token.$createdAt)} + + {token.expire + ? cleanFormattedDate(token.expire) + : 'never'} + + {token.accessedAt + ? cleanFormattedDate(token.accessedAt, true) + : 'never'} + + + {#if token.$permissions.length} + + {getPermissionGroups(token.$permissions)} + + {:else} + none + {/if} + + + + + + + + + + + + + { + toggle(e); + showCopyUrlModal = true; + selectedFileToken = token; + }} + leadingIcon={IconDuplicate}> + Copy URL + + + { + toggle(e); + showManageToken = true; + selectedFileToken = token; + }}> + Edit expiry + + { + toggle(e); + showManageToken = true; + tokenPermissionsMode = true; + selectedFileToken = token; + }}> + Edit Permissions + + { + toggle(e); + tokenDeleteMode = true; + showManageToken = true; + selectedFileToken = token; + }}> + Delete + + + + + + + + {/each} + + {:else} + (showManageToken = true)} + >Create new file token + {/if} + + + + Permissions Assign read or write permissions at the bucket level or file level. If bucket level permissions @@ -135,8 +365,8 @@ {:else} - If you want to assign document permissions. Go to Bucket settings and - enable file security. Otherwise, only Bucket permissions will be used. + If you want to assign file permissions. Go to Bucket settings and enable + file security. Otherwise, only Bucket permissions will be used. {/if} @@ -175,3 +405,20 @@ + + createFileToken(expiry)} + on:updated={({ detail: token }) => updateFileToken(token)} + on:deleted={async () => await deleteFileToken(selectedFileToken)} /> + + + + diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte index e4ba0b043..a21f60728 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte @@ -13,12 +13,13 @@ let error: string; const deleteFile = async () => { try { + const fileName = $file.name; await sdk.forProject.storage.deleteFile($file.bucketId, $file.$id); showDelete = false; await goto(`${base}/project-${page.params.project}/storage/bucket-${$file.bucketId}`); addNotification({ type: 'success', - message: `${$file.name} has been deleted` + message: `${fileName} has been deleted` }); trackEvent(Submit.FileDelete); } catch (error) { diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte new file mode 100644 index 000000000..8f13ac33c --- /dev/null +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte @@ -0,0 +1,141 @@ + + + + Use the token-based URL below to access this file securely. + + {#if error} + + Something went wrong, could not generate the URL. + + {:else} + {@const tokenUrl = codeSnippets[selectedTab]} + + + {#each ['Preview', 'View', 'Download'] as cat} + (selectedTab = cat)} + active={selectedTab === cat}> + {cat} + + {/each} + + + + {getMoreInfo()} + + {#if !token.expire} + + This token doesn't expire. Be cautious when sharing links. + + {/if} + + + {/if} + + + + diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte new file mode 100644 index 000000000..e51d93204 --- /dev/null +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte @@ -0,0 +1,101 @@ + + + + +{#if isDelete} + + {@const formattedDate = cleanFormattedDate(fileToken.$createdAt)} +

+ Are you sure you want to delete the file token created on {formattedDate}? +

+ +

+ {#if fileToken.accessedAt} + {@const formattedDate = cleanFormattedDate(fileToken.accessedAt, true)} + + This token was last accessed on {formattedDate} + {:else} + This token has never been accessed. + {/if} +

+ +{:else} + + + + {#if fileToken} + {@const formattedDate = cleanFormattedDate(fileToken.$createdAt)} + Edit the expiry of the file token created on {formattedDate} + {:else} + Create a file token to grant access to a file. + Learn more. + {/if} + + + {#if isUpdatePermissions} + + {:else} + + {/if} + + + + + + +{/if} diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts index 7d42b415a..8042caf2a 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts @@ -1,5 +1,21 @@ -import { derived } from 'svelte/store'; +import { derived, writable } from 'svelte/store'; import { page } from '$app/stores'; import type { Models } from '@appwrite.io/console'; +import type { Column } from '$lib/helpers/types'; export const file = derived(page, ($page) => $page.data.file as Models.File); + +export const tokens = derived(page, ($page) => $page.data.tokens as Models.ResourceTokenList); + +/** + * Caches JWTs in memory by `token.$id` to avoid regenerating them on each URL copy. + */ +export const cachedJwts = writable>(new Map()); + +export const columns = writable([ + { id: 'created', title: 'Created', type: 'datetime', width: 200 }, + { id: 'expiry', title: 'Expiration', type: 'datetime', width: 200 }, + { id: 'last_accessed', title: 'Last accessed', type: 'datetime', width: 200 }, + { id: 'permissions', title: 'Permissions', type: 'string', width: 200 }, + { id: 'actions', title: '', type: 'string', width: 60 } +]); diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte index 8d9e5409d..44d3d37d4 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte @@ -113,15 +113,12 @@ let isExtensionsDisabled = true; $: if (permissions) { - if (symmetricDifference(permissions, data.bucket.$permissions).length) { - $arePermsDisabled = false; - } else $arePermsDisabled = true; + $arePermsDisabled = !symmetricDifference(permissions, data.bucket.$permissions).length; } $: if (extensions) { - if (JSON.stringify(extensions) !== JSON.stringify(data.bucket.allowedFileExtensions)) { - isExtensionsDisabled = false; - } else isExtensionsDisabled = true; + isExtensionsDisabled = + JSON.stringify(extensions) === JSON.stringify(data.bucket.allowedFileExtensions); } function toggleBucket() { diff --git a/src/routes/(public)/auth/preview/access/+page.svelte b/src/routes/(public)/auth/preview/access/+page.svelte index 779c3db6c..f69f3783f 100644 --- a/src/routes/(public)/auth/preview/access/+page.svelte +++ b/src/routes/(public)/auth/preview/access/+page.svelte @@ -121,14 +121,15 @@ {#if state === 'authenticated'} - Request access to view this preview. You'll gain access once your request is approved. + Access is required to view this preview. You'll be able to see it once an admin invites + you to the organization. {/if}
@@ -225,21 +226,23 @@ {data.account.email} - { - logout(false); - state = 'login'; - }}>Switch account +
+ { + logout(false); + state = 'login'; + }}>Switch account +
{/if} - +