From 6f8de5307b8f3591e9d6050951bc30125e8977c3 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Mon, 3 Mar 2025 10:21:28 +0100
Subject: [PATCH] fix: add overwrite to getView so we can force a view when
 preferences are missing

---
 src/lib/components/git/connectGit.svelte              | 4 ++--
 src/lib/helpers/load.ts                               | 4 ++--
 src/routes/(console)/project-[project]/sites/+page.ts | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/git/connectGit.svelte b/src/lib/components/git/connectGit.svelte
index 66e613267..0d04da858 100644
--- a/src/lib/components/git/connectGit.svelte
+++ b/src/lib/components/git/connectGit.svelte
@@ -45,8 +45,8 @@
         title="No installation was added to the project yet"
         description="Add an installation to connect repositories">
         <svelte:fragment slot="actions">
-            <Button size="m" secondary href={connectGitHub().toString()} disabled={!isVcsEnabled}>
-                <Icon slot="start" icon={IconGithub} size="m" />
+            <Button secondary href={connectGitHub().toString()} disabled={!isVcsEnabled}>
+                <Icon slot="start" icon={IconGithub} />
                 Connect to GitHub
             </Button>
         </svelte:fragment>
diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts
index 88cd98c38..dc0cc151d 100644
--- a/src/lib/helpers/load.ts
+++ b/src/lib/helpers/load.ts
@@ -18,10 +18,10 @@ export enum View {
     Grid = 'grid'
 }
 
-export function getView(url: URL, route: Page['route'], fallback: View): View {
+export function getView(url: URL, route: Page['route'], fallback: View, overwrite?: View): View {
     return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid
         ? View.Grid
-        : (View.Table ?? fallback);
+        : (overwrite ?? View.Table ?? fallback);
 }
 
 export function getColumns(route: Page['route'], fallback: string[]): string[] {
diff --git a/src/routes/(console)/project-[project]/sites/+page.ts b/src/routes/(console)/project-[project]/sites/+page.ts
index e0c637f43..1525d8c9e 100644
--- a/src/routes/(console)/project-[project]/sites/+page.ts
+++ b/src/routes/(console)/project-[project]/sites/+page.ts
@@ -10,7 +10,7 @@ export const load = async ({ url, depends, route }) => {
     const search = getSearch(url);
     const limit = getLimit(url, route, CARD_LIMIT);
     const offset = pageToOffset(page, limit);
-    const view = getView(url, route, View.Grid);
+    const view = getView(url, route, View.Grid, View.Grid);
 
     const siteList = await sdk.forProject.sites.list(
         [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],