From a0dacc9717fd4ea04fd831f352d36bed76165cd4 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 12 Jan 2023 16:09:05 +0000 Subject: [PATCH] add create store method and tidy up --- .../src/pages/builder/portal/_layout.svelte | 5 -- .../builder/portal/settings/_layout.svelte | 5 ++ .../_components/editVariableModal.svelte | 0 .../{ => settings}/environment/index.svelte | 47 +++++++++---------- packages/builder/src/stores/portal/envVars.js | 11 +++-- packages/builder/src/stores/portal/index.js | 2 +- packages/frontend-core/src/api/envVars.js | 9 +++- 7 files changed, 43 insertions(+), 36 deletions(-) rename packages/builder/src/pages/builder/portal/{ => settings}/environment/_components/editVariableModal.svelte (100%) rename packages/builder/src/pages/builder/portal/{ => settings}/environment/index.svelte (70%) diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index dc8e60edd6..9048502550 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -55,11 +55,6 @@ title: "Plugins", href: "/builder/portal/plugins", }, - { - title: "Environment", - href: "/builder/portal/environment", - }, - { title: "Settings", href: "/builder/portal/settings", diff --git a/packages/builder/src/pages/builder/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte index 57410bcaeb..6d9f306991 100644 --- a/packages/builder/src/pages/builder/portal/settings/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/settings/_layout.svelte @@ -26,6 +26,11 @@ url={$url("./organisation")} active={$isActive("./organisation")} /> + {#if !$admin.cloud} - - - - Envrironment Variables - Add and manage environment variable for development and production - - - - - -
- -
+ + + Envrironment Variables + Add and manage environment variable for development and production - + + +
+ +
+ +
+ diff --git a/packages/builder/src/stores/portal/envVars.js b/packages/builder/src/stores/portal/envVars.js index ec3af53d8f..0d257d6bf7 100644 --- a/packages/builder/src/stores/portal/envVars.js +++ b/packages/builder/src/stores/portal/envVars.js @@ -6,16 +6,21 @@ export function createEnvVarsStore() { async function load() { // const envVars = await API.fetchEnvVars() - - let testVars = ['blah', 'blah123'] - const vars = testVars.map((name) => ({ name })) + let testVars = ["blah", "blah123"] + const vars = testVars.map(name => ({ name })) console.log(vars) set(vars) } + async function create() { + const envVar = await API.createEnvVar() + update(envVars => [envVar, ...envVars]) + } + return { subscribe, load, + create, } } diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js index 370c448bb3..a1ed6615a1 100644 --- a/packages/builder/src/stores/portal/index.js +++ b/packages/builder/src/stores/portal/index.js @@ -11,4 +11,4 @@ export { groups } from "./groups" export { plugins } from "./plugins" export { backups } from "./backups" export { overview } from "./overview" -export { envVars } from "./envVars" \ No newline at end of file +export { envVars } from "./envVars" diff --git a/packages/frontend-core/src/api/envVars.js b/packages/frontend-core/src/api/envVars.js index 7a728e9d18..44f81cd6c9 100644 --- a/packages/frontend-core/src/api/envVars.js +++ b/packages/frontend-core/src/api/envVars.js @@ -2,7 +2,14 @@ export const buildEnvironmentVariableEndpoints = API => ({ /** * Fetches a list of environment variables */ - fetchEnvVars: async () => { + fetchVariables: async () => { + return await API.get({ + url: `/api/env/variables`, + json: false, + }) + }, + + createVariable: async () => { return await API.get({ url: `/api/env/variables`, json: false,