From 2becc2b223b478cd135c84e18e597b274cf734ce Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 7 Sep 2022 13:51:14 +0100 Subject: [PATCH] add update modal --- .../plugins/_components/PluginRow.svelte | 58 ++++++++++++++++++- packages/builder/src/stores/portal/plugins.js | 4 +- packages/server/src/api/controllers/plugin.ts | 21 +++++-- 3 files changed, 74 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/manage/plugins/_components/PluginRow.svelte b/packages/builder/src/pages/builder/portal/manage/plugins/_components/PluginRow.svelte index 4335749a90..6ce3d9c1dc 100644 --- a/packages/builder/src/pages/builder/portal/manage/plugins/_components/PluginRow.svelte +++ b/packages/builder/src/pages/builder/portal/manage/plugins/_components/PluginRow.svelte @@ -7,18 +7,27 @@ Button, Label, Input, + Dropzone, } from "@budibase/bbui" import DeletePluginModal from "../_components/DeletePluginModal.svelte" + import { plugins } from "stores/portal" export let plugin let detailsModal let deleteModal + let updateModal + let file let icon = plugin.schema.type === "component" ? plugin.schema.schema.icon || "Book" : plugin.schema.schema.icon || "Beaker" + + async function save() { + let update = true + await plugins.uploadPlugin(file, plugin.source, update) + }
@@ -88,9 +97,13 @@ @@ -99,6 +112,38 @@ + + save()} + onCancel={() => { + updateModal.hide() + detailsModal.show() + }} + > + {#if plugin.source === "File Upload"} +
+ +
+ { + if (!e.detail || e.detail.length === 0) { + file = null + } else { + file = e.detail[0] + } + }} + /> + {/if} +
+
+ diff --git a/packages/builder/src/stores/portal/plugins.js b/packages/builder/src/stores/portal/plugins.js index a3d62ca6e3..9703b30cb7 100644 --- a/packages/builder/src/stores/portal/plugins.js +++ b/packages/builder/src/stores/portal/plugins.js @@ -50,11 +50,11 @@ export function createPluginsStore() { }) } - async function uploadPlugin(file, source) { + async function uploadPlugin(file, source, updatePlugin) { let data = new FormData() data.append("file", file) data.append("source", source) - + data.append("update", updatePlugin) let resp = await API.uploadPlugin(data) let newPlugin = resp.plugins[0] update(state => { diff --git a/packages/server/src/api/controllers/plugin.ts b/packages/server/src/api/controllers/plugin.ts index ce35d2fad5..a84a077b33 100644 --- a/packages/server/src/api/controllers/plugin.ts +++ b/packages/server/src/api/controllers/plugin.ts @@ -39,7 +39,11 @@ export async function upload(ctx: any) { let docs = [] // can do single or multiple plugins for (let plugin of plugins) { - const doc = await processPlugin(plugin, ctx.request.body.source) + const doc = await processPlugin( + plugin, + ctx.request.body.source, + ctx.request.body.update + ) docs.push(doc) } ctx.body = { @@ -128,7 +132,8 @@ export async function destroy(ctx: any) { export async function storePlugin( metadata: any, directory: any, - source?: string + source?: string, + update?: boolean ) { const db = getGlobalDB() const version = metadata.package.version, @@ -167,6 +172,9 @@ export async function storePlugin( const existing = await db.get(pluginId) rev = existing._rev } catch (err) { + if (update) { + throw new Error("Unable to update. Plugin does not exist") + } rev = undefined } let doc = { @@ -185,6 +193,7 @@ export async function storePlugin( source, } } + const response = await db.put(doc) return { ...doc, @@ -192,11 +201,15 @@ export async function storePlugin( } } -export async function processPlugin(plugin: FileType, source?: string) { +export async function processPlugin( + plugin: FileType, + source?: string, + update?: boolean +) { if (!env.SELF_HOSTED) { throw new Error("Plugins not supported outside of self-host.") } const { metadata, directory } = await uploadedFilePlugin(plugin) - return await storePlugin(metadata, directory, source) + return await storePlugin(metadata, directory, source, update) }