From 2c2611c624bc660d38d3c100651584e1545ff911 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 14 May 2025 11:03:04 +0530 Subject: [PATCH 1/8] update: file tokens api. --- package.json | 2 +- pnpm-lock.yaml | 10 +- .../bucket-[bucket]/file-[file]/+page.svelte | 59 +------- .../file-[file]/fileTokensCopyUrl.svelte | 135 +++++++----------- .../file-[file]/manageFileToken.svelte | 46 ++---- .../bucket-[bucket]/file-[file]/store.ts | 6 - 6 files changed, 77 insertions(+), 181 deletions(-) diff --git a/package.json b/package.json index f6ed453a6..c3c00c4cb 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@ai-sdk/svelte": "^1.1.24", - "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@7f8fe13", + "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@c2f54c6", "@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@d68e5e4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 04c8b909d..48b370384 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^1.1.24 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@7f8fe13 - version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@7f8fe13 + specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@c2f54c6 + version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@c2f54c6 '@appwrite.io/pink': specifier: 0.25.0 version: 0.25.0 @@ -254,8 +254,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@7f8fe13': - resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@7f8fe13} + '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@c2f54c6': + resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@c2f54c6} version: 1.2.1 '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@d68e5e4': @@ -3625,7 +3625,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@7f8fe13': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@c2f54c6': {} '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@d68e5e4(svelte@5.25.3)': dependencies: diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index 92c181d80..87f7ac765 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -52,7 +52,6 @@ let showManageToken = false; let tokenDeleteMode = false; let showCopyUrlModal = false; - let tokenPermissionsMode = false; let selectedFileToken: Models.ResourceToken | null = null; const getPreview = (fileId: string) => @@ -126,9 +125,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tokens.createFileToken($file.bucketId, $file.$id, expiry, [ - Permission.read(Role.any()) - ]); + .tokens.createFileToken($file.bucketId, $file.$id, expiry); await invalidate(Dependencies.FILE_TOKENS); addNotification({ @@ -151,11 +148,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tokens.update( - selectedFileToken.$id, - fileToken.expire ? fileToken.expire : null, - fileToken.$permissions - ); + .tokens.update(selectedFileToken.$id, fileToken.expire ? fileToken.expire : null); await invalidate(Dependencies.FILE_TOKENS); addNotification({ message: 'File token updated', @@ -173,23 +166,6 @@ } } - function getPermissionGroups(token: Models.ResourceToken): string { - const map = { - read: 'Read', - update: 'Update', - delete: 'Delete' - }; - - const groups = token.$permissions.reduce((set, perm) => { - const match = perm.match(/^(\w+)\(/); - const key = match?.[1]; - if (key && map[key]) set.add(map[key]); - return set; - }, new Set()); - - return [...groups].join(', '); - } - function getExpiryDetails(token: Models.ResourceToken): { status: 'success' | 'warning' | 'error' | null; message: string | null; @@ -301,16 +277,6 @@ ? cleanFormattedDate(token.accessedAt, true) : 'Never'} - - {#if token.$permissions.length} - - {getPermissionGroups(token)} - - {:else} - none - {/if} - - @@ -322,8 +288,8 @@ { - toggle(); + on:click={(e) => { + toggle(e); showCopyUrlModal = true; selectedFileToken = token; }} @@ -333,28 +299,18 @@ { - toggle(); + on:click={(e) => { + toggle(e); showManageToken = true; selectedFileToken = token; }}> Edit expiry - { - toggle(); - showManageToken = true; - tokenPermissionsMode = true; - selectedFileToken = token; - }}> - Edit permissions - { - toggle(); + toggle(e); tokenDeleteMode = true; showManageToken = true; selectedFileToken = token; @@ -439,7 +395,6 @@ bind:show={showManageToken} bind:isDelete={tokenDeleteMode} bind:fileToken={selectedFileToken} - bind:isUpdatePermissions={tokenPermissionsMode} on:created={({ detail: expiry }) => createFileToken(expiry)} on:updated={({ detail: token }) => updateFileToken(token)} on:deleted={async () => await deleteFileToken(selectedFileToken)} /> diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte index 106947370..f592d9de1 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte @@ -1,79 +1,47 @@ + {@const tokenUrl = tabContents[selectedTab]} 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} - + + + {#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} + + - - {getMoreInfo()} - - {#if !token.expire} - - This token doesn't expire. Be cautious when sharing links. - - {/if} - - - {/if} diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte index 9f13c1f71..9a3e5e266 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte @@ -13,27 +13,24 @@ import { createEventDispatcher } from 'svelte'; import { Link } from '@appwrite.io/pink-svelte'; import { type Models } from '@appwrite.io/console'; - import { Permissions } from '$lib/components/permissions'; import { Confirm, ExpirationInput, Modal } from '$lib/components'; export let show = false; export let isDelete = false; - export let isUpdatePermissions = false; export let fileToken: Models.ResourceToken | null = null; $: expire = fileToken?.expire ?? null; const dispatch = createEventDispatcher(); - function close() { + function close(): void { show = false; expire = null; isDelete = false; fileToken = null; - isUpdatePermissions = false; } - function handleFileToken() { + function handleFileToken(): void { if (isDelete) { dispatch('deleted'); } else { @@ -45,6 +42,10 @@ close(); } + function getModalTitle(): string { + return `${fileToken ? 'Edit' : 'Create'} token${fileToken ? ' expiry' : ''}`; + } + $: if (!show) { close(); } @@ -68,41 +69,24 @@

{:else} - + {#if fileToken} - {#if isUpdatePermissions} - Choose who can access or update your file using this token. - - Learn more - . - {:else} - {@const formattedDate = cleanFormattedDate(fileToken.$createdAt)} - Edit the expiry of the file token created on {formattedDate}. - {/if} + {@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} + diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts index 2f5748362..dd1432428 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts @@ -7,15 +7,9 @@ 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: 'expire', 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 } ]); From 4a2b173bf34ea0f44ef786ba4d6ad7989572c7f2 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 15 May 2025 19:45:01 +0530 Subject: [PATCH 2/8] run: linter. --- .../bucket-[bucket]/file-[file]/+page.svelte | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index e85d0c2a9..aef23122b 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -282,12 +282,12 @@ ? cleanFormattedDate(token.accessedAt, true) : 'Never'} - - - - - - + + + + + + @@ -313,8 +313,8 @@ { + leadingIcon={IconTrash} + on:click={async (e) => { toggle(e); tokenDeleteMode = true; showManageToken = true; From ee6c989bd36bd38f78f5159c144f60569536227f Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 15 May 2025 19:49:42 +0530 Subject: [PATCH 3/8] add: tokens scopes. --- src/lib/constants.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index bcbbc1a6e..58ae2e443 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -378,6 +378,18 @@ export const scopes: { category: 'Other', icon: 'globe' }, + { + scope: 'tokens.read', + description: "Access to read your project's file tokens", + category: 'Other', + icon: 'globe' + }, + { + scope: 'tokens.write', + description: 'Access to create file tokens', + category: 'Other', + icon: 'globe' + }, { scope: 'sites.read', description: "Access to read your project's sites and deployments", From 2c2e3c6d9fa7fd1a25d33803ab80ed180b61e6db Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 15 May 2025 20:01:30 +0530 Subject: [PATCH 4/8] bump: sdk. --- package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ .../storage/bucket-[bucket]/file-[file]/+page.svelte | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 7c05f4356..ed26ec193 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@ai-sdk/svelte": "^1.1.24", - "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@c2f54c6", + "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960", "@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@d68e5e4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6e47675f4..f2d1a6d9f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^1.1.24 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@c2f54c6 - version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@c2f54c6 + specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960 + version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960 '@appwrite.io/pink': specifier: 0.25.0 version: 0.25.0 @@ -254,9 +254,9 @@ 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@c2f54c6': - resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@c2f54c6} - version: 1.2.1 + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960': + resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960} + version: 1.5.2 '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@b39a7c45d4b8ebf03059018d195141c8d2b7c221': resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@b39a7c45d4b8ebf03059018d195141c8d2b7c221} @@ -3625,7 +3625,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@c2f54c6': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960': {} '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@b39a7c45d4b8ebf03059018d195141c8d2b7c221(svelte@5.25.3)': dependencies: diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index aef23122b..8594cf613 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -293,8 +293,8 @@ { - toggle(e); + on:click={() => { + toggle(); showCopyUrlModal = true; selectedFileToken = token; }} @@ -304,8 +304,8 @@ { - toggle(e); + on:click={() => { + toggle(); showManageToken = true; selectedFileToken = token; }}> @@ -314,8 +314,8 @@ { - toggle(e); + on:click={() => { + toggle(); tokenDeleteMode = true; showManageToken = true; selectedFileToken = token; From 7a985d8bcea92a8574742a92c444b72fa7a6cdcd Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 16 May 2025 13:31:13 +0530 Subject: [PATCH 5/8] fix: errors, warnings, tests. --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- src/lib/components/bottomModalAlert.svelte | 4 ++++ src/lib/components/git/repositories.svelte | 7 ++++--- src/lib/elements/forms/inputText.svelte | 3 ++- src/routes/(console)/bottomAlerts.ts | 2 +- .../add-domain/verify-[domain]/+page.svelte | 19 +++++++++--------- .../add-domain/verify-[domain]/+page.svelte | 19 +++++++++--------- .../add-domain/verify-[domain]/+page.svelte | 20 ++++++++++--------- .../domains/retryDomainModal.svelte | 20 ++++++++++--------- .../bucket-[bucket]/file-[file]/+page.svelte | 3 +-- 11 files changed, 60 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index ed26ec193..ca2e77b43 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@ai-sdk/svelte": "^1.1.24", - "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960", + "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1959", "@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@d68e5e4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f2d1a6d9f..5eca140a2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^1.1.24 version: 1.1.24(svelte@5.25.3)(zod@3.24.3) '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960 - version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960 + specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1959 + version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1959 '@appwrite.io/pink': specifier: 0.25.0 version: 0.25.0 @@ -254,8 +254,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-labs/cloud/@appwrite.io/console@1960': - resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1959': + resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1959} version: 1.5.2 '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@b39a7c45d4b8ebf03059018d195141c8d2b7c221': @@ -3625,7 +3625,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1960': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1959': {} '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@b39a7c45d4b8ebf03059018d195141c8d2b7c221(svelte@5.25.3)': dependencies: diff --git a/src/lib/components/bottomModalAlert.svelte b/src/lib/components/bottomModalAlert.svelte index 2c105354a..3e98be3ca 100644 --- a/src/lib/components/bottomModalAlert.svelte +++ b/src/lib/components/bottomModalAlert.svelte @@ -373,7 +373,11 @@ {:else} {@const mobileConfig = getMobileWindowConfig()} + +
{ diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index 4212997bc..9830edf81 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -22,6 +22,7 @@ import { page } from '$app/state'; import Card from '../card.svelte'; import SkeletonRepoList from './skeletonRepoList.svelte'; + import { untrack } from 'svelte'; let { action = $bindable('select'), @@ -42,13 +43,13 @@ } = $props(); let search = $state(''); - let selectedInstallation: string = null; + let selectedInstallation = $state(null); let isLoadingRepositories = $state(null); async function loadInstallations() { if (installationList) { if (installationList.installations.length) { - selectedInstallation = installationList.installations[0].$id; + untrack(() => selectedInstallation = installationList.installations[0].$id); installation.set( installationList.installations.find( (entry) => entry.$id === selectedInstallation @@ -61,7 +62,7 @@ .forProject(page.params.region, page.params.project) .vcs.listInstallations(); if (installations.length) { - selectedInstallation = installations[0].$id; + untrack(() => selectedInstallation = installations[0].$id); installation.set(installations.find((entry) => entry.$id === selectedInstallation)); } return installations; diff --git a/src/lib/elements/forms/inputText.svelte b/src/lib/elements/forms/inputText.svelte index 169d44245..800c661dc 100644 --- a/src/lib/elements/forms/inputText.svelte +++ b/src/lib/elements/forms/inputText.svelte @@ -6,7 +6,7 @@ export let name: string = id; export let helper: string = undefined; export let value = ''; - export let pattern: string = null; //TODO: implement pattern check + export let pattern: string = undefined; //TODO: implement pattern check export let patternError: string = ''; export let placeholder = ''; export let required = false; @@ -53,6 +53,7 @@ {label} {nullable} {readonly} + {pattern} autofocus={autofocus || undefined} autocomplete={autocomplete ? 'on' : 'off'} helper={error || helper} diff --git a/src/routes/(console)/bottomAlerts.ts b/src/routes/(console)/bottomAlerts.ts index 156a0dff8..88d63a6dd 100644 --- a/src/routes/(console)/bottomAlerts.ts +++ b/src/routes/(console)/bottomAlerts.ts @@ -9,7 +9,7 @@ import { isCloud } from '$lib/system'; const listOfPromotions: BottomModalAlertItem[] = []; -if (isCloud) { +if (!isCloud) { const title = 'Join Init 19-23 May'; const message = 'This release will change the way you build with Appwrite forever. Register for Init and join the giveaway.'; diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte index 155445767..f8b03eb86 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte @@ -29,15 +29,16 @@ const ruleId = page.url.searchParams.get('rule'); let isSubDomain = $derived(page.params.domain?.split('.')?.length >= 3); - let selectedTab: 'cname' | 'nameserver' | 'a' | 'aaaa' = $state( - !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain - ? 'cname' - : !!$consoleVariables._APP_DOMAIN_TARGET_A - ? 'a' - : !!$consoleVariables._APP_DOMAIN_TARGET_AAAA - ? 'aaaa' - : 'nameserver' - ); + let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); + $effect(() => { + if ($consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { + selectedTab = 'cname'; + } else if ($consoleVariables._APP_DOMAIN_TARGET_A) { + selectedTab = 'a'; + } else if ($consoleVariables._APP_DOMAIN_TARGET_AAAA) { + selectedTab = 'aaaa'; + } + }); let verified = $state(false); let routeBase = `${base}/project-${page.params.region}-${page.params.project}/functions/function-${page.params.function}/domains`; diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte index 7df1b1ccc..083034326 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte @@ -29,15 +29,16 @@ const ruleId = page.url.searchParams.get('rule'); let isSubDomain = $derived(page.params.domain?.split('.')?.length >= 3); - let selectedTab: 'cname' | 'nameserver' | 'a' | 'aaaa' = $state( - !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain - ? 'cname' - : !!$consoleVariables._APP_DOMAIN_TARGET_A - ? 'a' - : !!$consoleVariables._APP_DOMAIN_TARGET_AAAA - ? 'aaaa' - : 'nameserver' - ); + let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); + $effect(() => { + if ($consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { + selectedTab = 'cname'; + } else if ($consoleVariables._APP_DOMAIN_TARGET_A) { + selectedTab = 'a'; + } else if ($consoleVariables._APP_DOMAIN_TARGET_AAAA) { + selectedTab = 'aaaa'; + } + }); let verified = $state(false); let routeBase = `${base}/project-${page.params.region}-${page.params.project}/settings/domains`; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte index 7381f4173..d19eb28f2 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte @@ -29,15 +29,17 @@ const ruleId = page.url.searchParams.get('rule'); let isSubDomain = $derived(page.params.domain?.split('.')?.length >= 3); - let selectedTab: 'cname' | 'nameserver' | 'a' | 'aaaa' = $state( - !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain - ? 'cname' - : !!$consoleVariables._APP_DOMAIN_TARGET_A - ? 'a' - : !!$consoleVariables._APP_DOMAIN_TARGET_AAAA - ? 'aaaa' - : 'nameserver' - ); + let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); + $effect(() => { + if ($consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { + selectedTab = 'cname'; + } else if ($consoleVariables._APP_DOMAIN_TARGET_A) { + selectedTab = 'a'; + } else if ($consoleVariables._APP_DOMAIN_TARGET_AAAA) { + selectedTab = 'aaaa'; + } + }); + let verified = $state(false); let routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte index 5a6d05e1d..36e75c465 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte @@ -25,15 +25,17 @@ let isSubDomain = $derived.by(() => selectedDomain?.domain?.length ? selectedDomain?.domain?.split('.')?.length >= 3 : false ); - let selectedTab: 'cname' | 'nameserver' | 'a' | 'aaaa' = $state( - !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain - ? 'cname' - : !!$consoleVariables._APP_DOMAIN_TARGET_A - ? 'a' - : !!$consoleVariables._APP_DOMAIN_TARGET_AAAA - ? 'aaaa' - : 'nameserver' - ); + + let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); + $effect(() => { + if ($consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { + selectedTab = 'cname'; + } else if ($consoleVariables._APP_DOMAIN_TARGET_A) { + selectedTab = 'a'; + } else if ($consoleVariables._APP_DOMAIN_TARGET_AAAA) { + selectedTab = 'aaaa'; + } + }); let verified = $state(false); diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index 8594cf613..36e087c71 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -29,14 +29,13 @@ import { IconDotsHorizontal, IconDuplicate, - IconKey, IconPencil, IconPlus, IconTrash } from '@appwrite.io/pink-icons-svelte'; import FileTokensCopyUrl from './fileTokensCopyUrl.svelte'; import ManageFileTokenModal, { cleanFormattedDate } from './manageFileToken.svelte'; - import { type Models, Permission, Role } from '@appwrite.io/console'; + import { type Models } from '@appwrite.io/console'; import { isSmallViewport } from '$lib/stores/viewport'; import { Menu } from '$lib/components/menu'; import { SHOW_INIT_FEATURES } from '$lib/system'; From 34cb60e20898aa4503ddef552ae60fed16e91419 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 16 May 2025 13:37:06 +0530 Subject: [PATCH 6/8] fix: leftover. --- src/routes/(console)/bottomAlerts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(console)/bottomAlerts.ts b/src/routes/(console)/bottomAlerts.ts index 88d63a6dd..156a0dff8 100644 --- a/src/routes/(console)/bottomAlerts.ts +++ b/src/routes/(console)/bottomAlerts.ts @@ -9,7 +9,7 @@ import { isCloud } from '$lib/system'; const listOfPromotions: BottomModalAlertItem[] = []; -if (!isCloud) { +if (isCloud) { const title = 'Join Init 19-23 May'; const message = 'This release will change the way you build with Appwrite forever. Register for Init and join the giveaway.'; From 5d9f0e93f856abcf71ba3f12aac1ec4e02c962d5 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 16 May 2025 13:37:31 +0530 Subject: [PATCH 7/8] lint. --- src/lib/components/git/repositories.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index 9830edf81..ad59b0948 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -49,7 +49,7 @@ async function loadInstallations() { if (installationList) { if (installationList.installations.length) { - untrack(() => selectedInstallation = installationList.installations[0].$id); + untrack(() => (selectedInstallation = installationList.installations[0].$id)); installation.set( installationList.installations.find( (entry) => entry.$id === selectedInstallation @@ -62,7 +62,7 @@ .forProject(page.params.region, page.params.project) .vcs.listInstallations(); if (installations.length) { - untrack(() => selectedInstallation = installations[0].$id); + untrack(() => (selectedInstallation = installations[0].$id)); installation.set(installations.find((entry) => entry.$id === selectedInstallation)); } return installations; From 7c16b474679afa39e349ccfa6c75586219577882 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 16 May 2025 13:54:19 +0530 Subject: [PATCH 8/8] fix: advanced lint. --- src/lib/components/billing/usageRates.svelte | 2 +- src/lib/components/filters/filtersBottomSheet.svelte | 2 -- src/lib/components/filters/quickFilters.svelte | 2 -- src/lib/components/git/connectRepoModal.svelte | 2 +- src/lib/components/git/repositories.svelte | 2 -- src/lib/layout/shell.svelte | 2 +- src/lib/stores/feedback.ts | 1 - .../databases/database-[database]/backups/createPolicy.svelte | 4 ++-- .../functions/templates/+page.svelte | 2 +- .../sites/create-site/templates/+page.svelte | 2 +- .../storage/bucket-[bucket]/settings/updateMaxFileSize.svelte | 2 +- 11 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/lib/components/billing/usageRates.svelte b/src/lib/components/billing/usageRates.svelte index 4635a1d5a..653b9c154 100644 --- a/src/lib/components/billing/usageRates.svelte +++ b/src/lib/components/billing/usageRates.svelte @@ -45,7 +45,7 @@ $: isFree = org.billingPlan === BillingPlan.FREE; // equal or above means unlimited! - $: getCorrectSeatsCountValue = (count: number): string | number => { + const getCorrectSeatsCountValue = (count: number): string | number => { // php int max is always larger than js const exceedsSafeLimit = count >= Number.MAX_SAFE_INTEGER; return exceedsSafeLimit ? 'Unlimited' : count || 0; diff --git a/src/lib/components/filters/filtersBottomSheet.svelte b/src/lib/components/filters/filtersBottomSheet.svelte index 3d61e8b6b..5d7137c1a 100644 --- a/src/lib/components/filters/filtersBottomSheet.svelte +++ b/src/lib/components/filters/filtersBottomSheet.svelte @@ -111,8 +111,6 @@ return arrayValue; } } - - $inspect(subSheets); diff --git a/src/lib/components/filters/quickFilters.svelte b/src/lib/components/filters/quickFilters.svelte index 3e1d1142a..76bbf90c5 100644 --- a/src/lib/components/filters/quickFilters.svelte +++ b/src/lib/components/filters/quickFilters.svelte @@ -19,8 +19,6 @@ filterCols: FilterData[]; analyticsSource?: string; } = $props(); - - $inspect(filterCols); diff --git a/src/lib/components/git/connectRepoModal.svelte b/src/lib/components/git/connectRepoModal.svelte index c415b20e6..bf2685c65 100644 --- a/src/lib/components/git/connectRepoModal.svelte +++ b/src/lib/components/git/connectRepoModal.svelte @@ -46,7 +46,7 @@ $installation = installations.installations[0]; } selectedInstallationId = installations.total ? installations.installations[0]?.$id : ''; - if (!!installations?.total) { + if (installations?.total) { repositoryBehaviour = 'existing'; } }); diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index ad59b0948..e0a85095e 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -111,8 +111,6 @@ $repositories.search = search; $repositories.installationId = installationId; } - - $inspect(selectedRepository); {#if hasInstallations} diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 6590db601..871f2d525 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -118,7 +118,7 @@ showAccountMenu = false; } - $: progressCard = function getProgressCard() { + const progressCard = function getProgressCard() { if (selectedProject && !hasOnboardingDismissed(selectedProject.$id)) { const currentProject = projects.find((project) => project.$id === selectedProject.$id); diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts index 62b14f2f8..30dc99687 100644 --- a/src/lib/stores/feedback.ts +++ b/src/lib/stores/feedback.ts @@ -113,7 +113,6 @@ function createFeedbackStore() { currentPage: string, name?: string, email?: string, - // eslint-disable-next-line billingPlan?: string, value?: number, orgId?: string, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/createPolicy.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/createPolicy.svelte index b1c812919..ca4dc48a9 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/createPolicy.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/createPolicy.svelte @@ -113,7 +113,7 @@ }); }; - $: customPolicyDescription = (policy: UserBackupPolicy) => { + const customPolicyDescription = (policy: UserBackupPolicy) => { return backupPolicyDescription( policy.plainTextFrequency, null, @@ -123,7 +123,7 @@ ); }; - $: formPolicyDescription = () => { + const formPolicyDescription = () => { return backupPolicyDescription( policyFrequency, selectedTime, diff --git a/src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte index 6731bdde2..f1e393732 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte @@ -69,7 +69,7 @@ return [...baseRuntimes.values()]; } - $: isChecked = (useCase: string) => { + const isChecked = (useCase: string) => { return page.url.searchParams .getAll('useCase') .some((param) => param.toLowerCase() === useCase.toLowerCase()); diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte index d50ab92f2..6f9c0359c 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte @@ -67,7 +67,7 @@ goto(target.toString()); } - $: isChecked = (useCase: string) => { + const isChecked = (useCase: string) => { return page.url.searchParams .getAll('useCase') .some((param) => param.toLowerCase() === useCase.toLowerCase()); diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte index 78611e19e..62bbb8c4b 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte @@ -20,7 +20,7 @@ const options = units.map((v) => ({ label: v.name, value: v.name })); $: selectedUnit = $unit; - $: maxValue = function formMaxFileSize() { + const maxValue = function formMaxFileSize() { return (service * 1000 * 1000) / units.find((unit) => unit.name === selectedUnit).value; };