diff --git a/package.json b/package.json index 31818042d..db2162e58 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653", + "@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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 12669a9bb..923e56e90 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,8 +27,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653(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 @@ -258,14 +258,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@504c653542de13ba8b4815805806f301df92790a': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@504c653542de13ba8b4815805806f301df92790a} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@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 @@ -279,8 +279,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653} + '@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 @@ -3627,11 +3627,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@504c653542de13ba8b4815805806f301df92790a(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f(svelte@5.25.3)': dependencies: svelte: 5.25.3 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@de27ca407599e51b378814b421fb63625cb98c10(svelte@5.25.3)': dependencies: svelte: 5.25.3 @@ -3644,9 +3644,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@504c653(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@504c653542de13ba8b4815805806f301df92790a(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-[region]-[project]/overview/keys/expirationInput.svelte b/src/lib/components/expirationInput.svelte similarity index 77% rename from src/routes/(console)/project-[region]-[project]/overview/keys/expirationInput.svelte rename to src/lib/components/expirationInput.svelte index cafc292c6..3e8286e04 100644 --- a/src/routes/(console)/project-[region]-[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/index.ts b/src/lib/components/index.ts index 723ab85eb..3f451a4bf 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 RegionEndpoint } from './regionEndpoint.svelte'; +export { default as ExpirationInput } from './expirationInput.svelte'; diff --git a/src/lib/components/permissions/actions.svelte b/src/lib/components/permissions/actions.svelte index 4319e3d74..4bdbb7637 100644 --- a/src/lib/components/permissions/actions.svelte +++ b/src/lib/components/permissions/actions.svelte @@ -12,6 +12,7 @@ export let showTeam: boolean; export let showLabel: boolean; export let showCustom: boolean; + export let hideOnClick: boolean = false; export let groups: Writable>; const dispatch = createEventDispatcher(); @@ -19,31 +20,52 @@ - + dispatch('create', ['any'])}> + on:click={(e) => { + if (hideOnClick) hide(e); + dispatch('create', ['any']); + }}> Any dispatch('create', ['guests'])}> + on:click={(e) => { + if (hideOnClick) hide(e); + dispatch('create', ['guests']); + }}> All guests dispatch('create', ['users'])}> + on:click={(e) => { + if (hideOnClick) hide(e); + dispatch('create', ['users']); + }}> All users - (showUser = true)} - >Select users - (showTeam = true)} - >Select teams - (showLabel = true)} - >Label - (showCustom = true)} - >Custom permission + { + showUser = true; + if (hideOnClick) hide(e); + }}>Select users + { + showTeam = true; + if (hideOnClick) hide(e); + }}>Select teams + { + showLabel = true; + if (hideOnClick) hide(e); + }}>Label + { + showCustom = true; + if (hideOnClick) hide(e); + }}>Custom permission diff --git a/src/lib/components/permissions/permissions.svelte b/src/lib/components/permissions/permissions.svelte index 1dabdb0ba..efefa7f1a 100644 --- a/src/lib/components/permissions/permissions.svelte +++ b/src/lib/components/permissions/permissions.svelte @@ -21,6 +21,7 @@ import type { PinkColumn } from '$lib/helpers/types'; export let withCreate = false; + export let hideOnClick = false; export let permissions: string[] = []; let showUser = false; @@ -127,11 +128,11 @@ } const columns: PinkColumn[] = [ - { id: 'role', width: { min: 100 } }, - { id: 'create', width: { min: 100 }, hide: !withCreate }, - { id: 'read', width: { min: 100 } }, - { id: 'update', width: { min: 100 } }, - { id: 'delete', width: { min: 100 } }, + { id: 'role', width: { min: 80 } }, + { id: 'create', width: { min: 80 }, hide: !withCreate }, + { id: 'read', width: { min: 80 } }, + { id: 'update', width: { min: 80 } }, + { id: 'delete', width: { min: 80 } }, { id: 'action', width: 40 } ]; @@ -195,6 +196,7 @@ bind:showTeam bind:showUser {groups} + {hideOnClick} on:create={create} let:toggle> @@ -213,6 +215,7 @@ bind:showTeam bind:showUser {groups} + {hideOnClick} on:create={create} let:toggle> diff --git a/src/lib/constants.ts b/src/lib/constants.ts index cded22092..97ec76a0e 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -42,6 +42,7 @@ export enum Dependencies { DOCUMENTS = 'dependency:documents', BUCKET = 'dependency:bucket', FILE = 'dependency:file', + FILE_TOKENS = 'dependency:file_tokens', FILES = 'dependency:files', FUNCTION = 'dependency:function', FUNCTION_DOMAINS = 'dependency:function_domains', diff --git a/src/lib/elements/forms/inputDateTime.svelte b/src/lib/elements/forms/inputDateTime.svelte index 29ff8102d..8dcd115f6 100644 --- a/src/lib/elements/forms/inputDateTime.svelte +++ b/src/lib/elements/forms/inputDateTime.svelte @@ -1,12 +1,10 @@ - - - - - + + + {#if nullable} + + {/if} + + diff --git a/src/lib/elements/forms/inputSelect.svelte b/src/lib/elements/forms/inputSelect.svelte index b64746bfd..1939d5ac3 100644 --- a/src/lib/elements/forms/inputSelect.svelte +++ b/src/lib/elements/forms/inputSelect.svelte @@ -5,6 +5,7 @@ export let id: string; export let label: string | undefined = undefined; export let value: string | number | boolean | null; + export let helper: string | undefined = undefined; export let optionalText: string | number | boolean | null | undefined = undefined; export let placeholder = ''; export let required = false; @@ -54,8 +55,8 @@ {placeholder} {disabled} {isSearchable} + helper={error ?? helper} {required} - helper={error} state={error ? 'error' : 'default'} on:invalid={handleInvalid} on:input diff --git a/src/lib/helpers/date.ts b/src/lib/helpers/date.ts index 293062e6d..2d56c1cb6 100644 --- a/src/lib/helpers/date.ts +++ b/src/lib/helpers/date.ts @@ -15,13 +15,17 @@ if (browser) { dayjs.extend(relativeTime); } -export const toLocaleDate = (datetime: string) => { +export const toLocaleDate = (datetime: string, format: 'dd mm yyyy' | 'default' = 'default') => { const date = new Date(datetime); if (isNaN(date.getTime())) { return 'n/a'; } + if (format === 'dd mm yyyy') { + return `${date.getDate().toString().padStart(2, '0')} ${date.toLocaleString('en', { month: 'short' })} ${date.getFullYear()}`; + } + const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'short', @@ -33,6 +37,7 @@ export const toLocaleDate = (datetime: string) => { export const toLocaleDateTime = ( datetime: string | number, + is12HourFormat: boolean = false, timeZone: string | undefined = undefined ) => { const date = new Date(datetime); @@ -48,7 +53,8 @@ export const toLocaleDateTime = ( day: 'numeric', hour: 'numeric', minute: 'numeric', - hourCycle: 'h23' + hourCycle: is12HourFormat ? 'h12' : 'h23', + ...(is12HourFormat && { hour12: true }) }; return date.toLocaleDateString('en', options); diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index 38e356968..218297700 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -19,7 +19,8 @@ import { Teams, Users, Vcs, - Sites + Sites, + Tokens } from '@appwrite.io/console'; import { Billing } from '../sdk/billing'; import { Backups } from '../sdk/backups'; @@ -89,6 +90,7 @@ const sdkForProject = { project: new Project(clientProject), projectApi: new ProjectApi(clientProject), storage: new Storage(clientProject), + tokens: new Tokens(clientProject), teams: new Teams(clientProject), users: new Users(clientProject), vcs: new Vcs(clientProject), diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte new file mode 100644 index 000000000..e69de29bb diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/resetEmail.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/resetEmail.svelte index cec8738bb..ebf009cf4 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/templates/resetEmail.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/templates/resetEmail.svelte @@ -49,14 +49,14 @@ 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} + {#if error} + {error} + {/if} diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte index 25ffc7b9a..5b8cef881 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte @@ -1,6 +1,4 @@ - + @@ -193,4 +196,47 @@ + + + + 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-[region]-[project]/messaging/providers/wizard/settings.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/settings.svelte index eca807dd0..142450836 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/settings.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/settings.svelte @@ -4,8 +4,7 @@ import { providers } from '../store'; import { providerType, provider, providerParams } from './store'; import SettingsFormList from '../settingsFormList.svelte'; - import { newMemberModal } from '$lib/stores/organization'; - import CreateMember from '$routes/(console)/organization-[organization]/createMember.svelte'; + import { MessagingProviderType } from '@appwrite.io/console'; import { Collapsible, @@ -17,7 +16,6 @@ let files: Record = {}; $: inputs = providers[$providerType].providers[$provider].configure; - let open = false; $: { files; @@ -65,7 +63,6 @@ - Settings Set up the credentials below to enable {providers[$providerType].providers[$provider].title} for sending @@ -73,122 +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 - - - - - - - - -{#if $newMemberModal} - -{/if} - - diff --git a/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/updateExpirationDate.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/updateExpirationDate.svelte index 5595ea2b2..8a15fa347 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/updateExpirationDate.svelte +++ b/src/routes/(console)/project-[region]-[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-[region]-[project]/overview/keys/create/+page.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/create/+page.svelte index 9821d2f8a..a6549e8a9 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/keys/create/+page.svelte +++ b/src/routes/(console)/project-[region]-[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-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts index 161f625f5..e198256ae 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts @@ -7,6 +7,7 @@ import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.FILE); + depends(Dependencies.FILE_TOKENS); try { return { @@ -14,7 +15,10 @@ export const load: LayoutLoad = async ({ params, depends }) => { breadcrumbs: Breadcrumbs, file: await sdk .forProject(params.region, params.project) - .storage.getFile(params.bucket, params.file) + .storage.getFile(params.bucket, params.file), + tokens: await sdk + .forProject(params.region, params.project) + .tokens.list(params.bucket, params.file) }; } catch (e) { error(e.code, e.message); 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 a2e9871e7..ca3f3eeb8 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 @@ -1,8 +1,8 @@ @@ -121,6 +240,120 @@ + + + File tokens + Use tokens to provide public access to the file. + + {#if $tokens.total} + + (showManageToken = true)}> + + Create token + + + + + + {#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 @@ -140,8 +373,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} @@ -180,3 +413,20 @@ + + 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]/deleteFile.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte index b52afeb15..1cc182e0a 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte @@ -13,6 +13,7 @@ let error: string; const deleteFile = async () => { try { + const fileName = $file.name; await sdk .forProject(page.params.region, page.params.project) .storage.deleteFile($file.bucketId, $file.$id); @@ -22,7 +23,7 @@ ); 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-[region]-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte new file mode 100644 index 000000000..106947370 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/fileTokensCopyUrl.svelte @@ -0,0 +1,140 @@ + + + + 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} + + (show = false)}>Close + + 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 new file mode 100644 index 000000000..e51d93204 --- /dev/null +++ b/src/routes/(console)/project-[region]-[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} + + + Cancel + {fileToken ? 'Update' : 'Create'} + + +{/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 7d42b415a..8042caf2a 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 @@ -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-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte index d7c6e6ee8..07c8a40e8 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte @@ -116,15 +116,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() {
- 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. +
+ {@html p} +
Need a hand?
- {@html p} -
Read the full guide in the documentation
Invite a team member to complete this step
+ 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} +