From fad656d461b71f2fd565c717cbc8ef15fb7eaf81 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Tue, 25 Mar 2025 16:19:09 +0100
Subject: [PATCH] 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 @@
         </Typography.Text>
     {/if}
     <Table.Root
-        columns={[{ id: 'resource' }, { id: 'limit' }, { id: 'rate', hide: isFree }]}
+        columns={[{ id: 'resource' }, { id: 'limit' }, { id: 'rate', show: !isFree }]}
         let:root>
         <svelte:fragment slot="header" let:root>
             <Table.Header.Cell column="resource" {root}>Resource</Table.Header.Cell>
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);
 </script>
 
 {#if !hideColumns && view === View.Table}
@@ -95,13 +97,13 @@
             <svelte:fragment slot="tooltip">
                 <ActionMenu.Root>
                     <Layout.Stack>
-                        {#each $columns as column}
+                        {#each $columns.filter((c) => !c?.exclude) as column}
                             {#if !column?.exclude}
                                 <InputCheckbox
                                     id={column.id}
                                     label={column.title}
                                     on:change={() => (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 }
         ]}>
         <svelte:fragment slot="header" let:root>
             <Table.Header.Cell column="name" {root}>Name</Table.Header.Cell>
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 }
         ]}>
         <svelte:fragment slot="header" let:root>
             <Table.Header.Cell column="name" {root}>Name</Table.Header.Cell>
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 @@
         <Table.Root
             columns={[
                 { id: 'project' },
-                { id: 'reads', hide: !databaseOperationMetric },
-                { id: 'writes', hide: !databaseOperationMetric },
-                { id: 'metric', hide: !!databaseOperationMetric },
+                { id: 'reads', show: !!databaseOperationMetric },
+                { id: 'writes', show: !!databaseOperationMetric },
+                { id: 'metric', show: !databaseOperationMetric },
                 { id: 'costs' }
             ]}
             let:root>
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<Column[]>([
         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 }
                         ]}>
                         <svelte:fragment slot="header" let:root>
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 @@
         <Fieldset legend="Deploy">
             <Logs
                 bind:deployment={data.deployment}
-                bind:site={data.site}
                 hideScrollButtons
                 height="calc(100dvh - 430px)"
                 emptyCopy="No logs available yet..." />
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>
-            <Logs
-                site={data.site}
-                deployment={data.deployment}
-                hideTitle
-                hideScrollButtons
-                fullHeight />
+            <Logs deployment={data.deployment} hideTitle hideScrollButtons fullHeight />
             <svelte:fragment slot="end">
                 <LogsTimer status={data.deployment.status} deployment={data.deployment} />
             </svelte:fragment>