From fc8b9c13cf2b918bc80549490e5ef08abd85d5c5 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 17:15:55 +0100 Subject: [PATCH] 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> - +