Skip to content

Commit

Permalink
Simplify usage of console variables
Browse files Browse the repository at this point in the history
await the data during load so it's available downstream without needing
to await.
  • Loading branch information
stnguyen90 committed Sep 13, 2023
1 parent ba877ef commit a6d1ca5
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 26 deletions.
11 changes: 1 addition & 10 deletions src/lib/pages/domains/wizard/step1.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,12 @@
import { sdk } from '$lib/stores/sdk';
import { isSelfHosted } from '$lib/system';
import { func } from '$routes/console/project-[project]/functions/function-[function]/store';
import { onMount } from 'svelte';
import { ProxyTypes } from '../index.svelte';
import { domain, typeStore } from './store';
import { consoleVariables } from '$routes/console/store';
let error = null;
let isDomainsEnabled = false;
onMount(async () => {
if (!isSelfHosted) {
return;
}
isDomainsEnabled = (await $consoleVariables)?._APP_DOMAIN_ENABLED === true;
});
const isDomainsEnabled = $consoleVariables?._APP_DOMAIN_ENABLED === true;
async function createDomain() {
try {
Expand Down
5 changes: 1 addition & 4 deletions src/routes/console/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@
.join(' ');
}
let isAssistantEnabled = false;
onMount(async () => {
isAssistantEnabled = (await $consoleVariables)?._APP_ASSISTANT_ENABLED === true;
});
const isAssistantEnabled = $consoleVariables?._APP_ASSISTANT_ENABLED === true;
$: isOnSettingsLayout = $project?.$id
? $page.url.pathname.includes(`project-${$project.$id}/settings`)
Expand Down
2 changes: 1 addition & 1 deletion src/routes/console/+layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const load: LayoutLoad = async ({ fetch, depends }) => {
const data = await response.json();

return {
consoleVariables: sdk.forConsole.console.variables(),
consoleVariables: await sdk.forConsole.console.variables(),
version: data?.version ?? null
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@
import InputSelectSearch from '$lib/elements/forms/inputSelectSearch.svelte';
import { installations } from '$lib/wizards/functions/store';
import { isSelfHosted } from '$lib/system';
import { consoleVariables, isVcsEnabled } from '$routes/console/store';
import { consoleVariables } from '$routes/console/store';
const functionId = $page.params.function;
const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
let entrypoint: string;
let commands: string;
Expand Down Expand Up @@ -271,7 +272,7 @@
</div>
</Box>
{:else}
{#if isSelfHosted && !isVcsEnabled($consoleVariables)}
{#if isSelfHosted && !isVcsEnabled}
<Alert class="common-section" type="info">
<svelte:fragment slot="title">
Installing Git to a self-hosted instance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
import { Container } from '$lib/layout';
import { isSelfHosted } from '$lib/system';
import { connectTemplate } from '$lib/wizards/functions/cover.svelte';
import { consoleVariables, isVcsEnabled } from '$routes/console/store';
import { consoleVariables } from '$routes/console/store';
import { template } from './store';
const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
</script>

<Container>
Expand Down Expand Up @@ -60,7 +62,7 @@
</span>
</Heading>
<p class="u-margin-block-start-24">{$template.tagline}</p>
{#if isSelfHosted && !isVcsEnabled($consoleVariables)}
{#if isSelfHosted && !isVcsEnabled}
<Alert class="u-margin-block-start-24" type="info">
<svelte:fragment slot="title">
Cloning templates to a self-hosted instance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import GitDisconnectModal from './GitDisconnectModal.svelte';
import dayjs from 'dayjs';
import { isSelfHosted } from '$lib/system';
import { consoleVariables, isVcsEnabled } from '$routes/console/store';
import { consoleVariables } from '$routes/console/store';
export let total: number;
export let limit: number;
Expand All @@ -40,6 +40,7 @@
let showGitDisconnect = false;
let showInstallationDropdown: boolean[] = [];
let selectedInstallation: Models.Installation;
const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
function getInstallationLink(installation: Models.Installation) {
switch (installation.provider) {
Expand Down Expand Up @@ -180,7 +181,7 @@
bind:offset />
</div>
{:else}
{#if isSelfHosted && !isVcsEnabled($consoleVariables)}
{#if isSelfHosted && !isVcsEnabled}
<Alert type="info">
<svelte:fragment slot="title">
Installing Git to a self-hosted instance
Expand All @@ -203,7 +204,7 @@
<div class="avatar"><SvgIcon name="appwrite" type="color" size={80} /></div>
</div>
<Button
disabled={isSelfHosted && !isVcsEnabled($consoleVariables)}
disabled={isSelfHosted && !isVcsEnabled}
on:click={() => (showGitIstall = true)}
secondary>
<span class="text">Add Installation</span>
Expand Down
5 changes: 1 addition & 4 deletions src/routes/console/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@ import { derived } from 'svelte/store';
export const version = derived(page, ($page) => $page.data.version as string | null);
export const consoleVariables = derived(
page,
async ($page) => (await $page.data.consoleVariables) as Models.ConsoleVariables
($page) => $page.data.consoleVariables as Models.ConsoleVariables
);
export async function isVcsEnabled(store: Promise<Models.ConsoleVariables>) {
return (await store)?._APP_VCS_ENABLED === true;
}

0 comments on commit a6d1ca5

Please sign in to comment.