From d456f9fd087f239cbba2d54991fa625e97985e5d Mon Sep 17 00:00:00 2001
From: Arman
Date: Mon, 28 Aug 2023 16:36:16 +0200
Subject: [PATCH] feat: add missing alerts
---
src/lib/components/alert.svelte | 4 ++-
src/lib/pages/domains/wizard/step1.svelte | 28 ++++++++++++++++++-
src/lib/stores/variables.ts | 8 ++++++
.../functions/function-[function]/+page.ts | 3 +-
.../function-[function]/settings/+page.svelte | 14 ++++++++++
.../settings/updateConfiguration.svelte | 21 +++++++++++++-
.../template-[template]/+page.svelte | 19 ++++++++++++-
7 files changed, 92 insertions(+), 5 deletions(-)
create mode 100644 src/lib/stores/variables.ts
diff --git a/src/lib/components/alert.svelte b/src/lib/components/alert.svelte
index f7f03ab45..8bdd8c826 100644
--- a/src/lib/components/alert.svelte
+++ b/src/lib/components/alert.svelte
@@ -7,12 +7,14 @@
export let buttons: Buttons[] = [];
export let isAction = false;
export let isStandalone = false;
+ let classes = '';
+ export { classes as class };
const dispatch = createEventDispatcher();
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
- import { FormList, InputDomain } from '$lib/elements/forms';
+ import { Alert } from '$lib/components';
+ import { Button, FormList, InputDomain } from '$lib/elements/forms';
import { WizardStep } from '$lib/layout';
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';
let error = null;
+ let isDomainsEnabled = false;
+
+ onMount(async () => {
+ if (!isSelfHosted) {
+ return;
+ }
+ const vars = await sdk.forConsole.console.variables();
+ isDomainsEnabled = vars?._APP_DOMAIN_ENABLED === true;
+ });
+
async function createDomain() {
try {
if ($domain.$id) {
@@ -56,4 +69,17 @@
{/if}
+ {#if isSelfHosted && !isDomainsEnabled}
+
+
+ Adding a domain to a self-hosted instance
+
+ To add a domain to a locally hosted Appwrite project, you must first configure your server
+ domain.
+
+
+
+
+
+ {/if}
diff --git a/src/lib/stores/variables.ts b/src/lib/stores/variables.ts
new file mode 100644
index 000000000..6a3430611
--- /dev/null
+++ b/src/lib/stores/variables.ts
@@ -0,0 +1,8 @@
+import { page } from '$app/stores';
+import { derived } from 'svelte/store';
+import type { Models } from '@appwrite.io/console';
+
+export const consoleVariables = derived(
+ page,
+ ($page) => $page.data.account 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 1da9b2ebc..7d17d10f9 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+page.ts
+++ b/src/routes/console/project-[project]/functions/function-[function]/+page.ts
@@ -18,6 +18,7 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
Query.limit(limit),
Query.offset(offset),
Query.orderDesc('')
- ])
+ ]),
+ consoleVariables: sdk.forConsole.console.variables()
};
};
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
index 1324ba2dc..da6521239 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
@@ -16,6 +16,8 @@
import { invalidate } from '$app/navigation';
import UpdateLogging from './updateLogging.svelte';
import UpdateConfiguration from './updateConfiguration.svelte';
+ import { Alert, Heading } from '$lib/components';
+ import { Button } from '$lib/elements/forms';
export let data;
@@ -39,6 +41,18 @@
+ Settings
+ {#if $func.version !== 'v3'}
+
+ Your function is outdated
+ Update your function version to make use of new features including build commands and HTTP
+ data in your executions. To update, follow the steps outlined in our documentation.
+
+
+
+
+
+ {/if}
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 8634ee19d..bf7f2c690 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
@@ -15,6 +15,7 @@
import { page } from '$app/stores';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import {
+ Alert,
AvatarGroup,
Box,
CardGrid,
@@ -47,6 +48,8 @@
import ConnectExisting from '$lib/wizards/functions/connectExisting.svelte';
import InputSelectSearch from '$lib/elements/forms/inputSelectSearch.svelte';
import { installations } from '$lib/wizards/functions/store';
+ import { isSelfHosted } from '$lib/system';
+ import { consoleVariables } from '$lib/stores/variables';
const functionId = $page.params.function;
@@ -169,6 +172,8 @@
selectedBranch !== $func?.providerBranch ||
silentMode !== $func?.providerSilentMode ||
selectedDir !== $func?.providerRootDirectory;
+
+ $: isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;