From 87918fd55cf966d8031387a32449f352f9361676 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 18 Mar 2021 18:26:41 +0000 Subject: [PATCH 01/13] Updating the CLI to have a fast init method, this will make using it for DO much much easier. --- packages/cli/src/constants.js | 4 ++++ packages/cli/src/hosting/index.js | 26 +++++++++++++++----------- packages/cli/src/hosting/makeEnv.js | 24 ++++++++++++++++-------- packages/cli/src/structures/Command.js | 13 +++++-------- 4 files changed, 40 insertions(+), 27 deletions(-) diff --git a/packages/cli/src/constants.js b/packages/cli/src/constants.js index a601909232..40c63d218d 100644 --- a/packages/cli/src/constants.js +++ b/packages/cli/src/constants.js @@ -2,3 +2,7 @@ exports.CommandWords = { HOSTING: "hosting", HELP: "help", } + +exports.InitTypes = { + QUICK: "quick", +} diff --git a/packages/cli/src/hosting/index.js b/packages/cli/src/hosting/index.js index a8e77f49d7..f5c2552c64 100644 --- a/packages/cli/src/hosting/index.js +++ b/packages/cli/src/hosting/index.js @@ -1,5 +1,5 @@ const Command = require("../structures/Command") -const { CommandWords } = require("../constants") +const { CommandWords, InitTypes } = require("../constants") const { lookpath } = require("lookpath") const { downloadFile, logErrorToFile, success, info } = require("../utils") const { confirmation } = require("../questions") @@ -50,17 +50,21 @@ async function handleError(func) { } } -async function init() { +async function init(info) { + const isQuick = info === InitTypes.QUICK await checkDockerConfigured() - const shouldContinue = await confirmation( - "This will create multiple files in current directory, should continue?" - ) - if (!shouldContinue) { - console.log("Stopping.") - return + if (!isQuick) { + const shouldContinue = await confirmation( + "This will create multiple files in current directory, should continue?" + ) + if (!shouldContinue) { + console.log("Stopping.") + return + } } await downloadFiles() - await envFile.make() + const config = isQuick ? envFile.QUICK_CONFIG : {} + await envFile.make(config) } async function start() { @@ -128,8 +132,8 @@ async function update() { const command = new Command(`${CommandWords.HOSTING}`) .addHelp("Controls self hosting on the Budibase platform.") .addSubOption( - "--init", - "Configure a self hosted platform in current directory.", + "--init [type]", + "Configure a self hosted platform in current directory, type can be unspecified or 'quick'.", init ) .addSubOption( diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js index b7d3b9e849..b84e50eb6b 100644 --- a/packages/cli/src/hosting/makeEnv.js +++ b/packages/cli/src/hosting/makeEnv.js @@ -30,15 +30,23 @@ BUDIBASE_ENVIRONMENT=PRODUCTION` } module.exports.filePath = FILE_PATH +module.exports.QUICK_CONFIG = { + key: "budibase", + port: 10000, +} -module.exports.make = async () => { - const hostingKey = await string( - "Please input the password you'd like to use as your hosting key: " - ) - const hostingPort = await number( - "Please enter the port on which you want your installation to run: ", - 10000 - ) +module.exports.make = async (inputs = {}) => { + const hostingKey = + inputs.key || + (await string( + "Please input the password you'd like to use as your hosting key: " + )) + const hostingPort = + inputs.port || + (await number( + "Please enter the port on which you want your installation to run: ", + 10000 + )) const fileContents = getContents(hostingPort, hostingKey) fs.writeFileSync(FILE_PATH, fileContents) console.log( diff --git a/packages/cli/src/structures/Command.js b/packages/cli/src/structures/Command.js index 5ca0ce67ee..a8d24566be 100644 --- a/packages/cli/src/structures/Command.js +++ b/packages/cli/src/structures/Command.js @@ -13,8 +13,8 @@ class Command { return this } - addSubOption(command, help, func) { - this.opts.push({ command, help, func }) + addSubOption(command, help, func, extras = []) { + this.opts.push({ command, help, func, extras }) return this } @@ -37,13 +37,10 @@ class Command { command.action(async options => { try { let executed = false - if (thisCmd.func) { - await thisCmd.func(options) - executed = true - } for (let opt of thisCmd.opts) { - if (options[opt.command.replace("--", "")]) { - await opt.func(options) + const lookup = opt.command.split(" ")[0].replace("--", "") + if (options[lookup]) { + await opt.func(options[lookup]) executed = true } } From 60ab217386e4ef2ec97cad7c692eb4bd4d645631 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 18 Mar 2021 18:27:00 +0000 Subject: [PATCH 02/13] Formatting. --- .../EditAutomationPopover.svelte | 4 +- .../popovers/EditDatasourcePopover.svelte | 2 +- .../deploy/DeploymentHistory.svelte | 6 ++- .../automate/[automation]/index.svelte | 3 +- .../pages/[application]/automate/index.svelte | 23 ++++++----- .../pages/[application]/data/_layout.svelte | 9 ++-- .../[query]/_layout.svelte | 4 +- .../data/datasource/index.svelte | 41 ++++++++++--------- .../[application]/data/table/index.svelte | 3 +- 9 files changed, 50 insertions(+), 45 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte index a99a16e240..81c38e553b 100644 --- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte +++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte @@ -1,4 +1,4 @@ - diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte index c7842001d0..4cac41d63d 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte @@ -24,7 +24,7 @@ async function deleteDatasource() { await backendUiStore.actions.datasources.delete(datasource) notifier.success("Datasource deleted") - $goto('./datasource') + $goto("./datasource") hideEditor() } diff --git a/packages/builder/src/components/deploy/DeploymentHistory.svelte b/packages/builder/src/components/deploy/DeploymentHistory.svelte index c49abd433e..0933b1a676 100644 --- a/packages/builder/src/components/deploy/DeploymentHistory.svelte +++ b/packages/builder/src/components/deploy/DeploymentHistory.svelte @@ -119,11 +119,13 @@ {#if deployment.status.toLowerCase() === 'pending'} {/if} -
showErrorReasonModal(deployment.err)} class={`deployment-status ${deployment.status}`}> +
showErrorReasonModal(deployment.err)} + class={`deployment-status ${deployment.status}`}> {deployment.status} {#if deployment.status === DeploymentStatus.FAILURE} - + {/if}
diff --git a/packages/builder/src/pages/[application]/automate/[automation]/index.svelte b/packages/builder/src/pages/[application]/automate/[automation]/index.svelte index 031a72fad3..1a15ed48c6 100644 --- a/packages/builder/src/pages/[application]/automate/[automation]/index.svelte +++ b/packages/builder/src/pages/[application]/automate/[automation]/index.svelte @@ -1,6 +1,5 @@ - + - \ No newline at end of file diff --git a/packages/builder/src/pages/[application]/automate/index.svelte b/packages/builder/src/pages/[application]/automate/index.svelte index 98e5b80a18..f6568417a8 100644 --- a/packages/builder/src/pages/[application]/automate/index.svelte +++ b/packages/builder/src/pages/[application]/automate/index.svelte @@ -1,18 +1,19 @@ Create your first automation to get started @@ -23,4 +24,4 @@ color: var(--grey-5); margin-top: 2px; } - \ No newline at end of file + diff --git a/packages/builder/src/pages/[application]/data/_layout.svelte b/packages/builder/src/pages/[application]/data/_layout.svelte index 0674c93c88..5a31d7db92 100644 --- a/packages/builder/src/pages/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/[application]/data/_layout.svelte @@ -17,11 +17,11 @@ }, ] - let tab = $isActive('./datasource') ? "datasource" : "table" + let tab = $isActive("./datasource") ? "datasource" : "table" function selectFirstTableOrSource({ detail }) { const type = detail.heading.key - if (type === 'datasource') { + if (type === "datasource") { $goto("./datasource") } else { $goto("./table") @@ -34,7 +34,10 @@
- +
m._id === $params.query - ) + const query = $backendUiStore.queries.find(m => m._id === $params.query) if (query) { backendUiStore.actions.queries.select(query) } diff --git a/packages/builder/src/pages/[application]/data/datasource/index.svelte b/packages/builder/src/pages/[application]/data/datasource/index.svelte index b1c7708465..00b08fb7b7 100644 --- a/packages/builder/src/pages/[application]/data/datasource/index.svelte +++ b/packages/builder/src/pages/[application]/data/datasource/index.svelte @@ -1,22 +1,23 @@ - - {#if $backendUiStore.tables.length === 0} - Connect your first datasource to start building. - {:else}Select a datasource to edit{/if} - - \ No newline at end of file + onMount(async () => { + // navigate to first table in list, if not already selected + $backendUiStore.datasources.length > 0 && + $goto(`../${$backendUiStore.datasources[0]._id}`) + }) + + +{#if $backendUiStore.tables.length === 0} + Connect your first datasource to start building. +{:else}Select a datasource to edit{/if} + + diff --git a/packages/builder/src/pages/[application]/data/table/index.svelte b/packages/builder/src/pages/[application]/data/table/index.svelte index d1659257d4..134d9e510f 100644 --- a/packages/builder/src/pages/[application]/data/table/index.svelte +++ b/packages/builder/src/pages/[application]/data/table/index.svelte @@ -4,7 +4,8 @@ import { onMount } from "svelte" onMount(async () => { - $backendUiStore.tables.length > 0 && $goto(`../${$backendUiStore.tables[0]._id}`) + $backendUiStore.tables.length > 0 && + $goto(`../${$backendUiStore.tables[0]._id}`) }) From 8549764db4fa5880a830f5eb1e9f6182443b194d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 19 Mar 2021 10:02:29 +0000 Subject: [PATCH 03/13] Adding a digital ocean startup init process which makes use of the user_data system. --- packages/cli/package.json | 1 + packages/cli/src/constants.js | 1 + packages/cli/src/hosting/index.js | 19 +++++++++++++++++-- packages/cli/src/hosting/makeEnv.js | 4 ++++ packages/cli/yarn.lock | 5 +++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 5c58c80560..3f1b485f05 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -14,6 +14,7 @@ "chalk": "^4.1.0", "commander": "^7.1.0", "docker-compose": "^0.23.6", + "envfile": "^6.14.0", "inquirer": "^8.0.0", "lookpath": "^1.1.0", "pkg": "^4.4.9", diff --git a/packages/cli/src/constants.js b/packages/cli/src/constants.js index 40c63d218d..c8da56fa5c 100644 --- a/packages/cli/src/constants.js +++ b/packages/cli/src/constants.js @@ -5,4 +5,5 @@ exports.CommandWords = { exports.InitTypes = { QUICK: "quick", + DIGITAL_OCEAN: "do", } diff --git a/packages/cli/src/hosting/index.js b/packages/cli/src/hosting/index.js index f5c2552c64..8dbccde010 100644 --- a/packages/cli/src/hosting/index.js +++ b/packages/cli/src/hosting/index.js @@ -6,6 +6,8 @@ const { confirmation } = require("../questions") const fs = require("fs") const compose = require("docker-compose") const envFile = require("./makeEnv") +const { parse } = require("envfile") +const axios = require("axios") const BUDIBASE_SERVICES = ["app-service", "worker-service"] const ERROR_FILE = "docker-error.log" @@ -13,6 +15,7 @@ const FILE_URLS = [ "https://raw.githubusercontent.com/Budibase/budibase/master/hosting/docker-compose.yaml", "https://raw.githubusercontent.com/Budibase/budibase/master/hosting/envoy.yaml", ] +const DO_USER_DATA_URL = "http://169.254.169.254/metadata/v1/user-data" async function downloadFiles() { const promises = [] @@ -50,8 +53,8 @@ async function handleError(func) { } } -async function init(info) { - const isQuick = info === InitTypes.QUICK +async function init(type) { + const isQuick = type === InitTypes.QUICK || type === InitTypes.DIGITAL_OCEAN await checkDockerConfigured() if (!isQuick) { const shouldContinue = await confirmation( @@ -64,6 +67,18 @@ async function init(info) { } await downloadFiles() const config = isQuick ? envFile.QUICK_CONFIG : {} + if (type === InitTypes.DIGITAL_OCEAN) { + try { + const response = parse(await axios.get(DO_USER_DATA_URL)) + for (let [key, value] of Object.entries(envFile.ConfigMap)) { + if (response[key]) { + config[value] = response[key] + } + } + } catch (err) { + // don't need to handle error, just don't do anything + } + } await envFile.make(config) } diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js index b84e50eb6b..c8359dd5e4 100644 --- a/packages/cli/src/hosting/makeEnv.js +++ b/packages/cli/src/hosting/makeEnv.js @@ -30,6 +30,10 @@ BUDIBASE_ENVIRONMENT=PRODUCTION` } module.exports.filePath = FILE_PATH +module.exports.ConfigMap = { + HOSTING_KEY: "key", + MAIN_PORT: "port", +} module.exports.QUICK_CONFIG = { key: "budibase", port: 10000, diff --git a/packages/cli/yarn.lock b/packages/cli/yarn.lock index c03030576c..00cf6284e3 100644 --- a/packages/cli/yarn.lock +++ b/packages/cli/yarn.lock @@ -391,6 +391,11 @@ enquirer@^2.3.5: dependencies: ansi-colors "^4.1.1" +envfile@^6.14.0: + version "6.14.0" + resolved "https://registry.yarnpkg.com/envfile/-/envfile-6.14.0.tgz#8dab1ab915a4c6567087a6bb9e732b1f164c2b30" + integrity sha512-JxpcaOgJQB/x0XFmNiqFu0BLK22PlI3F0d95of5SOqcLvBlGC0ug7MHYDWnmZqmx9svIue8v0cVcqAygPTyXHQ== + escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" From a3750a2c5bc6c4bd1108459279ded463d80b023e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Fri, 19 Mar 2021 11:03:44 +0100 Subject: [PATCH 04/13] fix some navigation issues when removing tables/datasources --- packages/builder/src/builderStore/store/backend.js | 8 ++++++-- .../popovers/EditDatasourcePopover.svelte | 7 ++++++- .../TableNavigator/popovers/EditTablePopover.svelte | 5 +++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js index 0a5b9f0461..5d0e722650 100644 --- a/packages/builder/src/builderStore/store/backend.js +++ b/packages/builder/src/builderStore/store/backend.js @@ -105,7 +105,9 @@ export const getBackendUiStore = () => { state.datasources = state.datasources.filter( existing => existing._id !== datasource._id ) - state.selectedDatasourceId = null + if (datasource._id === state.selectedDatasourceId) { + state.selectedDatasourceId = null + } return state }) }, @@ -233,7 +235,9 @@ export const getBackendUiStore = () => { state.tables = state.tables.filter( existing => existing._id !== table._id ) - state.selectedTable = {} + if (table._id === state.selectedTable._id) { + state.selectedTable = {} + } return state }) }, diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte index c7842001d0..7679f0a9ba 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte @@ -22,9 +22,14 @@ } async function deleteDatasource() { + const wasSelectedSource = $backendUiStore.selectedDatasourceId await backendUiStore.actions.datasources.delete(datasource) notifier.success("Datasource deleted") - $goto('./datasource') + // navigate to first index page if the source you are deleting is selected + console.log('Is the same? ', wasSelectedSource === datasource._id) + if (wasSelectedSource === datasource._id) { + $goto('./datasource') + } hideEditor() } diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte index 900afe6f86..60886b5be1 100644 --- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte +++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte @@ -1,4 +1,5 @@