From e8d5d54f5db2996a63015ac2adc2a12d6d65e00f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 17 Feb 2022 10:12:35 +0100 Subject: [PATCH 1/4] bug fix for handlebars expression, show budibase version in updates panel --- .../src/components/common/bindings/BindingPanel.svelte | 2 +- packages/frontend-core/src/api/other.js | 2 +- packages/server/src/api/controllers/dev.js | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index 5c12d43ceb..2dfb3fda54 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -58,7 +58,7 @@ const updateValue = val => { valid = isValid(readableToRuntimeBinding(bindings, val)) if (valid) { - dispatch("change", value) + dispatch("change", val) } } diff --git a/packages/frontend-core/src/api/other.js b/packages/frontend-core/src/api/other.js index b2a5ccf441..e7b446c181 100644 --- a/packages/frontend-core/src/api/other.js +++ b/packages/frontend-core/src/api/other.js @@ -32,7 +32,7 @@ export const buildOtherEndpoints = API => ({ getBudibaseVersion: async () => { return await API.get({ url: "/api/dev/version", - }) + }).version }, /** diff --git a/packages/server/src/api/controllers/dev.js b/packages/server/src/api/controllers/dev.js index bec9478245..54f554e358 100644 --- a/packages/server/src/api/controllers/dev.js +++ b/packages/server/src/api/controllers/dev.js @@ -118,5 +118,7 @@ exports.revert = async ctx => { } exports.getBudibaseVersion = async ctx => { - ctx.body = require("../../../package.json").version + ctx.body = { + version: require("../../../package.json").version, + } } From c858b9341fcaf6167a3073333646f937dc59b278 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 17 Feb 2022 09:25:02 +0000 Subject: [PATCH 2/4] Fix issue with schema generation when datasource is undefined --- packages/builder/src/builderStore/dataBinding.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index db797bc743..edb12c7e74 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -536,11 +536,13 @@ export const getSchemaForDatasource = (asset, datasource, options) => { } // Add schema properties if required - if (addId) { - schema["_id"] = { type: "string" } - } - if (addRev) { - schema["_rev"] = { type: "string" } + if (schema) { + if (addId) { + schema["_id"] = { type: "string" } + } + if (addRev) { + schema["_rev"] = { type: "string" } + } } // Ensure there are "name" properties for all fields and that field schema From 053e6af3d1da69c273a8e10cd38e745c42b24ff3 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 17 Feb 2022 09:41:44 +0000 Subject: [PATCH 3/4] Use selected role when creating screens --- .../NavigationPanel/ScreenWizard.svelte | 1 + packages/client/stats.html | 2689 +++++++++++++++++ 2 files changed, 2690 insertions(+) create mode 100644 packages/client/stats.html diff --git a/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte b/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte index a9fea4a45b..394975e9da 100644 --- a/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte +++ b/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte @@ -74,6 +74,7 @@ } draftScreen.routing.route = route + draftScreen.routing.roleId = roleId await store.actions.screens.save(draftScreen) if (draftScreen.props._instanceName.endsWith("List")) { diff --git a/packages/client/stats.html b/packages/client/stats.html new file mode 100644 index 0000000000..3f05613e6b --- /dev/null +++ b/packages/client/stats.html @@ -0,0 +1,2689 @@ + + + + + + + + RollUp Visualizer + + + +
+ + + + + From 945ea9e0d8fd3a2c9d4c09c3a5a03aa793995567 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 17 Feb 2022 09:44:37 +0000 Subject: [PATCH 4/4] Revert adding stats --- packages/client/stats.html | 2689 ------------------------------------ 1 file changed, 2689 deletions(-) delete mode 100644 packages/client/stats.html diff --git a/packages/client/stats.html b/packages/client/stats.html deleted file mode 100644 index 3f05613e6b..0000000000 --- a/packages/client/stats.html +++ /dev/null @@ -1,2689 +0,0 @@ - - - - - - - - RollUp Visualizer - - - -
- - - - -