From a62184cf0dc63d390da5c1d0d750912e6c322310 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 13:32:43 +0100 Subject: [PATCH 01/12] fix: creation flow --- .../add-domain/verify-[domain]/+page.svelte | 38 ++++++++----------- .../verificationFieldset.svelte | 2 +- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte index de191bbe1..fdcc0b319 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte @@ -15,27 +15,28 @@ import { writable } from 'svelte/store'; export let data; + + const ruleId = $page.url.searchParams.get('rule'); let selectedTab: 'cname' | 'nameserver'; - let domainData = data.domain; + let verified = false; let routeBase = `${base}/project-${$page.params.project}/sites/site-${$page.params.site}/domains`; let isSubmitting = writable(false); - async function addDomain() { + async function verify() { const isNewDomain = data.domainsList.domains.findIndex((rule) => rule.domain === $page.params.domain) === -1; try { - // if (selectedTab === 'cname'){ - // domainData = await sdk.forProject.proxy.updateRuleVerification( - // $page.params.domain - // ); - // } - if (isNewDomain && isCloud) { - domainData = await sdk.forConsole.domains.create( + if (selectedTab === 'cname') { + const ruleData = await sdk.forProject.proxy.updateRuleVerification(ruleId); + verified = ruleData.status === 'verified'; + } else if (isNewDomain && isCloud) { + const domainData = await sdk.forConsole.domains.create( $organization.$id, $page.params.domain ); + verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; } addNotification({ @@ -46,8 +47,7 @@ await invalidate(Dependencies.DOMAINS); await invalidate(Dependencies.SITES_DOMAINS); } catch (error) { - await invalidate(Dependencies.DOMAINS); - + verified = false; addNotification({ type: 'error', message: error.message @@ -56,20 +56,15 @@ } async function back() { - if ($page.url.searchParams.has('rule')) { - const rule = $page.url.searchParams.get('rule'); - await sdk.forProject.proxy.deleteRule(rule); + if (ruleId) { + await sdk.forProject.proxy.deleteRule(ruleId); } await goto(`${routeBase}/add-domain?domain=${$page.params.domain}`); } - - $: isVerified = domainData?.nameservers - ? domainData?.nameservers.toLocaleLowerCase() === 'appwrite' - : undefined; -
+ - +
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte index 66f2acae2..5ec97049e 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte @@ -38,7 +38,7 @@ {#if selectedTab === 'cname' && isSubDomain} {:else if isCloud} - + {/if} From a0e9e604df9dfa8ceed125d12f3e945af3d3047b Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 14:38:03 +0100 Subject: [PATCH 02/12] fix: filter not being triggered --- src/lib/components/filters/quickfiltersSubMenu.svelte | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/components/filters/quickfiltersSubMenu.svelte b/src/lib/components/filters/quickfiltersSubMenu.svelte index 23159f67e..0e5793e10 100644 --- a/src/lib/components/filters/quickfiltersSubMenu.svelte +++ b/src/lib/components/filters/quickfiltersSubMenu.svelte @@ -69,7 +69,15 @@ }); }}> - + { + option.checked = !option.checked; + dispatch('add', { + value: option.checked + }); + }} + size="s" /> {capitalize(option.label)} From 95181d8c239b5d6d85a27eee4a8dbe162f2d5ae6 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 14:46:55 +0100 Subject: [PATCH 03/12] chore: change table logic to use `show` for legacy support --- package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- src/lib/components/viewSelector.svelte | 14 +++++++------- src/lib/helpers/types.ts | 1 - 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index ffca60fd7..96d4209a9 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@4a5aab5", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@e79fca8", "@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 10157dcdd..33ada7cbf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,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@4a5aab5 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@4a5aab5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@e79fca8 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@e79fca8(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -221,8 +221,8 @@ packages: peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab516090e3ae16aef591d8de5f04e1a84fbd': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab516090e3ae16aef591d8de5f04e1a84fbd} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@e79fca86741618055e808f8977282677d2fbc8e9': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@e79fca86741618055e808f8977282677d2fbc8e9} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,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@4a5aab5': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@4a5aab5} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@e79fca8': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@e79fca8} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4247,7 +4247,7 @@ snapshots: dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab516090e3ae16aef591d8de5f04e1a84fbd(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@e79fca86741618055e808f8977282677d2fbc8e9(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4260,9 +4260,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@4a5aab5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@e79fca8(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab516090e3ae16aef591d8de5f04e1a84fbd(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@e79fca86741618055e808f8977282677d2fbc8e9(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.3(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.3(svelte@4.2.19) diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index 75053d816..efb86ce67 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -29,7 +29,7 @@ const prefs = preferences.getCustomCollectionColumns($page.params.collection); columns.set( $columns.map((column) => { - column.hide = prefs?.includes(column.id) ?? false; + column.show = prefs?.includes(column.id) ?? false; return column; }) ); @@ -40,7 +40,7 @@ if (prefs?.columns) { columns.set( $columns.map((column) => { - column.hide = prefs.columns?.includes(column.id) ?? false; + column.show = prefs.columns?.includes(column.id) ?? false; return column; }) ); @@ -48,7 +48,7 @@ } columns.subscribe((ctx) => { - const columns = ctx.filter((n) => n.hide === true).map((n) => n.id); + const columns = ctx.filter((n) => n.show === true).map((n) => n.id); if (isCustomCollection) { preferences.setCustomCollectionColumns(columns); @@ -76,7 +76,7 @@ } $: selectedColumnsNumber = $columns.reduce((acc, column) => { - if (column.hide === true) return acc; + if (column.show === true) return acc; return ++acc; }, 0); @@ -100,11 +100,11 @@ (column.hide = !column.hide)} - checked={!column.hide} + on:change={() => (column.show = !column.show)} + checked={!column.show} disabled={allowNoColumns ? false - : selectedColumnsNumber <= 1 && column.hide !== true} /> + : selectedColumnsNumber <= 1 && column.show !== true} /> {/if} {/each} diff --git a/src/lib/helpers/types.ts b/src/lib/helpers/types.ts index 99fd0cb4d..2959c743f 100644 --- a/src/lib/helpers/types.ts +++ b/src/lib/helpers/types.ts @@ -30,7 +30,6 @@ export type Column = PinkColumn & { filter?: boolean; array?: boolean; format?: string; - show?: boolean; exclude?: boolean; elements?: string[] | { value: string | number; label: string }[]; }; From 191ceeec3edd35c322d6255775ce7c6c576f2f11 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 15:47:00 +0100 Subject: [PATCH 04/12] feat: logging --- src/lib/components/logs/index.ts | 2 + src/lib/components/logs/loggingAlert.svelte | 26 ++++ .../components/logs/logsRequest.svelte} | 0 .../components/logs/logsResponse.svelte} | 43 +++--- .../executions/+page.svelte | 13 +- .../executions/sheet.svelte | 6 +- .../executions/table.svelte | 3 +- .../function-[function]/settings/+page.svelte | 2 +- .../settings/updateLogging.svelte | 73 +++++------ .../settings/updateInstallations.svelte | 6 +- .../logs/(components)/LogsRequest.svelte | 124 ------------------ .../logs/(components)/LogsResponse.svelte | 119 ----------------- .../sites/site-[site]/logs/sheet.svelte | 6 +- .../sites/site-[site]/settings/+page.svelte | 2 + .../site-[site]/settings/updateLogging.svelte | 67 ++++++++++ 15 files changed, 169 insertions(+), 323 deletions(-) create mode 100644 src/lib/components/logs/index.ts create mode 100644 src/lib/components/logs/loggingAlert.svelte rename src/{routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsRequest.svelte => lib/components/logs/logsRequest.svelte} (100%) rename src/{routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte => lib/components/logs/logsResponse.svelte} (80%) delete mode 100644 src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte delete mode 100644 src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte create mode 100644 src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte diff --git a/src/lib/components/logs/index.ts b/src/lib/components/logs/index.ts new file mode 100644 index 000000000..588612d36 --- /dev/null +++ b/src/lib/components/logs/index.ts @@ -0,0 +1,2 @@ +export { default as LogsRequest } from './logsRequest.svelte'; +export { default as LogsResponse } from './logsResponse.svelte'; diff --git a/src/lib/components/logs/loggingAlert.svelte b/src/lib/components/logs/loggingAlert.svelte new file mode 100644 index 000000000..fc4018cd2 --- /dev/null +++ b/src/lib/components/logs/loggingAlert.svelte @@ -0,0 +1,26 @@ + + +{#if product === 'site'} + + To view logs and errors, enable them in your + + site settings. + +{:else if product === 'function'} + + To view execution logs and errors, enable them in your + + function settings. + +{/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsRequest.svelte b/src/lib/components/logs/logsRequest.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsRequest.svelte rename to src/lib/components/logs/logsRequest.svelte diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte b/src/lib/components/logs/logsResponse.svelte similarity index 80% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte rename to src/lib/components/logs/logsResponse.svelte index 9a082779d..c75e93b47 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte +++ b/src/lib/components/logs/logsResponse.svelte @@ -14,9 +14,11 @@ Typography } from '@appwrite.io/pink-svelte'; import { onMount } from 'svelte'; + import LoggingAlert from './loggingAlert.svelte'; export let selectedLog: Models.Execution; - + export let product: 'site' | 'function'; + export let logging: boolean; let responseTab: 'logs' | 'errors' | 'headers' | 'body' = 'logs'; onMount(() => { @@ -37,12 +39,14 @@ on:click={() => (responseTab = 'logs')}> Logs - (responseTab = 'errors')}> - Errors - + {#if product !== 'site'} + (responseTab = 'errors')}> + Errors + + {/if} - - (responseTab = 'body')}> - Body - + {#if product !== 'site'} + (responseTab = 'body')}> + Body + + {/if} {#if responseTab === 'logs'} + {#if !logging} + + {/if} {#if selectedLog.logs} {:else} @@ -72,6 +80,9 @@ {/if} {:else if responseTab === 'errors'} + {#if !logging} + + {/if} {#if selectedLog.errors} {:else} @@ -120,8 +131,8 @@ {:else} - Body data is not captured by Appwrite for your user's security and privacy. To + + Body data is not captured by Appwrite for your user's security and privacy. To display body data in the Logs tab, use . - {#if !data.func.logging} -
- - To view execution logs and errors, enable them in your - - Function settings. - -
- {/if} {#if data?.executions?.total} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte index 6657a6fc0..42248ac4a 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte @@ -19,12 +19,12 @@ import { capitalize } from '$lib/helpers/string'; import { Copy } from '$lib/components'; import { logStatusConverter } from './store'; - import LogsResponse from './(components)/LogsResponse.svelte'; - import LogsRequest from './(components)/LogsRequest.svelte'; + import { LogsRequest, LogsResponse } from '$lib/components/logs'; export let open = false; export let selectedLogId: string; export let logs: Models.Execution[]; + export let logging: boolean; function nextLog() { const currentIndex = logs.findIndex((log) => log.$id === selectedLogId); @@ -160,7 +160,7 @@ - + {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte index 0fe896442..3d82af0c9 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte @@ -9,6 +9,7 @@ import { formatTimeDetailed } from '$lib/helpers/timeConversion'; import { logStatusConverter } from './store'; import DualTimeView from '$lib/components/dualTimeView.svelte'; + import { func } from '../store'; export let columns: Column[]; export let logs: Models.ExecutionList; @@ -82,4 +83,4 @@ {/each} - + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte index 0db9d6895..0d1468222 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte @@ -108,7 +108,7 @@ - + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte index 76d235655..a5a92f00a 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte @@ -1,60 +1,49 @@ - + Execution logs - + - When disabled, execution logs and errors will not be shown in the - Executions tab. We recommend disabling them for better performance in production. + When disabled, executions will exclude logs and errors, and will be slightly faster. - + diff --git a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte b/src/routes/(console)/project-[project]/settings/updateInstallations.svelte index aa1df9886..955d3e280 100644 --- a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte +++ b/src/routes/(console)/project-[project]/settings/updateInstallations.svelte @@ -96,7 +96,11 @@ + columns={[ + { id: 'repo', width: { min: 150, max: 500 } }, + { id: 'updated', width: { min: 150, max: 500 } }, + { id: 'actions', width: 60 } + ]}> Repository Updated diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte deleted file mode 100644 index 2c6ff7f40..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - (requestTab = 'parameters')}> - Parameters - - - (requestTab = 'headers')}> - Headers - - - - - {#if requestTab === 'parameters'} - {#if parameters?.length} - - - Key - Value - - {#each parameters as parameter} - - {parameter.name} - {parameter.value} - - {/each} - - {:else} - - No parameters found. - - {/if} - {:else if requestTab === 'headers'} - {#if selectedLog.requestHeaders?.length} - - - Key - Value - - {#each selectedLog.requestHeaders as request} - - {request.name} - {request.value} - - {/each} - - - - - Missing headers? Check the docs to - see the supported data and how to log it. - - - {:else} - - No headers found. - - {/if} - {/if} - diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte deleted file mode 100644 index 94cd2b55e..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - (responseTab = 'logs')}> - Logs - - - (responseTab = 'headers')}> - Headers - - - - - - {#if responseTab === 'logs'} - {#if selectedLog.logs} - - {:else} - - No logs found. - - {/if} - {:else if responseTab === 'errors'} - {#if selectedLog.errors} - - {:else} - - No errors found. - - {/if} - {:else if responseTab === 'headers'} - {#if selectedLog.responseHeaders?.length} - - - Key - Value - - {#each selectedLog.responseHeaders as request} - - {request.name} - {request.value} - - {/each} - - - - - Missing headers? Check the docs to - see the supported data and how to log it. - - - {:else} - - No headers found. - - {/if} - {:else if responseTab === 'body'} - {#if selectedLog.responseBody} - - {:else} - - No parameters found. - - {/if} - {/if} - diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte index d50a824b3..63979f208 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte @@ -14,10 +14,10 @@ Typography } from '@appwrite.io/pink-svelte'; import { timeFromNow } from '$lib/helpers/date'; - import LogsRequest from './(components)/LogsRequest.svelte'; - import LogsResponse from './(components)/LogsResponse.svelte'; import { capitalize } from '$lib/helpers/string'; import { Copy } from '$lib/components'; + import { LogsRequest, LogsResponse } from '$lib/components/logs'; + import { site } from '../store'; export let open = false; export let selectedLogId: string; @@ -127,7 +127,7 @@ - + {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte index 676d1c3a0..78493460f 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte @@ -15,6 +15,7 @@ import { isCloud } from '$lib/system'; import UpdateResourceLimits from './updateResourceLimits.svelte'; import UpdateVariables from '$routes/(console)/project-[project]/updateVariables.svelte'; + import UpdateLogging from './updateLogging.svelte'; export let data; @@ -74,5 +75,6 @@ {/if} + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte new file mode 100644 index 000000000..768437b05 --- /dev/null +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte @@ -0,0 +1,67 @@ + + +
+ + Execution logs + + + + When disabled, request logs will exclude logs and errors, and site responses will be + slightly faster. + + + + + + + + From f1dc8801e42df3fac9510a3271e21d8c3980fb68 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 16:06:35 +0100 Subject: [PATCH 05/12] feat: site logging --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- .../sites/(components)/connectRepoModal.svelte | 1 + .../sites/create-site/manual/+page.svelte | 1 + .../repositories/repository-[repository]/+page.svelte | 1 + .../templates/template-[template]/+page.svelte | 1 + .../deployments/createGitDeploymentModal.svelte | 1 + .../sites/site-[site]/settings/disconnectRepo.svelte | 1 + .../site-[site]/settings/updateBuildSettings.svelte | 1 + .../sites/site-[site]/settings/updateLogging.svelte | 7 ++++--- .../sites/site-[site]/settings/updateName.svelte | 1 + .../sites/site-[site]/settings/updateRepository.svelte | 1 + .../site-[site]/settings/updateResourceLimits.svelte | 1 + .../site-[site]/settings/updateRuntimeSettings.svelte | 1 + .../sites/site-[site]/settings/updateTimeout.svelte | 1 + 15 files changed, 22 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 96d4209a9..b2b630fe2 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "e2e:ui": "playwright test tests/e2e --ui" }, "dependencies": { - "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08b7400", + "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@8db247c", "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5", "@appwrite.io/pink-legacy": "^1.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 33ada7cbf..8f814421d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08b7400 - version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08b7400 + specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@8db247c + version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@8db247c '@appwrite.io/pink-icons': specifier: 0.25.0 version: 0.25.0 @@ -211,8 +211,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@08b7400': - resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08b7400} + '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@8db247c': + resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@8db247c} version: 1.2.1 '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5': @@ -4241,7 +4241,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08b7400': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@8db247c': {} '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5(svelte@4.2.19)': dependencies: diff --git a/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte b/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte index 9ba9a924e..fc15eccc3 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte @@ -62,6 +62,7 @@ site.name, site.framework as Framework, site.enabled, + site.logging || undefined, site.timeout, site.installCommand, site.buildCommand, diff --git a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte index 3578b0598..5bac94204 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte @@ -55,6 +55,7 @@ buildRuntime, undefined, undefined, + undefined, installCommand || undefined, buildCommand || undefined, outputDirectory || undefined, diff --git a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte index 2f10361ac..1cf3266e4 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte @@ -99,6 +99,7 @@ buildRuntime, undefined, undefined, + undefined, installCommand, buildCommand, outputDirectory, diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte index dc869e44d..0223f6f0b 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte @@ -118,6 +118,7 @@ buildRuntime, undefined, undefined, + undefined, framework.installCommand, framework.buildCommand, framework.outputDirectory, 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 6de0fdec1..0a96db614 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 @@ -79,6 +79,7 @@ site.name, site.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte index 5029895a5..64d653c8b 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte @@ -22,6 +22,7 @@ site.name, site.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte index cda3dfc30..1643b3c69 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte @@ -40,6 +40,7 @@ site.name, selectedFramework.key as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, installCommand || undefined, buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte index 768437b05..5f4bae6c4 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte @@ -10,7 +10,7 @@ import { Typography } from '@appwrite.io/pink-svelte'; export let site: Models.Site; - let logging = site.logging; + let logging = site?.logging; async function update() { try { @@ -19,6 +19,7 @@ site.name, site.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, @@ -32,7 +33,7 @@ site.providerSilentMode || undefined, site.providerRootDirectory || undefined ); - await invalidate(Dependencies.FUNCTION); + await invalidate(Dependencies.SITE); addNotification({ type: 'success', message: @@ -61,7 +62,7 @@
- + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte index ab832d922..dc66144f0 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte @@ -23,6 +23,7 @@ siteName, site.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte index a68a3b396..2c32e73db 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte @@ -70,6 +70,7 @@ site.name, site?.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateResourceLimits.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateResourceLimits.svelte index 8f9cc8285..06c7590f4 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateResourceLimits.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateResourceLimits.svelte @@ -24,6 +24,7 @@ site.name, site.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte index 88fde4c1c..c7e495a21 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte @@ -29,6 +29,7 @@ site.name, site?.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte index 70cdf94e7..4eae9d04e 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte @@ -22,6 +22,7 @@ site.name, site?.framework as Framework, site.enabled || undefined, + site.logging || undefined, timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, From 70b73a5c98617cdc171f2f93c266c16f6f1ec4f8 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 16:10:30 +0100 Subject: [PATCH 06/12] fix: tables --- src/lib/helpers/types.ts | 1 + .../domains/domain-[domain]/store.ts | 4 ++-- src/routes/(console)/project-[project]/auth/+page.svelte | 4 ++-- .../auth/user-[user]/identities/+page.svelte | 4 ++-- .../functions/function-[function]/executions/store.ts | 6 +++--- .../(console)/project-[project]/messaging/+page.svelte | 2 +- .../project-[project]/messaging/topics/+page.svelte | 6 +++--- .../(console)/project-[project]/settings/webhooks/store.ts | 2 +- .../sites/site-[site]/deployments/store.ts | 4 ++-- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/lib/helpers/types.ts b/src/lib/helpers/types.ts index 2959c743f..5c95147a1 100644 --- a/src/lib/helpers/types.ts +++ b/src/lib/helpers/types.ts @@ -31,6 +31,7 @@ export type Column = PinkColumn & { array?: boolean; format?: string; exclude?: boolean; + show?: boolean; elements?: string[] | { value: string | number; label: string }[]; }; diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts index 18afb8527..56195529f 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts @@ -9,8 +9,8 @@ export const columns = writable([ { id: 'type', title: 'Type', type: 'string' }, { id: 'value', title: 'Value', type: 'string' }, { id: 'ttl', title: 'TTL', type: 'integer' }, - { id: 'priority', title: 'Priority', type: 'integer', hide: true }, - { id: 'comment', title: 'Comment', type: 'string', hide: true }, + { id: 'priority', title: 'Priority', type: 'integer', show: false }, + { id: 'comment', title: 'Comment', type: 'string', show: false }, { id: '$createdAt', title: 'Created', type: 'datetime' } ]); diff --git a/src/routes/(console)/project-[project]/auth/+page.svelte b/src/routes/(console)/project-[project]/auth/+page.svelte index 30c008614..46b4f8e6b 100644 --- a/src/routes/(console)/project-[project]/auth/+page.svelte +++ b/src/routes/(console)/project-[project]/auth/+page.svelte @@ -37,13 +37,13 @@ { id: 'name', title: 'Name', type: 'string', width: { min: 260 } }, { id: 'identifiers', title: 'Identifiers', type: 'string', width: { min: 140 } }, { id: 'status', title: 'Status', type: 'string', width: { min: 140 } }, - { id: 'labels', title: 'Labels', type: 'string', hide: true, width: { min: 140 } }, + { id: 'labels', title: 'Labels', type: 'string', show: false, width: { min: 140 } }, { id: 'joined', title: 'Joined', type: 'string', width: { min: 140 } }, { id: 'lastActivity', title: 'Last activity', type: 'string', - hide: true, + show: false, width: { min: 140 } } ]); diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte index 4076b3698..e5de459f0 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte +++ b/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte @@ -16,7 +16,7 @@ const columns = writable([ { id: '$id', title: 'Identity ID', type: 'string', width: 200 }, { id: 'provider', title: 'Provider', type: 'string', width: 80 }, - { id: 'providerUid', title: 'Provider UID', type: 'string', hide: true, width: 80 }, + { id: 'providerUid', title: 'Provider UID', type: 'string', show: false, width: 80 }, { id: 'providerEmail', title: 'Email', type: 'string', width: 80 }, { id: 'providerAccessTokenExpiry', @@ -25,7 +25,7 @@ width: 60 }, { id: '$createdAt', title: 'Created', type: 'datetime', width: 80 }, - { id: '$updatedAt', title: 'Updated', type: 'datetime', hide: true, width: 80 } + { id: '$updatedAt', title: 'Updated', type: 'datetime', show: false, width: 80 } ]); diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/store.ts b/src/routes/(console)/project-[project]/functions/function-[function]/executions/store.ts index fa5843428..f75e269c7 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/store.ts +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/store.ts @@ -15,7 +15,7 @@ export const columns = writable([ id: 'trigger', title: 'Trigger', type: 'string', - hide: true, + show: false, width: { min: 90, max: 200 }, array: true, format: 'enum', @@ -29,7 +29,7 @@ export const columns = writable([ id: 'requestMethod', title: 'Method', type: 'string', - hide: true, + show: false, width: { min: 90, max: 200 }, array: true, format: 'enum', @@ -39,7 +39,7 @@ export const columns = writable([ id: 'responseStatusCode', title: 'Status code', type: 'integer', - hide: true, + show: false, width: { min: 100, max: 200 }, format: 'integer', elements: [ diff --git a/src/routes/(console)/project-[project]/messaging/+page.svelte b/src/routes/(console)/project-[project]/messaging/+page.svelte index 7ffd02d04..1a98899e9 100644 --- a/src/routes/(console)/project-[project]/messaging/+page.svelte +++ b/src/routes/(console)/project-[project]/messaging/+page.svelte @@ -45,7 +45,7 @@ id: 'message', title: 'Message', type: 'string', - hide: true, + show: false, filter: false, width: { min: 140 } }, diff --git a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte b/src/routes/(console)/project-[project]/messaging/topics/+page.svelte index 924f13fe4..2a07d4cc8 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte +++ b/src/routes/(console)/project-[project]/messaging/topics/+page.svelte @@ -36,21 +36,21 @@ id: 'emailTotal', title: 'Email Subscribers', type: 'integer', - hide: true, + show: false, width: { min: 140 } }, { id: 'smsTotal', title: 'SMS Subscribers', type: 'integer', - hide: true, + show: false, width: { min: 140 } }, { id: 'pushTotal', title: 'Push Subscribers', type: 'integer', - hide: true, + show: false, width: { min: 140 } }, { diff --git a/src/routes/(console)/project-[project]/settings/webhooks/store.ts b/src/routes/(console)/project-[project]/settings/webhooks/store.ts index 85f0e8159..9f6459210 100644 --- a/src/routes/(console)/project-[project]/settings/webhooks/store.ts +++ b/src/routes/(console)/project-[project]/settings/webhooks/store.ts @@ -2,7 +2,7 @@ import type { Column } from '$lib/helpers/types'; import { writable } from 'svelte/store'; export const columns = writable([ - { id: '$id', title: 'Webhook ID', type: 'string', hide: true, width: 200 }, + { id: '$id', title: 'Webhook ID', type: 'string', show: false, width: 200 }, { id: 'name', title: 'Name', type: 'string', width: { min: 200 } }, { id: 'url', title: 'Post URL', type: 'string', width: { min: 200 } }, { id: 'events', title: 'Events', type: 'string', width: { min: 120 } }, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts index 853decfdf..f4f9622a6 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts @@ -61,7 +61,7 @@ export const columns = writable([ id: 'sourceSize', title: 'Source size', type: 'integer', - hide: true, + show: false, width: { min: 110, max: 190 }, elements: [ { @@ -82,7 +82,7 @@ export const columns = writable([ id: 'buildSize', title: 'Build size', type: 'integer', - hide: true, + show: false, filter: false, width: { min: 90, max: 190 } }, From fad656d461b71f2fd565c717cbc8ef15fb7eaf81 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 16:19:09 +0100 Subject: [PATCH 07/12] fix: tables --- src/lib/components/billing/usageRates.svelte | 2 +- .../components/permissions/permissions.svelte | 2 +- src/lib/components/viewSelector.svelte | 18 ++++++++++-------- src/lib/pages/domains/index.svelte | 2 +- .../members/+page.svelte | 2 +- .../usage/[[invoice]]/ProjectBreakdown.svelte | 6 +++--- .../functions/function-[function]/store.ts | 2 +- .../message-[message]/updateTargets.svelte | 2 +- .../sites/(components)/logs.svelte | 1 - .../sites/create-site/deploying/+page.svelte | 1 - .../deployment-[deployment]/+page.svelte | 7 +------ 11 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/lib/components/billing/usageRates.svelte b/src/lib/components/billing/usageRates.svelte index e835284c2..73a170622 100644 --- a/src/lib/components/billing/usageRates.svelte +++ b/src/lib/components/billing/usageRates.svelte @@ -63,7 +63,7 @@ {/if} Resource diff --git a/src/lib/components/permissions/permissions.svelte b/src/lib/components/permissions/permissions.svelte index 1118e4173..4b27490a4 100644 --- a/src/lib/components/permissions/permissions.svelte +++ b/src/lib/components/permissions/permissions.svelte @@ -128,7 +128,7 @@ const columns: Column[] = [ { id: 'role', width: { min: 100 } }, - { id: 'create', width: { min: 100 }, hide: !withCreate }, + { id: 'create', width: { min: 100 }, show: withCreate }, { id: 'read', width: { min: 100 } }, { id: 'update', width: { min: 100 } }, { id: 'delete', width: { min: 100 } }, diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index efb86ce67..01f594147 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -29,7 +29,7 @@ const prefs = preferences.getCustomCollectionColumns($page.params.collection); columns.set( $columns.map((column) => { - column.show = prefs?.includes(column.id) ?? false; + column.show = prefs?.includes(column.id) ?? true; return column; }) ); @@ -40,7 +40,7 @@ if (prefs?.columns) { columns.set( $columns.map((column) => { - column.show = prefs.columns?.includes(column.id) ?? false; + column.show = prefs.columns?.includes(column.id) ?? true; return column; }) ); @@ -75,11 +75,13 @@ }); } - $: selectedColumnsNumber = $columns.reduce((acc, column) => { - if (column.show === true) return acc; + $: selectedColumnsNumber = $columns + .filter((c) => !c?.exclude) + .reduce((acc, column) => { + if (column.show === true) return acc; - return ++acc; - }, 0); + return ++acc; + }, 0); {#if !hideColumns && view === View.Table} @@ -95,13 +97,13 @@ - {#each $columns as column} + {#each $columns.filter((c) => !c?.exclude) as column} {#if !column?.exclude} (column.show = !column.show)} - checked={!column.show} + checked={column.show} disabled={allowNoColumns ? false : selectedColumnsNumber <= 1 && column.show !== true} /> diff --git a/src/lib/pages/domains/index.svelte b/src/lib/pages/domains/index.svelte index 857f60ed8..8b4002e2d 100644 --- a/src/lib/pages/domains/index.svelte +++ b/src/lib/pages/domains/index.svelte @@ -78,7 +78,7 @@ { id: 'name' }, { id: 'verification' }, { id: 'certificate' }, - { id: 'action', width: 20, hide: !$canWriteRules } + { id: 'action', width: 20, show: $canWriteRules } ]}> Name diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte index 0a31d8459..d0ae34260 100644 --- a/src/routes/(console)/organization-[organization]/members/+page.svelte +++ b/src/routes/(console)/organization-[organization]/members/+page.svelte @@ -83,7 +83,7 @@ { id: 'email' }, { id: 'roles' }, { id: 'mfa' }, - { id: 'actions', hide: !$isOwner, width: 40 } + { id: 'actions', show: $isOwner, width: 40 } ]}> Name diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte index 2c739db7c..a0babca83 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte @@ -107,9 +107,9 @@ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/store.ts b/src/routes/(console)/project-[project]/functions/function-[function]/store.ts index 6ffa8f2cb..5cd317448 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/store.ts +++ b/src/routes/(console)/project-[project]/functions/function-[function]/store.ts @@ -82,7 +82,7 @@ export const columns = writable([ id: 'buildSize', title: 'Build size', type: 'integer', - hide: true, + show: false, filter: false, width: 80 }, diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte index 02456194a..4e05a411a 100644 --- a/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte +++ b/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte @@ -163,7 +163,7 @@ let:root columns={[ { id: 'target' }, - { id: 'identifier', hide: !recipientsAvailable }, + { id: 'identifier', show: recipientsAvailable }, { id: 'actions', width: 40 } ]}> diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte index e5c79cd8b..60bcb040a 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte @@ -22,7 +22,6 @@ import { Badge, Layout, Logs, Typography } from '@appwrite.io/pink-svelte'; import LogsTimer from './logsTimer.svelte'; - export let site: Models.Site; export let deployment: Models.Deployment; export let hideTitle = false; export let hideScrollButtons = false; diff --git a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte index edca6d2d0..8dee1b4d9 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte @@ -59,7 +59,6 @@
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte index cd19241e2..e06295683 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte @@ -74,12 +74,7 @@ open badgeType={badgeTypeDeployment(data.deployment.status)} hideDivider> - + From fc8b9c13cf2b918bc80549490e5ef08abd85d5c5 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 17:15:55 +0100 Subject: [PATCH 08/12] chore: revert column changes --- src/lib/components/billing/usageRates.svelte | 2 +- .../components/permissions/permissions.svelte | 2 +- src/lib/components/viewSelector.svelte | 18 ++++++++---------- src/lib/pages/domains/index.svelte | 2 +- .../members/+page.svelte | 2 +- .../usage/[[invoice]]/ProjectBreakdown.svelte | 6 +++--- .../functions/function-[function]/store.ts | 2 +- .../message-[message]/updateTargets.svelte | 2 +- .../sites/(components)/logs.svelte | 1 + .../sites/create-site/deploying/+page.svelte | 1 + .../deployment-[deployment]/+page.svelte | 7 ++++++- 11 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/lib/components/billing/usageRates.svelte b/src/lib/components/billing/usageRates.svelte index 73a170622..e835284c2 100644 --- a/src/lib/components/billing/usageRates.svelte +++ b/src/lib/components/billing/usageRates.svelte @@ -63,7 +63,7 @@ {/if} Resource diff --git a/src/lib/components/permissions/permissions.svelte b/src/lib/components/permissions/permissions.svelte index 4b27490a4..1118e4173 100644 --- a/src/lib/components/permissions/permissions.svelte +++ b/src/lib/components/permissions/permissions.svelte @@ -128,7 +128,7 @@ const columns: Column[] = [ { id: 'role', width: { min: 100 } }, - { id: 'create', width: { min: 100 }, show: withCreate }, + { id: 'create', width: { min: 100 }, hide: !withCreate }, { id: 'read', width: { min: 100 } }, { id: 'update', width: { min: 100 } }, { id: 'delete', width: { min: 100 } }, diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index 01f594147..efb86ce67 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -29,7 +29,7 @@ const prefs = preferences.getCustomCollectionColumns($page.params.collection); columns.set( $columns.map((column) => { - column.show = prefs?.includes(column.id) ?? true; + column.show = prefs?.includes(column.id) ?? false; return column; }) ); @@ -40,7 +40,7 @@ if (prefs?.columns) { columns.set( $columns.map((column) => { - column.show = prefs.columns?.includes(column.id) ?? true; + column.show = prefs.columns?.includes(column.id) ?? false; return column; }) ); @@ -75,13 +75,11 @@ }); } - $: selectedColumnsNumber = $columns - .filter((c) => !c?.exclude) - .reduce((acc, column) => { - if (column.show === true) return acc; + $: selectedColumnsNumber = $columns.reduce((acc, column) => { + if (column.show === true) return acc; - return ++acc; - }, 0); + return ++acc; + }, 0); {#if !hideColumns && view === View.Table} @@ -97,13 +95,13 @@ - {#each $columns.filter((c) => !c?.exclude) as column} + {#each $columns as column} {#if !column?.exclude} (column.show = !column.show)} - checked={column.show} + checked={!column.show} disabled={allowNoColumns ? false : selectedColumnsNumber <= 1 && column.show !== true} /> diff --git a/src/lib/pages/domains/index.svelte b/src/lib/pages/domains/index.svelte index 8b4002e2d..857f60ed8 100644 --- a/src/lib/pages/domains/index.svelte +++ b/src/lib/pages/domains/index.svelte @@ -78,7 +78,7 @@ { id: 'name' }, { id: 'verification' }, { id: 'certificate' }, - { id: 'action', width: 20, show: $canWriteRules } + { id: 'action', width: 20, hide: !$canWriteRules } ]}> Name diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte index d0ae34260..0a31d8459 100644 --- a/src/routes/(console)/organization-[organization]/members/+page.svelte +++ b/src/routes/(console)/organization-[organization]/members/+page.svelte @@ -83,7 +83,7 @@ { id: 'email' }, { id: 'roles' }, { id: 'mfa' }, - { id: 'actions', show: $isOwner, width: 40 } + { id: 'actions', hide: !$isOwner, width: 40 } ]}> Name diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte index a0babca83..2c739db7c 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte @@ -107,9 +107,9 @@ diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/store.ts b/src/routes/(console)/project-[project]/functions/function-[function]/store.ts index 5cd317448..6ffa8f2cb 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/store.ts +++ b/src/routes/(console)/project-[project]/functions/function-[function]/store.ts @@ -82,7 +82,7 @@ export const columns = writable([ id: 'buildSize', title: 'Build size', type: 'integer', - show: false, + hide: true, filter: false, width: 80 }, diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte index 4e05a411a..02456194a 100644 --- a/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte +++ b/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte @@ -163,7 +163,7 @@ let:root columns={[ { id: 'target' }, - { id: 'identifier', show: recipientsAvailable }, + { id: 'identifier', hide: !recipientsAvailable }, { id: 'actions', width: 40 } ]}> diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte index 60bcb040a..e5c79cd8b 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte @@ -22,6 +22,7 @@ import { Badge, Layout, Logs, Typography } from '@appwrite.io/pink-svelte'; import LogsTimer from './logsTimer.svelte'; + export let site: Models.Site; export let deployment: Models.Deployment; export let hideTitle = false; export let hideScrollButtons = false; diff --git a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte index 8dee1b4d9..edca6d2d0 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte @@ -59,6 +59,7 @@
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte index e06295683..cd19241e2 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte @@ -74,7 +74,12 @@ open badgeType={badgeTypeDeployment(data.deployment.status)} hideDivider> - + From 77d79acc467a21dc9c720d8e5aa820fb88987639 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 17:17:12 +0100 Subject: [PATCH 09/12] chore: revert column changes --- src/lib/components/viewSelector.svelte | 14 +++++++------- src/lib/helpers/types.ts | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index efb86ce67..75053d816 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -29,7 +29,7 @@ const prefs = preferences.getCustomCollectionColumns($page.params.collection); columns.set( $columns.map((column) => { - column.show = prefs?.includes(column.id) ?? false; + column.hide = prefs?.includes(column.id) ?? false; return column; }) ); @@ -40,7 +40,7 @@ if (prefs?.columns) { columns.set( $columns.map((column) => { - column.show = prefs.columns?.includes(column.id) ?? false; + column.hide = prefs.columns?.includes(column.id) ?? false; return column; }) ); @@ -48,7 +48,7 @@ } columns.subscribe((ctx) => { - const columns = ctx.filter((n) => n.show === true).map((n) => n.id); + const columns = ctx.filter((n) => n.hide === true).map((n) => n.id); if (isCustomCollection) { preferences.setCustomCollectionColumns(columns); @@ -76,7 +76,7 @@ } $: selectedColumnsNumber = $columns.reduce((acc, column) => { - if (column.show === true) return acc; + if (column.hide === true) return acc; return ++acc; }, 0); @@ -100,11 +100,11 @@ (column.show = !column.show)} - checked={!column.show} + on:change={() => (column.hide = !column.hide)} + checked={!column.hide} disabled={allowNoColumns ? false - : selectedColumnsNumber <= 1 && column.show !== true} /> + : selectedColumnsNumber <= 1 && column.hide !== true} /> {/if} {/each} diff --git a/src/lib/helpers/types.ts b/src/lib/helpers/types.ts index 5c95147a1..2959c743f 100644 --- a/src/lib/helpers/types.ts +++ b/src/lib/helpers/types.ts @@ -31,7 +31,6 @@ export type Column = PinkColumn & { array?: boolean; format?: string; exclude?: boolean; - show?: boolean; elements?: string[] | { value: string | number; label: string }[]; }; From 1eb7bcd5d490ac2e952e68d3ff8d0159ebd27c92 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 17:20:02 +0100 Subject: [PATCH 10/12] Revert "fix: tables" This reverts commit 70b73a5c98617cdc171f2f93c266c16f6f1ec4f8. --- .../domains/domain-[domain]/store.ts | 4 ++-- src/routes/(console)/project-[project]/auth/+page.svelte | 4 ++-- .../auth/user-[user]/identities/+page.svelte | 4 ++-- .../functions/function-[function]/executions/store.ts | 6 +++--- .../(console)/project-[project]/messaging/+page.svelte | 2 +- .../project-[project]/messaging/topics/+page.svelte | 6 +++--- .../(console)/project-[project]/settings/webhooks/store.ts | 2 +- .../sites/site-[site]/deployments/store.ts | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts index 56195529f..18afb8527 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts @@ -9,8 +9,8 @@ export const columns = writable([ { id: 'type', title: 'Type', type: 'string' }, { id: 'value', title: 'Value', type: 'string' }, { id: 'ttl', title: 'TTL', type: 'integer' }, - { id: 'priority', title: 'Priority', type: 'integer', show: false }, - { id: 'comment', title: 'Comment', type: 'string', show: false }, + { id: 'priority', title: 'Priority', type: 'integer', hide: true }, + { id: 'comment', title: 'Comment', type: 'string', hide: true }, { id: '$createdAt', title: 'Created', type: 'datetime' } ]); diff --git a/src/routes/(console)/project-[project]/auth/+page.svelte b/src/routes/(console)/project-[project]/auth/+page.svelte index 46b4f8e6b..30c008614 100644 --- a/src/routes/(console)/project-[project]/auth/+page.svelte +++ b/src/routes/(console)/project-[project]/auth/+page.svelte @@ -37,13 +37,13 @@ { id: 'name', title: 'Name', type: 'string', width: { min: 260 } }, { id: 'identifiers', title: 'Identifiers', type: 'string', width: { min: 140 } }, { id: 'status', title: 'Status', type: 'string', width: { min: 140 } }, - { id: 'labels', title: 'Labels', type: 'string', show: false, width: { min: 140 } }, + { id: 'labels', title: 'Labels', type: 'string', hide: true, width: { min: 140 } }, { id: 'joined', title: 'Joined', type: 'string', width: { min: 140 } }, { id: 'lastActivity', title: 'Last activity', type: 'string', - show: false, + hide: true, width: { min: 140 } } ]); diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte index e5de459f0..4076b3698 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte +++ b/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte @@ -16,7 +16,7 @@ const columns = writable([ { id: '$id', title: 'Identity ID', type: 'string', width: 200 }, { id: 'provider', title: 'Provider', type: 'string', width: 80 }, - { id: 'providerUid', title: 'Provider UID', type: 'string', show: false, width: 80 }, + { id: 'providerUid', title: 'Provider UID', type: 'string', hide: true, width: 80 }, { id: 'providerEmail', title: 'Email', type: 'string', width: 80 }, { id: 'providerAccessTokenExpiry', @@ -25,7 +25,7 @@ width: 60 }, { id: '$createdAt', title: 'Created', type: 'datetime', width: 80 }, - { id: '$updatedAt', title: 'Updated', type: 'datetime', show: false, width: 80 } + { id: '$updatedAt', title: 'Updated', type: 'datetime', hide: true, width: 80 } ]); diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/store.ts b/src/routes/(console)/project-[project]/functions/function-[function]/executions/store.ts index f75e269c7..fa5843428 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/store.ts +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/store.ts @@ -15,7 +15,7 @@ export const columns = writable([ id: 'trigger', title: 'Trigger', type: 'string', - show: false, + hide: true, width: { min: 90, max: 200 }, array: true, format: 'enum', @@ -29,7 +29,7 @@ export const columns = writable([ id: 'requestMethod', title: 'Method', type: 'string', - show: false, + hide: true, width: { min: 90, max: 200 }, array: true, format: 'enum', @@ -39,7 +39,7 @@ export const columns = writable([ id: 'responseStatusCode', title: 'Status code', type: 'integer', - show: false, + hide: true, width: { min: 100, max: 200 }, format: 'integer', elements: [ diff --git a/src/routes/(console)/project-[project]/messaging/+page.svelte b/src/routes/(console)/project-[project]/messaging/+page.svelte index 1a98899e9..7ffd02d04 100644 --- a/src/routes/(console)/project-[project]/messaging/+page.svelte +++ b/src/routes/(console)/project-[project]/messaging/+page.svelte @@ -45,7 +45,7 @@ id: 'message', title: 'Message', type: 'string', - show: false, + hide: true, filter: false, width: { min: 140 } }, diff --git a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte b/src/routes/(console)/project-[project]/messaging/topics/+page.svelte index 2a07d4cc8..924f13fe4 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte +++ b/src/routes/(console)/project-[project]/messaging/topics/+page.svelte @@ -36,21 +36,21 @@ id: 'emailTotal', title: 'Email Subscribers', type: 'integer', - show: false, + hide: true, width: { min: 140 } }, { id: 'smsTotal', title: 'SMS Subscribers', type: 'integer', - show: false, + hide: true, width: { min: 140 } }, { id: 'pushTotal', title: 'Push Subscribers', type: 'integer', - show: false, + hide: true, width: { min: 140 } }, { diff --git a/src/routes/(console)/project-[project]/settings/webhooks/store.ts b/src/routes/(console)/project-[project]/settings/webhooks/store.ts index 9f6459210..85f0e8159 100644 --- a/src/routes/(console)/project-[project]/settings/webhooks/store.ts +++ b/src/routes/(console)/project-[project]/settings/webhooks/store.ts @@ -2,7 +2,7 @@ import type { Column } from '$lib/helpers/types'; import { writable } from 'svelte/store'; export const columns = writable([ - { id: '$id', title: 'Webhook ID', type: 'string', show: false, width: 200 }, + { id: '$id', title: 'Webhook ID', type: 'string', hide: true, width: 200 }, { id: 'name', title: 'Name', type: 'string', width: { min: 200 } }, { id: 'url', title: 'Post URL', type: 'string', width: { min: 200 } }, { id: 'events', title: 'Events', type: 'string', width: { min: 120 } }, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts index f4f9622a6..853decfdf 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts @@ -61,7 +61,7 @@ export const columns = writable([ id: 'sourceSize', title: 'Source size', type: 'integer', - show: false, + hide: true, width: { min: 110, max: 190 }, elements: [ { @@ -82,7 +82,7 @@ export const columns = writable([ id: 'buildSize', title: 'Build size', type: 'integer', - show: false, + hide: true, filter: false, width: { min: 90, max: 190 } }, From 106fce881c5d0c171887c4628120b05f6c1fa0b7 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 17:24:00 +0100 Subject: [PATCH 11/12] feat: fix tables? --- package.json | 2 +- pnpm-lock.yaml | 24 +++++------ src/lib/stores/preferences.ts | 75 ++++++++++++++++------------------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index b2b630fe2..f74a73efc 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@e79fca8", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84", "@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 8f814421d..3f6bc6d6a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,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@e79fca8 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@e79fca8(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -215,14 +215,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@8db247c} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@203ff849e6d6a66529bf690af2e97cade99ef488': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@203ff849e6d6a66529bf690af2e97cade99ef488} 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@e79fca86741618055e808f8977282677d2fbc8e9': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@e79fca86741618055e808f8977282677d2fbc8e9} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,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@e79fca8': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@e79fca8} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4243,11 +4243,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@8db247c': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@203ff849e6d6a66529bf690af2e97cade99ef488(svelte@4.2.19)': dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@e79fca86741618055e808f8977282677d2fbc8e9(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4260,9 +4260,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@e79fca8(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@e79fca86741618055e808f8977282677d2fbc8e9(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@203ff849e6d6a66529bf690af2e97cade99ef488(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.3(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.3(svelte@4.2.19) diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts index d75cfcad1..a3737f51e 100644 --- a/src/lib/stores/preferences.ts +++ b/src/lib/stores/preferences.ts @@ -18,14 +18,12 @@ type TeamPreferences = { }; type PreferencesStore = { - [key: string]: { - [key: string]: Preferences; - collections?: { - [key: string]: Preferences['columns']; - }; - displayNames?: { - [key: string]: TeamPreferences['names']; - }; + [key: string]: Preferences; + collections?: { + [key: string]: Preferences['columns']; + }; + displayNames?: { + [key: string]: TeamPreferences['names']; }; } & { hideAiDisclaimer?: boolean }; @@ -51,7 +49,7 @@ function createPreferences() { get: (route?: Page['route']): Preferences => { const parsedRoute = route ?? get(page).route; return ( - preferences[sdk.forProject.client.config.project]?.[parsedRoute.id] ?? { + preferences?.[parsedRoute.id] ?? { limit: null, view: null, columns: null @@ -60,60 +58,58 @@ function createPreferences() { }, getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => { - return ( - preferences[sdk.forProject.client.config.project]?.collections?.[collectionId] ?? [] - ); + return preferences?.collections?.[collectionId] ?? []; }, setLimit: (limit: Preferences['limit']) => update((n) => { const path = get(page).route.id; - const project = sdk.forProject.client.config.project; - if (!n[project]?.[path]) { - n[project] ??= {}; - n[project][path] ??= {}; + + if (!n?.[path]) { + n ??= {}; + n[path] ??= {}; } - n[project][path].limit = limit; + n[path].limit = limit; return n; }), setView: (view: Preferences['view']) => update((n) => { const path = get(page).route.id; - const project = sdk.forProject.client.config.project; - if (!n[project]?.[path]) { - n[project] ??= {}; - n[project][path] ??= {}; + + if (!n?.[path]) { + n ??= {}; + n[path] ??= {}; } - n[project][path].view = view; + n[path].view = view; return n; }), setColumns: (columns: Preferences['columns']) => update((n) => { const path = get(page).route.id; - const project = sdk.forProject.client.config.project; - if (!n[project]?.[path]) { - n[project] ??= {}; - n[project][path] ??= {}; + + if (!n?.[path]) { + n ??= {}; + n[path] ??= {}; } - n[project][path].columns = columns; + n[path].columns = columns; return n; }), setCustomCollectionColumns: (columns: Preferences['columns']) => update((n) => { const current = get(page); - const project = sdk.forProject.client.config.project; + const collection = current.params.collection; - if (!n[project]?.collections?.[collection]) { - n[project] ??= {}; - n[project].collections ??= {}; + if (!n?.collections?.[collection]) { + n ??= {}; + n.collections ??= {}; } - n[project].collections[collection] = columns; + n.collections[collection] = columns; return n; }), @@ -127,22 +123,19 @@ function createPreferences() { return teamPrefs; }, getDisplayNames: () => { - const id = get(organization)?.$id; - if (!id) return {}; - - return preferences?.[id]?.displayNames ?? {}; + return preferences?.displayNames ?? {}; }, setDisplayNames: async (collectionId: string, names: TeamPreferences['names']) => { const id = get(organization).$id; let teamPrefs: Models.Preferences; update((n) => { - if (!n[id]?.displayNames) { - n[id] ??= {}; - n[id].displayNames ??= {}; + if (!n?.displayNames) { + n ??= {}; + n.displayNames ??= {}; } - teamPrefs = n[id]; - n[id].displayNames[collectionId] = names; + teamPrefs = n; + n.displayNames[collectionId] = names; return n; }); From 68b2af42d309cdbcd72ac405798c77bc6847659f Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 17:37:27 +0100 Subject: [PATCH 12/12] clean linter --- .../collection-[collection]/table.svelte | 2 +- .../project-[project]/sites/(components)/logs.svelte | 1 - .../sites/create-site/deploying/+page.svelte | 1 - .../deployments/deployment-[deployment]/+page.svelte | 7 +------ 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte index 5cc61575d..45235332a 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -46,7 +46,7 @@ function updateMaxWidth() { const tableCells = Array.from(document.querySelectorAll('.less-width-truncated')); - const visibleColumnsCount = $columns.filter((col) => col.show).length; + const visibleColumnsCount = $columns.filter((col) => !col.hide).length; const newMaxWidth = Math.max(50 - (visibleColumnsCount - 1) * 5, 25); tableCells.forEach((cell) => { diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte index e5c79cd8b..60bcb040a 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte @@ -22,7 +22,6 @@ import { Badge, Layout, Logs, Typography } from '@appwrite.io/pink-svelte'; import LogsTimer from './logsTimer.svelte'; - export let site: Models.Site; export let deployment: Models.Deployment; export let hideTitle = false; export let hideScrollButtons = false; diff --git a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte index edca6d2d0..8dee1b4d9 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte @@ -59,7 +59,6 @@
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte index cd19241e2..e06295683 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte @@ -74,12 +74,7 @@ open badgeType={badgeTypeDeployment(data.deployment.status)} hideDivider> - +