From 34aa86ca80c5964b49e3eaad8ed875fef98f7bb0 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Mon, 28 Aug 2023 16:50:24 +0200
Subject: [PATCH] fix: consolevariabels check

---
 src/lib/stores/variables.ts                              | 2 +-
 .../functions/function-[function]/+page.ts               | 9 +++++++--
 .../settings/updateConfiguration.svelte                  | 2 ++
 src/routes/console/project-[project]/settings/+page.ts   | 9 +++++++--
 .../settings/updateInstallations.svelte                  | 2 ++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/lib/stores/variables.ts b/src/lib/stores/variables.ts
index 6a3430611..887820b6b 100644
--- a/src/lib/stores/variables.ts
+++ b/src/lib/stores/variables.ts
@@ -4,5 +4,5 @@ import type { Models } from '@appwrite.io/console';
 
 export const consoleVariables = derived(
     page,
-    ($page) => $page.data.account as Models.ConsoleVariables
+    ($page) => $page.data.consoleVariables as Models.ConsoleVariables
 );
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/+page.ts
index 7d17d10f9..6e43f6235 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+page.ts
+++ b/src/routes/console/project-[project]/functions/function-[function]/+page.ts
@@ -1,8 +1,9 @@
-import { Query } from '@appwrite.io/console';
+import { Query, type Models } from '@appwrite.io/console';
 import { sdk } from '$lib/stores/sdk';
 import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
+import { isSelfHosted } from '$lib/system';
 
 export const load: PageLoad = async ({ params, depends, url, route, parent }) => {
     await parent();
@@ -10,6 +11,10 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
     const page = getPage(url);
     const limit = getLimit(url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
+    let consoleVariables: Models.ConsoleVariables = null;
+    if (isSelfHosted) {
+        consoleVariables = await sdk.forConsole.console.variables();
+    }
 
     return {
         offset,
@@ -19,6 +24,6 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
             Query.offset(offset),
             Query.orderDesc('')
         ]),
-        consoleVariables: sdk.forConsole.console.variables()
+        consoleVariables
     };
 };
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
index bf7f2c690..489dc8ae3 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
@@ -174,6 +174,8 @@
         selectedDir !== $func?.providerRootDirectory;
 
     $: isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
+
+    $: console.log($consoleVariables);
 </script>
 
 <Form onSubmit={updateConfiguration}>
diff --git a/src/routes/console/project-[project]/settings/+page.ts b/src/routes/console/project-[project]/settings/+page.ts
index 902837474..e57a62558 100644
--- a/src/routes/console/project-[project]/settings/+page.ts
+++ b/src/routes/console/project-[project]/settings/+page.ts
@@ -1,13 +1,18 @@
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
-import { Query } from '@appwrite.io/console';
+import { Query, type Models } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
+import { isSelfHosted } from '$lib/system';
 
 export const load: PageLoad = async ({ depends, url }) => {
     depends(Dependencies.PROJECT_VARIABLES);
     depends(Dependencies.PROJECT_INSTALLATIONS);
     const limit = PAGE_LIMIT;
     const offset = Number(url.searchParams.get('offset') ?? 0);
+    let consoleVariables: Models.ConsoleVariables = null;
+    if (isSelfHosted) {
+        consoleVariables = await sdk.forConsole.console.variables();
+    }
 
     return {
         limit,
@@ -17,6 +22,6 @@ export const load: PageLoad = async ({ depends, url }) => {
             Query.limit(limit),
             Query.offset(offset)
         ]),
-        consoleVariables: sdk.forConsole.console.variables()
+        consoleVariables
     };
 };
diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte
index a31cf72e2..53ee83e74 100644
--- a/src/routes/console/project-[project]/settings/updateInstallations.svelte
+++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte
@@ -78,6 +78,8 @@
     }
 
     $: isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
+
+    $: console.log($consoleVariables, isVcsEnabled);
 </script>
 
 <CardGrid>