From 7151f6df668d960b5cb84ea8926d5b24d98a043c Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 11 May 2022 14:03:08 +0100 Subject: [PATCH 001/272] Containers support onClick --- packages/client/manifest.json | 5 +++++ packages/client/src/components/app/Container.svelte | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 4190d7f07..bca61af09 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -219,6 +219,11 @@ "showInBar": true, "barIcon": "ModernGridView", "barTitle": "Wrap" + }, + { + "type": "event", + "label": "On Click", + "key": "onClick" } ] }, diff --git a/packages/client/src/components/app/Container.svelte b/packages/client/src/components/app/Container.svelte index 148179c98..9b2e17010 100644 --- a/packages/client/src/components/app/Container.svelte +++ b/packages/client/src/components/app/Container.svelte @@ -10,22 +10,30 @@ export let size export let gap export let wrap + export let onClick $: directionClass = direction ? `valid-container direction-${direction}` : "" $: hAlignClass = hAlign ? `hAlign-${hAlign}` : "" $: vAlignClass = vAlign ? `vAlign-${vAlign}` : "" $: sizeClass = size ? `size-${size}` : "" $: gapClass = gap ? `gap-${gap}` : "" + $: clickableClass = onClick ? "clickable" : "" $: classNames = [ directionClass, hAlignClass, vAlignClass, sizeClass, gapClass, + clickableClass, ].join(" ") -
+
@@ -104,4 +112,7 @@ .wrap { flex-wrap: wrap; } + .clickable { + cursor: pointer; + } From d9fb7297fa8c9119fd68448ada06dd4f40ed83e4 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 16 May 2022 11:26:52 +0100 Subject: [PATCH 002/272] Simplify clickable class --- packages/client/src/components/app/Container.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/client/src/components/app/Container.svelte b/packages/client/src/components/app/Container.svelte index 9b2e17010..a5c8ce6d4 100644 --- a/packages/client/src/components/app/Container.svelte +++ b/packages/client/src/components/app/Container.svelte @@ -17,19 +17,18 @@ $: vAlignClass = vAlign ? `vAlign-${vAlign}` : "" $: sizeClass = size ? `size-${size}` : "" $: gapClass = gap ? `gap-${gap}` : "" - $: clickableClass = onClick ? "clickable" : "" $: classNames = [ directionClass, hAlignClass, vAlignClass, sizeClass, gapClass, - clickableClass, ].join(" ")
Date: Mon, 18 Jul 2022 13:34:40 +0900 Subject: [PATCH 003/272] Fix popover min-width to have parents full width --- packages/bbui/src/Popover/Popover.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte index 1017ef71f..756e5e6a0 100644 --- a/packages/bbui/src/Popover/Popover.svelte +++ b/packages/bbui/src/Popover/Popover.svelte @@ -63,7 +63,7 @@ diff --git a/packages/string-templates/src/conversion/index.js b/packages/string-templates/src/conversion/index.js new file mode 100644 index 000000000..62abdf6f5 --- /dev/null +++ b/packages/string-templates/src/conversion/index.js @@ -0,0 +1,87 @@ +const { getHelperList } = require("../helpers") + +function getLayers(fullBlock) { + let layers = [] + while (fullBlock.length) { + const start = fullBlock.lastIndexOf("("), + end = fullBlock.indexOf(")") + let layer + if (start === -1 || end === -1) { + layer = fullBlock.trim() + fullBlock = "" + } else { + const untrimmed = fullBlock.substring(start, end + 1) + layer = untrimmed.substring(1, untrimmed.length - 1).trim() + fullBlock = + fullBlock.slice(0, start) + + fullBlock.slice(start + untrimmed.length + 1, fullBlock.length) + } + layers.push(layer) + } + return layers +} + +function getVariable(variableName) { + return isNaN(parseFloat(variableName)) ? `$("${variableName}")` : variableName +} + +function buildList(parts, value) { + function build() { + return parts + .map(part => (part.startsWith("helper") ? part : getVariable(part))) + .join(", ") + } + if (!value) { + return parts.length > 1 ? `...[${build()}]` : build() + } else { + return parts.length === 0 ? value : `...[${value}, ${build()}]` + } +} + +function splitBySpace(layer) { + const parts = [] + let started = null, + last = 0 + for (let index = 0; index < layer.length; index++) { + const char = layer[index] + if (char === "[" && started == null) { + started = index + } else if (char === "]" && started != null && layer[index + 1] !== ".") { + parts.push(layer.substring(started, index + 1).trim()) + started = null + last = index + } else if (started == null && char === " ") { + parts.push(layer.substring(last, index).trim()) + last = index + } + } + if (!layer.startsWith("[")) { + parts.push(layer.substring(last, layer.length).trim()) + } + return parts +} + +module.exports.convertHBSBlock = (block, blockNumber) => { + const braceLength = block[2] === "{" ? 3 : 2 + block = block.substring(braceLength, block.length - braceLength).trim() + const layers = getLayers(block) + + let value = null + const list = getHelperList() + for (let layer of layers) { + const parts = splitBySpace(layer) + if (value || parts.length > 1) { + // first of layer should always be the helper + const helper = parts.splice(0, 1) + if (list[helper]) { + value = `helpers.${helper}(${buildList(parts, value)})` + } + } + // no helpers + else { + value = getVariable(parts[0]) + } + } + // split by space will remove square brackets + return { variable: `var${blockNumber}`, value } +} diff --git a/packages/string-templates/src/helpers/external.js b/packages/string-templates/src/helpers/external.js index 0fa7f734d..f461045f7 100644 --- a/packages/string-templates/src/helpers/external.js +++ b/packages/string-templates/src/helpers/external.js @@ -23,6 +23,9 @@ const ADDED_HELPERS = { duration: duration, } +exports.externalCollections = EXTERNAL_FUNCTION_COLLECTIONS +exports.addedHelpers = ADDED_HELPERS + exports.registerAll = handlebars => { for (let [name, helper] of Object.entries(ADDED_HELPERS)) { handlebars.registerHelper(name, helper) diff --git a/packages/string-templates/src/helpers/index.js b/packages/string-templates/src/helpers/index.js index 76a4c5d2c..f04fa5839 100644 --- a/packages/string-templates/src/helpers/index.js +++ b/packages/string-templates/src/helpers/index.js @@ -7,6 +7,7 @@ const { HelperFunctionBuiltin, LITERAL_MARKER, } = require("./constants") +const { getHelperList } = require("./list") const HTML_SWAPS = { "<": "<", @@ -91,3 +92,5 @@ module.exports.unregisterAll = handlebars => { // unregister all imported helpers externalHandlebars.unregisterAll(handlebars) } + +module.exports.getHelperList = getHelperList diff --git a/packages/string-templates/src/helpers/javascript.js b/packages/string-templates/src/helpers/javascript.js index 0173be0b5..951a9f534 100644 --- a/packages/string-templates/src/helpers/javascript.js +++ b/packages/string-templates/src/helpers/javascript.js @@ -1,6 +1,7 @@ const { atob } = require("../utilities") const { cloneDeep } = require("lodash/fp") const { LITERAL_MARKER } = require("../helpers/constants") +const { getHelperList } = require("./list") // The method of executing JS scripts depends on the bundle being built. // This setter is used in the entrypoint (either index.cjs or index.mjs). @@ -45,6 +46,7 @@ module.exports.processJS = (handlebars, context) => { // app context. const sandboxContext = { $: path => getContextValue(path, cloneDeep(context)), + helpers: getHelperList(), } // Create a sandbox with our context and run the JS diff --git a/packages/string-templates/src/helpers/list.js b/packages/string-templates/src/helpers/list.js new file mode 100644 index 000000000..a309b9e57 --- /dev/null +++ b/packages/string-templates/src/helpers/list.js @@ -0,0 +1,19 @@ +const externalHandlebars = require("./external") +const helperList = require("@budibase/handlebars-helpers") + +module.exports.getHelperList = () => { + let constructed = [] + for (let collection of externalHandlebars.externalCollections) { + constructed.push(helperList[collection]()) + } + const fullMap = {} + for (let collection of constructed) { + for (let [key, func] of Object.entries(collection)) { + fullMap[key] = func + } + } + for (let key of Object.keys(externalHandlebars.addedHelpers)) { + fullMap[key] = externalHandlebars.addedHelpers[key] + } + return fullMap +} diff --git a/packages/string-templates/src/index.cjs b/packages/string-templates/src/index.cjs index d0de680ac..870e14493 100644 --- a/packages/string-templates/src/index.cjs +++ b/packages/string-templates/src/index.cjs @@ -19,6 +19,7 @@ module.exports.doesContainStrings = templates.doesContainStrings module.exports.doesContainString = templates.doesContainString module.exports.disableEscaping = templates.disableEscaping module.exports.findHBSBlocks = templates.findHBSBlocks +module.exports.convertToJS = templates.convertToJS /** * Use vm2 to run JS scripts in a node env diff --git a/packages/string-templates/src/index.js b/packages/string-templates/src/index.js index f4feceac4..eae545de1 100644 --- a/packages/string-templates/src/index.js +++ b/packages/string-templates/src/index.js @@ -8,6 +8,7 @@ const { FIND_ANY_HBS_REGEX, findDoubleHbsInstances, } = require("./utilities") +const { convertHBSBlock } = require("./conversion") const hbsInstance = handlebars.create() registerAll(hbsInstance) @@ -342,3 +343,31 @@ module.exports.findHBSBlocks = string => { module.exports.doesContainString = (template, string) => { return exports.doesContainStrings(template, [string]) } + +module.exports.convertToJS = hbs => { + const blocks = exports.findHBSBlocks(hbs) + let js = "return `", + prevBlock = null + const variables = {} + if (blocks.length === 0) { + js += hbs + } + let count = 1 + for (let block of blocks) { + let stringPart = hbs + if (prevBlock) { + stringPart = stringPart.split(prevBlock)[1] + } + stringPart = stringPart.split(block)[0] + prevBlock = block + const { variable, value } = convertHBSBlock(block, count++) + variables[variable] = value + js += `${stringPart.split()}\${${variable}}` + } + let varBlock = "" + for (let [variable, value] of Object.entries(variables)) { + varBlock += `const ${variable} = ${value};\n` + } + js += "`;" + return `${varBlock}${js}` +} diff --git a/packages/string-templates/src/index.mjs b/packages/string-templates/src/index.mjs index 3d115cdec..34cb90ea3 100644 --- a/packages/string-templates/src/index.mjs +++ b/packages/string-templates/src/index.mjs @@ -19,6 +19,7 @@ export const doesContainStrings = templates.doesContainStrings export const doesContainString = templates.doesContainString export const disableEscaping = templates.disableEscaping export const findHBSBlocks = templates.findHBSBlocks +export const convertToJS = templates.convertToJS /** * Use polyfilled vm to run JS scripts in a browser Env diff --git a/packages/string-templates/test/hbsToJs.spec.js b/packages/string-templates/test/hbsToJs.spec.js new file mode 100644 index 000000000..1197907b2 --- /dev/null +++ b/packages/string-templates/test/hbsToJs.spec.js @@ -0,0 +1,84 @@ +const { + convertToJS +} = require("../src/index.cjs") + +function checkLines(response, lines) { + const toCheck = response.split("\n") + let count = 0 + for (let line of lines) { + expect(toCheck[count++]).toBe(line) + } +} + +describe("Test that the string processing works correctly", () => { + it("should convert string without HBS", () => { + const response = convertToJS("Hello my name is Michael") + expect(response).toBe("return `Hello my name is Michael`;") + }) + + it("basic example with square brackets", () => { + const response = convertToJS("{{ [query] }}") + checkLines(response, [ + "const var1 = $(\"[query]\");", + "return `${var1}`;", + ]) + }) + + it("should convert some basic HBS strings", () => { + const response = convertToJS("Hello {{ name }}, welcome to {{ company }}!") + checkLines(response, [ + "const var1 = $(\"name\");", + "const var2 = $(\"company\");", + "return `Hello ${var1}, welcome to ${var2}`;", + ]) + }) + + it("should handle a helper block", () => { + const response = convertToJS("This is the average: {{ avg array }}") + checkLines(response, [ + "const var1 = helpers.avg($(\"array\"));", + "return `This is the average: ${var1}`;", + ]) + }) + + it("should handle multi-variable helper", () => { + const response = convertToJS("This is the average: {{ join ( avg val1 val2 val3 ) }}") + checkLines(response, [ + "const var1 = helpers.join(helpers.avg(...[$(\"val1\"), $(\"val2\"), $(\"val3\")]));", + "return `This is the average: ${var1}`;", + ]) + }) + + it("should handle a complex statement", () => { + const response = convertToJS("This is the average: {{ join ( avg val1 val2 val3 ) val4 }}") + checkLines(response, [ + "const var1 = helpers.join(...[helpers.avg(...[$(\"val1\"), $(\"val2\"), $(\"val3\")]), $(\"val4\")]);", + "return `This is the average: ${var1}`;", + ]) + }) + + it("should handle square brackets", () => { + const response = convertToJS("This is: {{ [val thing] }}") + checkLines(response, [ + "const var1 = $(\"[val thing]\");", + "return `This is: ${var1}`;", + ]) + }) + + it("should handle square brackets with properties", () => { + const response = convertToJS("{{ [user].[_id] }}") + checkLines(response, [ + "const var1 = $(\"[user].[_id]\");", + "return `${var1}`;", + ]) + }) + + it("should handle multiple complex statements", () => { + const response = convertToJS("average: {{ avg ( abs val1 ) val2 }} add: {{ add 1 2 }}") + checkLines(response, [ + "const var1 = helpers.avg(...[helpers.abs($(\"val1\")), $(\"val2\")]);", + "const var2 = helpers.add(...[1, 2]);", + "return `average: ${var1} add: ${var2}`;", + ]) + }) +}) \ No newline at end of file From 15b275c0f96e54840ddef217017832e4308a16ce Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 29 Jul 2022 09:50:53 +0100 Subject: [PATCH 025/272] Some minor fixes for edge cases. --- .../common/bindings/BindingPanel.svelte | 2 +- .../string-templates/src/conversion/index.js | 11 +++++---- .../string-templates/test/hbsToJs.spec.js | 24 +++++++++++++++---- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index 6f0bc4615..2a9a64b45 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -62,7 +62,7 @@ const updateValue = val => { valid = isValid(readableToRuntimeBinding(bindings, val)) - console.log(decodeJSBinding(readableToRuntimeBinding(bindings, val))) + console.log(readableToRuntimeBinding(bindings, val)) if (valid) { dispatch("change", val) } diff --git a/packages/string-templates/src/conversion/index.js b/packages/string-templates/src/conversion/index.js index 62abdf6f5..51b760b8c 100644 --- a/packages/string-templates/src/conversion/index.js +++ b/packages/string-templates/src/conversion/index.js @@ -32,9 +32,9 @@ function buildList(parts, value) { .join(", ") } if (!value) { - return parts.length > 1 ? `...[${build()}]` : build() + return parts.length > 1 ? `${build()}` : build() } else { - return parts.length === 0 ? value : `...[${value}, ${build()}]` + return parts.length === 0 ? value : `${value}, ${build()}` } } @@ -50,12 +50,15 @@ function splitBySpace(layer) { parts.push(layer.substring(started, index + 1).trim()) started = null last = index - } else if (started == null && char === " ") { + } else if (started == null && char === " " && last !== index - 1) { parts.push(layer.substring(last, index).trim()) last = index } } - if (!layer.startsWith("[")) { + if ( + (!layer.startsWith("[") || parts.length === 0) && + last !== layer.length - 1 + ) { parts.push(layer.substring(last, layer.length).trim()) } return parts diff --git a/packages/string-templates/test/hbsToJs.spec.js b/packages/string-templates/test/hbsToJs.spec.js index 1197907b2..aca2e931f 100644 --- a/packages/string-templates/test/hbsToJs.spec.js +++ b/packages/string-templates/test/hbsToJs.spec.js @@ -24,6 +24,14 @@ describe("Test that the string processing works correctly", () => { ]) }) + it("handle properties", () => { + const response = convertToJS("{{ [query].id }}") + checkLines(response, [ + "const var1 = $(\"[query].id\");", + "return `${var1}`;", + ]) + }) + it("should convert some basic HBS strings", () => { const response = convertToJS("Hello {{ name }}, welcome to {{ company }}!") checkLines(response, [ @@ -33,6 +41,14 @@ describe("Test that the string processing works correctly", () => { ]) }) + it("Should handle many square brackets in helpers", () => { + const response = convertToJS("Hello {{ avg [user].[_id] [user].[_rev] }}") + checkLines(response, [ + "const var1 = helpers.avg($(\"[user].[_id]\"), $(\"[user].[_rev]\"));", + "return `Hello ${var1}`;" + ]) + }) + it("should handle a helper block", () => { const response = convertToJS("This is the average: {{ avg array }}") checkLines(response, [ @@ -44,7 +60,7 @@ describe("Test that the string processing works correctly", () => { it("should handle multi-variable helper", () => { const response = convertToJS("This is the average: {{ join ( avg val1 val2 val3 ) }}") checkLines(response, [ - "const var1 = helpers.join(helpers.avg(...[$(\"val1\"), $(\"val2\"), $(\"val3\")]));", + "const var1 = helpers.join(helpers.avg($(\"val1\"), $(\"val2\"), $(\"val3\")));", "return `This is the average: ${var1}`;", ]) }) @@ -52,7 +68,7 @@ describe("Test that the string processing works correctly", () => { it("should handle a complex statement", () => { const response = convertToJS("This is the average: {{ join ( avg val1 val2 val3 ) val4 }}") checkLines(response, [ - "const var1 = helpers.join(...[helpers.avg(...[$(\"val1\"), $(\"val2\"), $(\"val3\")]), $(\"val4\")]);", + "const var1 = helpers.join(helpers.avg($(\"val1\"), $(\"val2\"), $(\"val3\")), $(\"val4\"));", "return `This is the average: ${var1}`;", ]) }) @@ -76,8 +92,8 @@ describe("Test that the string processing works correctly", () => { it("should handle multiple complex statements", () => { const response = convertToJS("average: {{ avg ( abs val1 ) val2 }} add: {{ add 1 2 }}") checkLines(response, [ - "const var1 = helpers.avg(...[helpers.abs($(\"val1\")), $(\"val2\")]);", - "const var2 = helpers.add(...[1, 2]);", + "const var1 = helpers.avg(helpers.abs($(\"val1\")), $(\"val2\"));", + "const var2 = helpers.add(1, 2);", "return `average: ${var1} add: ${var2}`;", ]) }) From d15d034af36b43058b3fd75dff3909e35fd39e02 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 28 Jul 2022 14:25:58 +0100 Subject: [PATCH 026/272] Add keyboard shortcuts for components. Improve component reordering --- .../src/builderStore/store/frontend.js | 203 ++++++++++++++++-- .../[screenId]/_components/AppPreview.svelte | 4 + .../navigation/ComponentListPanel.svelte | 79 ++++++- .../components/preview/KeyboardManager.svelte | 10 +- packages/client/src/stores/builder.js | 4 +- 5 files changed, 266 insertions(+), 34 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 58d803aa0..ff926bce1 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -618,6 +618,16 @@ export const getFrontendStore = () => { } } + // Check inside is valid + if (mode === "inside") { + const definition = store.actions.components.getDefinition( + targetComponent._component + ) + if (!definition.hasChildren) { + mode = "below" + } + } + // Paste new component if (mode === "inside") { // Paste inside target component if chosen @@ -654,46 +664,197 @@ export const getFrontendStore = () => { return state }) }, + selectPrevious: () => { + const state = get(store) + const componentId = state.selectedComponentId + const screen = get(selectedScreen) + const parent = findComponentParent(screen.props, componentId) + let newComponentId = componentId + + // Check we aren't right at the top of the tree + const index = parent?._children.findIndex(x => x._id === componentId) + if (!parent || componentId === screen.props._id) { + return + } + + // If we have siblings above us, choose the sibling or a descendant + if (index > 0) { + // If sibling before us accepts children, select a descendant + const previousSibling = parent._children[index - 1] + if (previousSibling._children?.length) { + let target = previousSibling + while (target._children?.length) { + target = target._children[target._children.length - 1] + } + newComponentId = target._id + } + + // Otherwise just select sibling + else { + newComponentId = previousSibling._id + } + } + + // If no siblings above us, select the parent + else { + newComponentId = parent._id + } + + // Only update state if component changed + if (newComponentId !== componentId) { + store.update(state => { + state.selectedComponentId = newComponentId + return state + }) + } + }, + selectNext: () => { + const component = get(selectedComponent) + const componentId = component?._id + const screen = get(selectedScreen) + const parent = findComponentParent(screen.props, componentId) + const index = parent?._children.findIndex(x => x._id === componentId) + let newComponentId = componentId + + // If we have children, select first child + if (component._children?.length) { + newComponentId = component._children[0]._id + } else if (!parent) { + return null + } + + // Otherwise select the next sibling if we have one + else if (index < parent._children.length - 1) { + const nextSibling = parent._children[index + 1] + newComponentId = nextSibling._id + } + + // Last child, select our parents next sibling + else { + let target = parent + let targetParent = findComponentParent(screen.props, target._id) + let targetIndex = targetParent?._children.findIndex( + child => child._id === target._id + ) + while ( + targetParent != null && + targetIndex === targetParent._children?.length - 1 + ) { + target = targetParent + targetParent = findComponentParent(screen.props, target._id) + targetIndex = targetParent?._children.findIndex( + child => child._id === target._id + ) + } + if (targetParent) { + newComponentId = targetParent._children[targetIndex + 1]._id + } + } + + // Only update state if component ID is different + if (newComponentId !== componentId) { + store.update(state => { + state.selectedComponentId = newComponentId + return state + }) + } + }, moveUp: async component => { await store.actions.screens.patch(screen => { const componentId = component?._id const parent = findComponentParent(screen.props, componentId) - if (!parent?._children?.length) { - return false - } - const currentIndex = parent._children.findIndex( - child => child._id === componentId - ) - if (currentIndex === 0) { - return false + + // Check we aren't right at the top of the tree + const index = parent?._children.findIndex(x => x._id === componentId) + if (!parent || (index === 0 && parent._id === screen.props._id)) { + return } - const originalComponent = cloneDeep(parent._children[currentIndex]) - const newChildren = parent._children.filter( + + // Copy original component and remove it from the parent + const originalComponent = cloneDeep(parent._children[index]) + parent._children = parent._children.filter( component => component._id !== componentId ) - newChildren.splice(currentIndex - 1, 0, originalComponent) - parent._children = newChildren + + // If we have siblings above us, move up + if (index > 0) { + // If sibling before us accepts children, move to last child of + // sibling + const previousSibling = parent._children[index - 1] + const definition = store.actions.components.getDefinition( + previousSibling._component + ) + if (definition.hasChildren) { + previousSibling._children.push(originalComponent) + } + + // Otherwise just move component above sibling + else { + parent._children.splice(index - 1, 0, originalComponent) + } + } + + // If no siblings above us, go above the parent as long as it isn't + // the screen + else if (parent._id !== screen.props._id) { + const grandParent = findComponentParent(screen.props, parent._id) + const parentIndex = grandParent._children.findIndex( + child => child._id === parent._id + ) + grandParent._children.splice(parentIndex, 0, originalComponent) + } }) }, moveDown: async component => { await store.actions.screens.patch(screen => { const componentId = component?._id const parent = findComponentParent(screen.props, componentId) + + // Sanity check parent is found if (!parent?._children?.length) { return false } - const currentIndex = parent._children.findIndex( - child => child._id === componentId - ) - if (currentIndex === parent._children.length - 1) { - return false + + // Check we aren't right at the bottom of the tree + const index = parent._children.findIndex(x => x._id === componentId) + if ( + index === parent._children.length - 1 && + parent._id === screen.props._id + ) { + return } - const originalComponent = cloneDeep(parent._children[currentIndex]) - const newChildren = parent._children.filter( + + // Copy the original component and remove from parent + const originalComponent = cloneDeep(parent._children[index]) + parent._children = parent._children.filter( component => component._id !== componentId ) - newChildren.splice(currentIndex + 1, 0, originalComponent) - parent._children = newChildren + + // Move below the next sibling if we are not the last sibling + if (index < parent._children.length) { + // If the next sibling has children, become the first child + const nextSibling = parent._children[index] + const definition = store.actions.components.getDefinition( + nextSibling._component + ) + if (definition.hasChildren) { + nextSibling._children.splice(0, 0, originalComponent) + } + + // Otherwise move below next sibling + else { + parent._children.splice(index + 1, 0, originalComponent) + } + } + + // Last child, so move below our parent + else { + const grandParent = findComponentParent(screen.props, parent._id) + const parentIndex = grandParent._children.findIndex( + child => child._id === parent._id + ) + grandParent._children.splice(parentIndex + 1, 0, originalComponent) + } }) }, updateStyle: async (name, value) => { diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte index abb956c9d..dc22f9330 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte @@ -144,7 +144,11 @@ } else if (type === "update-prop") { await store.actions.components.updateSetting(data.prop, data.value) } else if (type === "delete-component" && data.id) { + // Legacy type, can be deleted in future confirmDeleteComponent(data.id) + } else if (type === "key-down") { + const { key, ctrlKey } = data + document.dispatchEvent(new KeyboardEvent("keydown", { key, ctrlKey })) } else if (type === "duplicate-component" && data.id) { const rootComponent = get(currentAsset).props const component = findComponent(rootComponent, data.id) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte index 1bb4e3d9c..e10015f96 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte @@ -2,16 +2,19 @@ import Panel from "components/design/Panel.svelte" import ComponentTree from "./ComponentTree.svelte" import { dndStore } from "./dndStore.js" - import { goto } from "@roxi/routify" - import { store, selectedScreen } from "builderStore" + import { goto, isActive } from "@roxi/routify" + import { store, selectedScreen, selectedComponent } from "builderStore" import NavItem from "components/common/NavItem.svelte" import ScreenslotDropdownMenu from "./ScreenslotDropdownMenu.svelte" - import { setContext } from "svelte" + import { setContext, onMount } from "svelte" + import { get } from "svelte/store" import DNDPositionIndicator from "./DNDPositionIndicator.svelte" import { DropPosition } from "./dndStore" import { notifications } from "@budibase/bbui" + import ConfirmDialog from "components/common/ConfirmDialog.svelte" let scrollRef + let confirmDeleteDialog const scrollTo = bounds => { if (!bounds) { @@ -69,6 +72,69 @@ setContext("scroll", { scrollTo, }) + + const deleteComponent = async () => { + await store.actions.components.delete(get(selectedComponent)) + } + + const handleKeyPress = async e => { + // Ignore repeating events + if (e.repeat) { + return + } + // Ignore events when typing + const activeTag = document.activeElement?.tagName.toLowerCase() + if (["input", "textarea"].indexOf(activeTag) !== -1 && e.key !== "Escape") { + return + } + const component = get(selectedComponent) + try { + if (e.key === "Delete") { + e.preventDefault() + confirmDeleteDialog.show() + } else if (e.ctrlKey) { + if (e.key === "ArrowUp") { + e.preventDefault() + e.stopPropagation() + await store.actions.components.moveUp(component) + } else if (e.key === "ArrowDown") { + e.preventDefault() + await store.actions.components.moveDown(component) + } else if (e.key === "c") { + e.preventDefault() + await store.actions.components.copy(component, false) + } else if (e.key === "x") { + e.preventDefault() + store.actions.components.copy(component, true) + } else if (e.key === "v") { + e.preventDefault() + await store.actions.components.paste(component, "inside") + } else if (e.key === "Enter") { + e.preventDefault() + $goto("./new") + } + } else if (e.key === "ArrowUp") { + e.preventDefault() + await store.actions.components.selectPrevious() + } else if (e.key === "ArrowDown") { + e.preventDefault() + await store.actions.components.selectNext() + } else if (e.key === "Escape" && $isActive("./new")) { + e.preventDefault() + $goto("./") + } + } catch (error) { + console.log(error) + notifications.error("Error handling key press") + } + } + + onMount(() => { + document.addEventListener("keydown", handleKeyPress) + return () => { + document.removeEventListener("keydown", handleKeyPress) + } + })
+ diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ButtonRoundnessSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ButtonRoundnessSelect.svelte new file mode 100644 index 000000000..21b04f694 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ButtonRoundnessSelect.svelte @@ -0,0 +1,38 @@ + + +
+ +
+ +
+
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte index 4bad3b7bc..19184a864 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeSettingsPanel.svelte @@ -11,25 +11,7 @@ import { get } from "svelte/store" import { DefaultAppTheme } from "constants" import AppThemeSelect from "./AppThemeSelect.svelte" - - const ButtonBorderRadiusOptions = [ - { - label: "Square", - value: "0", - }, - { - label: "Soft edge", - value: "4px", - }, - { - label: "Curved", - value: "8px", - }, - { - label: "Round", - value: "16px", - }, - ] + import ButtonRoundnessSelect from "./ButtonRoundnessSelect.svelte" $: customTheme = $store.customTheme || {} @@ -52,22 +34,11 @@ - -
- {#each ButtonBorderRadiusOptions as option} -
- -
- {/each} -
+ + update("buttonBorderRadius", e.detail)} + /> @@ -88,29 +59,3 @@ - - From 5737e23dd6b7e5463a00316e7c6d7e8a8adaf8f3 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 29 Jul 2022 12:10:53 +0100 Subject: [PATCH 033/272] Add keybindings to component context menu. Add duplicate keybinding. Simplify pasting --- packages/bbui/src/Menu/Item.svelte | 13 +++++ .../navigation/ComponentDropdownMenu.svelte | 52 +++++++++++-------- .../navigation/ComponentListPanel.svelte | 4 ++ .../components/preview/KeyboardManager.svelte | 6 +++ 4 files changed, 54 insertions(+), 21 deletions(-) diff --git a/packages/bbui/src/Menu/Item.svelte b/packages/bbui/src/Menu/Item.svelte index a5609683a..138eb33b3 100644 --- a/packages/bbui/src/Menu/Item.svelte +++ b/packages/bbui/src/Menu/Item.svelte @@ -8,6 +8,7 @@ export let icon = undefined export let disabled = undefined export let noClose = false + export let keyBind = undefined const onClick = () => { if (actionMenu && !noClose) { @@ -36,10 +37,22 @@ {/if} + {#if keyBind} +
+ {keyBind} +
+ {/if} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte index ed66c66c2..d2e35b836 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte @@ -64,44 +64,54 @@
- + Delete - + Move up - + Move down - + Duplicate - storeComponentForCopy(true)}> - Cut - - storeComponentForCopy(false)}> - Copy - pasteComponent("above")} - disabled={noPaste} + icon="Cut" + keyBind="Ctrl+X" + on:click={() => storeComponentForCopy(true)} > - Paste above + Cut pasteComponent("below")} - disabled={noPaste} + icon="Copy" + keyBind="Ctrl+C" + on:click={() => storeComponentForCopy(false)} > - Paste below + Copy pasteComponent("inside")} - disabled={noPaste || noChildrenAllowed} + disabled={noPaste} > - Paste inside + Paste From 65e43b0f70c65dc964d1d08d0d0169e00848d9ad Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 29 Jul 2022 13:05:50 +0100 Subject: [PATCH 034/272] Improve component selection after deleting a component --- .../src/builderStore/store/frontend.js | 108 +++++++++--------- 1 file changed, 57 insertions(+), 51 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index ff926bce1..c7795d4b5 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -534,7 +534,16 @@ export const getFrontendStore = () => { if (!component) { return } - let parentId + + // Determine the next component to select after deletion + const state = get(store) + let nextSelectedComponentId + if (state.selectedComponentId === component._id) { + nextSelectedComponentId = store.actions.components.getNext() + if (!nextSelectedComponentId) { + nextSelectedComponentId = store.actions.components.getPrevious() + } + } // Patch screen await store.actions.screens.patch(screen => { @@ -549,17 +558,18 @@ export const getFrontendStore = () => { if (!parent) { return false } - parentId = parent._id parent._children = parent._children.filter( child => child._id !== component._id ) }) - // Select the deleted component's parent - store.update(state => { - state.selectedComponentId = parentId - return state - }) + // Update selected component if required + if (nextSelectedComponentId) { + store.update(state => { + state.selectedComponentId = nextSelectedComponentId + return state + }) + } }, copy: (component, cut = false, selectParent = true) => { // Update store with copied component @@ -664,17 +674,16 @@ export const getFrontendStore = () => { return state }) }, - selectPrevious: () => { + getPrevious: () => { const state = get(store) const componentId = state.selectedComponentId const screen = get(selectedScreen) const parent = findComponentParent(screen.props, componentId) - let newComponentId = componentId // Check we aren't right at the top of the tree const index = parent?._children.findIndex(x => x._id === componentId) if (!parent || componentId === screen.props._id) { - return + return null } // If we have siblings above us, choose the sibling or a descendant @@ -686,75 +695,72 @@ export const getFrontendStore = () => { while (target._children?.length) { target = target._children[target._children.length - 1] } - newComponentId = target._id + return target._id } // Otherwise just select sibling - else { - newComponentId = previousSibling._id - } + return previousSibling._id } // If no siblings above us, select the parent - else { - newComponentId = parent._id - } - - // Only update state if component changed - if (newComponentId !== componentId) { - store.update(state => { - state.selectedComponentId = newComponentId - return state - }) - } + return parent._id }, - selectNext: () => { + getNext: () => { const component = get(selectedComponent) const componentId = component?._id const screen = get(selectedScreen) const parent = findComponentParent(screen.props, componentId) const index = parent?._children.findIndex(x => x._id === componentId) - let newComponentId = componentId // If we have children, select first child if (component._children?.length) { - newComponentId = component._children[0]._id + return component._children[0]._id } else if (!parent) { return null } // Otherwise select the next sibling if we have one - else if (index < parent._children.length - 1) { + if (index < parent._children.length - 1) { const nextSibling = parent._children[index + 1] - newComponentId = nextSibling._id + return nextSibling._id } // Last child, select our parents next sibling - else { - let target = parent - let targetParent = findComponentParent(screen.props, target._id) - let targetIndex = targetParent?._children.findIndex( + let target = parent + let targetParent = findComponentParent(screen.props, target._id) + let targetIndex = targetParent?._children.findIndex( + child => child._id === target._id + ) + while ( + targetParent != null && + targetIndex === targetParent._children?.length - 1 + ) { + target = targetParent + targetParent = findComponentParent(screen.props, target._id) + targetIndex = targetParent?._children.findIndex( child => child._id === target._id ) - while ( - targetParent != null && - targetIndex === targetParent._children?.length - 1 - ) { - target = targetParent - targetParent = findComponentParent(screen.props, target._id) - targetIndex = targetParent?._children.findIndex( - child => child._id === target._id - ) - } - if (targetParent) { - newComponentId = targetParent._children[targetIndex + 1]._id - } } - - // Only update state if component ID is different - if (newComponentId !== componentId) { + if (targetParent) { + return targetParent._children[targetIndex + 1]._id + } else { + return null + } + }, + selectPrevious: () => { + const previousId = store.actions.components.getPrevious() + if (previousId) { + store.update(state => { + state.selectedComponentId = previousId + return state + }) + } + }, + selectNext: () => { + const nextId = store.actions.components.getNext() + if (nextId) { store.update(state => { - state.selectedComponentId = newComponentId + state.selectedComponentId = nextId return state }) } From cfe10e36e411550922bc70e2f9fe43fea7c9bd8d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 29 Jul 2022 13:10:02 +0100 Subject: [PATCH 035/272] Add key binds to screenslot component --- packages/bbui/src/Menu/Item.svelte | 3 +++ .../navigation/ScreenslotDropdownMenu.svelte | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/bbui/src/Menu/Item.svelte b/packages/bbui/src/Menu/Item.svelte index 138eb33b3..495bb8d71 100644 --- a/packages/bbui/src/Menu/Item.svelte +++ b/packages/bbui/src/Menu/Item.svelte @@ -55,4 +55,7 @@ font-size: 12px; font-weight: 600; } + .is-disabled .keyBind { + color: var(--spectrum-global-color-gray-300); + } diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ScreenslotDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ScreenslotDropdownMenu.svelte index 7ec7b0821..9d4486096 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ScreenslotDropdownMenu.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ScreenslotDropdownMenu.svelte @@ -31,15 +31,20 @@
- storeComponentForCopy(false)}> + storeComponentForCopy(false)} + > Copy pasteComponent("inside")} disabled={noPaste} > - Paste inside + Paste {/if} From 447f463ec5c13930ebdfd47a324dbb36d86c30a5 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 29 Jul 2022 13:11:50 +0100 Subject: [PATCH 036/272] Fix icon colors being static grey in automation section --- .../automation/AutomationBuilder/FlowChart/FlowItem.svelte | 2 +- .../AutomationBuilder/FlowChart/FlowItemHeader.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte index c1618a890..dd8fa7df4 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte @@ -162,7 +162,7 @@ width="28px" height="28px" class="spectrum-Icon" - style="color:grey;" + style="color:var(--spectrum-global-color-gray-700);" focusable="false" > diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte index 99c6f251f..676af0d17 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte @@ -63,7 +63,7 @@ width="28px" height="28px" class="spectrum-Icon" - style="color:grey;" + style="color:var(--spectrum-global-color-gray-700);" focusable="false" > From 67dd1fd9c33370f1dce50ff2ed26c40f15bc7149 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 29 Jul 2022 14:12:04 +0100 Subject: [PATCH 037/272] Adding the examples and helper add functionality for JS as well as hiding button to convert outside of development environment. --- .../common/bindings/BindingPanel.svelte | 48 ++++++++++++---- .../src/components/common/bindings/utils.js | 8 ++- packages/string-templates/manifest.json | 2 +- .../scripts/gen-collection-info.js | 6 +- .../string-templates/src/conversion/index.js | 55 ++++++++++++++++--- .../string-templates/test/hbsToJs.spec.js | 36 +++++++++++- 6 files changed, 129 insertions(+), 26 deletions(-) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index 2a9a64b45..4dc9d9700 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -24,6 +24,7 @@ import { addHBSBinding, addJSBinding } from "./utils" import CodeMirrorEditor from "components/common/CodeMirrorEditor.svelte" import { convertToJS } from "@budibase/string-templates" + import { admin } from "stores/portal" const dispatch = createEventDispatcher() @@ -62,16 +63,24 @@ const updateValue = val => { valid = isValid(readableToRuntimeBinding(bindings, val)) - console.log(readableToRuntimeBinding(bindings, val)) if (valid) { dispatch("change", val) } } - // Adds a HBS helper to the expression - const addHelper = helper => { - hbsValue = addHBSBinding(hbsValue, getCaretPosition(), helper.text) - updateValue(hbsValue) + // Adds a JS/HBS helper to the expression + const addHelper = (helper, js) => { + let value + const pos = getCaretPosition() + if (js) { + const decoded = decodeJSBinding(jsValue) + value = jsValue = encodeJSBinding( + addJSBinding(decoded, pos, helper.text, { helper: true }) + ) + } else { + value = hbsValue = addHBSBinding(hbsValue, pos, helper.text) + } + updateValue(value) } // Adds a data binding to the expression @@ -108,7 +117,6 @@ const convert = () => { const runtime = readableToRuntimeBinding(bindings, hbsValue) - console.log(runtime) const runtimeJs = encodeJSBinding(convertToJS(runtime)) jsValue = runtimeToReadableBinding(bindings, runtimeJs) hbsValue = null @@ -116,6 +124,17 @@ addBinding("", { forceJS: true }) } + const getHelperExample = (helper, js) => { + let example = helper.example || "" + if (js) { + example = convertToJS(example).split("\n")[0].split("= ")[1] + if (example === "null;") { + example = "" + } + } + return example || "" + } + onMount(() => { valid = isValid(readableToRuntimeBinding(bindings, value)) }) @@ -151,18 +170,21 @@ {/if} {/each} - {#if filteredHelpers?.length && !usingJS} + {#if filteredHelpers?.length}
Helpers
    {#each filteredHelpers as helper} -
  • addHelper(helper)}> +
  • addHelper(helper, usingJS)}>
    {helper.displayText}
    {@html helper.description}
    - 
    {helper.example || ""}
    + 
    {getHelperExample(
+                      helper,
+                      usingJS
+                    )}
    • {/each} @@ -188,9 +210,11 @@ for more details.

    {/if} -
    - -
    + {#if $admin.isDev} +
    + +
    + {/if}
{#if allowJS} diff --git a/packages/builder/src/components/common/bindings/utils.js b/packages/builder/src/components/common/bindings/utils.js index 42a3f1167..c7b40604a 100644 --- a/packages/builder/src/components/common/bindings/utils.js +++ b/packages/builder/src/components/common/bindings/utils.js @@ -18,10 +18,14 @@ export function addHBSBinding(value, caretPos, binding) { return value } -export function addJSBinding(value, caretPos, binding) { +export function addJSBinding(value, caretPos, binding, { helper } = {}) { binding = typeof binding === "string" ? binding : binding.path value = value == null ? "" : value - binding = `$("${binding}")` + if (!helper) { + binding = `$("${binding}")` + } else { + binding = `helper.${binding}()` + } if (caretPos.start) { value = value.substring(0, caretPos.start) + diff --git a/packages/string-templates/manifest.json b/packages/string-templates/manifest.json index 748330add..f8600121f 100644 --- a/packages/string-templates/manifest.json +++ b/packages/string-templates/manifest.json @@ -74,7 +74,7 @@ "b" ], "numArgs": 2, - "example": "{{ product 10 5 }} -> 50", + "example": "{{ multiply 10 5 }} -> 50", "description": "

Return the product of a times b.

\n" }, "plus": { diff --git a/packages/string-templates/scripts/gen-collection-info.js b/packages/string-templates/scripts/gen-collection-info.js index 29df10423..bfc0ec79a 100644 --- a/packages/string-templates/scripts/gen-collection-info.js +++ b/packages/string-templates/scripts/gen-collection-info.js @@ -108,6 +108,10 @@ function getCommentInfo(file, func) { if (examples.length > 0) { docs.example = examples.join(" ") } + // hacky example fix + if (docs.example && docs.example.includes("product")) { + docs.example = docs.example.replace("product", "multiply") + } docs.description = blocks[0].trim() return docs } @@ -166,7 +170,7 @@ function run() { // convert all markdown to HTML for (let collection of Object.values(outputJSON)) { for (let helper of Object.values(collection)) { - helper.description = marked(helper.description) + helper.description = marked.parse(helper.description) } } fs.writeFileSync(FILENAME, JSON.stringify(outputJSON, null, 2)) diff --git a/packages/string-templates/src/conversion/index.js b/packages/string-templates/src/conversion/index.js index 51b760b8c..bbe0c3394 100644 --- a/packages/string-templates/src/conversion/index.js +++ b/packages/string-templates/src/conversion/index.js @@ -22,7 +22,29 @@ function getLayers(fullBlock) { } function getVariable(variableName) { - return isNaN(parseFloat(variableName)) ? `$("${variableName}")` : variableName + if (!variableName || typeof variableName !== "string") { + return variableName + } + // it is an array + const arrayOrObject = [",", "{", ":"] + let contains = false + arrayOrObject.forEach(char => { + if (variableName.includes(char)) { + contains = true + } + }) + if (variableName.startsWith("[") && contains) { + return variableName + } + // it is just a number + if (!isNaN(parseFloat(variableName))) { + return variableName + } + if (variableName.startsWith("'") || variableName.startsWith('"')) { + return variableName + } + // extract variable + return `$("${variableName}")` } function buildList(parts, value) { @@ -41,17 +63,34 @@ function buildList(parts, value) { function splitBySpace(layer) { const parts = [] let started = null, + endChar = null, last = 0 + function add(str) { + const startsWith = ["]"] + while (startsWith.indexOf(str.substring(0, 1)) !== -1) { + str = str.substring(1, str.length) + } + if (str.length > 0) { + parts.push(str.trim()) + } + } + const continuationChars = ["[", "'", '"'] for (let index = 0; index < layer.length; index++) { const char = layer[index] - if (char === "[" && started == null) { + if (continuationChars.indexOf(char) !== -1 && started == null) { started = index - } else if (char === "]" && started != null && layer[index + 1] !== ".") { - parts.push(layer.substring(started, index + 1).trim()) + endChar = char === "[" ? "]" : char + } else if ( + char === endChar && + started != null && + layer[index + 1] !== "." + ) { + add(layer.substring(started, index + 1)) started = null - last = index - } else if (started == null && char === " " && last !== index - 1) { - parts.push(layer.substring(last, index).trim()) + endChar = null + last = index + 1 + } else if (started == null && char === " ") { + add(layer.substring(last, index)) last = index } } @@ -59,7 +98,7 @@ function splitBySpace(layer) { (!layer.startsWith("[") || parts.length === 0) && last !== layer.length - 1 ) { - parts.push(layer.substring(last, layer.length).trim()) + add(layer.substring(last, layer.length)) } return parts } diff --git a/packages/string-templates/test/hbsToJs.spec.js b/packages/string-templates/test/hbsToJs.spec.js index aca2e931f..63bd80db8 100644 --- a/packages/string-templates/test/hbsToJs.spec.js +++ b/packages/string-templates/test/hbsToJs.spec.js @@ -41,11 +41,43 @@ describe("Test that the string processing works correctly", () => { ]) }) - it("Should handle many square brackets in helpers", () => { + it("should handle many square brackets in helpers", () => { const response = convertToJS("Hello {{ avg [user].[_id] [user].[_rev] }}") checkLines(response, [ "const var1 = helpers.avg($(\"[user].[_id]\"), $(\"[user].[_rev]\"));", - "return `Hello ${var1}`;" + "return `Hello ${var1}`;", + ]) + }) + + it("should handle one of the examples (after)", () => { + const response = convertToJS("{{ after [1, 2, 3] 1}}") + checkLines(response, [ + "const var1 = helpers.after([1, 2, 3], 1);", + "return `${var1}`;", + ]) + }) + + it("should handle one of the examples (equalsLength)", () => { + const response = convertToJS("{{equalsLength '[1,2,3]' 3}}") + checkLines(response, [ + "const var1 = helpers.equalsLength('[1,2,3]', 3);", + "return `${var1}`;" + ]) + }) + + it("should handle one of the examples (pluck)", () => { + const response = convertToJS("{{pluck [{ 'name': 'Bob' }] 'name' }}") + checkLines(response, [ + "const var1 = helpers.pluck([{ 'name': 'Bob' }], 'name');", + "return `${var1}`;", + ]) + }) + + it("should handle sorting an array", () => { + const response = convertToJS("{{ sort ['b', 'a', 'c'] }}") + checkLines(response, [ + "const var1 = helpers.sort(['b', 'a', 'c']);", + "return `${var1}`;", ]) }) From 2aa7f2b2ff82355a68491db4ad0dec10045d7dd6 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 29 Jul 2022 14:41:41 +0100 Subject: [PATCH 038/272] Add Is in filter for options type --- packages/frontend-core/src/utils/lucene.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js index 72ccdc9fe..f0df19608 100644 --- a/packages/frontend-core/src/utils/lucene.js +++ b/packages/frontend-core/src/utils/lucene.js @@ -30,7 +30,7 @@ export const getValidOperatorsForType = type => { } else if (type === "number") { return numOps } else if (type === "options") { - return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty] + return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In] } else if (type === "array") { return [Op.Contains, Op.NotContains, Op.Empty, Op.NotEmpty, Op.ContainsAny] } else if (type === "boolean") { From fb3351e99bf03c6d97279e149b1686e6d605bade Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 29 Jul 2022 16:09:53 +0100 Subject: [PATCH 039/272] Add multiselect for options is in --- packages/bbui/src/Form/Multiselect.svelte | 2 +- .../design/settings/controls/FilterEditor/FilterDrawer.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/bbui/src/Form/Multiselect.svelte b/packages/bbui/src/Form/Multiselect.svelte index 7bcf22aa0..67e6f6105 100644 --- a/packages/bbui/src/Form/Multiselect.svelte +++ b/packages/bbui/src/Form/Multiselect.svelte @@ -27,7 +27,7 @@ {error} {disabled} {readonly} - {value} + value={Array.isArray(value) ? value : [value]} {options} {placeholder} {sort} diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte index d99c0f43b..4eab5d4f4 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte @@ -140,7 +140,7 @@ /> {:else if ["string", "longform", "number", "formula"].includes(filter.type)} - {:else if filter.type === "array"} + {:else if filter.type === "array" || (filter.type === "options" && filter.operator === "oneOf")} Date: Mon, 1 Aug 2022 09:54:30 +0100 Subject: [PATCH 040/272] Update modal background colours to be themeable and use theme colours for nord and midnight --- packages/bbui/src/Modal/Modal.svelte | 24 +++++++++++++------ .../frontend-core/src/themes/midnight.css | 2 ++ packages/frontend-core/src/themes/nord.css | 2 ++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/packages/bbui/src/Modal/Modal.svelte b/packages/bbui/src/Modal/Modal.svelte index 85a3d25e4..47420444a 100644 --- a/packages/bbui/src/Modal/Modal.svelte +++ b/packages/bbui/src/Modal/Modal.svelte @@ -82,12 +82,12 @@ --> {#if visible} -
+
+
@@ -116,7 +116,17 @@ z-index: 999; overflow: auto; overflow-x: hidden; - background: rgba(0, 0, 0, 0.75); + background: transparent; + } + .background { + background: var(--modal-background, rgba(0, 0, 0, 0.75)); + position: fixed; + top: 0; + left: 0; + height: 100vh; + width: 100vw; + opacity: 0.65; + pointer-events: none; } .modal-wrapper { diff --git a/packages/frontend-core/src/themes/midnight.css b/packages/frontend-core/src/themes/midnight.css index 528d84770..f2b4650eb 100644 --- a/packages/frontend-core/src/themes/midnight.css +++ b/packages/frontend-core/src/themes/midnight.css @@ -12,5 +12,7 @@ --spectrum-global-color-gray-700: hsl(var(--hue), var(--sat), 70%); --spectrum-global-color-gray-800: hsl(var(--hue), var(--sat), 80%); --spectrum-global-color-gray-900: hsl(var(--hue), var(--sat), 95%); + + --modal-background: var(--spectrum-global-color-gray-50); } diff --git a/packages/frontend-core/src/themes/nord.css b/packages/frontend-core/src/themes/nord.css index ebcf7efaf..05a4215e4 100644 --- a/packages/frontend-core/src/themes/nord.css +++ b/packages/frontend-core/src/themes/nord.css @@ -43,4 +43,6 @@ --spectrum-alias-highlight-hover: rgba(169, 177, 193, 0.1); --spectrum-alias-highlight-active: rgba(169, 177, 193, 0.1); + + --modal-background: var(--spectrum-global-color-gray-50); } From f07fd31e6852a310ba94e487758fb4cde4931a6a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 1 Aug 2022 10:06:01 +0100 Subject: [PATCH 041/272] Dedupe component actions by dispatching keyboard events when clicking component dropdown menu --- .../navigation/ComponentDropdownMenu.svelte | 174 ++++++------------ 1 file changed, 58 insertions(+), 116 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte index d2e35b836..f01d49f8e 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte @@ -1,127 +1,69 @@ -{#if showMenu} - -
- -
- - Delete - - - Move up - - - Move down - - - Duplicate - - storeComponentForCopy(true)} - > - Cut - - storeComponentForCopy(false)} - > - Copy - - pasteComponent("inside")} - disabled={noPaste} - > - Paste - - - -{/if} + +
+ +
+ keyboardEvent("Delete")} + > + Delete + + keyboardEvent("ArrowUp", true)} + > + Move up + + keyboardEvent("ArrowDown", true)} + > + Move down + + keyboardEvent("d", true)} + > + Duplicate + + keyboardEvent("x", true)} + > + Cut + + keyboardEvent("c", true)} + > + Copy + + keyboardEvent("v", true)} + disabled={noPaste} + > + Paste + + From b75e53b50aab1155e1f554047ecabfc509ef6cb6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 2 Aug 2022 10:01:46 +0100 Subject: [PATCH 047/272] Allow use of meta key as well as control key for modifier shortcuts --- .../_components/navigation/ComponentListPanel.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte index 484ac68ec..ec01c6290 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentListPanel.svelte @@ -89,7 +89,7 @@ } const component = get(selectedComponent) try { - if (e.ctrlKey) { + if (e.ctrlKey || e.metaKey) { if (e.key === "ArrowUp") { e.preventDefault() await store.actions.components.moveUp(component) From 63a0dacf3687952a4dc9edb3aec98e90df623606 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 2 Aug 2022 10:02:04 +0100 Subject: [PATCH 048/272] Update hover background colour for nord theme --- packages/frontend-core/src/themes/nord.css | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend-core/src/themes/nord.css b/packages/frontend-core/src/themes/nord.css index 05a4215e4..c5a9b1364 100644 --- a/packages/frontend-core/src/themes/nord.css +++ b/packages/frontend-core/src/themes/nord.css @@ -43,6 +43,7 @@ --spectrum-alias-highlight-hover: rgba(169, 177, 193, 0.1); --spectrum-alias-highlight-active: rgba(169, 177, 193, 0.1); + --spectrum-alias-background-color-hover-overlay: rgba(169, 177, 193, 0.1); --modal-background: var(--spectrum-global-color-gray-50); } From c7f4be584da1ebaef952fd99c2ee7aeeaee74abb Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 2 Aug 2022 10:52:09 +0100 Subject: [PATCH 049/272] Reduce event frequency --- .../src/events/processors/PosthogProcessor.ts | 21 ++++++++++ .../processors/tests/PosthogProcessor.spec.ts | 40 +++++++++++++++++++ .../src/events/publishers/license.ts | 6 --- .../tests/utilities/mocks/index.js | 2 + .../tests/utilities/mocks/posthog.ts | 7 ++++ .../builder/src/analytics/PosthogClient.js | 10 ++++- packages/builder/src/stores/portal/auth.js | 5 +++ packages/types/src/sdk/events/event.ts | 1 - 8 files changed, 84 insertions(+), 8 deletions(-) create mode 100644 packages/backend-core/src/events/processors/tests/PosthogProcessor.spec.ts create mode 100644 packages/backend-core/tests/utilities/mocks/posthog.ts diff --git a/packages/backend-core/src/events/processors/PosthogProcessor.ts b/packages/backend-core/src/events/processors/PosthogProcessor.ts index eb12db1dc..9d68d3919 100644 --- a/packages/backend-core/src/events/processors/PosthogProcessor.ts +++ b/packages/backend-core/src/events/processors/PosthogProcessor.ts @@ -5,6 +5,22 @@ import env from "../../environment" import * as context from "../../context" const pkg = require("../../../package.json") +const EXCLUDED_EVENTS: Event[] = [ + Event.USER_UPDATED, + Event.EMAIL_SMTP_UPDATED, + Event.AUTH_SSO_UPDATED, + Event.APP_UPDATED, + Event.ROLE_UPDATED, + Event.DATASOURCE_UPDATED, + Event.QUERY_UPDATED, + Event.TABLE_UPDATED, + Event.VIEW_UPDATED, + Event.VIEW_FILTER_UPDATED, + Event.VIEW_CALCULATION_UPDATED, + Event.AUTOMATION_TRIGGER_UPDATED, + Event.USER_GROUP_UPDATED, +] + export default class PosthogProcessor implements EventProcessor { posthog: PostHog @@ -21,6 +37,11 @@ export default class PosthogProcessor implements EventProcessor { properties: BaseEvent, timestamp?: string | number ): Promise { + // don't send excluded events + if (EXCLUDED_EVENTS.includes(event)) { + return + } + properties.version = pkg.version properties.service = env.SERVICE properties.environment = identity.environment diff --git a/packages/backend-core/src/events/processors/tests/PosthogProcessor.spec.ts b/packages/backend-core/src/events/processors/tests/PosthogProcessor.spec.ts new file mode 100644 index 000000000..4a6d55b27 --- /dev/null +++ b/packages/backend-core/src/events/processors/tests/PosthogProcessor.spec.ts @@ -0,0 +1,40 @@ +import PosthogProcessor from "../PosthogProcessor" +import { Event, IdentityType, Hosting } from "@budibase/types" + +const newIdentity = () => { + return { + id: "test", + type: IdentityType.USER, + hosting: Hosting.SELF, + environment: "test", + } +} + +describe("PosthogProcessor", () => { + beforeEach(() => { + jest.clearAllMocks() + }) + + describe("processEvent", () => { + it("processes event", () => { + const processor = new PosthogProcessor("test") + + const identity = newIdentity() + const properties = {} + + processor.processEvent(Event.APP_CREATED, identity, properties) + + expect(processor.posthog.capture).toHaveBeenCalledTimes(1) + }) + + it("honours exclusions", () => { + const processor = new PosthogProcessor("test") + + const identity = newIdentity() + const properties = {} + + processor.processEvent(Event.AUTH_SSO_UPDATED, identity, properties) + expect(processor.posthog.capture).toHaveBeenCalledTimes(0) + }) + }) +}) diff --git a/packages/backend-core/src/events/publishers/license.ts b/packages/backend-core/src/events/publishers/license.ts index 44dafd84c..1adc71652 100644 --- a/packages/backend-core/src/events/publishers/license.ts +++ b/packages/backend-core/src/events/publishers/license.ts @@ -20,12 +20,6 @@ export async function downgraded(license: License) { await publishEvent(Event.LICENSE_DOWNGRADED, properties) } -// TODO -export async function updated(license: License) { - const properties: LicenseUpdatedEvent = {} - await publishEvent(Event.LICENSE_UPDATED, properties) -} - // TODO export async function activated(license: License) { const properties: LicenseActivatedEvent = {} diff --git a/packages/backend-core/tests/utilities/mocks/index.js b/packages/backend-core/tests/utilities/mocks/index.js index 3dd5c854c..6aa1c4a54 100644 --- a/packages/backend-core/tests/utilities/mocks/index.js +++ b/packages/backend-core/tests/utilities/mocks/index.js @@ -1,7 +1,9 @@ +const posthog = require("./posthog") const events = require("./events") const date = require("./date") module.exports = { + posthog, date, events, } diff --git a/packages/backend-core/tests/utilities/mocks/posthog.ts b/packages/backend-core/tests/utilities/mocks/posthog.ts new file mode 100644 index 000000000..e9cc653cc --- /dev/null +++ b/packages/backend-core/tests/utilities/mocks/posthog.ts @@ -0,0 +1,7 @@ +jest.mock("posthog-node", () => { + return jest.fn().mockImplementation(() => { + return { + capture: jest.fn(), + } + }) +}) diff --git a/packages/builder/src/analytics/PosthogClient.js b/packages/builder/src/analytics/PosthogClient.js index 0b9f05290..c1e596358 100644 --- a/packages/builder/src/analytics/PosthogClient.js +++ b/packages/builder/src/analytics/PosthogClient.js @@ -1,5 +1,7 @@ import posthog from "posthog-js" import { Events } from "./constants" +import { get } from "svelte/store" +import { admin } from "../stores/portal" export default class PosthogClient { constructor(token) { @@ -9,9 +11,15 @@ export default class PosthogClient { init() { if (!this.token) return + // enable page views in cloud only + let capturePageViews = false + if (get(admin).cloud) { + capturePageViews = true + } + posthog.init(this.token, { autocapture: false, - capture_pageview: true, + capture_pageview: capturePageViews, }) posthog.set_config({ persistence: "cookie" }) diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js index d6f4fc140..7075b40d5 100644 --- a/packages/builder/src/stores/portal/auth.js +++ b/packages/builder/src/stores/portal/auth.js @@ -131,6 +131,11 @@ export function createAuthStore() { await setOrganisation(tenantId) }, getSelf: async () => { + // for analytics, we need to make sure the environment has been loaded + // before setting the user + if (!get(admin).loaded) { + await admin.init() + } // We need to catch this locally as we never want this to fail, even // though normally we never want to swallow API errors at the store level. // We're either logged in or we aren't. diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts index f0e023df5..d7086370e 100644 --- a/packages/types/src/sdk/events/event.ts +++ b/packages/types/src/sdk/events/event.ts @@ -135,7 +135,6 @@ export enum Event { // LICENSE LICENSE_UPGRADED = "license:upgraded", LICENSE_DOWNGRADED = "license:downgraded", - LICENSE_UPDATED = "license:updated", LICENSE_ACTIVATED = "license:activated", // ACCOUNT From e2f269bd1a8a1d57b93e798c51c5c0034dc5cf09 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 2 Aug 2022 11:16:35 +0100 Subject: [PATCH 050/272] Ensure the row key is unique even when the rows are sorted. --- .../src/components/common/AppLockModal.svelte | 116 +++++++++--------- .../src/components/start/AppRow.svelte | 5 +- .../pages/builder/portal/apps/index.svelte | 9 +- 3 files changed, 71 insertions(+), 59 deletions(-) diff --git a/packages/builder/src/components/common/AppLockModal.svelte b/packages/builder/src/components/common/AppLockModal.svelte index 5ca35f05d..cf8f17dbe 100644 --- a/packages/builder/src/components/common/AppLockModal.svelte +++ b/packages/builder/src/components/common/AppLockModal.svelte @@ -6,6 +6,8 @@ Modal, notifications, ProgressCircle, + Layout, + Body, } from "@budibase/bbui" import { auth, apps } from "stores/portal" import { processStringSync } from "@budibase/string-templates" @@ -29,6 +31,7 @@ lockedBy && lockedByYou ? "Locked by you" : `Locked by ${lockIdentifer}` const getExpiryDuration = app => { + console.log("Testing") if (!app?.lockedBy?.lockedAt) { return -1 } @@ -72,62 +75,65 @@ {/if}
- - -

- Apps are locked to prevent work from being lost from overlapping changes - between your team. -

- - {#if lockedByYou && getExpiryDuration(app) > 0} - - {processStringSync( - "This lock will expire in {{ duration time 'millisecond' }} from now.", - { - time: getExpiryDuration(app), - } - )} - - {/if} -
- - - {#if lockedByYou} - +
+ + + + + Apps are locked to prevent work from being lost from overlapping + changes between your team. + + {#if lockedByYou && getExpiryDuration(app) > 0} + + {processStringSync( + "This lock will expire in {{ duration time 'millisecond' }} from now. This lock will expire in This lock will expire in ", + { + time: getExpiryDuration(app), + } + )} + {/if} - -
- - +
+ + + {#if lockedByYou} + + {/if} + +
+ + + +
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte index 2cb35a9cf..ea54afc0e 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte @@ -8,21 +8,73 @@ import FilterDrawer from "./FilterDrawer.svelte" import { currentAsset } from "builderStore" + const QUERY_START_REGEX = /\d[0-9]*:/g const dispatch = createEventDispatcher() export let value = [] export let componentInstance export let bindings = [] - let drawer - let tempValue = value || [] + let drawer, + toSaveFilters = null, + allOr, + initialAllOr + $: initialFilters = correctFilters(value || []) $: dataSource = getDatasourceForProvider($currentAsset, componentInstance) $: schema = getSchemaForDatasource($currentAsset, dataSource)?.schema $: schemaFields = Object.values(schema || {}) - const saveFilter = async () => { - dispatch("change", tempValue) + function addNumbering(filters) { + let count = 1 + for (let value of filters) { + if (value.field && value.field?.match(QUERY_START_REGEX) == null) { + value.field = `${count++}:${value.field}` + } + } + return filters + } + + function correctFilters(filters) { + const corrected = [] + for (let filter of filters) { + let field = filter.field + if (filter.operator === "allOr") { + initialAllOr = allOr = true + continue + } + if ( + typeof filter.field === "string" && + filter.field.match(QUERY_START_REGEX) != null + ) { + const parts = field.split(":") + const number = parts[0] + // it's the new format, remove number + if (!isNaN(parseInt(number))) { + parts.shift() + field = parts.join(":") + } + } + corrected.push({ + ...filter, + field, + }) + } + return corrected + } + + async function saveFilter() { + if (!toSaveFilters && allOr !== initialAllOr) { + toSaveFilters = initialFilters + } + const filters = toSaveFilters?.filter(filter => filter.operator !== "allOr") + if (allOr && filters) { + filters.push({ operator: "allOr" }) + } + // only save if anything was updated + if (filters) { + dispatch("change", addNumbering(filters)) + } notifications.success("Filters saved.") drawer.hide() } @@ -33,8 +85,12 @@ { + toSaveFilters = event.detail + }} /> diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js index b6699628d..780cb2da3 100644 --- a/packages/frontend-core/src/utils/lucene.js +++ b/packages/frontend-core/src/utils/lucene.js @@ -103,6 +103,10 @@ export const buildLuceneQuery = filter => { const isHbs = typeof value === "string" && value.match(HBS_REGEX)?.length > 0 // Parse all values into correct types + if (operator === "allOr") { + query.allOr = true + return + } if (type === "datetime") { // Ensure date value is a valid date and parse into correct format if (!value) { diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js index 8a04fc2bd..ab084d9e0 100644 --- a/packages/server/src/api/controllers/row/internalSearch.js +++ b/packages/server/src/api/controllers/row/internalSearch.js @@ -1,4 +1,5 @@ const { SearchIndexes } = require("../../../db/utils") +const { removeKeyNumbering } = require("./utils") const fetch = require("node-fetch") const { getCouchInfo } = require("@budibase/backend-core/db") const { getAppId } = require("@budibase/backend-core/context") @@ -197,6 +198,8 @@ class QueryBuilder { function build(structure, queryFn) { for (let [key, value] of Object.entries(structure)) { + // check for new format - remove numbering if needed + key = removeKeyNumbering(key) key = builder.preprocess(key.replace(/ /g, "_"), { escape: true, }) diff --git a/packages/server/src/api/controllers/row/utils.js b/packages/server/src/api/controllers/row/utils.js index 5da7ca331..da1402075 100644 --- a/packages/server/src/api/controllers/row/utils.js +++ b/packages/server/src/api/controllers/row/utils.js @@ -3,8 +3,11 @@ const { cloneDeep } = require("lodash/fp") const { InternalTables } = require("../../../db/utils") const userController = require("../user") const { FieldTypes } = require("../../../constants") -const { makeExternalQuery } = require("../../../integrations/base/utils") const { getAppDB } = require("@budibase/backend-core/context") +const { + makeExternalQuery, + removeKeyNumbering, +} = require("../../../integrations/base/utils") validateJs.extend(validateJs.validators.datetime, { parse: function (value) { @@ -16,6 +19,8 @@ validateJs.extend(validateJs.validators.datetime, { }, }) +exports.removeKeyNumbering = removeKeyNumbering + exports.getDatasourceAndQuery = async json => { const datasourceId = json.endpoint.datasourceId const db = getAppDB() diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts index 750564c6f..a46ce7aea 100644 --- a/packages/server/src/integrations/base/sql.ts +++ b/packages/server/src/integrations/base/sql.ts @@ -10,6 +10,7 @@ import { import { isIsoDateString, SqlClients } from "../utils" import SqlTableQueryBuilder from "./sqlTable" import environment from "../../environment" +import { removeKeyNumbering } from "./utils" const envLimit = environment.SQL_MAX_ROWS ? parseInt(environment.SQL_MAX_ROWS) @@ -133,12 +134,13 @@ class InternalBuilder { fn: (key: string, value: any) => void ) { for (let [key, value] of Object.entries(structure)) { - const isRelationshipField = key.includes(".") + const updatedKey = removeKeyNumbering(key) + const isRelationshipField = updatedKey.includes(".") if (!opts.relationship && !isRelationshipField) { - fn(`${opts.tableName}.${key}`, value) + fn(`${opts.tableName}.${updatedKey}`, value) } if (opts.relationship && isRelationshipField) { - fn(key, value) + fn(updatedKey, value) } } } diff --git a/packages/server/src/integrations/base/utils.ts b/packages/server/src/integrations/base/utils.ts index 086912b92..0913d59b2 100644 --- a/packages/server/src/integrations/base/utils.ts +++ b/packages/server/src/integrations/base/utils.ts @@ -1,22 +1,30 @@ import { QueryJson } from "../../definitions/datasource" import { Datasource } from "../../definitions/common" +const { integrations } = require("../index") -module DatasourceUtils { - const { integrations } = require("../index") +const QUERY_START_REGEX = /\d[0-9]*:/g - export async function makeExternalQuery( - datasource: Datasource, - json: QueryJson - ) { - const Integration = integrations[datasource.source] - // query is the opinionated function - if (Integration.prototype.query) { - const integration = new Integration(datasource.config) - return integration.query(json) - } else { - throw "Datasource does not support query." - } +export async function makeExternalQuery( + datasource: Datasource, + json: QueryJson +) { + const Integration = integrations[datasource.source] + // query is the opinionated function + if (Integration.prototype.query) { + const integration = new Integration(datasource.config) + return integration.query(json) + } else { + throw "Datasource does not support query." } +} - module.exports.makeExternalQuery = makeExternalQuery +export function removeKeyNumbering(key: any): string { + if (typeof key === "string" && key.match(QUERY_START_REGEX) != null) { + const parts = key.split(":") + // remove the number + parts.shift() + return parts.join(":") + } else { + return key + } } diff --git a/packages/server/src/integrations/queries/sql.ts b/packages/server/src/integrations/queries/sql.ts index 271a414d4..7fbcfea0a 100644 --- a/packages/server/src/integrations/queries/sql.ts +++ b/packages/server/src/integrations/queries/sql.ts @@ -1,5 +1,4 @@ import { findHBSBlocks, processStringSync } from "@budibase/string-templates" -import { Integration } from "../../definitions/datasource" import { DatasourcePlus } from "../base/datasourcePlus" const CONST_CHAR_REGEX = new RegExp("'[^']*'", "g") From 7d6b45c1e694c508d25ee00a5b93a5c513fbd554 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 3 Aug 2022 17:44:44 +0100 Subject: [PATCH 061/272] Switching to an explicit select for the OR/AND options in the filter. --- .../controls/FilterEditor/FilterDrawer.svelte | 172 ++++++++++-------- 1 file changed, 94 insertions(+), 78 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte index 1d9c3dea0..fcec0e35a 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte @@ -9,7 +9,6 @@ Input, Layout, Select, - Toggle, Label, } from "@budibase/bbui" import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte" @@ -17,7 +16,7 @@ import { generate } from "shortid" import { LuceneUtils, Constants } from "@budibase/frontend-core" import { getFields } from "helpers/searchFields" - import { createEventDispatcher } from "svelte" + import { createEventDispatcher, onMount } from "svelte" const dispatch = createEventDispatcher() @@ -33,6 +32,11 @@ $: fieldOptions = enrichedSchemaFields.map(field => field.name) || [] $: valueTypeOptions = allowBindings ? ["Value", "Binding"] : ["Value"] + let behaviourValue + const behaviourOptions = [ + { value: "and", label: "Match all of the following filters" }, + { value: "or", label: "Match any of the following filters" }, + ] const addFilter = () => { filters = [ ...filters, @@ -99,6 +103,10 @@ const schema = enrichedSchemaFields.find(x => x.name === field) return schema?.constraints?.inclusion || [] } + + onMount(() => { + behaviourValue = allOr ? "or" : "and" + }) @@ -114,88 +122,98 @@ {#if filters?.length}
- {#each filters as filter, idx} - onOperatorChange(filter, e.detail)} - placeholder={null} - /> - opt.label} + getOptionValue={opt => opt.value} + on:change={e => (allOr = e.detail === "or")} + placeholder={null} + /> +
+
+
+ +
+
+ {#each filters as filter, idx} + onOperatorChange(filter, e.detail)} + placeholder={null} /> - {:else if ["string", "longform", "number", "formula"].includes(filter.type)} - - {:else if ["options", "array"].includes(filter.type)} - - {:else if filter.type === "boolean"} - (filter.value = event.detail)} + /> + {:else if ["string", "longform", "number", "formula"].includes(filter.type)} + + {:else if ["options", "array"].includes(filter.type)} + + {:else if filter.type === "boolean"} + + {:else if filter.type === "datetime"} + + {:else} + + {/if} + duplicateFilter(filter.id)} /> - {:else if filter.type === "datetime"} - removeFilter(filter.id)} /> - {:else} - - {/if} - duplicateFilter(filter.id)} - /> - removeFilter(filter.id)} - /> - {/each} + {/each} +
{/if}
-
- (allOr = event.detail)} - /> -
@@ -216,10 +234,8 @@ grid-template-columns: 1fr 120px 120px 1fr auto auto; } - .toggle { - display: flex; - align-items: center; - padding-right: var(--spacing-s); + .filter-label { + margin-bottom: var(--spacing-s); } .bottom { From df074c60048fdcc565194ad803ce1ad7c0838e7b Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 3 Aug 2022 18:20:07 +0100 Subject: [PATCH 062/272] Fixing test cases. --- .../server/src/api/controllers/row/utils.js | 6 ++---- .../src/api/controllers/table/external.js | 2 +- packages/server/src/integrations/base/query.ts | 17 +++++++++++++++++ packages/server/src/integrations/base/sql.ts | 1 - packages/server/src/integrations/base/utils.ts | 18 ------------------ .../src/integrations/microsoftSqlServer.ts | 5 +++-- packages/server/src/integrations/mysql.ts | 2 +- packages/server/src/integrations/postgres.ts | 3 ++- .../server/src/integrations/tests/sql.spec.js | 2 +- 9 files changed, 27 insertions(+), 29 deletions(-) create mode 100644 packages/server/src/integrations/base/query.ts diff --git a/packages/server/src/api/controllers/row/utils.js b/packages/server/src/api/controllers/row/utils.js index da1402075..4c837e763 100644 --- a/packages/server/src/api/controllers/row/utils.js +++ b/packages/server/src/api/controllers/row/utils.js @@ -4,10 +4,8 @@ const { InternalTables } = require("../../../db/utils") const userController = require("../user") const { FieldTypes } = require("../../../constants") const { getAppDB } = require("@budibase/backend-core/context") -const { - makeExternalQuery, - removeKeyNumbering, -} = require("../../../integrations/base/utils") +const { makeExternalQuery } = require("../../../integrations/base/query") +const { removeKeyNumbering } = require("../../../integrations/base/utils") validateJs.extend(validateJs.validators.datetime, { parse: function (value) { diff --git a/packages/server/src/api/controllers/table/external.js b/packages/server/src/api/controllers/table/external.js index 34319c5bf..d919e9dad 100644 --- a/packages/server/src/api/controllers/table/external.js +++ b/packages/server/src/api/controllers/table/external.js @@ -14,7 +14,7 @@ const { FieldTypes, RelationshipTypes, } = require("../../../constants") -const { makeExternalQuery } = require("../../../integrations/base/utils") +const { makeExternalQuery } = require("../../../integrations/base/query") const { cloneDeep } = require("lodash/fp") const csvParser = require("../../../utilities/csvParser") const { handleRequest } = require("../row/external") diff --git a/packages/server/src/integrations/base/query.ts b/packages/server/src/integrations/base/query.ts new file mode 100644 index 000000000..59d67b2ef --- /dev/null +++ b/packages/server/src/integrations/base/query.ts @@ -0,0 +1,17 @@ +import { QueryJson } from "../../definitions/datasource" +import { Datasource } from "../../definitions/common" +const { integrations } = require("../index") + +export async function makeExternalQuery( + datasource: Datasource, + json: QueryJson +) { + const Integration = integrations[datasource.source] + // query is the opinionated function + if (Integration.prototype.query) { + const integration = new Integration(datasource.config) + return integration.query(json) + } else { + throw "Datasource does not support query." + } +} diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts index a46ce7aea..4d33669a0 100644 --- a/packages/server/src/integrations/base/sql.ts +++ b/packages/server/src/integrations/base/sql.ts @@ -584,4 +584,3 @@ class SqlQueryBuilder extends SqlTableQueryBuilder { } export default SqlQueryBuilder -module.exports = SqlQueryBuilder diff --git a/packages/server/src/integrations/base/utils.ts b/packages/server/src/integrations/base/utils.ts index 0913d59b2..54efdb91a 100644 --- a/packages/server/src/integrations/base/utils.ts +++ b/packages/server/src/integrations/base/utils.ts @@ -1,23 +1,5 @@ -import { QueryJson } from "../../definitions/datasource" -import { Datasource } from "../../definitions/common" -const { integrations } = require("../index") - const QUERY_START_REGEX = /\d[0-9]*:/g -export async function makeExternalQuery( - datasource: Datasource, - json: QueryJson -) { - const Integration = integrations[datasource.source] - // query is the opinionated function - if (Integration.prototype.query) { - const integration = new Integration(datasource.config) - return integration.query(json) - } else { - throw "Datasource does not support query." - } -} - export function removeKeyNumbering(key: any): string { if (typeof key === "string" && key.match(QUERY_START_REGEX) != null) { const parts = key.split(":") diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts index 1e5664748..2fe445f8f 100644 --- a/packages/server/src/integrations/microsoftSqlServer.ts +++ b/packages/server/src/integrations/microsoftSqlServer.ts @@ -15,10 +15,10 @@ import { } from "./utils" import { DatasourcePlus } from "./base/datasourcePlus" import { Table, TableSchema } from "../definitions/common" +import Sql from "./base/sql" module MSSQLModule { const sqlServer = require("mssql") - const Sql = require("./base/sql") const DEFAULT_SCHEMA = "dbo" interface MSSQLConfig { @@ -96,7 +96,8 @@ module MSSQLModule { class SqlServerIntegration extends Sql implements DatasourcePlus { private readonly config: MSSQLConfig private index: number = 0 - static pool: any + private readonly pool: any + private client: any public tables: Record = {} public schemaErrors: Record = {} diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index 1fdab6670..61780ffcd 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -16,10 +16,10 @@ import { import { DatasourcePlus } from "./base/datasourcePlus" import dayjs from "dayjs" const { NUMBER_REGEX } = require("../utilities") +import Sql from "./base/sql" module MySQLModule { const mysql = require("mysql2/promise") - const Sql = require("./base/sql") interface MySQLConfig { host: string diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index 7cc01bdc7..48b9544e5 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -14,10 +14,10 @@ import { SqlClients, } from "./utils" import { DatasourcePlus } from "./base/datasourcePlus" +import Sql from "./base/sql" module PostgresModule { const { Client, types } = require("pg") - const Sql = require("./base/sql") const { escapeDangerousCharacters } = require("../utilities") // Return "date" and "timestamp" types as plain strings. @@ -117,6 +117,7 @@ module PostgresModule { private readonly client: any private readonly config: PostgresConfig private index: number = 1 + private open: boolean public tables: Record = {} public schemaErrors: Record = {} diff --git a/packages/server/src/integrations/tests/sql.spec.js b/packages/server/src/integrations/tests/sql.spec.js index 55c762573..42fe9e3b3 100644 --- a/packages/server/src/integrations/tests/sql.spec.js +++ b/packages/server/src/integrations/tests/sql.spec.js @@ -1,4 +1,4 @@ -const Sql = require("../base/sql") +const Sql = require("../base/sql").default const { SqlClients } = require("../utils") const TABLE_NAME = "test" From 090493c959dd89e07761e2f0f76e91e74c5d2c69 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 4 Aug 2022 12:56:08 +0100 Subject: [PATCH 063/272] Switching variable name to make it more obvious value isn't being set directly. --- .../src/components/common/bindings/BindingPanel.svelte | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index 4dc9d9700..49cbd434c 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -70,17 +70,17 @@ // Adds a JS/HBS helper to the expression const addHelper = (helper, js) => { - let value + let tempVal const pos = getCaretPosition() if (js) { const decoded = decodeJSBinding(jsValue) - value = jsValue = encodeJSBinding( + tempVal = jsValue = encodeJSBinding( addJSBinding(decoded, pos, helper.text, { helper: true }) ) } else { - value = hbsValue = addHBSBinding(hbsValue, pos, helper.text) + tempVal = hbsValue = addHBSBinding(hbsValue, pos, helper.text) } - updateValue(value) + updateValue(tempVal) } // Adds a data binding to the expression From a8695513281795c2bede4291a62c72e510fe4245 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 4 Aug 2022 20:47:50 +0000 Subject: [PATCH 064/272] v1.2.13-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index b82f3faee..856609014 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.12", + "version": "1.2.13-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 50ff14d08..7468e73d0 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.12", + "version": "1.2.13-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.12", + "@budibase/types": "1.2.13-alpha.0", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 417940aa5..5a345e48d 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.12", + "version": "1.2.13-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.12", + "@budibase/string-templates": "1.2.13-alpha.0", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3688514c2..fdcbc7afc 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.12", + "version": "1.2.13-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.12", - "@budibase/client": "^1.2.12", - "@budibase/frontend-core": "^1.2.12", - "@budibase/string-templates": "^1.2.12", + "@budibase/bbui": "1.2.13-alpha.0", + "@budibase/client": "1.2.13-alpha.0", + "@budibase/frontend-core": "1.2.13-alpha.0", + "@budibase/string-templates": "1.2.13-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index c24c32ad1..8fea40f32 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.12", + "version": "1.2.13-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 7cdc66413..1c10a57c7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.12", + "version": "1.2.13-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.12", - "@budibase/frontend-core": "^1.2.12", - "@budibase/string-templates": "^1.2.12", + "@budibase/bbui": "1.2.13-alpha.0", + "@budibase/frontend-core": "1.2.13-alpha.0", + "@budibase/string-templates": "1.2.13-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 9561d4336..f40a60463 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.12", + "version": "1.2.13-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.12", + "@budibase/bbui": "1.2.13-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 7730db03f..1281c9248 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.12", + "version": "1.2.13-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.12", - "@budibase/client": "^1.2.12", + "@budibase/backend-core": "1.2.13-alpha.0", + "@budibase/client": "1.2.13-alpha.0", "@budibase/pro": "1.2.12", - "@budibase/string-templates": "^1.2.12", - "@budibase/types": "^1.2.12", + "@budibase/string-templates": "1.2.13-alpha.0", + "@budibase/types": "1.2.13-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d832e5a32..d41df308d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.12", + "version": "1.2.13-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 4ddb558c5..7e310f024 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.12", + "version": "1.2.13-alpha.0", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 987846423..1de8f2115 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.12", + "version": "1.2.13-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.12", + "@budibase/backend-core": "1.2.13-alpha.0", "@budibase/pro": "1.2.12", - "@budibase/string-templates": "^1.2.12", - "@budibase/types": "^1.2.12", + "@budibase/string-templates": "1.2.13-alpha.0", + "@budibase/types": "1.2.13-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 17c2fc1a7be126be1ece627d045f9fb523f95f5d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 4 Aug 2022 20:50:55 +0000 Subject: [PATCH 065/272] Update pro version to 1.2.13-alpha.0 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 31 ++++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 31 ++++++++++++++++--------------- 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 1281c9248..d0ccb31a8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.13-alpha.0", "@budibase/client": "1.2.13-alpha.0", - "@budibase/pro": "1.2.12", + "@budibase/pro": "1.2.13-alpha.0", "@budibase/string-templates": "1.2.13-alpha.0", "@budibase/types": "1.2.13-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 62f204199..9d424377b 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,18 +1094,19 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.12": - version "1.2.12" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.12.tgz#a09ef7c4b7d1217b65e385199f2d044d1f30f450" - integrity sha512-o6tsX9bfpMLfAEfxBI4StC6Lvt1PkJ6b0JYlgp8QiXa0WxZX7np24cOxt2fWrP3ASIMDCrzLn2e3k3eOnzvh8w== +"@budibase/backend-core@1.2.13-alpha.0": + version "1.2.13-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.13-alpha.0.tgz#32e17c35d90313d5c4aeafa26f1223547cbc1120" + integrity sha512-EPuxofOZc1svullIVohJhgjDhi36U3jPHPlvMdbc0H9tMPXQZPv+sKGDJROdHJRYMOMKPpEqzSheDI+v86oTLg== dependencies: - "@budibase/types" "^1.2.12" + "@budibase/types" "1.2.13-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" dotenv "16.0.1" emitter-listener "1.1.2" ioredis "4.28.0" + joi "17.6.0" jsonwebtoken "8.5.1" koa-passport "4.1.4" lodash "4.17.21" @@ -1177,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.12": - version "1.2.12" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.12.tgz#252f8f1c6730a3395d9d340f2e843052bf0293bb" - integrity sha512-1zhMMVBCX+VX/ILPlSbI7tdsQLcrxf1W29IQD4W55AbevlFnpQs4qNVveIdXFm+GWvCJbdN5I26CXBOftbVUhA== +"@budibase/pro@1.2.13-alpha.0": + version "1.2.13-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.13-alpha.0.tgz#59f972e50e41346cbc1a4730b133c43c39b3610a" + integrity sha512-LE/lXBmLxHgnD//ySpFLyQXM6Hys9Fjhikl/zQAHbUwnxtXE/GKXvwHTvCJTY9A2WHzhh/0ZZcbt+EkJrgDuTA== dependencies: - "@budibase/backend-core" "1.2.12" - "@budibase/types" "1.2.12" + "@budibase/backend-core" "1.2.13-alpha.0" + "@budibase/types" "1.2.13-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.12", "@budibase/types@^1.2.12": - version "1.2.12" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.12.tgz#c460d1b39116538e47e00178116ad066aa6a6f1c" - integrity sha512-EeWadHUzeLx4X27Pv6XWlpSXbeLIMvg7r+Q52kYyOZFkmjtdCNFQW5PCu1bYUw9L1Xa64t7fvRLjKiNs2xGX7g== +"@budibase/types@1.2.13-alpha.0": + version "1.2.13-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.13-alpha.0.tgz#5005a55042f9b5e4df6b91ffd700482e920f22da" + integrity sha512-+P2VkkiTWs8VtbdZ1lBiTi6Cf9LbGrDLu3lFWQ/WfVTda8ijGpMM3gHgfF5tncV1krn6Ha3yA1uFvCf6KHz08g== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 1de8f2115..b48d02c6c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.13-alpha.0", - "@budibase/pro": "1.2.12", + "@budibase/pro": "1.2.13-alpha.0", "@budibase/string-templates": "1.2.13-alpha.0", "@budibase/types": "1.2.13-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 0241459cf..44b51f390 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,18 +291,19 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.12": - version "1.2.12" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.12.tgz#a09ef7c4b7d1217b65e385199f2d044d1f30f450" - integrity sha512-o6tsX9bfpMLfAEfxBI4StC6Lvt1PkJ6b0JYlgp8QiXa0WxZX7np24cOxt2fWrP3ASIMDCrzLn2e3k3eOnzvh8w== +"@budibase/backend-core@1.2.13-alpha.0": + version "1.2.13-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.13-alpha.0.tgz#32e17c35d90313d5c4aeafa26f1223547cbc1120" + integrity sha512-EPuxofOZc1svullIVohJhgjDhi36U3jPHPlvMdbc0H9tMPXQZPv+sKGDJROdHJRYMOMKPpEqzSheDI+v86oTLg== dependencies: - "@budibase/types" "^1.2.12" + "@budibase/types" "1.2.13-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" dotenv "16.0.1" emitter-listener "1.1.2" ioredis "4.28.0" + joi "17.6.0" jsonwebtoken "8.5.1" koa-passport "4.1.4" lodash "4.17.21" @@ -324,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.12": - version "1.2.12" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.12.tgz#252f8f1c6730a3395d9d340f2e843052bf0293bb" - integrity sha512-1zhMMVBCX+VX/ILPlSbI7tdsQLcrxf1W29IQD4W55AbevlFnpQs4qNVveIdXFm+GWvCJbdN5I26CXBOftbVUhA== +"@budibase/pro@1.2.13-alpha.0": + version "1.2.13-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.13-alpha.0.tgz#59f972e50e41346cbc1a4730b133c43c39b3610a" + integrity sha512-LE/lXBmLxHgnD//ySpFLyQXM6Hys9Fjhikl/zQAHbUwnxtXE/GKXvwHTvCJTY9A2WHzhh/0ZZcbt+EkJrgDuTA== dependencies: - "@budibase/backend-core" "1.2.12" - "@budibase/types" "1.2.12" + "@budibase/backend-core" "1.2.13-alpha.0" + "@budibase/types" "1.2.13-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.12", "@budibase/types@^1.2.12": - version "1.2.12" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.12.tgz#c460d1b39116538e47e00178116ad066aa6a6f1c" - integrity sha512-EeWadHUzeLx4X27Pv6XWlpSXbeLIMvg7r+Q52kYyOZFkmjtdCNFQW5PCu1bYUw9L1Xa64t7fvRLjKiNs2xGX7g== +"@budibase/types@1.2.13-alpha.0": + version "1.2.13-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.13-alpha.0.tgz#5005a55042f9b5e4df6b91ffd700482e920f22da" + integrity sha512-+P2VkkiTWs8VtbdZ1lBiTi6Cf9LbGrDLu3lFWQ/WfVTda8ijGpMM3gHgfF5tncV1krn6Ha3yA1uFvCf6KHz08g== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 4890cda6c92cc7819fafcf34c5a86220d7b7ea87 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 Aug 2022 10:50:30 +0000 Subject: [PATCH 066/272] v1.2.13-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 856609014..91f1a57b0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 7468e73d0..825568e97 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.13-alpha.0", + "@budibase/types": "1.2.13-alpha.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5a345e48d..bbdb398c5 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.13-alpha.0", + "@budibase/string-templates": "1.2.13-alpha.1", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index fdcbc7afc..d4523e5ca 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.13-alpha.0", - "@budibase/client": "1.2.13-alpha.0", - "@budibase/frontend-core": "1.2.13-alpha.0", - "@budibase/string-templates": "1.2.13-alpha.0", + "@budibase/bbui": "1.2.13-alpha.1", + "@budibase/client": "1.2.13-alpha.1", + "@budibase/frontend-core": "1.2.13-alpha.1", + "@budibase/string-templates": "1.2.13-alpha.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8fea40f32..f67a0873f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 1c10a57c7..db232d59c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.13-alpha.0", - "@budibase/frontend-core": "1.2.13-alpha.0", - "@budibase/string-templates": "1.2.13-alpha.0", + "@budibase/bbui": "1.2.13-alpha.1", + "@budibase/frontend-core": "1.2.13-alpha.1", + "@budibase/string-templates": "1.2.13-alpha.1", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index f40a60463..4ad7b3154 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.13-alpha.0", + "@budibase/bbui": "1.2.13-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index d0ccb31a8..5b0c0fc1d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.13-alpha.0", - "@budibase/client": "1.2.13-alpha.0", + "@budibase/backend-core": "1.2.13-alpha.1", + "@budibase/client": "1.2.13-alpha.1", "@budibase/pro": "1.2.13-alpha.0", - "@budibase/string-templates": "1.2.13-alpha.0", - "@budibase/types": "1.2.13-alpha.0", + "@budibase/string-templates": "1.2.13-alpha.1", + "@budibase/types": "1.2.13-alpha.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d41df308d..f35f006fb 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 7e310f024..7ed0d6336 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index b48d02c6c..5947aeb81 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.13-alpha.0", + "version": "1.2.13-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.13-alpha.0", + "@budibase/backend-core": "1.2.13-alpha.1", "@budibase/pro": "1.2.13-alpha.0", - "@budibase/string-templates": "1.2.13-alpha.0", - "@budibase/types": "1.2.13-alpha.0", + "@budibase/string-templates": "1.2.13-alpha.1", + "@budibase/types": "1.2.13-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b034d78d71ad6dad673a43d8cac610d367cd1478 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 5 Aug 2022 10:53:28 +0000 Subject: [PATCH 067/272] Update pro version to 1.2.13-alpha.1 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5b0c0fc1d..94c2f5486 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.13-alpha.1", "@budibase/client": "1.2.13-alpha.1", - "@budibase/pro": "1.2.13-alpha.0", + "@budibase/pro": "1.2.13-alpha.1", "@budibase/string-templates": "1.2.13-alpha.1", "@budibase/types": "1.2.13-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 9d424377b..77018f13d 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.13-alpha.0": - version "1.2.13-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.13-alpha.0.tgz#32e17c35d90313d5c4aeafa26f1223547cbc1120" - integrity sha512-EPuxofOZc1svullIVohJhgjDhi36U3jPHPlvMdbc0H9tMPXQZPv+sKGDJROdHJRYMOMKPpEqzSheDI+v86oTLg== +"@budibase/backend-core@1.2.13-alpha.1": + version "1.2.13-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.13-alpha.1.tgz#3f51e51f30209f58a76e53629d349645f1e15b30" + integrity sha512-d8vGKhkHGWJoFSPphfSe8JeV/8lfNptGt/xvkOaBS3sSPm/tW0bhAG8hwek1ib2xsmUxTT2q5YBuK/8QlZMpWg== dependencies: - "@budibase/types" "1.2.13-alpha.0" + "@budibase/types" "1.2.13-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.13-alpha.0": - version "1.2.13-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.13-alpha.0.tgz#59f972e50e41346cbc1a4730b133c43c39b3610a" - integrity sha512-LE/lXBmLxHgnD//ySpFLyQXM6Hys9Fjhikl/zQAHbUwnxtXE/GKXvwHTvCJTY9A2WHzhh/0ZZcbt+EkJrgDuTA== +"@budibase/pro@1.2.13-alpha.1": + version "1.2.13-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.13-alpha.1.tgz#df5bf7741035781fe0f8b389da9eaffc7048eeb6" + integrity sha512-2sEQglt67i4tU/h2RS53z0MLf/iCy54gGtuRCnMBb721pMioaqRj+bqkpcoTYMIOWm4eaJSs9Kwn1a0SPABRLQ== dependencies: - "@budibase/backend-core" "1.2.13-alpha.0" - "@budibase/types" "1.2.13-alpha.0" + "@budibase/backend-core" "1.2.13-alpha.1" + "@budibase/types" "1.2.13-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.13-alpha.0": - version "1.2.13-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.13-alpha.0.tgz#5005a55042f9b5e4df6b91ffd700482e920f22da" - integrity sha512-+P2VkkiTWs8VtbdZ1lBiTi6Cf9LbGrDLu3lFWQ/WfVTda8ijGpMM3gHgfF5tncV1krn6Ha3yA1uFvCf6KHz08g== +"@budibase/types@1.2.13-alpha.1": + version "1.2.13-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.13-alpha.1.tgz#0369ede65c490996a4f3e03239e45bb56523a31d" + integrity sha512-2rdZMKVZSDv+074ljH8QBb6IgzeFih2z0usXCH2fjNTUs1wO7saO5EX1UcprFWm0xYHAOsaWWFUrzqrh+38+cw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 5947aeb81..bb4b8fd43 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.13-alpha.1", - "@budibase/pro": "1.2.13-alpha.0", + "@budibase/pro": "1.2.13-alpha.1", "@budibase/string-templates": "1.2.13-alpha.1", "@budibase/types": "1.2.13-alpha.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 44b51f390..4c971fe16 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.13-alpha.0": - version "1.2.13-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.13-alpha.0.tgz#32e17c35d90313d5c4aeafa26f1223547cbc1120" - integrity sha512-EPuxofOZc1svullIVohJhgjDhi36U3jPHPlvMdbc0H9tMPXQZPv+sKGDJROdHJRYMOMKPpEqzSheDI+v86oTLg== +"@budibase/backend-core@1.2.13-alpha.1": + version "1.2.13-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.13-alpha.1.tgz#3f51e51f30209f58a76e53629d349645f1e15b30" + integrity sha512-d8vGKhkHGWJoFSPphfSe8JeV/8lfNptGt/xvkOaBS3sSPm/tW0bhAG8hwek1ib2xsmUxTT2q5YBuK/8QlZMpWg== dependencies: - "@budibase/types" "1.2.13-alpha.0" + "@budibase/types" "1.2.13-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.13-alpha.0": - version "1.2.13-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.13-alpha.0.tgz#59f972e50e41346cbc1a4730b133c43c39b3610a" - integrity sha512-LE/lXBmLxHgnD//ySpFLyQXM6Hys9Fjhikl/zQAHbUwnxtXE/GKXvwHTvCJTY9A2WHzhh/0ZZcbt+EkJrgDuTA== +"@budibase/pro@1.2.13-alpha.1": + version "1.2.13-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.13-alpha.1.tgz#df5bf7741035781fe0f8b389da9eaffc7048eeb6" + integrity sha512-2sEQglt67i4tU/h2RS53z0MLf/iCy54gGtuRCnMBb721pMioaqRj+bqkpcoTYMIOWm4eaJSs9Kwn1a0SPABRLQ== dependencies: - "@budibase/backend-core" "1.2.13-alpha.0" - "@budibase/types" "1.2.13-alpha.0" + "@budibase/backend-core" "1.2.13-alpha.1" + "@budibase/types" "1.2.13-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.13-alpha.0": - version "1.2.13-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.13-alpha.0.tgz#5005a55042f9b5e4df6b91ffd700482e920f22da" - integrity sha512-+P2VkkiTWs8VtbdZ1lBiTi6Cf9LbGrDLu3lFWQ/WfVTda8ijGpMM3gHgfF5tncV1krn6Ha3yA1uFvCf6KHz08g== +"@budibase/types@1.2.13-alpha.1": + version "1.2.13-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.13-alpha.1.tgz#0369ede65c490996a4f3e03239e45bb56523a31d" + integrity sha512-2rdZMKVZSDv+074ljH8QBb6IgzeFih2z0usXCH2fjNTUs1wO7saO5EX1UcprFWm0xYHAOsaWWFUrzqrh+38+cw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 5b6e8992bcdff1464ce15b116dd0abfdf8d465d7 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 5 Aug 2022 15:16:04 +0100 Subject: [PATCH 068/272] Removed query filtering on dynamic variables in binding drawer --- .../[selectedDatasource]/rest/[query]/index.svelte | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte index 5ccc17331..8ecd88243 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte @@ -231,13 +231,10 @@ ] // convert dynamic variables list to simple key/val object - const getDynamicVariables = (datasource, queryId) => { + const getDynamicVariables = datasource => { const variablesList = datasource?.config?.dynamicVariables if (variablesList && variablesList.length > 0) { - const filtered = queryId - ? variablesList.filter(variable => variable.queryId === queryId) - : variablesList - return filtered.reduce( + return variablesList.reduce( (acc, next) => ({ ...acc, [next.name]: next.value }), {} ) @@ -367,7 +364,7 @@ if (query && !query.fields.pagination) { query.fields.pagination = {} } - dynamicVariables = getDynamicVariables(datasource, query._id) + dynamicVariables = getDynamicVariables(datasource) prettifyQueryRequestBody( query, From fbdef393f95cdc942dc62613aeb14d6094c19b00 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Sat, 6 Aug 2022 20:32:52 +0100 Subject: [PATCH 069/272] Revert Multiselect component changes --- packages/bbui/src/Form/Multiselect.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bbui/src/Form/Multiselect.svelte b/packages/bbui/src/Form/Multiselect.svelte index 67e6f6105..7bcf22aa0 100644 --- a/packages/bbui/src/Form/Multiselect.svelte +++ b/packages/bbui/src/Form/Multiselect.svelte @@ -27,7 +27,7 @@ {error} {disabled} {readonly} - value={Array.isArray(value) ? value : [value]} + {value} {options} {placeholder} {sort} From 350e0233e201e2441b8e4face337f13e3338640b Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Sat, 6 Aug 2022 20:52:34 +0100 Subject: [PATCH 070/272] Handle 'Is in' onOperatorChange --- .../settings/controls/FilterEditor/FilterDrawer.svelte | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte index 4eab5d4f4..004e3f0f0 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte @@ -87,6 +87,16 @@ if (expression.noValue) { expression.value = null } + if ( + operator === Constants.OperatorOptions.In.value && + !Array.isArray(expression.value) + ) { + if (expression.value) { + expression.value = [expression.value] + } else { + expression.value = [] + } + } } const getFieldOptions = field => { From 29023910c04107aad67a50490c1638137d35948f Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 8 Aug 2022 10:33:39 +0100 Subject: [PATCH 071/272] Walked back previous change. Ensured filtering of global bindings surfaces appropriate values. Filtering logic separated for global and local dynamic variables. --- .../rest/[query]/index.svelte | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte index 8ecd88243..b0a93f8ee 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte @@ -55,13 +55,16 @@ let saveId, url let response, schema, enabledHeaders let authConfigId - let dynamicVariables, addVariableModal, varBinding + let dynamicVariables, addVariableModal, varBinding, globalDynamicBindings let restBindings = getRestBindings() $: staticVariables = datasource?.config?.staticVariables || {} $: customRequestBindings = toBindingsArray(requestBindings, "Binding") - $: dynamicRequestBindings = toBindingsArray(dynamicVariables, "Dynamic") + $: globalDynamicRequestBindings = toBindingsArray( + globalDynamicBindings, + "Dynamic" + ) $: dataSourceStaticBindings = toBindingsArray( staticVariables, "Datasource.Static" @@ -70,7 +73,7 @@ $: mergedBindings = [ ...restBindings, ...customRequestBindings, - ...dynamicRequestBindings, + ...globalDynamicRequestBindings, ...dataSourceStaticBindings, ] @@ -231,10 +234,13 @@ ] // convert dynamic variables list to simple key/val object - const getDynamicVariables = datasource => { + const getDynamicVariables = (datasource, queryId, matchFn) => { const variablesList = datasource?.config?.dynamicVariables if (variablesList && variablesList.length > 0) { - return variablesList.reduce( + const filtered = queryId + ? variablesList.filter(variable => matchFn(variable, queryId)) + : variablesList + return filtered.reduce( (acc, next) => ({ ...acc, [next.name]: next.value }), {} ) @@ -364,12 +370,21 @@ if (query && !query.fields.pagination) { query.fields.pagination = {} } - dynamicVariables = getDynamicVariables(datasource) + dynamicVariables = getDynamicVariables( + datasource, + query._id, + (variable, queryId) => variable.queryId === queryId + ) + globalDynamicBindings = getDynamicVariables( + datasource, + query._id, + (variable, queryId) => variable.queryId !== queryId + ) prettifyQueryRequestBody( query, requestBindings, - dynamicVariables, + globalDynamicBindings, staticVariables, restBindings ) @@ -434,7 +449,7 @@ valuePlaceholder="Default" bindings={[ ...restBindings, - ...dynamicRequestBindings, + ...globalDynamicRequestBindings, ...dataSourceStaticBindings, ]} bindingDrawerLeft="260px" From dab6da7e75a384718fc4d4ee89c3f17ff283ced9 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 8 Aug 2022 11:51:38 +0100 Subject: [PATCH 072/272] Disable posthog in release env --- .github/workflows/release-develop.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 631308d94..772fcf933 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -18,8 +18,9 @@ on: workflow_dispatch: env: - # Posthog token used by ui at build time - POSTHOG_TOKEN: phc_uDYOfnFt6wAbBAXkC6STjcrTpAFiWIhqgFcsC1UVO5F + # Posthog token used by ui at build time + # disable unless needed for testing + # POSTHOG_TOKEN: phc_uDYOfnFt6wAbBAXkC6STjcrTpAFiWIhqgFcsC1UVO5F INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} FEATURE_PREVIEW_URL: https://budirelease.live From 02fbe2a7d28b918cb41d9d432f993ddfd38a628b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 8 Aug 2022 11:01:32 +0000 Subject: [PATCH 073/272] v1.2.20-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index e079a0fae..08b9563a9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.19", + "version": "1.2.20-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index afbf39160..4949c050e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.19", + "version": "1.2.20-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.19", + "@budibase/types": "1.2.20-alpha.0", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 3ae887a4f..f619b69d9 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.19", + "version": "1.2.20-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.19", + "@budibase/string-templates": "1.2.20-alpha.0", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index a0ab10f02..6a07b41bb 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.19", + "version": "1.2.20-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.19", - "@budibase/client": "^1.2.19", - "@budibase/frontend-core": "^1.2.19", - "@budibase/string-templates": "^1.2.19", + "@budibase/bbui": "1.2.20-alpha.0", + "@budibase/client": "1.2.20-alpha.0", + "@budibase/frontend-core": "1.2.20-alpha.0", + "@budibase/string-templates": "1.2.20-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 697143931..cf4dfc6f3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.19", + "version": "1.2.20-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 8aad954c2..418d7267a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.19", + "version": "1.2.20-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.19", - "@budibase/frontend-core": "^1.2.19", - "@budibase/string-templates": "^1.2.19", + "@budibase/bbui": "1.2.20-alpha.0", + "@budibase/frontend-core": "1.2.20-alpha.0", + "@budibase/string-templates": "1.2.20-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 8b76bfae5..39719d2d1 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.19", + "version": "1.2.20-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.19", + "@budibase/bbui": "1.2.20-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 628658ad2..0f6af3a5f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.19", + "version": "1.2.20-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.19", - "@budibase/client": "^1.2.19", + "@budibase/backend-core": "1.2.20-alpha.0", + "@budibase/client": "1.2.20-alpha.0", "@budibase/pro": "1.2.19", - "@budibase/string-templates": "^1.2.19", - "@budibase/types": "^1.2.19", + "@budibase/string-templates": "1.2.20-alpha.0", + "@budibase/types": "1.2.20-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 674f922f0..d2fb5d0be 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.19", + "version": "1.2.20-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 145329204..6916a0b8b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.19", + "version": "1.2.20-alpha.0", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 6305ebcbb..da7fe7131 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.19", + "version": "1.2.20-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.19", + "@budibase/backend-core": "1.2.20-alpha.0", "@budibase/pro": "1.2.19", - "@budibase/string-templates": "^1.2.19", - "@budibase/types": "^1.2.19", + "@budibase/string-templates": "1.2.20-alpha.0", + "@budibase/types": "1.2.20-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d7605500d6a37f948017209f2a390bbc0c3e9766 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 8 Aug 2022 11:04:33 +0000 Subject: [PATCH 074/272] Update pro version to 1.2.20-alpha.0 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 31 ++++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 31 ++++++++++++++++--------------- 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 0f6af3a5f..b891098c7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.20-alpha.0", "@budibase/client": "1.2.20-alpha.0", - "@budibase/pro": "1.2.19", + "@budibase/pro": "1.2.20-alpha.0", "@budibase/string-templates": "1.2.20-alpha.0", "@budibase/types": "1.2.20-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 865fcd0df..d4ed0b6ac 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,18 +1094,19 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.19.tgz#8606f41eb02530ff84cc1cd1e3580dd952879103" - integrity sha512-WN1y7NDWhUWzwl4ek+8XejEncZckmYheWqWod1l0JI93apiRfhMfxxPxW1/9Hi473Ofd5LG5qZbFuu8BfZGSVQ== +"@budibase/backend-core@1.2.20-alpha.0": + version "1.2.20-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20-alpha.0.tgz#a7b660785f96a34bff214b505caad3a18a6fbc88" + integrity sha512-s0LwhDyfrmBwmwReNrkbmYu6s81FsWnt9qCvJsB3kQottCLVmo7yS+ruHa1CKoTLeJX6IIG4OxgkDqXFR107/A== dependencies: - "@budibase/types" "^1.2.19" + "@budibase/types" "1.2.20-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" dotenv "16.0.1" emitter-listener "1.1.2" ioredis "4.28.0" + joi "17.6.0" jsonwebtoken "8.5.1" koa-passport "4.1.4" lodash "4.17.21" @@ -1177,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.19.tgz#bfe9305e7dabe3ed239ad494838ba1fa7b4da37b" - integrity sha512-bdD/Y+zpeFe06bBxg6c2fX0C5xm4vwn3BLUelovLBr9CTyrkGEr40NkoEAligWkHZ5awSTiVhHaFkzFceJkjVQ== +"@budibase/pro@1.2.20-alpha.0": + version "1.2.20-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20-alpha.0.tgz#9fff53db95fee7ee26c38179915abc73e5b9b7a2" + integrity sha512-a3CmmHnZys5bdw4lODxd8x+sub1z9mVZMxQwi/QaaAYBtJT/yb9p/zic2OHIsybx9b6geyE6khC5zN1MZY7nKw== dependencies: - "@budibase/backend-core" "1.2.19" - "@budibase/types" "1.2.19" + "@budibase/backend-core" "1.2.20-alpha.0" + "@budibase/types" "1.2.20-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.19", "@budibase/types@^1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.19.tgz#f2dade0f25f4fa55c3a7a99b3195f655db6c9cf5" - integrity sha512-+FKv29hJ3FXldmihdfn8omfEVp2WsB7nm7gbZPJs7mD+yP+AYGnuZinCYJ8PcX1CjoIgzcYE27OOQuxy+9cDmQ== +"@budibase/types@1.2.20-alpha.0": + version "1.2.20-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20-alpha.0.tgz#495482859a44eab065b9e5a670a984ad027caaa6" + integrity sha512-HmGXXpxj0cnJZlQ69B2TQ/+otBioVqHG/mYugvkYcqqPWSX3mKdgwXmj7RRZdhWjJY+QiSnTFw6O7HjjXuoCNQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index da7fe7131..315724726 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.20-alpha.0", - "@budibase/pro": "1.2.19", + "@budibase/pro": "1.2.20-alpha.0", "@budibase/string-templates": "1.2.20-alpha.0", "@budibase/types": "1.2.20-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 53eed9581..e8e796b1f 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,18 +291,19 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.19.tgz#8606f41eb02530ff84cc1cd1e3580dd952879103" - integrity sha512-WN1y7NDWhUWzwl4ek+8XejEncZckmYheWqWod1l0JI93apiRfhMfxxPxW1/9Hi473Ofd5LG5qZbFuu8BfZGSVQ== +"@budibase/backend-core@1.2.20-alpha.0": + version "1.2.20-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20-alpha.0.tgz#a7b660785f96a34bff214b505caad3a18a6fbc88" + integrity sha512-s0LwhDyfrmBwmwReNrkbmYu6s81FsWnt9qCvJsB3kQottCLVmo7yS+ruHa1CKoTLeJX6IIG4OxgkDqXFR107/A== dependencies: - "@budibase/types" "^1.2.19" + "@budibase/types" "1.2.20-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" dotenv "16.0.1" emitter-listener "1.1.2" ioredis "4.28.0" + joi "17.6.0" jsonwebtoken "8.5.1" koa-passport "4.1.4" lodash "4.17.21" @@ -324,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.19.tgz#bfe9305e7dabe3ed239ad494838ba1fa7b4da37b" - integrity sha512-bdD/Y+zpeFe06bBxg6c2fX0C5xm4vwn3BLUelovLBr9CTyrkGEr40NkoEAligWkHZ5awSTiVhHaFkzFceJkjVQ== +"@budibase/pro@1.2.20-alpha.0": + version "1.2.20-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20-alpha.0.tgz#9fff53db95fee7ee26c38179915abc73e5b9b7a2" + integrity sha512-a3CmmHnZys5bdw4lODxd8x+sub1z9mVZMxQwi/QaaAYBtJT/yb9p/zic2OHIsybx9b6geyE6khC5zN1MZY7nKw== dependencies: - "@budibase/backend-core" "1.2.19" - "@budibase/types" "1.2.19" + "@budibase/backend-core" "1.2.20-alpha.0" + "@budibase/types" "1.2.20-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.19", "@budibase/types@^1.2.19": - version "1.2.19" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.19.tgz#f2dade0f25f4fa55c3a7a99b3195f655db6c9cf5" - integrity sha512-+FKv29hJ3FXldmihdfn8omfEVp2WsB7nm7gbZPJs7mD+yP+AYGnuZinCYJ8PcX1CjoIgzcYE27OOQuxy+9cDmQ== +"@budibase/types@1.2.20-alpha.0": + version "1.2.20-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20-alpha.0.tgz#495482859a44eab065b9e5a670a984ad027caaa6" + integrity sha512-HmGXXpxj0cnJZlQ69B2TQ/+otBioVqHG/mYugvkYcqqPWSX3mKdgwXmj7RRZdhWjJY+QiSnTFw6O7HjjXuoCNQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 4f1f86fda068daa9390ee4857df2f827097de8c9 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 8 Aug 2022 13:01:41 +0000 Subject: [PATCH 075/272] v1.2.20-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 08b9563a9..82fca15c4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4949c050e..4e2034550 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.20-alpha.0", + "@budibase/types": "1.2.20-alpha.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f619b69d9..4e6f6fa22 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.20-alpha.0", + "@budibase/string-templates": "1.2.20-alpha.1", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 6a07b41bb..614c1aaa6 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.20-alpha.0", - "@budibase/client": "1.2.20-alpha.0", - "@budibase/frontend-core": "1.2.20-alpha.0", - "@budibase/string-templates": "1.2.20-alpha.0", + "@budibase/bbui": "1.2.20-alpha.1", + "@budibase/client": "1.2.20-alpha.1", + "@budibase/frontend-core": "1.2.20-alpha.1", + "@budibase/string-templates": "1.2.20-alpha.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index cf4dfc6f3..9b815b7ea 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 418d7267a..37efb9613 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.20-alpha.0", - "@budibase/frontend-core": "1.2.20-alpha.0", - "@budibase/string-templates": "1.2.20-alpha.0", + "@budibase/bbui": "1.2.20-alpha.1", + "@budibase/frontend-core": "1.2.20-alpha.1", + "@budibase/string-templates": "1.2.20-alpha.1", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 39719d2d1..4fd528606 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.20-alpha.0", + "@budibase/bbui": "1.2.20-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index b891098c7..05432cfc8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.20-alpha.0", - "@budibase/client": "1.2.20-alpha.0", + "@budibase/backend-core": "1.2.20-alpha.1", + "@budibase/client": "1.2.20-alpha.1", "@budibase/pro": "1.2.20-alpha.0", - "@budibase/string-templates": "1.2.20-alpha.0", - "@budibase/types": "1.2.20-alpha.0", + "@budibase/string-templates": "1.2.20-alpha.1", + "@budibase/types": "1.2.20-alpha.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d2fb5d0be..ad9de5609 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 6916a0b8b..cd5d5a828 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 315724726..d9f6dbe4e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.20-alpha.0", + "version": "1.2.20-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.20-alpha.0", + "@budibase/backend-core": "1.2.20-alpha.1", "@budibase/pro": "1.2.20-alpha.0", - "@budibase/string-templates": "1.2.20-alpha.0", - "@budibase/types": "1.2.20-alpha.0", + "@budibase/string-templates": "1.2.20-alpha.1", + "@budibase/types": "1.2.20-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b6033a1bc5e7762450516f3cd8cab017f22f2a45 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 8 Aug 2022 13:04:41 +0000 Subject: [PATCH 076/272] Update pro version to 1.2.20-alpha.1 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 05432cfc8..a694e60f9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.20-alpha.1", "@budibase/client": "1.2.20-alpha.1", - "@budibase/pro": "1.2.20-alpha.0", + "@budibase/pro": "1.2.20-alpha.1", "@budibase/string-templates": "1.2.20-alpha.1", "@budibase/types": "1.2.20-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index d4ed0b6ac..46c3a0280 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.20-alpha.0": - version "1.2.20-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20-alpha.0.tgz#a7b660785f96a34bff214b505caad3a18a6fbc88" - integrity sha512-s0LwhDyfrmBwmwReNrkbmYu6s81FsWnt9qCvJsB3kQottCLVmo7yS+ruHa1CKoTLeJX6IIG4OxgkDqXFR107/A== +"@budibase/backend-core@1.2.20-alpha.1": + version "1.2.20-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20-alpha.1.tgz#f25d65f6c298be24679a22148f768bb7479fee49" + integrity sha512-aeZKM/8sLnEHJguKxPFiFZ5r/qjD5aC10n9SEcwxnAFgP0l9uUitkBEmhALd9wLcpkf5BCxPql1ytJTvXQR4XA== dependencies: - "@budibase/types" "1.2.20-alpha.0" + "@budibase/types" "1.2.20-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.20-alpha.0": - version "1.2.20-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20-alpha.0.tgz#9fff53db95fee7ee26c38179915abc73e5b9b7a2" - integrity sha512-a3CmmHnZys5bdw4lODxd8x+sub1z9mVZMxQwi/QaaAYBtJT/yb9p/zic2OHIsybx9b6geyE6khC5zN1MZY7nKw== +"@budibase/pro@1.2.20-alpha.1": + version "1.2.20-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20-alpha.1.tgz#9d58ccc0f4fa722c5a1e781c61538e8a815337b7" + integrity sha512-mHF/CCd2zqw7DiDa2asLvgHKxmMdjnIUbJM/Xb/t5qQM5KrWlX2jrrP4w0HaCGiV9BhHMPdkcc1f70w0oGadoA== dependencies: - "@budibase/backend-core" "1.2.20-alpha.0" - "@budibase/types" "1.2.20-alpha.0" + "@budibase/backend-core" "1.2.20-alpha.1" + "@budibase/types" "1.2.20-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.20-alpha.0": - version "1.2.20-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20-alpha.0.tgz#495482859a44eab065b9e5a670a984ad027caaa6" - integrity sha512-HmGXXpxj0cnJZlQ69B2TQ/+otBioVqHG/mYugvkYcqqPWSX3mKdgwXmj7RRZdhWjJY+QiSnTFw6O7HjjXuoCNQ== +"@budibase/types@1.2.20-alpha.1": + version "1.2.20-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20-alpha.1.tgz#5179957b972fb2778b862bca67b2ebb5facf1353" + integrity sha512-Y09pdnTinbAcjTTvML1XN/XRdzymiXcADHl9x1sr7muWcBe3OCcVyu4bh4WDLF/WX+kXEdmvrSH4w27rYx+uWw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index d9f6dbe4e..bd0da25c5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.20-alpha.1", - "@budibase/pro": "1.2.20-alpha.0", + "@budibase/pro": "1.2.20-alpha.1", "@budibase/string-templates": "1.2.20-alpha.1", "@budibase/types": "1.2.20-alpha.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index e8e796b1f..65badfecb 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.20-alpha.0": - version "1.2.20-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20-alpha.0.tgz#a7b660785f96a34bff214b505caad3a18a6fbc88" - integrity sha512-s0LwhDyfrmBwmwReNrkbmYu6s81FsWnt9qCvJsB3kQottCLVmo7yS+ruHa1CKoTLeJX6IIG4OxgkDqXFR107/A== +"@budibase/backend-core@1.2.20-alpha.1": + version "1.2.20-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20-alpha.1.tgz#f25d65f6c298be24679a22148f768bb7479fee49" + integrity sha512-aeZKM/8sLnEHJguKxPFiFZ5r/qjD5aC10n9SEcwxnAFgP0l9uUitkBEmhALd9wLcpkf5BCxPql1ytJTvXQR4XA== dependencies: - "@budibase/types" "1.2.20-alpha.0" + "@budibase/types" "1.2.20-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.20-alpha.0": - version "1.2.20-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20-alpha.0.tgz#9fff53db95fee7ee26c38179915abc73e5b9b7a2" - integrity sha512-a3CmmHnZys5bdw4lODxd8x+sub1z9mVZMxQwi/QaaAYBtJT/yb9p/zic2OHIsybx9b6geyE6khC5zN1MZY7nKw== +"@budibase/pro@1.2.20-alpha.1": + version "1.2.20-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20-alpha.1.tgz#9d58ccc0f4fa722c5a1e781c61538e8a815337b7" + integrity sha512-mHF/CCd2zqw7DiDa2asLvgHKxmMdjnIUbJM/Xb/t5qQM5KrWlX2jrrP4w0HaCGiV9BhHMPdkcc1f70w0oGadoA== dependencies: - "@budibase/backend-core" "1.2.20-alpha.0" - "@budibase/types" "1.2.20-alpha.0" + "@budibase/backend-core" "1.2.20-alpha.1" + "@budibase/types" "1.2.20-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.20-alpha.0": - version "1.2.20-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20-alpha.0.tgz#495482859a44eab065b9e5a670a984ad027caaa6" - integrity sha512-HmGXXpxj0cnJZlQ69B2TQ/+otBioVqHG/mYugvkYcqqPWSX3mKdgwXmj7RRZdhWjJY+QiSnTFw6O7HjjXuoCNQ== +"@budibase/types@1.2.20-alpha.1": + version "1.2.20-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20-alpha.1.tgz#5179957b972fb2778b862bca67b2ebb5facf1353" + integrity sha512-Y09pdnTinbAcjTTvML1XN/XRdzymiXcADHl9x1sr7muWcBe3OCcVyu4bh4WDLF/WX+kXEdmvrSH4w27rYx+uWw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 3c5e933577b4357711caa3e7ac728ff1c207824e Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 8 Aug 2022 16:44:00 +0100 Subject: [PATCH 077/272] Fix crash when attempting to parse a nullish automation error --- packages/server/src/automations/logging/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/server/src/automations/logging/index.ts b/packages/server/src/automations/logging/index.ts index f3c149d5e..80779f084 100644 --- a/packages/server/src/automations/logging/index.ts +++ b/packages/server/src/automations/logging/index.ts @@ -23,6 +23,9 @@ export async function checkAppMetadata(apps: App[]) { for (let [key, errors] of Object.entries(metadata.automationErrors)) { const updated = [] for (let error of errors) { + if (!error) { + continue + } const startDate = error.split(dbUtils.SEPARATOR)[2] if (startDate > maxStartDate) { updated.push(error) From d02e5ae87f18c21372fd17443b21d23bac5939db Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 8 Aug 2022 17:01:56 +0100 Subject: [PATCH 078/272] Add unit tests for ObjectId --- packages/server/__mocks__/mongodb.ts | 2 + .../src/integrations/tests/mongo.spec.js | 66 +++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/packages/server/__mocks__/mongodb.ts b/packages/server/__mocks__/mongodb.ts index 2a03dc7a7..3b6db96b7 100644 --- a/packages/server/__mocks__/mongodb.ts +++ b/packages/server/__mocks__/mongodb.ts @@ -31,5 +31,7 @@ module MongoMock { }) } + mongodb.ObjectID = require("mongodb").ObjectID + module.exports = mongodb } diff --git a/packages/server/src/integrations/tests/mongo.spec.js b/packages/server/src/integrations/tests/mongo.spec.js index b0a49521e..f866048e4 100644 --- a/packages/server/src/integrations/tests/mongo.spec.js +++ b/packages/server/src/integrations/tests/mongo.spec.js @@ -102,4 +102,70 @@ describe("MongoDB Integration", () => { expect(error).toBeDefined() restore() }) + + it("creates ObjectIds if the _id fields contains a match on ObjectId", async () => { + const query = { + json: { + filter: { + _id: "ObjectId('ACBD12345678ABCD12345678')", + name: "ObjectId('name')" + }, + update: { + _id: "ObjectId('FFFF12345678ABCD12345678')", + name: "ObjectId('updatedName')", + }, + options: { + upsert: false, + }, + }, + extra: { collection: "testCollection", actionTypes: "updateOne" }, + } + await config.integration.update(query) + expect(config.integration.client.updateOne).toHaveBeenCalled() + + const args = config.integration.client.updateOne.mock.calls[0] + expect(args[0]).toEqual({ + _id: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"), + name: "ObjectId('name')", + }) + expect(args[1]).toEqual({ + _id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"), + name: "ObjectId('updatedName')", + }) + }) + + it("creates ObjectIds if the $ operator fields contains a match on ObjectId", async () => { + const query = { + json: { + filter: { + _id: { + $eq: "ObjectId('ACBD12345678ABCD12345678')", + } + }, + update: { + $set: { + _id: "ObjectId('FFFF12345678ABCD12345678')", + }, + }, + options: { + upsert: false, + }, + }, + extra: { collection: "testCollection", actionTypes: "updateOne" }, + } + await config.integration.update(query) + expect(config.integration.client.updateOne).toHaveBeenCalled() + + const args = config.integration.client.updateOne.mock.calls[0] + expect(args[0]).toEqual({ + _id: { + $eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"), + } + }) + expect(args[1]).toEqual({ + $set: { + _id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"), + } + }) + }) }) From 98d8080826e6d639e7d8c4bf7143be816b6646a8 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 8 Aug 2022 17:53:17 +0100 Subject: [PATCH 079/272] Bug fix findOneAndUpdate --- packages/server/__mocks__/mongodb.ts | 2 + packages/server/src/integrations/mongodb.ts | 5 +- .../src/integrations/tests/mongo.spec.js | 48 ++++++++++++++++++- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/packages/server/__mocks__/mongodb.ts b/packages/server/__mocks__/mongodb.ts index 3b6db96b7..92ec89227 100644 --- a/packages/server/__mocks__/mongodb.ts +++ b/packages/server/__mocks__/mongodb.ts @@ -8,6 +8,7 @@ module MongoMock { this.insertMany = jest.fn(() => ({ toArray: () => [] })) this.find = jest.fn(() => ({ toArray: () => [] })) this.findOne = jest.fn() + this.findOneAndUpdate = jest.fn() this.count = jest.fn() this.deleteOne = jest.fn() this.deleteMany = jest.fn(() => ({ toArray: () => [] })) @@ -19,6 +20,7 @@ module MongoMock { find: this.find, insertMany: this.insertMany, findOne: this.findOne, + findOneAndUpdate: this.findOneAndUpdate, count: this.count, deleteOne: this.deleteOne, deleteMany: this.deleteMany, diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index e30071578..a520cdb15 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -179,7 +179,10 @@ module MongoDBModule { return await collection.findOne(json) } case "findOneAndUpdate": { - let findAndUpdateJson = json as { + if (typeof query.json === "string") { + json = this.parseQueryParams(query.json, "update") + } + let findAndUpdateJson = this.createObjectIds(json) as { filter: FilterQuery update: UpdateQuery options: FindOneAndUpdateOption diff --git a/packages/server/src/integrations/tests/mongo.spec.js b/packages/server/src/integrations/tests/mongo.spec.js index f866048e4..555188a52 100644 --- a/packages/server/src/integrations/tests/mongo.spec.js +++ b/packages/server/src/integrations/tests/mongo.spec.js @@ -132,6 +132,9 @@ describe("MongoDB Integration", () => { _id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"), name: "ObjectId('updatedName')", }) + expect(args[2]).toEqual({ + upsert: false + }) }) it("creates ObjectIds if the $ operator fields contains a match on ObjectId", async () => { @@ -148,7 +151,7 @@ describe("MongoDB Integration", () => { }, }, options: { - upsert: false, + upsert: true, }, }, extra: { collection: "testCollection", actionTypes: "updateOne" }, @@ -167,5 +170,48 @@ describe("MongoDB Integration", () => { _id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"), } }) + expect(args[2]).toEqual({ + upsert: true + }) + }) + + it("supports findOneAndUpdate", async () => { + const query = { + json: { + filter: { + _id: { + $eq: "ObjectId('ACBD12345678ABCD12345678')", + } + }, + update: { + $set: { + name: "UPDATED", + age: 99 + }, + }, + options: { + upsert: false, + }, + }, + extra: { collection: "testCollection", actionTypes: "findOneAndUpdate" }, + } + await config.integration.read(query) + expect(config.integration.client.findOneAndUpdate).toHaveBeenCalled() + + const args = config.integration.client.findOneAndUpdate.mock.calls[0] + expect(args[0]).toEqual({ + _id: { + $eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"), + } + }) + expect(args[1]).toEqual({ + $set: { + name: "UPDATED", + age: 99 + } + }) + expect(args[2]).toEqual({ + upsert: false + }) }) }) From 77947e8ba9c384bdc5e91cee5cbbfc2b135deb5f Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 8 Aug 2022 19:16:25 +0100 Subject: [PATCH 080/272] Adding unit tests for internal DB lucene syntax building. --- packages/server/__mocks__/node-fetch.ts | 9 +- .../src/api/controllers/row/internalSearch.js | 3 + .../api/routes/tests/internalSearch.spec.js | 136 ++++++++++++++++++ 3 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 packages/server/src/api/routes/tests/internalSearch.spec.js diff --git a/packages/server/__mocks__/node-fetch.ts b/packages/server/__mocks__/node-fetch.ts index 1a7015fa5..dfffa7eb5 100644 --- a/packages/server/__mocks__/node-fetch.ts +++ b/packages/server/__mocks__/node-fetch.ts @@ -57,12 +57,19 @@ module FetchMock { 404 ) } else if (url.includes("_search")) { + const body = opts.body + const parts = body.split("tableId:") + let tableId + if (parts && parts[1]) { + tableId = parts[1].split('"')[0] + } return json({ rows: [ { doc: { _id: "test", - tableId: opts.body.split("tableId:")[1].split('"')[0], + tableId: tableId, + query: opts.body, }, }, ], diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js index ab084d9e0..a403b76ae 100644 --- a/packages/server/src/api/controllers/row/internalSearch.js +++ b/packages/server/src/api/controllers/row/internalSearch.js @@ -313,6 +313,9 @@ class QueryBuilder { } } +// exported for unit testing +exports.QueryBuilder = QueryBuilder + /** * Executes a lucene search query. * @param url The query URL diff --git a/packages/server/src/api/routes/tests/internalSearch.spec.js b/packages/server/src/api/routes/tests/internalSearch.spec.js new file mode 100644 index 000000000..238b915cf --- /dev/null +++ b/packages/server/src/api/routes/tests/internalSearch.spec.js @@ -0,0 +1,136 @@ +const search = require("../../controllers/row/internalSearch") +// this will be mocked out for _search endpoint +const fetch = require("node-fetch") +const PARAMS = { + tableId: "ta_12345679abcdef", + version: "1", + bookmark: null, + sort: null, + sortOrder: "ascending", + sortType: "string", +} + +function checkLucene(resp, expected, params = PARAMS) { + const query = resp.rows[0].query + const json = JSON.parse(query) + if (PARAMS.sort) { + expect(json.sort).toBe(`${PARAMS.sort}<${PARAMS.sortType}>`) + } + if (PARAMS.bookmark) { + expect(json.bookmark).toBe(PARAMS.bookmark) + } + expect(json.include_docs).toBe(true) + expect(json.q).toBe(`(${expected}) AND tableId:"${params.tableId}"`) + expect(json.limit).toBe(params.limit || 50) +} + +describe("internal search", () => { + it("default query", async () => { + const response = await search.paginatedSearch({ + }, PARAMS) + checkLucene(response, `*:*`) + }) + + it("test equal query", async () => { + const response = await search.paginatedSearch({ + equal: { + "column": "1", + } + }, PARAMS) + checkLucene(response, `*:* AND column:"1"`) + }) + + it("test notEqual query", async () => { + const response = await search.paginatedSearch({ + notEqual: { + "column": "1", + } + }, PARAMS) + checkLucene(response, `*:* AND !column:"1"`) + }) + + it("test OR query", async () => { + const response = await search.paginatedSearch({ + allOr: true, + equal: { + "column": "2", + }, + notEqual: { + "column": "1", + } + }, PARAMS) + checkLucene(response, `column:"2" OR !column:"1"`) + }) + + it("test AND query", async () => { + const response = await search.paginatedSearch({ + equal: { + "column": "2", + }, + notEqual: { + "column": "1", + } + }, PARAMS) + checkLucene(response, `*:* AND column:"2" AND !column:"1"`) + }) + + it("test pagination query", async () => { + const updatedParams = { + ...PARAMS, + limit: 100, + bookmark: "awd", + sort: "column", + } + const response = await search.paginatedSearch({ + string: { + "column": "2", + }, + }, updatedParams) + checkLucene(response, `*:* AND column:2*`, updatedParams) + }) + + it("test range query", async () => { + const response = await search.paginatedSearch({ + range: { + "column": { low: 1, high: 2 }, + }, + }, PARAMS) + checkLucene(response, `*:* AND column:[1 TO 2]`, PARAMS) + }) + + it("test empty query", async () => { + const response = await search.paginatedSearch({ + empty: { + "column": "", + }, + }, PARAMS) + checkLucene(response, `*:* AND !column:["" TO *]`, PARAMS) + }) + + it("test notEmpty query", async () => { + const response = await search.paginatedSearch({ + notEmpty: { + "column": "", + }, + }, PARAMS) + checkLucene(response, `*:* AND column:["" TO *]`, PARAMS) + }) + + it("test oneOf query", async () => { + const response = await search.paginatedSearch({ + oneOf: { + "column": ["a", "b"], + }, + }, PARAMS) + checkLucene(response, `*:* AND column:("a" OR "b")`, PARAMS) + }) + + it("test contains query", async () => { + const response = await search.paginatedSearch({ + contains: { + "column": "a", + }, + }, PARAMS) + checkLucene(response, `*:* AND column:a`, PARAMS) + }) +}) \ No newline at end of file From be80839573321563f48103d2ff93a34e520d819d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 8 Aug 2022 19:19:33 +0100 Subject: [PATCH 081/272] Adding multiple of same property test case for lucene building. --- .../src/api/routes/tests/internalSearch.spec.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/server/src/api/routes/tests/internalSearch.spec.js b/packages/server/src/api/routes/tests/internalSearch.spec.js index 238b915cf..810226aae 100644 --- a/packages/server/src/api/routes/tests/internalSearch.spec.js +++ b/packages/server/src/api/routes/tests/internalSearch.spec.js @@ -133,4 +133,16 @@ describe("internal search", () => { }, PARAMS) checkLucene(response, `*:* AND column:a`, PARAMS) }) + + it("test multiple of same column", async () => { + const response = await search.paginatedSearch({ + allOr: true, + equal: { + "1:column": "a", + "2:column": "b", + "3:column": "c", + }, + }, PARAMS) + checkLucene(response, `column:"a" OR column:"b" OR column:"c"`, PARAMS) + }) }) \ No newline at end of file From 2bb0dbdc06ef301718d9d29c0d0bbce474111cbd Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 8 Aug 2022 19:21:06 +0100 Subject: [PATCH 082/272] Adding a test for the case where a user has added a number: at the start of the column - could have broken things. --- .../server/src/api/routes/tests/internalSearch.spec.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/server/src/api/routes/tests/internalSearch.spec.js b/packages/server/src/api/routes/tests/internalSearch.spec.js index 810226aae..50ee2b26a 100644 --- a/packages/server/src/api/routes/tests/internalSearch.spec.js +++ b/packages/server/src/api/routes/tests/internalSearch.spec.js @@ -145,4 +145,13 @@ describe("internal search", () => { }, PARAMS) checkLucene(response, `column:"a" OR column:"b" OR column:"c"`, PARAMS) }) + + it("check a weird case for lucene building", async () => { + const response = await search.paginatedSearch({ + equal: { + "1:1:column": "a", + }, + }, PARAMS) + checkLucene(response, `*:* AND 1\\:column:"a"`, PARAMS) + }) }) \ No newline at end of file From 88f06539a4d278f5a93e8438b00d88fda7b6a440 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 8 Aug 2022 21:56:55 +0100 Subject: [PATCH 083/272] Nested braces parse fix added for MongoDB --- packages/server/src/integrations/mongodb.ts | 16 ++++++ .../src/integrations/tests/mongo.spec.js | 52 +++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index a520cdb15..d24cb51fc 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -118,6 +118,22 @@ module MongoDBModule { parseQueryParams(params: string, mode: string) { let queryParams = params.split(/(?<=}),[\n\s]*(?={)/g) + if (queryParams.length > 3) { + for (let i = 0; i < queryParams.length; i++) { + const openCount = queryParams[i].match(/{/g)?.length ?? 0 + const closeCount = queryParams[i].match(/}/g)?.length ?? 0 + if ((openCount + closeCount) % 2 !== 0) { + if (openCount > closeCount) { + queryParams[i] += `, ${queryParams[i+1]}` + queryParams.splice(i+1, 1) + } else { + queryParams[i-1] += `, ${queryParams[i]}` + queryParams.splice(i, 1) + i-- + } + } + } + } let group1 = queryParams[0] ? JSON.parse(queryParams[0]) : {} let group2 = queryParams[1] ? JSON.parse(queryParams[1]) : {} let group3 = queryParams[2] ? JSON.parse(queryParams[2]) : {} diff --git a/packages/server/src/integrations/tests/mongo.spec.js b/packages/server/src/integrations/tests/mongo.spec.js index 555188a52..17561723b 100644 --- a/packages/server/src/integrations/tests/mongo.spec.js +++ b/packages/server/src/integrations/tests/mongo.spec.js @@ -214,4 +214,56 @@ describe("MongoDB Integration", () => { upsert: false }) }) + + it("can parse nested objects with arrays", async () => { + const query = { + json: `{ + "_id": { + "$eq": "ObjectId('ACBD12345678ABCD12345678')" + } + }, + { + "$set": { + "value": { + "data": [ + { "cid": 1 }, + { "cid": 2 }, + { "nested": { + "name": "test" + }} + ] + } + } + }, + { + "upsert": true + }`, + extra: { collection: "testCollection", actionTypes: "updateOne" }, + } + await config.integration.update(query) + expect(config.integration.client.updateOne).toHaveBeenCalled() + + const args = config.integration.client.updateOne.mock.calls[0] + expect(args[0]).toEqual({ + _id: { + $eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"), + } + }) + expect(args[1]).toEqual({ + $set: { + value: { + data: [ + { cid: 1 }, + { cid: 2 }, + { nested: { + name: "test" + }} + ] + }, + }, + }) + expect(args[2]).toEqual({ + upsert: true + }) + }) }) From e23d29b7efb4d21a46562594a2821cff329bd102 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 8 Aug 2022 21:57:36 +0100 Subject: [PATCH 084/272] lint --- packages/server/src/integrations/mongodb.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index d24cb51fc..0ae9515a0 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -124,10 +124,10 @@ module MongoDBModule { const closeCount = queryParams[i].match(/}/g)?.length ?? 0 if ((openCount + closeCount) % 2 !== 0) { if (openCount > closeCount) { - queryParams[i] += `, ${queryParams[i+1]}` - queryParams.splice(i+1, 1) + queryParams[i] += `, ${queryParams[i + 1]}` + queryParams.splice(i + 1, 1) } else { - queryParams[i-1] += `, ${queryParams[i]}` + queryParams[i - 1] += `, ${queryParams[i]}` queryParams.splice(i, 1) i-- } From 646b5c223e54d83c963c77da814474836d9c89a9 Mon Sep 17 00:00:00 2001 From: Ashish Kapoor Date: Tue, 9 Aug 2022 13:32:28 +0530 Subject: [PATCH 085/272] Update .all-contributorsrc --- .all-contributorsrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 53705907c..3a416f917 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -162,6 +162,7 @@ "translation" ] }, + { "login": "mslourens", "name": "Maurits Lourens", "avatar_url": "https://avatars.githubusercontent.com/u/1907152?v=4", From 93cd77c605e65316d7a84189547122538fdafe36 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 9 Aug 2022 10:20:35 +0000 Subject: [PATCH 086/272] v1.2.20-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 82fca15c4..b8495a870 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4e2034550..63ce04f4e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.20-alpha.1", + "@budibase/types": "1.2.20-alpha.2", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4e6f6fa22..9df404fec 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.20-alpha.1", + "@budibase/string-templates": "1.2.20-alpha.2", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 614c1aaa6..70589f5c8 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.20-alpha.1", - "@budibase/client": "1.2.20-alpha.1", - "@budibase/frontend-core": "1.2.20-alpha.1", - "@budibase/string-templates": "1.2.20-alpha.1", + "@budibase/bbui": "1.2.20-alpha.2", + "@budibase/client": "1.2.20-alpha.2", + "@budibase/frontend-core": "1.2.20-alpha.2", + "@budibase/string-templates": "1.2.20-alpha.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9b815b7ea..e1892a28e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 37efb9613..19155f63a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.20-alpha.1", - "@budibase/frontend-core": "1.2.20-alpha.1", - "@budibase/string-templates": "1.2.20-alpha.1", + "@budibase/bbui": "1.2.20-alpha.2", + "@budibase/frontend-core": "1.2.20-alpha.2", + "@budibase/string-templates": "1.2.20-alpha.2", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 4fd528606..8f9e20c1b 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.20-alpha.1", + "@budibase/bbui": "1.2.20-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index a694e60f9..f0706cf17 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.20-alpha.1", - "@budibase/client": "1.2.20-alpha.1", + "@budibase/backend-core": "1.2.20-alpha.2", + "@budibase/client": "1.2.20-alpha.2", "@budibase/pro": "1.2.20-alpha.1", - "@budibase/string-templates": "1.2.20-alpha.1", - "@budibase/types": "1.2.20-alpha.1", + "@budibase/string-templates": "1.2.20-alpha.2", + "@budibase/types": "1.2.20-alpha.2", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ad9de5609..2ece1f7ea 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index cd5d5a828..ae049b9e9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index bd0da25c5..4c06aff78 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.20-alpha.1", + "version": "1.2.20-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.20-alpha.1", + "@budibase/backend-core": "1.2.20-alpha.2", "@budibase/pro": "1.2.20-alpha.1", - "@budibase/string-templates": "1.2.20-alpha.1", - "@budibase/types": "1.2.20-alpha.1", + "@budibase/string-templates": "1.2.20-alpha.2", + "@budibase/types": "1.2.20-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d6a0e3b75eac9a1b700766bbf2b395b14dae7b82 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 9 Aug 2022 10:23:45 +0000 Subject: [PATCH 087/272] Update pro version to 1.2.20-alpha.2 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f0706cf17..af0157a1b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.20-alpha.2", "@budibase/client": "1.2.20-alpha.2", - "@budibase/pro": "1.2.20-alpha.1", + "@budibase/pro": "1.2.20-alpha.2", "@budibase/string-templates": "1.2.20-alpha.2", "@budibase/types": "1.2.20-alpha.2", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 46c3a0280..1c373904d 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.20-alpha.1": - version "1.2.20-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20-alpha.1.tgz#f25d65f6c298be24679a22148f768bb7479fee49" - integrity sha512-aeZKM/8sLnEHJguKxPFiFZ5r/qjD5aC10n9SEcwxnAFgP0l9uUitkBEmhALd9wLcpkf5BCxPql1ytJTvXQR4XA== +"@budibase/backend-core@1.2.20-alpha.2": + version "1.2.20-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20-alpha.2.tgz#18adb18fc4d017df6cf3e04431114a617ac54a34" + integrity sha512-zw8AvxTHoQYUOno53pxXuf0YunuDMscgj6vJ56t1hR+iG24X8Uy3/phh2KwS6kM35huIZVmY25nwWQLs+gOf2g== dependencies: - "@budibase/types" "1.2.20-alpha.1" + "@budibase/types" "1.2.20-alpha.2" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.20-alpha.1": - version "1.2.20-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20-alpha.1.tgz#9d58ccc0f4fa722c5a1e781c61538e8a815337b7" - integrity sha512-mHF/CCd2zqw7DiDa2asLvgHKxmMdjnIUbJM/Xb/t5qQM5KrWlX2jrrP4w0HaCGiV9BhHMPdkcc1f70w0oGadoA== +"@budibase/pro@1.2.20-alpha.2": + version "1.2.20-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20-alpha.2.tgz#7b2451fe39d5781424ada144552adc9ccfb97232" + integrity sha512-vy5eOjM4tLFKw6t0Yssnsb1OCX4BwMcFc9KTj/N2lQ/JkNbx4aLUa+NdLd1Dl8qgJ1SaBbFrpgnLUBCz+BxD0Q== dependencies: - "@budibase/backend-core" "1.2.20-alpha.1" - "@budibase/types" "1.2.20-alpha.1" + "@budibase/backend-core" "1.2.20-alpha.2" + "@budibase/types" "1.2.20-alpha.2" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.20-alpha.1": - version "1.2.20-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20-alpha.1.tgz#5179957b972fb2778b862bca67b2ebb5facf1353" - integrity sha512-Y09pdnTinbAcjTTvML1XN/XRdzymiXcADHl9x1sr7muWcBe3OCcVyu4bh4WDLF/WX+kXEdmvrSH4w27rYx+uWw== +"@budibase/types@1.2.20-alpha.2": + version "1.2.20-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20-alpha.2.tgz#28e6c5d9d31c546287dcb1e5eee94fa25ee3fd29" + integrity sha512-UyvqwDAs0ZCpWRJY4qPzovXVQE2SNMbf93qKM10LNyriWeeH1FabXNI0iBKHO9xndbhuZGhudqY5LT+IaEcZfQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 4c06aff78..f6e0e4bfe 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.20-alpha.2", - "@budibase/pro": "1.2.20-alpha.1", + "@budibase/pro": "1.2.20-alpha.2", "@budibase/string-templates": "1.2.20-alpha.2", "@budibase/types": "1.2.20-alpha.2", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 65badfecb..c716cef77 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.20-alpha.1": - version "1.2.20-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20-alpha.1.tgz#f25d65f6c298be24679a22148f768bb7479fee49" - integrity sha512-aeZKM/8sLnEHJguKxPFiFZ5r/qjD5aC10n9SEcwxnAFgP0l9uUitkBEmhALd9wLcpkf5BCxPql1ytJTvXQR4XA== +"@budibase/backend-core@1.2.20-alpha.2": + version "1.2.20-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.20-alpha.2.tgz#18adb18fc4d017df6cf3e04431114a617ac54a34" + integrity sha512-zw8AvxTHoQYUOno53pxXuf0YunuDMscgj6vJ56t1hR+iG24X8Uy3/phh2KwS6kM35huIZVmY25nwWQLs+gOf2g== dependencies: - "@budibase/types" "1.2.20-alpha.1" + "@budibase/types" "1.2.20-alpha.2" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.20-alpha.1": - version "1.2.20-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20-alpha.1.tgz#9d58ccc0f4fa722c5a1e781c61538e8a815337b7" - integrity sha512-mHF/CCd2zqw7DiDa2asLvgHKxmMdjnIUbJM/Xb/t5qQM5KrWlX2jrrP4w0HaCGiV9BhHMPdkcc1f70w0oGadoA== +"@budibase/pro@1.2.20-alpha.2": + version "1.2.20-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.20-alpha.2.tgz#7b2451fe39d5781424ada144552adc9ccfb97232" + integrity sha512-vy5eOjM4tLFKw6t0Yssnsb1OCX4BwMcFc9KTj/N2lQ/JkNbx4aLUa+NdLd1Dl8qgJ1SaBbFrpgnLUBCz+BxD0Q== dependencies: - "@budibase/backend-core" "1.2.20-alpha.1" - "@budibase/types" "1.2.20-alpha.1" + "@budibase/backend-core" "1.2.20-alpha.2" + "@budibase/types" "1.2.20-alpha.2" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.20-alpha.1": - version "1.2.20-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20-alpha.1.tgz#5179957b972fb2778b862bca67b2ebb5facf1353" - integrity sha512-Y09pdnTinbAcjTTvML1XN/XRdzymiXcADHl9x1sr7muWcBe3OCcVyu4bh4WDLF/WX+kXEdmvrSH4w27rYx+uWw== +"@budibase/types@1.2.20-alpha.2": + version "1.2.20-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.20-alpha.2.tgz#28e6c5d9d31c546287dcb1e5eee94fa25ee3fd29" + integrity sha512-UyvqwDAs0ZCpWRJY4qPzovXVQE2SNMbf93qKM10LNyriWeeH1FabXNI0iBKHO9xndbhuZGhudqY5LT+IaEcZfQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 5efb77d1fe6dc5fe86115cda7a0cb297efefd0e9 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 9 Aug 2022 11:03:46 +0000 Subject: [PATCH 088/272] v1.2.26-alpha.0 --- lerna.json | 4 ++-- packages/backend-core/package.json | 6 +++--- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 4 ++-- packages/client/package.json | 10 +++++----- packages/frontend-core/package.json | 6 +++--- packages/server/package.json | 12 ++++++------ packages/string-templates/package.json | 4 ++-- packages/types/package.json | 4 ++-- packages/worker/package.json | 10 +++++----- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 30502d64b..26cb79285 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.25", + "version": "1.2.26-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" @@ -15,4 +15,4 @@ ] } } -} \ No newline at end of file +} diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 80f8711ba..9fe0dcc94 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.25", + "version": "1.2.26-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.25", + "@budibase/types": "1.2.26-alpha.0", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", @@ -81,4 +81,4 @@ "typescript": "4.7.3" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c3f3c9404..eb96cdef3 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.25", + "version": "1.2.26-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.25", + "@budibase/string-templates": "1.2.26-alpha.0", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", @@ -86,4 +86,4 @@ "svelte-portal": "^1.0.0" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/builder/package.json b/packages/builder/package.json index a1d673fdf..2a9c94c35 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.25", + "version": "1.2.26-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.25", - "@budibase/client": "^1.2.25", - "@budibase/frontend-core": "^1.2.25", - "@budibase/string-templates": "^1.2.25", + "@budibase/bbui": "1.2.26-alpha.0", + "@budibase/client": "1.2.26-alpha.0", + "@budibase/frontend-core": "1.2.26-alpha.0", + "@budibase/string-templates": "1.2.26-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", @@ -121,4 +121,4 @@ "vite": "^2.1.5" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} \ No newline at end of file +} diff --git a/packages/cli/package.json b/packages/cli/package.json index 1c025b8ec..709683af4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.25", + "version": "1.2.26-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -48,4 +48,4 @@ "eslint": "^7.20.0", "renamer": "^4.0.0" } -} \ No newline at end of file +} diff --git a/packages/client/package.json b/packages/client/package.json index c164ebd7b..b11d1cfb4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.25", + "version": "1.2.26-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.25", - "@budibase/frontend-core": "^1.2.25", - "@budibase/string-templates": "^1.2.25", + "@budibase/bbui": "1.2.26-alpha.0", + "@budibase/frontend-core": "1.2.26-alpha.0", + "@budibase/string-templates": "1.2.26-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", @@ -58,4 +58,4 @@ "rollup-plugin-visualizer": "^5.5.4" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 2061a71b9..68b436bc4 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "1.2.25", + "version": "1.2.26-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.25", + "@budibase/bbui": "1.2.26-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } -} \ No newline at end of file +} diff --git a/packages/server/package.json b/packages/server/package.json index 302de49a2..75e72003f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.25", + "version": "1.2.26-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.25", - "@budibase/client": "^1.2.25", + "@budibase/backend-core": "1.2.26-alpha.0", + "@budibase/client": "1.2.26-alpha.0", "@budibase/pro": "1.2.25", - "@budibase/string-templates": "^1.2.25", - "@budibase/types": "^1.2.25", + "@budibase/string-templates": "1.2.26-alpha.0", + "@budibase/types": "1.2.26-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", @@ -196,4 +196,4 @@ "oracledb": "5.3.0" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index aa94aeb9c..bfafc094a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.25", + "version": "1.2.26-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", @@ -46,4 +46,4 @@ "typescript": "^4.5.5" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/types/package.json b/packages/types/package.json index dea2c074b..fadfc3529 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.25", + "version": "1.2.26-alpha.0", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -17,4 +17,4 @@ "rimraf": "3.0.2", "typescript": "4.7.3" } -} \ No newline at end of file +} diff --git a/packages/worker/package.json b/packages/worker/package.json index e701203bf..aa7eb78f5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.25", + "version": "1.2.26-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.25", + "@budibase/backend-core": "1.2.26-alpha.0", "@budibase/pro": "1.2.25", - "@budibase/string-templates": "^1.2.25", - "@budibase/types": "^1.2.25", + "@budibase/string-templates": "1.2.26-alpha.0", + "@budibase/types": "1.2.26-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", @@ -102,4 +102,4 @@ ] }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} From 527bf06f48a29de13b900edae5a98b50b5aade24 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 9 Aug 2022 11:06:45 +0000 Subject: [PATCH 089/272] Update pro version to 1.2.26-alpha.0 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 75e72003f..fd70df44b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.26-alpha.0", "@budibase/client": "1.2.26-alpha.0", - "@budibase/pro": "1.2.25", + "@budibase/pro": "1.2.26-alpha.0", "@budibase/string-templates": "1.2.26-alpha.0", "@budibase/types": "1.2.26-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 63ceb0cc5..dee85f9c1 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.25": - version "1.2.25" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.25.tgz#7dcb958cfdd8f73d3755bf0d8470248d4f721360" - integrity sha512-UKA8t8trzTe/jHEpAGlYT2fZIR8SRxDnFvY0wQFGPspvJ0EnoVX6U2sV7kuZy8EtTxpJxShG7Nvt94I0EjiN5w== +"@budibase/backend-core@1.2.26-alpha.0": + version "1.2.26-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.26-alpha.0.tgz#31b099435ef3929763cd20fd69f3c46ca31f5a55" + integrity sha512-xAWNDEF80dpJcGcTZirG3yYxypSpUzsFw0gbZ/j2SoweN0M2ux6kglqko1kpa+8NNxq36s73Led8H/9atLW25w== dependencies: - "@budibase/types" "^1.2.25" + "@budibase/types" "1.2.26-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.25": - version "1.2.25" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.25.tgz#9e802bb7b18ba192617b01269f6ebefee0477b05" - integrity sha512-zxL7p61jMNznnAL9EKYg+Ap9ar3K9lbzwyM75uZjgAw2VGCYm7Z1Kftj9EGmEQxzXiZfrWTJcOE8MAhu8nAJRA== +"@budibase/pro@1.2.26-alpha.0": + version "1.2.26-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.26-alpha.0.tgz#3a60cd1ac42c285adfa7425b8645d90c7d916a55" + integrity sha512-q9OORGd3iKTehci+YCiJN87TuqPQ2l/LNMZ0mXju+lWTDwFLH+oqyY2LJSTxqGutkZXElTxFTH+EWx0rRqxPAg== dependencies: - "@budibase/backend-core" "1.2.25" - "@budibase/types" "1.2.25" + "@budibase/backend-core" "1.2.26-alpha.0" + "@budibase/types" "1.2.26-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.25", "@budibase/types@^1.2.25": - version "1.2.25" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.25.tgz#9b3738f774592e25f9ac44527e8b2e4aba6b4933" - integrity sha512-ReBvf2aN5/3M1eFcCrqycu68g54CxV2BXiEQTOS2om4u3WRcQMPa69eMjHJ4SltBb5HwfXveDu50Tc+4M8kS6w== +"@budibase/types@1.2.26-alpha.0": + version "1.2.26-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.26-alpha.0.tgz#c567ec674e070cd57cb774e773164b99a9aee421" + integrity sha512-c86z1rJDFGV6aYxBXt3OTUU6N3BZynYuhufHQA4p/IxHdMf3dOIEJrfG8UHIlDek8L/g3fSEAtP/DmpPGaXUGw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index aa7eb78f5..95697d7d2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.26-alpha.0", - "@budibase/pro": "1.2.25", + "@budibase/pro": "1.2.26-alpha.0", "@budibase/string-templates": "1.2.26-alpha.0", "@budibase/types": "1.2.26-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 41e10b85a..9a03fe11d 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.25": - version "1.2.25" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.25.tgz#7dcb958cfdd8f73d3755bf0d8470248d4f721360" - integrity sha512-UKA8t8trzTe/jHEpAGlYT2fZIR8SRxDnFvY0wQFGPspvJ0EnoVX6U2sV7kuZy8EtTxpJxShG7Nvt94I0EjiN5w== +"@budibase/backend-core@1.2.26-alpha.0": + version "1.2.26-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.26-alpha.0.tgz#31b099435ef3929763cd20fd69f3c46ca31f5a55" + integrity sha512-xAWNDEF80dpJcGcTZirG3yYxypSpUzsFw0gbZ/j2SoweN0M2ux6kglqko1kpa+8NNxq36s73Led8H/9atLW25w== dependencies: - "@budibase/types" "^1.2.25" + "@budibase/types" "1.2.26-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.25": - version "1.2.25" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.25.tgz#9e802bb7b18ba192617b01269f6ebefee0477b05" - integrity sha512-zxL7p61jMNznnAL9EKYg+Ap9ar3K9lbzwyM75uZjgAw2VGCYm7Z1Kftj9EGmEQxzXiZfrWTJcOE8MAhu8nAJRA== +"@budibase/pro@1.2.26-alpha.0": + version "1.2.26-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.26-alpha.0.tgz#3a60cd1ac42c285adfa7425b8645d90c7d916a55" + integrity sha512-q9OORGd3iKTehci+YCiJN87TuqPQ2l/LNMZ0mXju+lWTDwFLH+oqyY2LJSTxqGutkZXElTxFTH+EWx0rRqxPAg== dependencies: - "@budibase/backend-core" "1.2.25" - "@budibase/types" "1.2.25" + "@budibase/backend-core" "1.2.26-alpha.0" + "@budibase/types" "1.2.26-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.25", "@budibase/types@^1.2.25": - version "1.2.25" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.25.tgz#9b3738f774592e25f9ac44527e8b2e4aba6b4933" - integrity sha512-ReBvf2aN5/3M1eFcCrqycu68g54CxV2BXiEQTOS2om4u3WRcQMPa69eMjHJ4SltBb5HwfXveDu50Tc+4M8kS6w== +"@budibase/types@1.2.26-alpha.0": + version "1.2.26-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.26-alpha.0.tgz#c567ec674e070cd57cb774e773164b99a9aee421" + integrity sha512-c86z1rJDFGV6aYxBXt3OTUU6N3BZynYuhufHQA4p/IxHdMf3dOIEJrfG8UHIlDek8L/g3fSEAtP/DmpPGaXUGw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 40c846ce8f44ae14e8d5cd418bd1fab16d531c6c Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 9 Aug 2022 17:27:51 +0100 Subject: [PATCH 090/272] Handle braces within quotes --- packages/server/src/integrations/mongodb.ts | 39 ++++++++------ .../src/integrations/tests/mongo.spec.js | 54 +++++++++++++++++++ 2 files changed, 76 insertions(+), 17 deletions(-) diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index 0ae9515a0..9bfc10514 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -117,26 +117,31 @@ module MongoDBModule { } parseQueryParams(params: string, mode: string) { - let queryParams = params.split(/(?<=}),[\n\s]*(?={)/g) - if (queryParams.length > 3) { - for (let i = 0; i < queryParams.length; i++) { - const openCount = queryParams[i].match(/{/g)?.length ?? 0 - const closeCount = queryParams[i].match(/}/g)?.length ?? 0 - if ((openCount + closeCount) % 2 !== 0) { - if (openCount > closeCount) { - queryParams[i] += `, ${queryParams[i + 1]}` - queryParams.splice(i + 1, 1) - } else { - queryParams[i - 1] += `, ${queryParams[i]}` - queryParams.splice(i, 1) - i-- - } + let queryParams = [] + let openCount = 0 + let inQuotes = false + let i = 0 + let startIndex = 0 + for (let c of params) { + if (c === '"') { + inQuotes = !inQuotes + } + if (c === '{' && !inQuotes) { + openCount++ + if (openCount === 1) { + startIndex = i + } + } else if (c === '}' && !inQuotes) { + if (openCount === 1) { + queryParams.push(JSON.parse(params.substring(startIndex, i+1))) } + openCount-- } + i++ } - let group1 = queryParams[0] ? JSON.parse(queryParams[0]) : {} - let group2 = queryParams[1] ? JSON.parse(queryParams[1]) : {} - let group3 = queryParams[2] ? JSON.parse(queryParams[2]) : {} + let group1 = queryParams[0] ?? {} + let group2 = queryParams[1] ?? {} + let group3 = queryParams[2] ?? {} if (mode === "update") { return { filter: group1, diff --git a/packages/server/src/integrations/tests/mongo.spec.js b/packages/server/src/integrations/tests/mongo.spec.js index 17561723b..02d37b18a 100644 --- a/packages/server/src/integrations/tests/mongo.spec.js +++ b/packages/server/src/integrations/tests/mongo.spec.js @@ -266,4 +266,58 @@ describe("MongoDB Integration", () => { upsert: true }) }) + + it("ignores braces within strings when parsing nested objects", async () => { + const query = { + json: `{ + "_id": { + "$eq": "ObjectId('ACBD12345678ABCD12345678')" + } + }, + { + "$set": { + "value": { + "data": [ + { "cid": 1 }, + { "cid": 2 }, + { "nested": { + "name": "te}st" + }} + ] + } + } + }, + { + "upsert": true, + "extra": "ad{d" + }`, + extra: { collection: "testCollection", actionTypes: "updateOne" }, + } + await config.integration.update(query) + expect(config.integration.client.updateOne).toHaveBeenCalled() + + const args = config.integration.client.updateOne.mock.calls[0] + expect(args[0]).toEqual({ + _id: { + $eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"), + } + }) + expect(args[1]).toEqual({ + $set: { + value: { + data: [ + { cid: 1 }, + { cid: 2 }, + { nested: { + name: "te}st" + }} + ] + }, + }, + }) + expect(args[2]).toEqual({ + upsert: true, + extra: "ad{d" + }) + }) }) From f7c816bce952ddf6234764d0c06296115c26202b Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 9 Aug 2022 17:28:21 +0100 Subject: [PATCH 091/272] lint --- packages/server/src/integrations/mongodb.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index 9bfc10514..f3be29e38 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -126,14 +126,14 @@ module MongoDBModule { if (c === '"') { inQuotes = !inQuotes } - if (c === '{' && !inQuotes) { + if (c === "{" && !inQuotes) { openCount++ if (openCount === 1) { startIndex = i } - } else if (c === '}' && !inQuotes) { + } else if (c === "}" && !inQuotes) { if (openCount === 1) { - queryParams.push(JSON.parse(params.substring(startIndex, i+1))) + queryParams.push(JSON.parse(params.substring(startIndex, i + 1))) } openCount-- } From 334d9a956deeea96ae0f74001d23a414cfc01b5a Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 10 Aug 2022 10:57:42 +0100 Subject: [PATCH 092/272] Ignore escaped double quotes within strings --- packages/server/src/integrations/mongodb.ts | 2 +- packages/server/src/integrations/tests/mongo.spec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index f3be29e38..cdc1b581b 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -123,7 +123,7 @@ module MongoDBModule { let i = 0 let startIndex = 0 for (let c of params) { - if (c === '"') { + if (c === '"' && (i > 0 && params[i-1] !== '\\')) { inQuotes = !inQuotes } if (c === "{" && !inQuotes) { diff --git a/packages/server/src/integrations/tests/mongo.spec.js b/packages/server/src/integrations/tests/mongo.spec.js index 02d37b18a..968772352 100644 --- a/packages/server/src/integrations/tests/mongo.spec.js +++ b/packages/server/src/integrations/tests/mongo.spec.js @@ -289,7 +289,7 @@ describe("MongoDB Integration", () => { }, { "upsert": true, - "extra": "ad{d" + "extra": "ad\\"{\\"d" }`, extra: { collection: "testCollection", actionTypes: "updateOne" }, } @@ -317,7 +317,7 @@ describe("MongoDB Integration", () => { }) expect(args[2]).toEqual({ upsert: true, - extra: "ad{d" + extra: "ad\"{\"d" }) }) }) From 9ce34aa4c0d46282aaecf85372899863fd1d717f Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 10 Aug 2022 10:58:11 +0100 Subject: [PATCH 093/272] lint --- packages/server/src/integrations/mongodb.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index cdc1b581b..35420c456 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -123,7 +123,7 @@ module MongoDBModule { let i = 0 let startIndex = 0 for (let c of params) { - if (c === '"' && (i > 0 && params[i-1] !== '\\')) { + if (c === '"' && i > 0 && params[i - 1] !== "\\") { inQuotes = !inQuotes } if (c === "{" && !inQuotes) { From f73078bcbfba186fefdfe09a8558f89d9e961ce8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 10 Aug 2022 11:09:57 +0000 Subject: [PATCH 094/272] v1.2.28-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 15a771a46..9e190e668 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.27", + "version": "1.2.28-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 3e2386df2..23d4c07fe 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.27", + "version": "1.2.28-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.27", + "@budibase/types": "1.2.28-alpha.0", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c80fa643e..431570af1 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.27", + "version": "1.2.28-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.27", + "@budibase/string-templates": "1.2.28-alpha.0", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index d2e0bc0fe..ca7b3b938 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.27", + "version": "1.2.28-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.27", - "@budibase/client": "^1.2.27", - "@budibase/frontend-core": "^1.2.27", - "@budibase/string-templates": "^1.2.27", + "@budibase/bbui": "1.2.28-alpha.0", + "@budibase/client": "1.2.28-alpha.0", + "@budibase/frontend-core": "1.2.28-alpha.0", + "@budibase/string-templates": "1.2.28-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e92ea4a86..8875bb2af 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.27", + "version": "1.2.28-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 9a83975e6..f3050be5d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.27", + "version": "1.2.28-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.27", - "@budibase/frontend-core": "^1.2.27", - "@budibase/string-templates": "^1.2.27", + "@budibase/bbui": "1.2.28-alpha.0", + "@budibase/frontend-core": "1.2.28-alpha.0", + "@budibase/string-templates": "1.2.28-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 7d0ee0c42..ec9399e38 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.27", + "version": "1.2.28-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.27", + "@budibase/bbui": "1.2.28-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index b76fa66db..c43a345df 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.27", + "version": "1.2.28-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.27", - "@budibase/client": "^1.2.27", + "@budibase/backend-core": "1.2.28-alpha.0", + "@budibase/client": "1.2.28-alpha.0", "@budibase/pro": "1.2.27", - "@budibase/string-templates": "^1.2.27", - "@budibase/types": "^1.2.27", + "@budibase/string-templates": "1.2.28-alpha.0", + "@budibase/types": "1.2.28-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 726b5207b..57fa17c1f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.27", + "version": "1.2.28-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 8e15aae14..ed9dee51b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.27", + "version": "1.2.28-alpha.0", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index a1d20c090..3614bde7d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.27", + "version": "1.2.28-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.27", + "@budibase/backend-core": "1.2.28-alpha.0", "@budibase/pro": "1.2.27", - "@budibase/string-templates": "^1.2.27", - "@budibase/types": "^1.2.27", + "@budibase/string-templates": "1.2.28-alpha.0", + "@budibase/types": "1.2.28-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 5b9f241420cf4af7835fcd4a0dd7203353bf8378 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 10 Aug 2022 11:13:09 +0000 Subject: [PATCH 095/272] Update pro version to 1.2.28-alpha.0 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index c43a345df..6d9fe3680 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.28-alpha.0", "@budibase/client": "1.2.28-alpha.0", - "@budibase/pro": "1.2.27", + "@budibase/pro": "1.2.28-alpha.0", "@budibase/string-templates": "1.2.28-alpha.0", "@budibase/types": "1.2.28-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index dee85f9c1..6b26556c4 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.26-alpha.0": - version "1.2.26-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.26-alpha.0.tgz#31b099435ef3929763cd20fd69f3c46ca31f5a55" - integrity sha512-xAWNDEF80dpJcGcTZirG3yYxypSpUzsFw0gbZ/j2SoweN0M2ux6kglqko1kpa+8NNxq36s73Led8H/9atLW25w== +"@budibase/backend-core@1.2.28-alpha.0": + version "1.2.28-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.28-alpha.0.tgz#f4253825724327e6552000f8c7575134bfaa05cd" + integrity sha512-ueu+NZgkiKrX49E0Zy2rrNE4NLe2HAyl3VolTrZfVxOzu1IvtQ/wJBcGDG84VvSliP+0bOOVO9TiGMY3bvZ/Hw== dependencies: - "@budibase/types" "1.2.26-alpha.0" + "@budibase/types" "1.2.28-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.26-alpha.0": - version "1.2.26-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.26-alpha.0.tgz#3a60cd1ac42c285adfa7425b8645d90c7d916a55" - integrity sha512-q9OORGd3iKTehci+YCiJN87TuqPQ2l/LNMZ0mXju+lWTDwFLH+oqyY2LJSTxqGutkZXElTxFTH+EWx0rRqxPAg== +"@budibase/pro@1.2.28-alpha.0": + version "1.2.28-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.28-alpha.0.tgz#f372dcbac55634a1f0e7ff8125ffb0a0aeea086c" + integrity sha512-YxElWs5gwpe1JmHgpB52YeRkyeWPoBiUIt8EshyW90EFVUXP7FOy3LsjvKMNJXAZs1mI4ttkZfuWva8HjrGaKA== dependencies: - "@budibase/backend-core" "1.2.26-alpha.0" - "@budibase/types" "1.2.26-alpha.0" + "@budibase/backend-core" "1.2.28-alpha.0" + "@budibase/types" "1.2.28-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.26-alpha.0": - version "1.2.26-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.26-alpha.0.tgz#c567ec674e070cd57cb774e773164b99a9aee421" - integrity sha512-c86z1rJDFGV6aYxBXt3OTUU6N3BZynYuhufHQA4p/IxHdMf3dOIEJrfG8UHIlDek8L/g3fSEAtP/DmpPGaXUGw== +"@budibase/types@1.2.28-alpha.0": + version "1.2.28-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.28-alpha.0.tgz#61668b7d5d9b1f85c09d658deed87ec3dc28e290" + integrity sha512-tYhdUl1+dEtG8h2xoGUl0NXZC5BZYQIhgPK7JkYrqFHuNx+1f6EoHPQ9MMb/WyOxIDZv4gY7QJLg0KeVflofbw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 3614bde7d..2902a9e47 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.28-alpha.0", - "@budibase/pro": "1.2.27", + "@budibase/pro": "1.2.28-alpha.0", "@budibase/string-templates": "1.2.28-alpha.0", "@budibase/types": "1.2.28-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 9a03fe11d..297378326 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.26-alpha.0": - version "1.2.26-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.26-alpha.0.tgz#31b099435ef3929763cd20fd69f3c46ca31f5a55" - integrity sha512-xAWNDEF80dpJcGcTZirG3yYxypSpUzsFw0gbZ/j2SoweN0M2ux6kglqko1kpa+8NNxq36s73Led8H/9atLW25w== +"@budibase/backend-core@1.2.28-alpha.0": + version "1.2.28-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.28-alpha.0.tgz#f4253825724327e6552000f8c7575134bfaa05cd" + integrity sha512-ueu+NZgkiKrX49E0Zy2rrNE4NLe2HAyl3VolTrZfVxOzu1IvtQ/wJBcGDG84VvSliP+0bOOVO9TiGMY3bvZ/Hw== dependencies: - "@budibase/types" "1.2.26-alpha.0" + "@budibase/types" "1.2.28-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.26-alpha.0": - version "1.2.26-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.26-alpha.0.tgz#3a60cd1ac42c285adfa7425b8645d90c7d916a55" - integrity sha512-q9OORGd3iKTehci+YCiJN87TuqPQ2l/LNMZ0mXju+lWTDwFLH+oqyY2LJSTxqGutkZXElTxFTH+EWx0rRqxPAg== +"@budibase/pro@1.2.28-alpha.0": + version "1.2.28-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.28-alpha.0.tgz#f372dcbac55634a1f0e7ff8125ffb0a0aeea086c" + integrity sha512-YxElWs5gwpe1JmHgpB52YeRkyeWPoBiUIt8EshyW90EFVUXP7FOy3LsjvKMNJXAZs1mI4ttkZfuWva8HjrGaKA== dependencies: - "@budibase/backend-core" "1.2.26-alpha.0" - "@budibase/types" "1.2.26-alpha.0" + "@budibase/backend-core" "1.2.28-alpha.0" + "@budibase/types" "1.2.28-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.26-alpha.0": - version "1.2.26-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.26-alpha.0.tgz#c567ec674e070cd57cb774e773164b99a9aee421" - integrity sha512-c86z1rJDFGV6aYxBXt3OTUU6N3BZynYuhufHQA4p/IxHdMf3dOIEJrfG8UHIlDek8L/g3fSEAtP/DmpPGaXUGw== +"@budibase/types@1.2.28-alpha.0": + version "1.2.28-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.28-alpha.0.tgz#61668b7d5d9b1f85c09d658deed87ec3dc28e290" + integrity sha512-tYhdUl1+dEtG8h2xoGUl0NXZC5BZYQIhgPK7JkYrqFHuNx+1f6EoHPQ9MMb/WyOxIDZv4gY7QJLg0KeVflofbw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From c0f75a286f66b855da328de16d000306ef989ab6 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 10 Aug 2022 14:48:45 +0100 Subject: [PATCH 096/272] Update lockfiles --- packages/server/yarn.lock | 58 ++++++++++----------------------------- packages/worker/yarn.lock | 30 ++++++++++---------- 2 files changed, 30 insertions(+), 58 deletions(-) diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 2148b4471..be0cc80b5 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.29": - version "1.2.29" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.29.tgz#b95a5969209d474cb64f8f2c1d2d1e92de7a6062" - integrity sha512-jexTSQby2ClPe3oXyGr/msSHc6aYC5Ptl4SSg5PTFUhNsS7O1uk3Te2cuTWHCz1FVjv0X6iJiLrSD+Fw94ymGg== +"@budibase/backend-core@1.2.30": + version "1.2.30" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.30.tgz#7683406573d2be9c2cd8a25fc4c1bc9de8cb2523" + integrity sha512-SoF+tKksdalUGB2EFyei86Y9aHGGE1yF8IG6Ex1G0vdajIE7+vEhKgxuACyfzPilptCor6m0pwfK6trtL4rd9w== dependencies: - "@budibase/types" "^1.2.29" + "@budibase/types" "^1.2.30" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1177,13 +1177,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.29": - version "1.2.29" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.29.tgz#204efed7a6519173227d7c8172edc24622a74b68" - integrity sha512-Ymwvg6iPaKBC59MnOrxKnn9G4hM8HYVsCElcw98JiUC/hs8VpFIgq2L3Z6iZV9KMQ3ipIvdUMvWEW6b2NqCgCA== +"@budibase/pro@1.2.30": + version "1.2.30" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.30.tgz#ee498cf776da17cbbf7af43882e4283fc2c9fd92" + integrity sha512-avBjS97zPoAxHDwcrt0zdxZajgaqeS5242NRqirLi07q91yODZBV8tSeh0nPopR8feMuoCDqKV1txm8/ciStnQ== dependencies: - "@budibase/backend-core" "1.2.29" - "@budibase/types" "1.2.29" + "@budibase/backend-core" "1.2.30" + "@budibase/types" "1.2.30" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1206,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.29", "@budibase/types@^1.2.29": - version "1.2.29" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.29.tgz#9e47e360bd9979f6e3ed5539cc31111484aaf203" - integrity sha512-Em5MOxBokJmwWGby8MOXyaT4hAZQBmM6r11O+HNpI/Zzq60GsmVDgtZPyZkumDRxTwI/n8bqugeMvxsxkd9uDw== +"@budibase/types@1.2.30", "@budibase/types@^1.2.30": + version "1.2.30" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.30.tgz#5b94fceabf6abb2b7f5aed2f3aca9fcce9b17fd2" + integrity sha512-gezzb1WDsePlLWL13Q0I2a+ZwWAmcnAYCnY/dz/bNIrIFli+Svlnx/wbsehAn43MBtMDnLpaquuFJ3VVszTdSw== "@bull-board/api@3.7.0": version "3.7.0" @@ -1343,33 +1343,16 @@ protobufjs "^6.11.3" yargs "^16.2.0" -"@hapi/address@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.1.0.tgz#d60c5c0d930e77456fdcde2598e77302e2955e1d" - integrity sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ== - dependencies: - "@hapi/hoek" "^9.0.0" - "@hapi/bourne@^2.0.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-2.1.0.tgz#66aff77094dc3080bd5df44ec63881f2676eb020" integrity sha512-i1BpaNDVLJdRBEKeJWkVO6tYX6DMFBuwMhSuWqLsY4ufeTKGVuV5rBsUhxPayXqnnWHgXUAmWK16H/ykO5Wj4Q== -"@hapi/formula@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-2.0.0.tgz#edade0619ed58c8e4f164f233cda70211e787128" - integrity sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A== - "@hapi/hoek@^9.0.0": version "9.3.0" resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== -"@hapi/pinpoint@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-2.0.0.tgz#805b40d4dbec04fc116a73089494e00f073de8df" - integrity sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw== - "@hapi/topo@^5.0.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" @@ -8673,17 +8656,6 @@ jmespath@0.16.0: resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076" integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw== -joi@17.2.1: - version "17.2.1" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.2.1.tgz#e5140fdf07e8fecf9bc977c2832d1bdb1e3f2a0a" - integrity sha512-YT3/4Ln+5YRpacdmfEfrrKh50/kkgX3LgBltjqnlMPIYiZ4hxXZuVJcxmsvxsdeHg9soZfE3qXxHC2tMpCCBOA== - dependencies: - "@hapi/address" "^4.1.0" - "@hapi/formula" "^2.0.0" - "@hapi/hoek" "^9.0.0" - "@hapi/pinpoint" "^2.0.0" - "@hapi/topo" "^5.0.0" - joi@17.6.0: version "17.6.0" resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2" diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 2de479624..3ff75bc00 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.29": - version "1.2.29" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.29.tgz#b95a5969209d474cb64f8f2c1d2d1e92de7a6062" - integrity sha512-jexTSQby2ClPe3oXyGr/msSHc6aYC5Ptl4SSg5PTFUhNsS7O1uk3Te2cuTWHCz1FVjv0X6iJiLrSD+Fw94ymGg== +"@budibase/backend-core@1.2.30": + version "1.2.30" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.30.tgz#7683406573d2be9c2cd8a25fc4c1bc9de8cb2523" + integrity sha512-SoF+tKksdalUGB2EFyei86Y9aHGGE1yF8IG6Ex1G0vdajIE7+vEhKgxuACyfzPilptCor6m0pwfK6trtL4rd9w== dependencies: - "@budibase/types" "^1.2.29" + "@budibase/types" "^1.2.30" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -324,21 +324,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.29": - version "1.2.29" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.29.tgz#204efed7a6519173227d7c8172edc24622a74b68" - integrity sha512-Ymwvg6iPaKBC59MnOrxKnn9G4hM8HYVsCElcw98JiUC/hs8VpFIgq2L3Z6iZV9KMQ3ipIvdUMvWEW6b2NqCgCA== +"@budibase/pro@1.2.30": + version "1.2.30" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.30.tgz#ee498cf776da17cbbf7af43882e4283fc2c9fd92" + integrity sha512-avBjS97zPoAxHDwcrt0zdxZajgaqeS5242NRqirLi07q91yODZBV8tSeh0nPopR8feMuoCDqKV1txm8/ciStnQ== dependencies: - "@budibase/backend-core" "1.2.29" - "@budibase/types" "1.2.29" + "@budibase/backend-core" "1.2.30" + "@budibase/types" "1.2.30" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.29", "@budibase/types@^1.2.29": - version "1.2.29" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.29.tgz#9e47e360bd9979f6e3ed5539cc31111484aaf203" - integrity sha512-Em5MOxBokJmwWGby8MOXyaT4hAZQBmM6r11O+HNpI/Zzq60GsmVDgtZPyZkumDRxTwI/n8bqugeMvxsxkd9uDw== +"@budibase/types@1.2.30", "@budibase/types@^1.2.30": + version "1.2.30" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.30.tgz#5b94fceabf6abb2b7f5aed2f3aca9fcce9b17fd2" + integrity sha512-gezzb1WDsePlLWL13Q0I2a+ZwWAmcnAYCnY/dz/bNIrIFli+Svlnx/wbsehAn43MBtMDnLpaquuFJ3VVszTdSw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 8edeb4bdad0ce64ff9f442c42c2d6944027fb14b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 10 Aug 2022 14:04:56 +0000 Subject: [PATCH 097/272] v1.2.28-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 9e190e668..6b5866101 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 23d4c07fe..ccbbc9bb5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.28-alpha.0", + "@budibase/types": "1.2.28-alpha.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 431570af1..e9508e53d 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.28-alpha.0", + "@budibase/string-templates": "1.2.28-alpha.1", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ca7b3b938..045f6ce2d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.28-alpha.0", - "@budibase/client": "1.2.28-alpha.0", - "@budibase/frontend-core": "1.2.28-alpha.0", - "@budibase/string-templates": "1.2.28-alpha.0", + "@budibase/bbui": "1.2.28-alpha.1", + "@budibase/client": "1.2.28-alpha.1", + "@budibase/frontend-core": "1.2.28-alpha.1", + "@budibase/string-templates": "1.2.28-alpha.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8875bb2af..757e1734f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index f3050be5d..460fa792e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.28-alpha.0", - "@budibase/frontend-core": "1.2.28-alpha.0", - "@budibase/string-templates": "1.2.28-alpha.0", + "@budibase/bbui": "1.2.28-alpha.1", + "@budibase/frontend-core": "1.2.28-alpha.1", + "@budibase/string-templates": "1.2.28-alpha.1", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index ec9399e38..6afce3e53 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.28-alpha.0", + "@budibase/bbui": "1.2.28-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 6d9fe3680..16e4e6742 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.28-alpha.0", - "@budibase/client": "1.2.28-alpha.0", + "@budibase/backend-core": "1.2.28-alpha.1", + "@budibase/client": "1.2.28-alpha.1", "@budibase/pro": "1.2.28-alpha.0", - "@budibase/string-templates": "1.2.28-alpha.0", - "@budibase/types": "1.2.28-alpha.0", + "@budibase/string-templates": "1.2.28-alpha.1", + "@budibase/types": "1.2.28-alpha.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 57fa17c1f..fe615f611 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index ed9dee51b..2ffe31c54 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 2902a9e47..546c7a002 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.28-alpha.0", + "version": "1.2.28-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.28-alpha.0", + "@budibase/backend-core": "1.2.28-alpha.1", "@budibase/pro": "1.2.28-alpha.0", - "@budibase/string-templates": "1.2.28-alpha.0", - "@budibase/types": "1.2.28-alpha.0", + "@budibase/string-templates": "1.2.28-alpha.1", + "@budibase/types": "1.2.28-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7b0a82c1ce42f900551de68d58d0742b119d4fad Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 10 Aug 2022 14:07:59 +0000 Subject: [PATCH 098/272] Update pro version to 1.2.28-alpha.1 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 16e4e6742..b7173a4f1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.28-alpha.1", "@budibase/client": "1.2.28-alpha.1", - "@budibase/pro": "1.2.28-alpha.0", + "@budibase/pro": "1.2.28-alpha.1", "@budibase/string-templates": "1.2.28-alpha.1", "@budibase/types": "1.2.28-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 6b26556c4..7e51a4018 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.28-alpha.0": - version "1.2.28-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.28-alpha.0.tgz#f4253825724327e6552000f8c7575134bfaa05cd" - integrity sha512-ueu+NZgkiKrX49E0Zy2rrNE4NLe2HAyl3VolTrZfVxOzu1IvtQ/wJBcGDG84VvSliP+0bOOVO9TiGMY3bvZ/Hw== +"@budibase/backend-core@1.2.28-alpha.1": + version "1.2.28-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.28-alpha.1.tgz#8dbed2df0098fa2361834ca9e95af686f9db0c9c" + integrity sha512-7mVl7jPtWZ6spVvAicF/kFMn0Io8GBY4LHmv+D/SWngbT8ATtcQHMlcBvg404ulevCJQBs4DaMweFnZsCvAyNA== dependencies: - "@budibase/types" "1.2.28-alpha.0" + "@budibase/types" "1.2.28-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.28-alpha.0": - version "1.2.28-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.28-alpha.0.tgz#f372dcbac55634a1f0e7ff8125ffb0a0aeea086c" - integrity sha512-YxElWs5gwpe1JmHgpB52YeRkyeWPoBiUIt8EshyW90EFVUXP7FOy3LsjvKMNJXAZs1mI4ttkZfuWva8HjrGaKA== +"@budibase/pro@1.2.28-alpha.1": + version "1.2.28-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.28-alpha.1.tgz#9fa6ac9ebd40b10cca63dba4d3fe0c5063bf4aac" + integrity sha512-6DzX2506wBDGKNp6/0tT6FpHLYKub0XyIM99FM/GHwccsUTZ3zRJ1NNHxBw2X2ahQ8ZT0Zcz533xNhb5vx0mGw== dependencies: - "@budibase/backend-core" "1.2.28-alpha.0" - "@budibase/types" "1.2.28-alpha.0" + "@budibase/backend-core" "1.2.28-alpha.1" + "@budibase/types" "1.2.28-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.28-alpha.0": - version "1.2.28-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.28-alpha.0.tgz#61668b7d5d9b1f85c09d658deed87ec3dc28e290" - integrity sha512-tYhdUl1+dEtG8h2xoGUl0NXZC5BZYQIhgPK7JkYrqFHuNx+1f6EoHPQ9MMb/WyOxIDZv4gY7QJLg0KeVflofbw== +"@budibase/types@1.2.28-alpha.1": + version "1.2.28-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.28-alpha.1.tgz#2de2546d60b86ff6a14ddf3a6cd0de194d833c3c" + integrity sha512-2FUGUHVGwcdBmMdZgBdeBuhCn4L8oqUgqsAki0hD46YeLEtx/gPVHb14/Mk6kfafmcyUuoa2KJs0S8YYi3uMkw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 546c7a002..3bfbfcbb5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.28-alpha.1", - "@budibase/pro": "1.2.28-alpha.0", + "@budibase/pro": "1.2.28-alpha.1", "@budibase/string-templates": "1.2.28-alpha.1", "@budibase/types": "1.2.28-alpha.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 297378326..42f1157a9 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.28-alpha.0": - version "1.2.28-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.28-alpha.0.tgz#f4253825724327e6552000f8c7575134bfaa05cd" - integrity sha512-ueu+NZgkiKrX49E0Zy2rrNE4NLe2HAyl3VolTrZfVxOzu1IvtQ/wJBcGDG84VvSliP+0bOOVO9TiGMY3bvZ/Hw== +"@budibase/backend-core@1.2.28-alpha.1": + version "1.2.28-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.28-alpha.1.tgz#8dbed2df0098fa2361834ca9e95af686f9db0c9c" + integrity sha512-7mVl7jPtWZ6spVvAicF/kFMn0Io8GBY4LHmv+D/SWngbT8ATtcQHMlcBvg404ulevCJQBs4DaMweFnZsCvAyNA== dependencies: - "@budibase/types" "1.2.28-alpha.0" + "@budibase/types" "1.2.28-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.28-alpha.0": - version "1.2.28-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.28-alpha.0.tgz#f372dcbac55634a1f0e7ff8125ffb0a0aeea086c" - integrity sha512-YxElWs5gwpe1JmHgpB52YeRkyeWPoBiUIt8EshyW90EFVUXP7FOy3LsjvKMNJXAZs1mI4ttkZfuWva8HjrGaKA== +"@budibase/pro@1.2.28-alpha.1": + version "1.2.28-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.28-alpha.1.tgz#9fa6ac9ebd40b10cca63dba4d3fe0c5063bf4aac" + integrity sha512-6DzX2506wBDGKNp6/0tT6FpHLYKub0XyIM99FM/GHwccsUTZ3zRJ1NNHxBw2X2ahQ8ZT0Zcz533xNhb5vx0mGw== dependencies: - "@budibase/backend-core" "1.2.28-alpha.0" - "@budibase/types" "1.2.28-alpha.0" + "@budibase/backend-core" "1.2.28-alpha.1" + "@budibase/types" "1.2.28-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.28-alpha.0": - version "1.2.28-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.28-alpha.0.tgz#61668b7d5d9b1f85c09d658deed87ec3dc28e290" - integrity sha512-tYhdUl1+dEtG8h2xoGUl0NXZC5BZYQIhgPK7JkYrqFHuNx+1f6EoHPQ9MMb/WyOxIDZv4gY7QJLg0KeVflofbw== +"@budibase/types@1.2.28-alpha.1": + version "1.2.28-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.28-alpha.1.tgz#2de2546d60b86ff6a14ddf3a6cd0de194d833c3c" + integrity sha512-2FUGUHVGwcdBmMdZgBdeBuhCn4L8oqUgqsAki0hD46YeLEtx/gPVHb14/Mk6kfafmcyUuoa2KJs0S8YYi3uMkw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From f4a729b0e6fe9221914747b26d9dbbaa46197f61 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 10 Aug 2022 14:57:48 +0000 Subject: [PATCH 099/272] v1.2.33-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index b97375a63..3f1784054 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.32", + "version": "1.2.33-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1ec99e90c..ba11215dc 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.32", + "version": "1.2.33-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.32", + "@budibase/types": "1.2.33-alpha.0", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index b888587bd..3d776fb64 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.32", + "version": "1.2.33-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.32", + "@budibase/string-templates": "1.2.33-alpha.0", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 822d5bea0..3bd53cb30 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.32", + "version": "1.2.33-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.32", - "@budibase/client": "^1.2.32", - "@budibase/frontend-core": "^1.2.32", - "@budibase/string-templates": "^1.2.32", + "@budibase/bbui": "1.2.33-alpha.0", + "@budibase/client": "1.2.33-alpha.0", + "@budibase/frontend-core": "1.2.33-alpha.0", + "@budibase/string-templates": "1.2.33-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 62dc3e663..aba1a0ffc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.32", + "version": "1.2.33-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 056d5aab7..908f0f220 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.32", + "version": "1.2.33-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.32", - "@budibase/frontend-core": "^1.2.32", - "@budibase/string-templates": "^1.2.32", + "@budibase/bbui": "1.2.33-alpha.0", + "@budibase/frontend-core": "1.2.33-alpha.0", + "@budibase/string-templates": "1.2.33-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index d5403cf92..bbfeeda32 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.32", + "version": "1.2.33-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.32", + "@budibase/bbui": "1.2.33-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index d43321114..278456d63 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.32", + "version": "1.2.33-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.32", - "@budibase/client": "^1.2.32", + "@budibase/backend-core": "1.2.33-alpha.0", + "@budibase/client": "1.2.33-alpha.0", "@budibase/pro": "1.2.32", - "@budibase/string-templates": "^1.2.32", - "@budibase/types": "^1.2.32", + "@budibase/string-templates": "1.2.33-alpha.0", + "@budibase/types": "1.2.33-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 493f4bd65..18977235b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.32", + "version": "1.2.33-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 26b44dc6c..cbf562515 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.32", + "version": "1.2.33-alpha.0", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 97e6e8b79..e050de1be 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.32", + "version": "1.2.33-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.32", + "@budibase/backend-core": "1.2.33-alpha.0", "@budibase/pro": "1.2.32", - "@budibase/string-templates": "^1.2.32", - "@budibase/types": "^1.2.32", + "@budibase/string-templates": "1.2.33-alpha.0", + "@budibase/types": "1.2.33-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 437024d5c759e236c9e3dc18a0aa42887386caf8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 10 Aug 2022 15:01:22 +0000 Subject: [PATCH 100/272] Update pro version to 1.2.33-alpha.0 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 59 ++++++++++-------------------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 31 ++++++++++--------- 4 files changed, 34 insertions(+), 60 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 278456d63..455a92fd9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.33-alpha.0", "@budibase/client": "1.2.33-alpha.0", - "@budibase/pro": "1.2.32", + "@budibase/pro": "1.2.33-alpha.0", "@budibase/string-templates": "1.2.33-alpha.0", "@budibase/types": "1.2.33-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index de2a2dbd2..c08839197 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,18 +1094,19 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.32": - version "1.2.32" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.32.tgz#4ec9350a0afb3dc096123ff891ec0da0b5ebca24" - integrity sha512-g0kKpByyhpQI+T2tmW3f2alWHB1KRO6jOJLvtHXGQndayRFA3dJZtDyW8Rd4KqfOEztmYUb6mbc0un8KzeMGqw== +"@budibase/backend-core@1.2.33-alpha.0": + version "1.2.33-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.0.tgz#e70f937c51ddc9fdba6422cc77e5f0cd5671efb1" + integrity sha512-SuIxP/4tqNmmfhJ5KcOeEZLA4T1rBLrCczsnJ6CMXsgpPkzdhA6sG/QluIAJimaOrUkjEiSsiTFk3VILun4B4Q== dependencies: - "@budibase/types" "^1.2.32" + "@budibase/types" "1.2.33-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" dotenv "16.0.1" emitter-listener "1.1.2" ioredis "4.28.0" + joi "17.6.0" jsonwebtoken "8.5.1" koa-passport "4.1.4" lodash "4.17.21" @@ -1177,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.32": - version "1.2.32" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.32.tgz#7116f54ee26218a179ad6720c444f238d47bea5e" - integrity sha512-TbwtUT50ErL/346fGiZdK+I3ddlVkP3hOeafa608Z/kuAwiEpBB8XNk8bbJjjpQfPsy1nbqyWNR66FtXcjE/TA== +"@budibase/pro@1.2.33-alpha.0": + version "1.2.33-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.0.tgz#edc4141b160211b9c26c3098412b8f9672501f97" + integrity sha512-6HRQlJvJrLtMEElWZWpKPeYX5zQNlMreiRaNVvMOYXheRCQRz+5YukwUUGqWbpPLTPYrFCcx2NzGydHTOT/ZOw== dependencies: - "@budibase/backend-core" "1.2.32" - "@budibase/types" "1.2.32" + "@budibase/backend-core" "1.2.33-alpha.0" + "@budibase/types" "1.2.33-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.32", "@budibase/types@^1.2.32": - version "1.2.32" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.32.tgz#121ab38c0a956662673f8ca689f6cc4371e652b3" - integrity sha512-cmcNSUppv2tkM/R+SHt611uh7jmfJRtFzxwMEaceJMRxFuk9d++v3gmNJxf4Q+C9ENi1lvBOw87SLakqaMfCgQ== +"@budibase/types@1.2.33-alpha.0": + version "1.2.33-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.0.tgz#d88fc187158bcd0f133954b2f2d2ce4c48d58a87" + integrity sha512-ABLoVYIa+yqXn2xTrL+3uYmhdBTAHCkpUL+mOasM8Ei2bSGw5SoCKIsdIsO6Fx46jSYdFbbSuQSBKf9njEjcBg== "@bull-board/api@3.7.0": version "3.7.0" @@ -1343,33 +1344,16 @@ protobufjs "^6.11.3" yargs "^16.2.0" -"@hapi/address@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.1.0.tgz#d60c5c0d930e77456fdcde2598e77302e2955e1d" - integrity sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ== - dependencies: - "@hapi/hoek" "^9.0.0" - "@hapi/bourne@^2.0.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-2.1.0.tgz#66aff77094dc3080bd5df44ec63881f2676eb020" integrity sha512-i1BpaNDVLJdRBEKeJWkVO6tYX6DMFBuwMhSuWqLsY4ufeTKGVuV5rBsUhxPayXqnnWHgXUAmWK16H/ykO5Wj4Q== -"@hapi/formula@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-2.0.0.tgz#edade0619ed58c8e4f164f233cda70211e787128" - integrity sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A== - "@hapi/hoek@^9.0.0": version "9.3.0" resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== -"@hapi/pinpoint@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-2.0.0.tgz#805b40d4dbec04fc116a73089494e00f073de8df" - integrity sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw== - "@hapi/topo@^5.0.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" @@ -8673,17 +8657,6 @@ jmespath@0.16.0: resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076" integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw== -joi@17.2.1: - version "17.2.1" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.2.1.tgz#e5140fdf07e8fecf9bc977c2832d1bdb1e3f2a0a" - integrity sha512-YT3/4Ln+5YRpacdmfEfrrKh50/kkgX3LgBltjqnlMPIYiZ4hxXZuVJcxmsvxsdeHg9soZfE3qXxHC2tMpCCBOA== - dependencies: - "@hapi/address" "^4.1.0" - "@hapi/formula" "^2.0.0" - "@hapi/hoek" "^9.0.0" - "@hapi/pinpoint" "^2.0.0" - "@hapi/topo" "^5.0.0" - joi@17.6.0: version "17.6.0" resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2" diff --git a/packages/worker/package.json b/packages/worker/package.json index e050de1be..adfeec790 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.33-alpha.0", - "@budibase/pro": "1.2.32", + "@budibase/pro": "1.2.33-alpha.0", "@budibase/string-templates": "1.2.33-alpha.0", "@budibase/types": "1.2.33-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d2c4e0494..83d5918e6 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,18 +291,19 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.32": - version "1.2.32" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.32.tgz#4ec9350a0afb3dc096123ff891ec0da0b5ebca24" - integrity sha512-g0kKpByyhpQI+T2tmW3f2alWHB1KRO6jOJLvtHXGQndayRFA3dJZtDyW8Rd4KqfOEztmYUb6mbc0un8KzeMGqw== +"@budibase/backend-core@1.2.33-alpha.0": + version "1.2.33-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.0.tgz#e70f937c51ddc9fdba6422cc77e5f0cd5671efb1" + integrity sha512-SuIxP/4tqNmmfhJ5KcOeEZLA4T1rBLrCczsnJ6CMXsgpPkzdhA6sG/QluIAJimaOrUkjEiSsiTFk3VILun4B4Q== dependencies: - "@budibase/types" "^1.2.32" + "@budibase/types" "1.2.33-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" dotenv "16.0.1" emitter-listener "1.1.2" ioredis "4.28.0" + joi "17.6.0" jsonwebtoken "8.5.1" koa-passport "4.1.4" lodash "4.17.21" @@ -324,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.32": - version "1.2.32" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.32.tgz#7116f54ee26218a179ad6720c444f238d47bea5e" - integrity sha512-TbwtUT50ErL/346fGiZdK+I3ddlVkP3hOeafa608Z/kuAwiEpBB8XNk8bbJjjpQfPsy1nbqyWNR66FtXcjE/TA== +"@budibase/pro@1.2.33-alpha.0": + version "1.2.33-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.0.tgz#edc4141b160211b9c26c3098412b8f9672501f97" + integrity sha512-6HRQlJvJrLtMEElWZWpKPeYX5zQNlMreiRaNVvMOYXheRCQRz+5YukwUUGqWbpPLTPYrFCcx2NzGydHTOT/ZOw== dependencies: - "@budibase/backend-core" "1.2.32" - "@budibase/types" "1.2.32" + "@budibase/backend-core" "1.2.33-alpha.0" + "@budibase/types" "1.2.33-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.32", "@budibase/types@^1.2.32": - version "1.2.32" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.32.tgz#121ab38c0a956662673f8ca689f6cc4371e652b3" - integrity sha512-cmcNSUppv2tkM/R+SHt611uh7jmfJRtFzxwMEaceJMRxFuk9d++v3gmNJxf4Q+C9ENi1lvBOw87SLakqaMfCgQ== +"@budibase/types@1.2.33-alpha.0": + version "1.2.33-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.0.tgz#d88fc187158bcd0f133954b2f2d2ce4c48d58a87" + integrity sha512-ABLoVYIa+yqXn2xTrL+3uYmhdBTAHCkpUL+mOasM8Ei2bSGw5SoCKIsdIsO6Fx46jSYdFbbSuQSBKf9njEjcBg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From e8bf52a3a122481b30215a72796ad4b270572eac Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 10 Aug 2022 16:17:56 +0100 Subject: [PATCH 101/272] Add git fetch --tags to release-selfhost --- .github/workflows/release-selfhost.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml index 5544a3582..16742ea87 100644 --- a/.github/workflows/release-selfhost.yml +++ b/.github/workflows/release-selfhost.yml @@ -38,7 +38,9 @@ jobs: echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV - name: Checkout tag - run: git checkout v${{ env.RELEASE_VERSION }} + run: | + git fetch --tags + git checkout v${{ env.RELEASE_VERSION }} - name: Tag and release Docker images (Self Host) run: | From 8e7169e0647d7f5c133e9b49a37bd7428eca743a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 10 Aug 2022 15:28:57 +0000 Subject: [PATCH 102/272] v1.2.33-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 3f1784054..7632aa158 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ba11215dc..ff810ca37 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.33-alpha.0", + "@budibase/types": "1.2.33-alpha.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 3d776fb64..51c9ab1d1 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.33-alpha.0", + "@budibase/string-templates": "1.2.33-alpha.1", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3bd53cb30..bf60ee3b4 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.33-alpha.0", - "@budibase/client": "1.2.33-alpha.0", - "@budibase/frontend-core": "1.2.33-alpha.0", - "@budibase/string-templates": "1.2.33-alpha.0", + "@budibase/bbui": "1.2.33-alpha.1", + "@budibase/client": "1.2.33-alpha.1", + "@budibase/frontend-core": "1.2.33-alpha.1", + "@budibase/string-templates": "1.2.33-alpha.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index aba1a0ffc..6d946e15d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 908f0f220..7b8d168a4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.33-alpha.0", - "@budibase/frontend-core": "1.2.33-alpha.0", - "@budibase/string-templates": "1.2.33-alpha.0", + "@budibase/bbui": "1.2.33-alpha.1", + "@budibase/frontend-core": "1.2.33-alpha.1", + "@budibase/string-templates": "1.2.33-alpha.1", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index bbfeeda32..c576691a6 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.33-alpha.0", + "@budibase/bbui": "1.2.33-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 455a92fd9..f0573cd2b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.33-alpha.0", - "@budibase/client": "1.2.33-alpha.0", + "@budibase/backend-core": "1.2.33-alpha.1", + "@budibase/client": "1.2.33-alpha.1", "@budibase/pro": "1.2.33-alpha.0", - "@budibase/string-templates": "1.2.33-alpha.0", - "@budibase/types": "1.2.33-alpha.0", + "@budibase/string-templates": "1.2.33-alpha.1", + "@budibase/types": "1.2.33-alpha.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 18977235b..0605e02f4 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index cbf562515..f3143ebbe 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index adfeec790..953fd6852 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.33-alpha.0", + "version": "1.2.33-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.33-alpha.0", + "@budibase/backend-core": "1.2.33-alpha.1", "@budibase/pro": "1.2.33-alpha.0", - "@budibase/string-templates": "1.2.33-alpha.0", - "@budibase/types": "1.2.33-alpha.0", + "@budibase/string-templates": "1.2.33-alpha.1", + "@budibase/types": "1.2.33-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From aaa7e48f992bf91f5e00a5121e7035fcb70bf590 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 10 Aug 2022 15:32:02 +0000 Subject: [PATCH 103/272] Update pro version to 1.2.33-alpha.1 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f0573cd2b..9266072a1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.33-alpha.1", "@budibase/client": "1.2.33-alpha.1", - "@budibase/pro": "1.2.33-alpha.0", + "@budibase/pro": "1.2.33-alpha.1", "@budibase/string-templates": "1.2.33-alpha.1", "@budibase/types": "1.2.33-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index c08839197..677f3b286 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.33-alpha.0": - version "1.2.33-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.0.tgz#e70f937c51ddc9fdba6422cc77e5f0cd5671efb1" - integrity sha512-SuIxP/4tqNmmfhJ5KcOeEZLA4T1rBLrCczsnJ6CMXsgpPkzdhA6sG/QluIAJimaOrUkjEiSsiTFk3VILun4B4Q== +"@budibase/backend-core@1.2.33-alpha.1": + version "1.2.33-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.1.tgz#8c7ecce806a522d28781ca9e95d773df45b0ffd9" + integrity sha512-0gTuNw4tWhgs2WY/lj58tK5/dXtBgnjmNrNfy65BZ4Qf12yKowv/BJrH5mmGzQ/b3ygUjN07XMcfdYyBJi11kg== dependencies: - "@budibase/types" "1.2.33-alpha.0" + "@budibase/types" "1.2.33-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.33-alpha.0": - version "1.2.33-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.0.tgz#edc4141b160211b9c26c3098412b8f9672501f97" - integrity sha512-6HRQlJvJrLtMEElWZWpKPeYX5zQNlMreiRaNVvMOYXheRCQRz+5YukwUUGqWbpPLTPYrFCcx2NzGydHTOT/ZOw== +"@budibase/pro@1.2.33-alpha.1": + version "1.2.33-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.1.tgz#d0cb78249bbbf5f82488bf3df1d5a6c67bbe046d" + integrity sha512-5P/1GLMTtG4EU2N7qHXOOhmEjuvOT1fbzPT6Uq3mFeXlf1SSoUk66r/+ys4oPdfMA9ssNkak77QjtqVMour5HQ== dependencies: - "@budibase/backend-core" "1.2.33-alpha.0" - "@budibase/types" "1.2.33-alpha.0" + "@budibase/backend-core" "1.2.33-alpha.1" + "@budibase/types" "1.2.33-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.33-alpha.0": - version "1.2.33-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.0.tgz#d88fc187158bcd0f133954b2f2d2ce4c48d58a87" - integrity sha512-ABLoVYIa+yqXn2xTrL+3uYmhdBTAHCkpUL+mOasM8Ei2bSGw5SoCKIsdIsO6Fx46jSYdFbbSuQSBKf9njEjcBg== +"@budibase/types@1.2.33-alpha.1": + version "1.2.33-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.1.tgz#d08ddc84a66e70fc1b1405fbc2814dfb42e02ea4" + integrity sha512-wbPPZGDEvSMupf5FaOViEpsx375fDRSo9mmIGWmJfFMNFksqoKJEOvPelx+YrdOHjQI/5Lo/eV5blMqBfzRWJA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 953fd6852..b46c7c7c8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.33-alpha.1", - "@budibase/pro": "1.2.33-alpha.0", + "@budibase/pro": "1.2.33-alpha.1", "@budibase/string-templates": "1.2.33-alpha.1", "@budibase/types": "1.2.33-alpha.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 83d5918e6..a7642f861 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.33-alpha.0": - version "1.2.33-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.0.tgz#e70f937c51ddc9fdba6422cc77e5f0cd5671efb1" - integrity sha512-SuIxP/4tqNmmfhJ5KcOeEZLA4T1rBLrCczsnJ6CMXsgpPkzdhA6sG/QluIAJimaOrUkjEiSsiTFk3VILun4B4Q== +"@budibase/backend-core@1.2.33-alpha.1": + version "1.2.33-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.1.tgz#8c7ecce806a522d28781ca9e95d773df45b0ffd9" + integrity sha512-0gTuNw4tWhgs2WY/lj58tK5/dXtBgnjmNrNfy65BZ4Qf12yKowv/BJrH5mmGzQ/b3ygUjN07XMcfdYyBJi11kg== dependencies: - "@budibase/types" "1.2.33-alpha.0" + "@budibase/types" "1.2.33-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.33-alpha.0": - version "1.2.33-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.0.tgz#edc4141b160211b9c26c3098412b8f9672501f97" - integrity sha512-6HRQlJvJrLtMEElWZWpKPeYX5zQNlMreiRaNVvMOYXheRCQRz+5YukwUUGqWbpPLTPYrFCcx2NzGydHTOT/ZOw== +"@budibase/pro@1.2.33-alpha.1": + version "1.2.33-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.1.tgz#d0cb78249bbbf5f82488bf3df1d5a6c67bbe046d" + integrity sha512-5P/1GLMTtG4EU2N7qHXOOhmEjuvOT1fbzPT6Uq3mFeXlf1SSoUk66r/+ys4oPdfMA9ssNkak77QjtqVMour5HQ== dependencies: - "@budibase/backend-core" "1.2.33-alpha.0" - "@budibase/types" "1.2.33-alpha.0" + "@budibase/backend-core" "1.2.33-alpha.1" + "@budibase/types" "1.2.33-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.33-alpha.0": - version "1.2.33-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.0.tgz#d88fc187158bcd0f133954b2f2d2ce4c48d58a87" - integrity sha512-ABLoVYIa+yqXn2xTrL+3uYmhdBTAHCkpUL+mOasM8Ei2bSGw5SoCKIsdIsO6Fx46jSYdFbbSuQSBKf9njEjcBg== +"@budibase/types@1.2.33-alpha.1": + version "1.2.33-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.1.tgz#d08ddc84a66e70fc1b1405fbc2814dfb42e02ea4" + integrity sha512-wbPPZGDEvSMupf5FaOViEpsx375fDRSo9mmIGWmJfFMNFksqoKJEOvPelx+YrdOHjQI/5Lo/eV5blMqBfzRWJA== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From bf16ffd8a51a471319e49703595ff7883c3cf8eb Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 10 Aug 2022 18:39:41 +0100 Subject: [PATCH 104/272] dont get app db name if undefined --- packages/backend-core/src/db/utils.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts index 8ab6fa6e9..d0ffbf1b4 100644 --- a/packages/backend-core/src/db/utils.ts +++ b/packages/backend-core/src/db/utils.ts @@ -233,6 +233,10 @@ export async function getAllApps({ dev, all, idsOnly, efficient }: any = {}) { } let dbs = await getAllDbs({ efficient }) const appDbNames = dbs.filter((dbName: any) => { + if (!dbName) { + return false + } + const split = dbName.split(SEPARATOR) // it is an app, check the tenantId if (split[0] === DocumentTypes.APP) { From 52429314096d8e268d4e2b428b110315cb61bf2f Mon Sep 17 00:00:00 2001 From: FlaminWrap <97764630+FlaminWrap@users.noreply.github.com> Date: Wed, 10 Aug 2022 23:04:52 +0000 Subject: [PATCH 105/272] Fix issue #4290 * Fixes issue #4290 * Changed the title from 'Accept Invitation' to 'Invitation to organistaion / Budibase' * Changed the 'Please enter a password to set up your user.' to 'Please enter a password to get started.' * Increased width to 300px to allow longer org names --- .../src/pages/builder/invite/index.svelte | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/pages/builder/invite/index.svelte b/packages/builder/src/pages/builder/invite/index.svelte index 8ac35de07..2b9e9592f 100644 --- a/packages/builder/src/pages/builder/invite/index.svelte +++ b/packages/builder/src/pages/builder/invite/index.svelte @@ -1,13 +1,16 @@
- logo + logo - Accept Invitation + Invitation to {company} - Please enter a password to set up your user. + Please enter a password to get started. @@ -46,7 +57,7 @@ } .container { margin: 0 auto; - width: 260px; + width: 300px; display: flex; flex-direction: column; justify-content: flex-start; From eb0086e532d362457bc54de7f8c0da0ca7e9ac6c Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 11 Aug 2022 09:30:29 +0100 Subject: [PATCH 106/272] skip empty dbs in test --- packages/backend-core/src/db/utils.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts index d0ffbf1b4..61e059227 100644 --- a/packages/backend-core/src/db/utils.ts +++ b/packages/backend-core/src/db/utils.ts @@ -233,8 +233,10 @@ export async function getAllApps({ dev, all, idsOnly, efficient }: any = {}) { } let dbs = await getAllDbs({ efficient }) const appDbNames = dbs.filter((dbName: any) => { - if (!dbName) { - return false + if (env.isTest()) { + if (!dbName) { + return false + } } const split = dbName.split(SEPARATOR) From 6d4f3244d5e7dc87cc665fbb859eb3214a75822d Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 11 Aug 2022 11:01:48 +0100 Subject: [PATCH 107/272] Add prop for 24hr time --- packages/bbui/src/Form/Core/DatePicker.svelte | 2 ++ packages/bbui/src/Form/DatePicker.svelte | 2 ++ packages/client/manifest.json | 6 ++++++ .../client/src/components/app/forms/DateTimeField.svelte | 2 ++ 4 files changed, 12 insertions(+) diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte index 39a7d9d62..ff0840735 100644 --- a/packages/bbui/src/Form/Core/DatePicker.svelte +++ b/packages/bbui/src/Form/Core/DatePicker.svelte @@ -16,6 +16,7 @@ export let appendTo = undefined export let timeOnly = false export let ignoreTimezones = false + export let time24hr = false const dispatch = createEventDispatcher() const flatpickrId = `${uuid()}-wrapper` @@ -37,6 +38,7 @@ enableTime: timeOnly || enableTime || false, noCalendar: timeOnly || false, altInput: true, + time_24hr: time24hr || false, altFormat: timeOnly ? "H:i" : enableTime ? "F j Y, H:i" : "F j, Y", wrap: true, appendTo, diff --git a/packages/bbui/src/Form/DatePicker.svelte b/packages/bbui/src/Form/DatePicker.svelte index a4b237978..a0b102dbe 100644 --- a/packages/bbui/src/Form/DatePicker.svelte +++ b/packages/bbui/src/Form/DatePicker.svelte @@ -10,6 +10,7 @@ export let error = null export let enableTime = true export let timeOnly = false + export let time24hr = false export let placeholder = null export let appendTo = undefined export let ignoreTimezones = false @@ -30,6 +31,7 @@ {placeholder} {enableTime} {timeOnly} + {time24hr} {appendTo} {ignoreTimezones} on:change={onChange} diff --git a/packages/client/manifest.json b/packages/client/manifest.json index cfed5b65f..0368b4356 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -2875,6 +2875,12 @@ "key": "timeOnly", "defaultValue": false }, + { + "type": "boolean", + "label": "24-Hour time", + "key": "time24hr", + "defaultValue": false + }, { "type": "boolean", "label": "Ignore time zones", diff --git a/packages/client/src/components/app/forms/DateTimeField.svelte b/packages/client/src/components/app/forms/DateTimeField.svelte index 4ca766121..bbbc5a266 100644 --- a/packages/client/src/components/app/forms/DateTimeField.svelte +++ b/packages/client/src/components/app/forms/DateTimeField.svelte @@ -8,6 +8,7 @@ export let disabled = false export let enableTime = false export let timeOnly = false + export let time24hr = false export let ignoreTimezones = false export let validation export let defaultValue @@ -44,6 +45,7 @@ appendTo={document.getElementById("flatpickr-root")} {enableTime} {timeOnly} + {time24hr} {ignoreTimezones} {placeholder} /> From 740a5b05ba7256ebf03e4fef7b81e85b774f3bd6 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 11 Aug 2022 11:13:50 +0100 Subject: [PATCH 108/272] Redraw Date Picker when settings change --- packages/bbui/src/Form/Core/DatePicker.svelte | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte index ff0840735..d75350d8e 100644 --- a/packages/bbui/src/Form/Core/DatePicker.svelte +++ b/packages/bbui/src/Form/Core/DatePicker.svelte @@ -51,6 +51,12 @@ }, } + $: redrawOptions = { + timeOnly, + enableTime, + time24hr, + } + const handleChange = event => { const [dates] = event.detail const noTimezone = enableTime && !timeOnly && ignoreTimezones @@ -144,7 +150,7 @@ } -{#key timeOnly} +{#key redrawOptions} Date: Thu, 11 Aug 2022 11:31:16 +0100 Subject: [PATCH 109/272] simplify if --- packages/backend-core/src/db/utils.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts index 61e059227..d43ea1ae3 100644 --- a/packages/backend-core/src/db/utils.ts +++ b/packages/backend-core/src/db/utils.ts @@ -233,10 +233,8 @@ export async function getAllApps({ dev, all, idsOnly, efficient }: any = {}) { } let dbs = await getAllDbs({ efficient }) const appDbNames = dbs.filter((dbName: any) => { - if (env.isTest()) { - if (!dbName) { - return false - } + if (env.isTest() && !dbName) { + return false } const split = dbName.split(SEPARATOR) From 5618e9b27b34e6f61c4f2da31582a1eb76cc564a Mon Sep 17 00:00:00 2001 From: Jonny McCullagh Date: Thu, 11 Aug 2022 12:08:56 +0100 Subject: [PATCH 110/272] single image build data path for azure --- hosting/scripts/build-target-paths.sh | 13 +++++------ hosting/single/Dockerfile | 6 +++-- hosting/single/clouseau/clouseau.ini | 2 +- hosting/single/couch/local.ini | 4 ++-- hosting/single/runner.sh | 32 +++++++++++++++++++-------- 5 files changed, 36 insertions(+), 21 deletions(-) diff --git a/hosting/scripts/build-target-paths.sh b/hosting/scripts/build-target-paths.sh index 4c165d12e..6d5a8429f 100644 --- a/hosting/scripts/build-target-paths.sh +++ b/hosting/scripts/build-target-paths.sh @@ -3,15 +3,14 @@ echo ${TARGETBUILD} > /buildtarget.txt if [[ "${TARGETBUILD}" = "aas" ]]; then # Azure AppService uses /home for persisent data & SSH on port 2222 - mkdir -p /home/{search,minio,couch} - mkdir -p /home/couch/{dbs,views} - chown -R couchdb:couchdb /home/couch/ + DATA_DIR=/home + mkdir -p $DATA_DIR/{search,minio,couchdb} + mkdir -p $DATA_DIR/couchdb/{dbs,views} + chown -R couchdb:couchdb $DATA_DIR/couchdb/ apt update apt-get install -y openssh-server - sed -i 's#dir=/opt/couchdb/data/search#dir=/home/search#' /opt/clouseau/clouseau.ini - sed -i 's#/minio/minio server /minio &#/minio/minio server /home/minio &#' /runner.sh - sed -i 's#database_dir = ./data#database_dir = /home/couch/dbs#' /opt/couchdb/etc/default.ini - sed -i 's#view_index_dir = ./data#view_index_dir = /home/couch/views#' /opt/couchdb/etc/default.ini sed -i "s/#Port 22/Port 2222/" /etc/ssh/sshd_config /etc/init.d/ssh restart fi + +sed -i 's#DATA_DIR#$DATA_DIR#' /opt/clouseau/clouseau.ini /opt/couchdb/etc/local.ini diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index b5bf17add..959b3f3e8 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -20,10 +20,10 @@ RUN node /pinVersions.js && yarn && yarn build && /cleanup.sh FROM couchdb:3.2.1 # TARGETARCH can be amd64 or arm e.g. docker build --build-arg TARGETARCH=amd64 -ARG TARGETARCH amd64 +ARG TARGETARCH=amd64 #TARGETBUILD can be set to single (for single docker image) or aas (for azure app service) # e.g. docker build --build-arg TARGETBUILD=aas .... -ARG TARGETBUILD single +ARG TARGETBUILD=single ENV TARGETBUILD $TARGETBUILD COPY --from=build /app /app @@ -35,6 +35,7 @@ ENV \ BUDIBASE_ENVIRONMENT=PRODUCTION \ CLUSTER_PORT=80 \ # CUSTOM_DOMAIN=budi001.custom.com \ + DATA_DIR=/data \ DEPLOYMENT_ENVIRONMENT=docker \ MINIO_URL=http://localhost:9000 \ POSTHOG_TOKEN=phc_fg5I3nDOf6oJVMHSaycEhpPdlgS8rzXG2r6F2IpxCHS \ @@ -114,6 +115,7 @@ RUN chmod +x ./healthcheck.sh ADD hosting/scripts/build-target-paths.sh . RUN chmod +x ./build-target-paths.sh +# Script below sets the path for storing data based on $DATA_DIR # For Azure App Service install SSH & point data locations to /home RUN /build-target-paths.sh diff --git a/hosting/single/clouseau/clouseau.ini b/hosting/single/clouseau/clouseau.ini index 78e43744e..578a5acaf 100644 --- a/hosting/single/clouseau/clouseau.ini +++ b/hosting/single/clouseau/clouseau.ini @@ -7,7 +7,7 @@ name=clouseau@127.0.0.1 cookie=monster ; the path where you would like to store the search index files -dir=/data/search +dir=DATA_DIR/search ; the number of search indexes that can be open simultaneously max_indexes_open=500 diff --git a/hosting/single/couch/local.ini b/hosting/single/couch/local.ini index 72872a60e..266c0d4b6 100644 --- a/hosting/single/couch/local.ini +++ b/hosting/single/couch/local.ini @@ -1,5 +1,5 @@ ; CouchDB Configuration Settings [couchdb] -database_dir = /data/couch/dbs -view_index_dir = /data/couch/views +database_dir = DATA_DIR/couch/dbs +view_index_dir = DATA_DIR/couch/views diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index 9abb2fd09..09387343b 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -1,7 +1,16 @@ #!/bin/bash -declare -a ENV_VARS=("COUCHDB_USER" "COUCHDB_PASSWORD" "MINIO_ACCESS_KEY" "MINIO_SECRET_KEY" "INTERNAL_API_KEY" "JWT_SECRET" "REDIS_PASSWORD") -if [ -f "/data/.env" ]; then - export $(cat /data/.env | xargs) +declare -a ENV_VARS=("COUCHDB_USER" "COUCHDB_PASSWORD" "DATA_DIR" "MINIO_ACCESS_KEY" "MINIO_SECRET_KEY" "INTERNAL_API_KEY" "JWT_SECRET" "REDIS_PASSWORD") + +# Azure App Service customisations +if [[ "${TARGETBUILD}" = "aas" ]]; then + DATA_DIR=/home + /etc/init.d/ssh start +else + DATA_DIR=${DATA_DIR:-/data} +fi + +if [ -f "${DATA_DIR}/.env" ]; then + export $(cat ${DATA_DIR}/.env | xargs) fi # first randomise any unset environment variables for ENV_VAR in "${ENV_VARS[@]}" @@ -14,21 +23,26 @@ done if [[ -z "${COUCH_DB_URL}" ]]; then export COUCH_DB_URL=http://$COUCHDB_USER:$COUCHDB_PASSWORD@localhost:5984 fi -if [ ! -f "/data/.env" ]; then - touch /data/.env +if [ ! -f "${DATA_DIR}/.env" ]; then + touch ${DATA_DIR}/.env for ENV_VAR in "${ENV_VARS[@]}" do temp=$(eval "echo \$$ENV_VAR") - echo "$ENV_VAR=$temp" >> /data/.env + echo "$ENV_VAR=$temp" >> ${DATA_DIR}/.env done + echo "COUCH_DB_URL=${COUCH_DB_URL}" >> ${DATA_DIR}/.env fi +export COUCH_DB_URL=http://$COUCHDB_USER:$COUCHDB_PASSWORD@localhost:5984 + # make these directories in runner, incase of mount -mkdir -p /data/couch/{dbs,views} /home/couch/{dbs,views} -chown -R couchdb:couchdb /data/couch /home/couch +mkdir -p ${DATA_DIR}/couchdb/{dbs,views} +mkdir -p ${DATA_DIR}/minio +mkdir -p ${DATA_DIR}/search +chown -R couchdb:couchdb ${DATA_DIR}/couchdb redis-server --requirepass $REDIS_PASSWORD & /opt/clouseau/bin/clouseau & -/minio/minio server /data/minio & +/minio/minio server ${DATA_DIR}/minio & /docker-entrypoint.sh /opt/couchdb/bin/couchdb & /etc/init.d/nginx restart if [[ ! -z "${CUSTOM_DOMAIN}" ]]; then From f70a04090b07fc82ceeab811758c798abcce3794 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 11 Aug 2022 12:28:20 +0100 Subject: [PATCH 111/272] Smoke build test changes - adminAndManagement Some test changes for test files within the adminAndManagement folder - Changes related to UI - Restructured accountPortals tests - Changes related to changing passwords (flow is different now) --- .../adminAndManagement/accountPortals.spec.js | 34 +++++++++---------- .../adminAndManagement/userManagement.spec.js | 14 ++++---- .../adminAndManagement/userSettings.spec.js | 7 ++-- packages/builder/cypress/support/commands.js | 4 +-- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js b/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js index 7b2c68089..448240f81 100644 --- a/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js @@ -23,7 +23,7 @@ filterTests(["smoke", "all"], () => { cy.get(interact.SPECTRUM_ICON).click({ force: true }) }) cy.get(interact.SPECTRUM_MENU).within(() => { - cy.get(interact.SPECTRUM_MENU_ITEM).contains("Force Password Reset").click({ force: true }) + cy.get(interact.SPECTRUM_MENU_ITEM).contains("Force password reset").click({ force: true }) }) cy.get(interact.SPECTRUM_DIALOG_GRID) @@ -41,10 +41,25 @@ filterTests(["smoke", "all"], () => { cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test") } cy.get(interact.SPECTRUM_BUTTON).contains("Reset your password").click({ force: true }) + //cy.logoutNoAppGrid() + }) + + it("should verify Standard Portal", () => { + // Development access should be disabled (Admin access is already disabled) + cy.login() + cy.setUserRole("bbuser", "App User") + bbUserLogin() + + // Verify Standard Portal + cy.get(interact.SPECTRUM_SIDENAV).should('not.exist') // No config sections + cy.get(interact.CREATE_APP_BUTTON).should('not.exist') // No create app button + cy.get(".app").should('not.exist') // No apps -> no roles assigned to user + cy.get(interact.CONTAINER).should('contain', bbUserEmail) // Message containing users email + cy.logoutNoAppGrid() }) - xit("should verify Admin Portal", () => { + it("should verify Admin Portal", () => { cy.login() // Configure user role cy.setUserRole("bbuser", "Admin") @@ -86,21 +101,6 @@ filterTests(["smoke", "all"], () => { cy.logOut() }) - it("should verify Standard Portal", () => { - // Development access should be disabled (Admin access is already disabled) - cy.login() - cy.setUserRole("bbuser", "App User") - bbUserLogin() - - // Verify Standard Portal - cy.get(interact.SPECTRUM_SIDENAV).should('not.exist') // No config sections - cy.get(interact.CREATE_APP_BUTTON).should('not.exist') // No create app button - cy.get(".app").should('not.exist') // No apps -> no roles assigned to user - cy.get(interact.CONTAINER).should('contain', bbUserEmail) // Message containing users email - - cy.logoutNoAppGrid() - }) - const bbUserLogin = () => { // Login as bbuser cy.logOut() diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js index 3dfffb1d3..5a864e3bb 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js @@ -17,7 +17,7 @@ filterTests(["smoke", "all"], () => { it("should confirm App User role for a New User", () => { cy.contains("bbuser").click() - cy.get(".spectrum-Form-itemField").eq(2).should('contain', 'App User') + cy.get(".spectrum-Form-itemField").eq(3).should('contain', 'App User') // User should not have app access cy.get(interact.LIST_ITEMS, { timeout: 500 }).should("contain", "No apps") @@ -166,12 +166,12 @@ filterTests(["smoke", "all"], () => { it("Should edit user details within user details page", () => { // Add First name - cy.get(interact.FIELD, { timeout: 1000 }).eq(0).within(() => { + cy.get(interact.FIELD, { timeout: 1000 }).eq(1).within(() => { cy.wait(500) cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).wait(500).clear().click().type("bb") }) // Add Last name - cy.get(interact.FIELD, { timeout: 1000 }).eq(1).within(() => { + cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => { cy.wait(500) cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().wait(500).clear().type("test") }) @@ -180,10 +180,10 @@ filterTests(["smoke", "all"], () => { cy.reload() // Confirm details have been saved - cy.get(interact.FIELD, { timeout: 1000 }).eq(0).within(() => { + cy.get(interact.FIELD, { timeout: 1000 }).eq(1).within(() => { cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', "bb") }) - cy.get(interact.FIELD, { timeout: 1000 }).eq(1).within(() => { + cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => { cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).should('have.value', "test") }) }) @@ -193,13 +193,14 @@ filterTests(["smoke", "all"], () => { cy.get(interact.SPECTRUM_ICON).click({ force: true }) }) cy.get(interact.SPECTRUM_MENU).within(() => { - cy.get(interact.SPECTRUM_MENU_ITEM).contains("Force Password Reset").click({ force: true }) + cy.get(interact.SPECTRUM_MENU_ITEM).contains("Force password reset").click({ force: true }) }) // Reset password modal cy.get(interact.SPECTRUM_DIALOG_GRID) .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('pwd') cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").click({ force: true }) + cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").should('not.exist') // Logout, then login with new password cy.logOut() @@ -214,6 +215,7 @@ filterTests(["smoke", "all"], () => { cy.get(interact.SPECTRUM_BUTTON).contains("Reset your password").click({ force: true }) // Confirm user logged in afer password change + cy.login("bbuser@test.com", "test") cy.get(".avatar > .icon").click({ force: true }) cy.get(".spectrum-Menu-item").contains("Update user information").click({ force: true }) diff --git a/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js b/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js index d388d9c7a..a2b0d32d0 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js @@ -19,10 +19,10 @@ filterTests(["smoke", "all"], () => { cy.contains("Users").click() cy.contains("test@test.com").click() - cy.get(interact.FIELD, { timeout: 1000 }).eq(0).within(() => { + cy.get(interact.FIELD, { timeout: 1000 }).eq(1).within(() => { cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', fname) }) - cy.get(interact.FIELD).eq(1).within(() => { + cy.get(interact.FIELD).eq(2).within(() => { cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', lname) }) }) @@ -72,7 +72,7 @@ filterTests(["smoke", "all"], () => { }) // Logout & in with new password - cy.logOut() + //cy.logOut() cy.login("test@test.com", "newpwd") }) @@ -90,7 +90,6 @@ filterTests(["smoke", "all"], () => { cy.get(interact.SPECTRUM_MENU_ITEM).contains("Open developer mode").click({ force: true }) cy.get(interact.SPECTRUM_SIDENAV).should('exist') // config sections available cy.get(interact.CREATE_APP_BUTTON).should('exist') // create app button available - cy.get(interact.APP_TABLE).should('exist') // App table available }) after(() => { diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index 7efd32d25..dbcdb04ac 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -140,14 +140,14 @@ Cypress.Commands.add("setUserRole", (user, role) => { // Set Role cy.wait(500) cy.get(".spectrum-Form-itemField") - .eq(2) + .eq(3) .within(() => { cy.get(".spectrum-Picker-label").click({ force: true }) }) cy.get(".spectrum-Menu").within(() => { cy.get(".spectrum-Menu-itemLabel").contains(role).click({ force: true }) }) - cy.get(".spectrum-Form-itemField").eq(2).should("contain", role) + cy.get(".spectrum-Form-itemField").eq(3).should("contain", role) }) // APPLICATIONS From 64d24b2219f38c96fdaf2b0c83e7e0576be3b004 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 11 Aug 2022 11:34:47 +0000 Subject: [PATCH 112/272] v1.2.33-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 7632aa158..60ca77b14 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ff810ca37..a290adde3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.33-alpha.1", + "@budibase/types": "1.2.33-alpha.2", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 51c9ab1d1..d9885763a 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.33-alpha.1", + "@budibase/string-templates": "1.2.33-alpha.2", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index bf60ee3b4..138dc6eb3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.33-alpha.1", - "@budibase/client": "1.2.33-alpha.1", - "@budibase/frontend-core": "1.2.33-alpha.1", - "@budibase/string-templates": "1.2.33-alpha.1", + "@budibase/bbui": "1.2.33-alpha.2", + "@budibase/client": "1.2.33-alpha.2", + "@budibase/frontend-core": "1.2.33-alpha.2", + "@budibase/string-templates": "1.2.33-alpha.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 6d946e15d..d27435a74 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 7b8d168a4..2b62fdbbe 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.33-alpha.1", - "@budibase/frontend-core": "1.2.33-alpha.1", - "@budibase/string-templates": "1.2.33-alpha.1", + "@budibase/bbui": "1.2.33-alpha.2", + "@budibase/frontend-core": "1.2.33-alpha.2", + "@budibase/string-templates": "1.2.33-alpha.2", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index c576691a6..b32b724fe 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.33-alpha.1", + "@budibase/bbui": "1.2.33-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 9266072a1..9baeadc70 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.33-alpha.1", - "@budibase/client": "1.2.33-alpha.1", + "@budibase/backend-core": "1.2.33-alpha.2", + "@budibase/client": "1.2.33-alpha.2", "@budibase/pro": "1.2.33-alpha.1", - "@budibase/string-templates": "1.2.33-alpha.1", - "@budibase/types": "1.2.33-alpha.1", + "@budibase/string-templates": "1.2.33-alpha.2", + "@budibase/types": "1.2.33-alpha.2", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0605e02f4..ef1eb40db 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index f3143ebbe..9ae95f649 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index b46c7c7c8..a05ab9b8d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.33-alpha.1", + "version": "1.2.33-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.33-alpha.1", + "@budibase/backend-core": "1.2.33-alpha.2", "@budibase/pro": "1.2.33-alpha.1", - "@budibase/string-templates": "1.2.33-alpha.1", - "@budibase/types": "1.2.33-alpha.1", + "@budibase/string-templates": "1.2.33-alpha.2", + "@budibase/types": "1.2.33-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 77ad2b3a8819ee0a11ad8777023257a55830515c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 11 Aug 2022 11:38:04 +0000 Subject: [PATCH 113/272] Update pro version to 1.2.33-alpha.2 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 9baeadc70..80109c0a7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.33-alpha.2", "@budibase/client": "1.2.33-alpha.2", - "@budibase/pro": "1.2.33-alpha.1", + "@budibase/pro": "1.2.33-alpha.2", "@budibase/string-templates": "1.2.33-alpha.2", "@budibase/types": "1.2.33-alpha.2", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 677f3b286..61cc29f57 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.33-alpha.1": - version "1.2.33-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.1.tgz#8c7ecce806a522d28781ca9e95d773df45b0ffd9" - integrity sha512-0gTuNw4tWhgs2WY/lj58tK5/dXtBgnjmNrNfy65BZ4Qf12yKowv/BJrH5mmGzQ/b3ygUjN07XMcfdYyBJi11kg== +"@budibase/backend-core@1.2.33-alpha.2": + version "1.2.33-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.2.tgz#b4f78beadf4637400984db3b5dde4e70cb359b1b" + integrity sha512-Ij3e9qCYbLyqDyeTxyYki3LyUzkp/Wd7aLwgIueEaA3VwNMDqd8kCg88BFSJYO/mbLVozVaXj1ovuiRjhm5JGQ== dependencies: - "@budibase/types" "1.2.33-alpha.1" + "@budibase/types" "1.2.33-alpha.2" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.33-alpha.1": - version "1.2.33-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.1.tgz#d0cb78249bbbf5f82488bf3df1d5a6c67bbe046d" - integrity sha512-5P/1GLMTtG4EU2N7qHXOOhmEjuvOT1fbzPT6Uq3mFeXlf1SSoUk66r/+ys4oPdfMA9ssNkak77QjtqVMour5HQ== +"@budibase/pro@1.2.33-alpha.2": + version "1.2.33-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.2.tgz#373f6eb05c2f08c58ef4bca68ff3962279693654" + integrity sha512-9SqijrpQyCSJn9T3JvwWbPu6GD4m2adWTF5qSKJmt+7CekGJIilVUJJsXIkd5YjrHwD+ASd85cfKcYRhqmoz5A== dependencies: - "@budibase/backend-core" "1.2.33-alpha.1" - "@budibase/types" "1.2.33-alpha.1" + "@budibase/backend-core" "1.2.33-alpha.2" + "@budibase/types" "1.2.33-alpha.2" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.33-alpha.1": - version "1.2.33-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.1.tgz#d08ddc84a66e70fc1b1405fbc2814dfb42e02ea4" - integrity sha512-wbPPZGDEvSMupf5FaOViEpsx375fDRSo9mmIGWmJfFMNFksqoKJEOvPelx+YrdOHjQI/5Lo/eV5blMqBfzRWJA== +"@budibase/types@1.2.33-alpha.2": + version "1.2.33-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.2.tgz#50cd72f44933582b8e6b4c6e58837d67e332bdc1" + integrity sha512-lqASvhwERIIxltaVRGoq0WK0xOtLQBZlRhuEd+FmdiTTi0oQ4sNwgVB6wlDibBHbBFR6769SL9PS3OvfLT2LxA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index a05ab9b8d..92bf68e78 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.33-alpha.2", - "@budibase/pro": "1.2.33-alpha.1", + "@budibase/pro": "1.2.33-alpha.2", "@budibase/string-templates": "1.2.33-alpha.2", "@budibase/types": "1.2.33-alpha.2", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index a7642f861..7dd057c53 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.33-alpha.1": - version "1.2.33-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.1.tgz#8c7ecce806a522d28781ca9e95d773df45b0ffd9" - integrity sha512-0gTuNw4tWhgs2WY/lj58tK5/dXtBgnjmNrNfy65BZ4Qf12yKowv/BJrH5mmGzQ/b3ygUjN07XMcfdYyBJi11kg== +"@budibase/backend-core@1.2.33-alpha.2": + version "1.2.33-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.2.tgz#b4f78beadf4637400984db3b5dde4e70cb359b1b" + integrity sha512-Ij3e9qCYbLyqDyeTxyYki3LyUzkp/Wd7aLwgIueEaA3VwNMDqd8kCg88BFSJYO/mbLVozVaXj1ovuiRjhm5JGQ== dependencies: - "@budibase/types" "1.2.33-alpha.1" + "@budibase/types" "1.2.33-alpha.2" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.33-alpha.1": - version "1.2.33-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.1.tgz#d0cb78249bbbf5f82488bf3df1d5a6c67bbe046d" - integrity sha512-5P/1GLMTtG4EU2N7qHXOOhmEjuvOT1fbzPT6Uq3mFeXlf1SSoUk66r/+ys4oPdfMA9ssNkak77QjtqVMour5HQ== +"@budibase/pro@1.2.33-alpha.2": + version "1.2.33-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.2.tgz#373f6eb05c2f08c58ef4bca68ff3962279693654" + integrity sha512-9SqijrpQyCSJn9T3JvwWbPu6GD4m2adWTF5qSKJmt+7CekGJIilVUJJsXIkd5YjrHwD+ASd85cfKcYRhqmoz5A== dependencies: - "@budibase/backend-core" "1.2.33-alpha.1" - "@budibase/types" "1.2.33-alpha.1" + "@budibase/backend-core" "1.2.33-alpha.2" + "@budibase/types" "1.2.33-alpha.2" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.33-alpha.1": - version "1.2.33-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.1.tgz#d08ddc84a66e70fc1b1405fbc2814dfb42e02ea4" - integrity sha512-wbPPZGDEvSMupf5FaOViEpsx375fDRSo9mmIGWmJfFMNFksqoKJEOvPelx+YrdOHjQI/5Lo/eV5blMqBfzRWJA== +"@budibase/types@1.2.33-alpha.2": + version "1.2.33-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.2.tgz#50cd72f44933582b8e6b4c6e58837d67e332bdc1" + integrity sha512-lqASvhwERIIxltaVRGoq0WK0xOtLQBZlRhuEd+FmdiTTi0oQ4sNwgVB6wlDibBHbBFR6769SL9PS3OvfLT2LxA== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From cc8cda3b408098cfbdb07d652f4b1c431260b621 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 11 Aug 2022 13:26:27 +0100 Subject: [PATCH 114/272] Create App/Table tests update Changes made for the smoke build - UI changes required createTable update - User Information needed updated for the createApp tests --- packages/builder/cypress/integration/createApp.spec.js | 1 + packages/builder/cypress/integration/createTable.spec.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/cypress/integration/createApp.spec.js b/packages/builder/cypress/integration/createApp.spec.js index 516489b09..179741e21 100644 --- a/packages/builder/cypress/integration/createApp.spec.js +++ b/packages/builder/cypress/integration/createApp.spec.js @@ -94,6 +94,7 @@ filterTests(['smoke', 'all'], () => { }) it("should create the first application from scratch with a default name", () => { + cy.updateUserInformation("", "") cy.createApp("", false) cy.applicationInAppTable("My app") cy.deleteApp("My app") diff --git a/packages/builder/cypress/integration/createTable.spec.js b/packages/builder/cypress/integration/createTable.spec.js index da73c19fa..36d78afb2 100644 --- a/packages/builder/cypress/integration/createTable.spec.js +++ b/packages/builder/cypress/integration/createTable.spec.js @@ -48,7 +48,7 @@ filterTests(["smoke", "all"], () => { it("deletes a row", () => { cy.get(interact.SPECTRUM_CHECKBOX_INPUT).check({ force: true }) - cy.contains("Delete 1 row(s)").click() + cy.contains("Delete 1 row").click() cy.get(interact.SPECTRUM_MODAL).contains("Delete").click() cy.contains("RoverUpdated").should("not.exist") }) From 0d08dcc856127b07e98e361a985257873ed211d0 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 11 Aug 2022 13:49:14 +0000 Subject: [PATCH 115/272] v1.2.33-alpha.3 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 60ca77b14..5a487a65c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a290adde3..12fbdcb99 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.33-alpha.2", + "@budibase/types": "1.2.33-alpha.3", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index d9885763a..0e6fa8f7c 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.33-alpha.2", + "@budibase/string-templates": "1.2.33-alpha.3", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 138dc6eb3..57a7fef8d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.33-alpha.2", - "@budibase/client": "1.2.33-alpha.2", - "@budibase/frontend-core": "1.2.33-alpha.2", - "@budibase/string-templates": "1.2.33-alpha.2", + "@budibase/bbui": "1.2.33-alpha.3", + "@budibase/client": "1.2.33-alpha.3", + "@budibase/frontend-core": "1.2.33-alpha.3", + "@budibase/string-templates": "1.2.33-alpha.3", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index d27435a74..43cb06a09 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 2b62fdbbe..afbe82b5b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.33-alpha.2", - "@budibase/frontend-core": "1.2.33-alpha.2", - "@budibase/string-templates": "1.2.33-alpha.2", + "@budibase/bbui": "1.2.33-alpha.3", + "@budibase/frontend-core": "1.2.33-alpha.3", + "@budibase/string-templates": "1.2.33-alpha.3", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index b32b724fe..894a3ed1f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.33-alpha.2", + "@budibase/bbui": "1.2.33-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 80109c0a7..c6e29b57c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.33-alpha.2", - "@budibase/client": "1.2.33-alpha.2", + "@budibase/backend-core": "1.2.33-alpha.3", + "@budibase/client": "1.2.33-alpha.3", "@budibase/pro": "1.2.33-alpha.2", - "@budibase/string-templates": "1.2.33-alpha.2", - "@budibase/types": "1.2.33-alpha.2", + "@budibase/string-templates": "1.2.33-alpha.3", + "@budibase/types": "1.2.33-alpha.3", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ef1eb40db..af11332ec 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 9ae95f649..db347cbeb 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 92bf68e78..0b4f2de6a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.33-alpha.2", + "version": "1.2.33-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.33-alpha.2", + "@budibase/backend-core": "1.2.33-alpha.3", "@budibase/pro": "1.2.33-alpha.2", - "@budibase/string-templates": "1.2.33-alpha.2", - "@budibase/types": "1.2.33-alpha.2", + "@budibase/string-templates": "1.2.33-alpha.3", + "@budibase/types": "1.2.33-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d2713e52a8664e8ebf5dbc4f7f12dfb871232891 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 11 Aug 2022 13:52:16 +0000 Subject: [PATCH 116/272] Update pro version to 1.2.33-alpha.3 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index c6e29b57c..555158728 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.33-alpha.3", "@budibase/client": "1.2.33-alpha.3", - "@budibase/pro": "1.2.33-alpha.2", + "@budibase/pro": "1.2.33-alpha.3", "@budibase/string-templates": "1.2.33-alpha.3", "@budibase/types": "1.2.33-alpha.3", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 61cc29f57..4f4034320 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.33-alpha.2": - version "1.2.33-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.2.tgz#b4f78beadf4637400984db3b5dde4e70cb359b1b" - integrity sha512-Ij3e9qCYbLyqDyeTxyYki3LyUzkp/Wd7aLwgIueEaA3VwNMDqd8kCg88BFSJYO/mbLVozVaXj1ovuiRjhm5JGQ== +"@budibase/backend-core@1.2.33-alpha.3": + version "1.2.33-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.3.tgz#22c90a89aa4c10806f6dcd027867dcd336df7357" + integrity sha512-cKsccllgSgX50CdapehrH+u9UHpQk1ecTmsGS+P0czeVmJL+hus2RNb9MTQKpVd6R3mG2mFhkMCMNXHDx4Om8Q== dependencies: - "@budibase/types" "1.2.33-alpha.2" + "@budibase/types" "1.2.33-alpha.3" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.33-alpha.2": - version "1.2.33-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.2.tgz#373f6eb05c2f08c58ef4bca68ff3962279693654" - integrity sha512-9SqijrpQyCSJn9T3JvwWbPu6GD4m2adWTF5qSKJmt+7CekGJIilVUJJsXIkd5YjrHwD+ASd85cfKcYRhqmoz5A== +"@budibase/pro@1.2.33-alpha.3": + version "1.2.33-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.3.tgz#d67f857ab0937962633d64c343c627949496e828" + integrity sha512-iGAYIB7z+wTNniWSRFhlJZjAbQv60o6wAyrYt1NGm+8ftsPBrfBFMz0RLqdS8kY4bgd0Zwf/ZLdNF+1DeHWgEQ== dependencies: - "@budibase/backend-core" "1.2.33-alpha.2" - "@budibase/types" "1.2.33-alpha.2" + "@budibase/backend-core" "1.2.33-alpha.3" + "@budibase/types" "1.2.33-alpha.3" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.33-alpha.2": - version "1.2.33-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.2.tgz#50cd72f44933582b8e6b4c6e58837d67e332bdc1" - integrity sha512-lqASvhwERIIxltaVRGoq0WK0xOtLQBZlRhuEd+FmdiTTi0oQ4sNwgVB6wlDibBHbBFR6769SL9PS3OvfLT2LxA== +"@budibase/types@1.2.33-alpha.3": + version "1.2.33-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.3.tgz#2f363f2bb30e5c49b9660a12966e304288abb08e" + integrity sha512-+TTCloQyh0zRy3TkDdrHLNJ4JhV587sSV5NncUapUeYsaxlZCE8qe1U28K6BqZfdFvMgeYO7HB1F6bbr6aWFhA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 0b4f2de6a..63592fb04 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.33-alpha.3", - "@budibase/pro": "1.2.33-alpha.2", + "@budibase/pro": "1.2.33-alpha.3", "@budibase/string-templates": "1.2.33-alpha.3", "@budibase/types": "1.2.33-alpha.3", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 7dd057c53..139131666 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.33-alpha.2": - version "1.2.33-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.2.tgz#b4f78beadf4637400984db3b5dde4e70cb359b1b" - integrity sha512-Ij3e9qCYbLyqDyeTxyYki3LyUzkp/Wd7aLwgIueEaA3VwNMDqd8kCg88BFSJYO/mbLVozVaXj1ovuiRjhm5JGQ== +"@budibase/backend-core@1.2.33-alpha.3": + version "1.2.33-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.33-alpha.3.tgz#22c90a89aa4c10806f6dcd027867dcd336df7357" + integrity sha512-cKsccllgSgX50CdapehrH+u9UHpQk1ecTmsGS+P0czeVmJL+hus2RNb9MTQKpVd6R3mG2mFhkMCMNXHDx4Om8Q== dependencies: - "@budibase/types" "1.2.33-alpha.2" + "@budibase/types" "1.2.33-alpha.3" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.33-alpha.2": - version "1.2.33-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.2.tgz#373f6eb05c2f08c58ef4bca68ff3962279693654" - integrity sha512-9SqijrpQyCSJn9T3JvwWbPu6GD4m2adWTF5qSKJmt+7CekGJIilVUJJsXIkd5YjrHwD+ASd85cfKcYRhqmoz5A== +"@budibase/pro@1.2.33-alpha.3": + version "1.2.33-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.33-alpha.3.tgz#d67f857ab0937962633d64c343c627949496e828" + integrity sha512-iGAYIB7z+wTNniWSRFhlJZjAbQv60o6wAyrYt1NGm+8ftsPBrfBFMz0RLqdS8kY4bgd0Zwf/ZLdNF+1DeHWgEQ== dependencies: - "@budibase/backend-core" "1.2.33-alpha.2" - "@budibase/types" "1.2.33-alpha.2" + "@budibase/backend-core" "1.2.33-alpha.3" + "@budibase/types" "1.2.33-alpha.3" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.33-alpha.2": - version "1.2.33-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.2.tgz#50cd72f44933582b8e6b4c6e58837d67e332bdc1" - integrity sha512-lqASvhwERIIxltaVRGoq0WK0xOtLQBZlRhuEd+FmdiTTi0oQ4sNwgVB6wlDibBHbBFR6769SL9PS3OvfLT2LxA== +"@budibase/types@1.2.33-alpha.3": + version "1.2.33-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.33-alpha.3.tgz#2f363f2bb30e5c49b9660a12966e304288abb08e" + integrity sha512-+TTCloQyh0zRy3TkDdrHLNJ4JhV587sSV5NncUapUeYsaxlZCE8qe1U28K6BqZfdFvMgeYO7HB1F6bbr6aWFhA== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 38e8971019fb7d96dda223d777e507b2058b741e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 11 Aug 2022 15:31:39 +0100 Subject: [PATCH 117/272] Custom color bar chart --- packages/client/manifest.json | 13 ++++++++++++- .../src/components/app/charts/ApexChart.svelte | 4 +++- .../src/components/app/charts/ApexOptionsBuilder.js | 10 ++++++++-- .../src/components/app/charts/BarChart.svelte | 12 ++++++++++-- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 0368b4356..3394a9420 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -1466,10 +1466,11 @@ }, { "type": "select", - "label": "Colours", + "label": "Colors", "key": "palette", "defaultValue": "Palette 1", "options": [ + "Custom", "Palette 1", "Palette 2", "Palette 3", @@ -1482,6 +1483,16 @@ "Palette 10" ] }, + { + "type": "color", + "label": "C1", + "key": "c1", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, { "type": "boolean", "label": "Stacked", diff --git a/packages/client/src/components/app/charts/ApexChart.svelte b/packages/client/src/components/app/charts/ApexChart.svelte index 7bb37a587..87d78bf5a 100644 --- a/packages/client/src/components/app/charts/ApexChart.svelte +++ b/packages/client/src/components/app/charts/ApexChart.svelte @@ -10,7 +10,9 @@ {#if options} -
+ {#key options.customColor} +
+ {/key} {:else if $builderStore.inBuilder}
diff --git a/packages/client/src/components/app/charts/ApexOptionsBuilder.js b/packages/client/src/components/app/charts/ApexOptionsBuilder.js index ef4083d64..31c5a820f 100644 --- a/packages/client/src/components/app/charts/ApexOptionsBuilder.js +++ b/packages/client/src/components/app/charts/ApexOptionsBuilder.js @@ -62,8 +62,14 @@ export class ApexOptionsBuilder { return this.setOption(["title", "text"], title) } - color(color) { - return this.setOption(["colors"], [color]) + colors(colors) { + if (!colors) { + delete this.options.colors + this.options["customColor"] = false + return this + } + this.options["customColor"] = true + return this.setOption(["colors"], colors) } width(width) { diff --git a/packages/client/src/components/app/charts/BarChart.svelte b/packages/client/src/components/app/charts/BarChart.svelte index f1e02d8af..75c147f5d 100644 --- a/packages/client/src/components/app/charts/BarChart.svelte +++ b/packages/client/src/components/app/charts/BarChart.svelte @@ -16,6 +16,7 @@ export let stacked export let yAxisUnits export let palette + export let c1, c2, c3, c4, c5 export let horizontal $: options = setUpChart( @@ -33,9 +34,13 @@ stacked, yAxisUnits, palette, - horizontal + horizontal, + c1 ? [c1] : null, + customColor ) + $: customColor = palette === "Custom" + const setUpChart = ( title, dataProvider, @@ -51,7 +56,9 @@ stacked, yAxisUnits, palette, - horizontal + horizontal, + colors, + customColor ) => { const allCols = [labelColumn, ...(valueColumns || [null])] if ( @@ -85,6 +92,7 @@ .stacked(stacked) .palette(palette) .horizontal(horizontal) + .colors(customColor ? colors : null) // Add data let useDates = false From d2171a4596f6b5050918f9cd107f5c73a47eb1d7 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 11 Aug 2022 16:59:50 +0100 Subject: [PATCH 118/272] Custom colors for Pie Chart --- packages/client/manifest.json | 66 ++++++++++++++++++- .../src/components/app/charts/PieChart.svelte | 12 +++- 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 3394a9420..a60e5c6b1 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -1811,10 +1811,11 @@ }, { "type": "select", - "label": "Colours", + "label": "Colors", "key": "palette", "defaultValue": "Palette 1", "options": [ + "Custom", "Palette 1", "Palette 2", "Palette 3", @@ -1827,6 +1828,56 @@ "Palette 10" ] }, + { + "type": "color", + "label": "C1", + "key": "c1", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C2", + "key": "c2", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C3", + "key": "c3", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C4", + "key": "c4", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C5", + "key": "c5", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, { "type": "boolean", "label": "Data Labels", @@ -1893,10 +1944,11 @@ }, { "type": "select", - "label": "Colours", + "label": "Colors", "key": "palette", "defaultValue": "Palette 1", "options": [ + "Custom", "Palette 1", "Palette 2", "Palette 3", @@ -1909,6 +1961,16 @@ "Palette 10" ] }, + { + "type": "color", + "label": "Color", + "key": "color", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, { "type": "boolean", "label": "Data Labels", diff --git a/packages/client/src/components/app/charts/PieChart.svelte b/packages/client/src/components/app/charts/PieChart.svelte index 38a42ee37..8cb7317d9 100644 --- a/packages/client/src/components/app/charts/PieChart.svelte +++ b/packages/client/src/components/app/charts/PieChart.svelte @@ -13,6 +13,7 @@ export let legend export let donut export let palette + export let c1, c2, c3, c4, c5 $: options = setUpChart( title, @@ -25,9 +26,13 @@ animate, legend, donut, - palette + palette, + c1 && c2 && c3 && c4 && c5 ? [c1, c2, c3, c4, c5] : null, + customColor ) + $: customColor = palette === "Custom" + const setUpChart = ( title, dataProvider, @@ -39,7 +44,9 @@ animate, legend, donut, - palette + palette, + colors, + customColor ) => { if ( !dataProvider || @@ -70,6 +77,7 @@ .legend(legend) .legendPosition("right") .palette(palette) + .colors(customColor ? colors : null) // Add data if valid datasource const series = data.map(row => parseFloat(row[valueColumn])) From 0fbfadd2e8e7fce71801808bd7e54979f3c00928 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 11 Aug 2022 17:17:18 +0100 Subject: [PATCH 119/272] Cypress: Smoke Build - Timing based Changes Adding a few corrections to support failing/Flakey smoke tests (timing issues) --- packages/builder/cypress/integration/appOverview.spec.js | 2 +- packages/builder/cypress/support/commands.js | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js index feaace6fb..d7f2882b2 100644 --- a/packages/builder/cypress/integration/appOverview.spec.js +++ b/packages/builder/cypress/integration/appOverview.spec.js @@ -266,7 +266,7 @@ filterTests(["all"], () => { cy.reload() cy.log("Current deployment version: " + clientPackage.version) - cy.get(".version-status a", { timeout: 1000 }).contains("Update").click() + cy.get(".version-status a", { timeout: 5000 }).contains("Update").click() cy.get(".spectrum-Tabs-item.is-selected").contains("Settings") cy.get(".version-section .page-action button") diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index dbcdb04ac..85531b2f3 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -128,7 +128,9 @@ Cypress.Commands.add("updateUserInformation", (firstName, lastName) => { .should("have.value", lastName) .blur() } - cy.get("button").contains("Update information").click({ force: true }) + cy.get(".confirm-wrap").within(() => { + cy.get("button").contains("Update information").click({ force: true }) + }) cy.get(".spectrum-Dialog-grid").should("not.exist") }) }) @@ -432,6 +434,7 @@ Cypress.Commands.add("createAppFromScratch", appName => { // TABLES Cypress.Commands.add("createTable", (tableName, initialTable) => { + // Creates an internal Budibase DB table if (!initialTable) { cy.navigateToDataSection() cy.get(`[data-cy="new-table"]`, { timeout: 2000 }).click() @@ -445,6 +448,10 @@ Cypress.Commands.add("createTable", (tableName, initialTable) => { .contains("Continue") .click({ force: true }) }) + cy.get(".spectrum-Modal", { timeout: 2000 }).should( + "not.contain", + "Add data source" + ) cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => { cy.get("input", { timeout: 2000 }).first().type(tableName).blur() cy.get(".spectrum-ButtonGroup").contains("Create").click() From 9893db4bb0063a8ff1b4e0dd77a1f6990f71d217 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 11 Aug 2022 17:29:59 +0100 Subject: [PATCH 120/272] Timeout increase for createTable Cypress Command --- packages/builder/cypress/support/commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index 85531b2f3..d33bd516c 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -448,7 +448,7 @@ Cypress.Commands.add("createTable", (tableName, initialTable) => { .contains("Continue") .click({ force: true }) }) - cy.get(".spectrum-Modal", { timeout: 2000 }).should( + cy.get(".spectrum-Modal", { timeout: 10000 }).should( "not.contain", "Add data source" ) From f99a6c69a530d1fc93090a86da6b3d341b776f71 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 11 Aug 2022 17:43:33 +0100 Subject: [PATCH 121/272] Removing Add Multi-Option Datatype Test from Cypress Suite We don't need a specific test file for this. The test file will remain for now but will not run. The test will be reworked into a different test file or as part of the API testing --- .../builder/cypress/integration/addMultiOptionDatatype.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js index f436f3ff3..f84440295 100644 --- a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js +++ b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js @@ -2,7 +2,7 @@ import filterTests from "../support/filterTests" const interact = require('../support/interact') filterTests(['all'], () => { - context("Add Multi-Option Datatype", () => { + xcontext("Add Multi-Option Datatype", () => { before(() => { cy.login() cy.createTestApp() From 3421febb1c0f82963df7dddf6d91059f39472885 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 11 Aug 2022 17:45:46 +0100 Subject: [PATCH 122/272] Add colors for Bar and Donut Charts --- packages/client/manifest.json | 84 ++++++++++++++++++- .../src/components/app/charts/BarChart.svelte | 2 +- 2 files changed, 83 insertions(+), 3 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index a60e5c6b1..ac6de1ba3 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -1493,6 +1493,46 @@ "value": "Custom" } }, + { + "type": "color", + "label": "C2", + "key": "c2", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C3", + "key": "c3", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C4", + "key": "c4", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C5", + "key": "c5", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, { "type": "boolean", "label": "Stacked", @@ -1963,8 +2003,48 @@ }, { "type": "color", - "label": "Color", - "key": "color", + "label": "C1", + "key": "c1", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C2", + "key": "c2", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C3", + "key": "c3", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C4", + "key": "c4", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C5", + "key": "c5", "barSeparator": false, "dependsOn": { "setting": "palette", diff --git a/packages/client/src/components/app/charts/BarChart.svelte b/packages/client/src/components/app/charts/BarChart.svelte index 75c147f5d..fd8443e2d 100644 --- a/packages/client/src/components/app/charts/BarChart.svelte +++ b/packages/client/src/components/app/charts/BarChart.svelte @@ -35,7 +35,7 @@ yAxisUnits, palette, horizontal, - c1 ? [c1] : null, + c1 && c2 && c3 && c4 && c5 ? [c1, c2, c3, c4, c5] : null, customColor ) From 864f8756bcd0bedf14c54d4cd4bed67658d47a4d Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 11 Aug 2022 17:52:09 +0100 Subject: [PATCH 123/272] Custom colors line chart --- packages/client/manifest.json | 53 ++++++++++++++++++- .../components/app/charts/LineChart.svelte | 12 ++++- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index ac6de1ba3..19b4ef804 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -1632,10 +1632,11 @@ }, { "type": "select", - "label": "Colours", + "label": "Colors", "key": "palette", "defaultValue": "Palette 1", "options": [ + "Custom", "Palette 1", "Palette 2", "Palette 3", @@ -1648,6 +1649,56 @@ "Palette 10" ] }, + { + "type": "color", + "label": "C1", + "key": "c1", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C2", + "key": "c2", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C3", + "key": "c3", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C4", + "key": "c4", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C5", + "key": "c5", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, { "type": "select", "label": "Curve", diff --git a/packages/client/src/components/app/charts/LineChart.svelte b/packages/client/src/components/app/charts/LineChart.svelte index afb9f1426..7f82a833d 100644 --- a/packages/client/src/components/app/charts/LineChart.svelte +++ b/packages/client/src/components/app/charts/LineChart.svelte @@ -17,6 +17,7 @@ export let legend export let yAxisUnits export let palette + export let c1, c2, c3, c4, c5 // Area specific props export let area @@ -40,9 +41,13 @@ palette, area, stacked, - gradient + gradient, + c1 && c2 && c3 && c4 && c5 ? [c1, c2, c3, c4, c5] : null, + customColor ) + $: customColor = palette === "Custom" + const setUpChart = ( title, dataProvider, @@ -60,7 +65,9 @@ palette, area, stacked, - gradient + gradient, + colors, + customColor ) => { const allCols = [labelColumn, ...(valueColumns || [null])] if ( @@ -96,6 +103,7 @@ .legend(legend) .yUnits(yAxisUnits) .palette(palette) + .colors(customColor ? colors : null) // Add data let useDates = false From c04191bba52007c6883d7ed01f8a9e838a3acc3f Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 11 Aug 2022 17:59:38 +0100 Subject: [PATCH 124/272] Custom colors Area Chart --- packages/client/manifest.json | 53 ++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 19b4ef804..f5848356d 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -1797,10 +1797,11 @@ }, { "type": "select", - "label": "Colours", + "label": "Colors", "key": "palette", "defaultValue": "Palette 1", "options": [ + "Custom", "Palette 1", "Palette 2", "Palette 3", @@ -1813,6 +1814,56 @@ "Palette 10" ] }, + { + "type": "color", + "label": "C1", + "key": "c1", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C2", + "key": "c2", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C3", + "key": "c3", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C4", + "key": "c4", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, + { + "type": "color", + "label": "C5", + "key": "c5", + "barSeparator": false, + "dependsOn": { + "setting": "palette", + "value": "Custom" + } + }, { "type": "select", "label": "Curve", From b166e155fafe78b4ee81426f77d5796e9c109982 Mon Sep 17 00:00:00 2001 From: FlaminWrap <97764630+FlaminWrap@users.noreply.github.com> Date: Thu, 11 Aug 2022 20:05:06 +0000 Subject: [PATCH 125/272] Update index.svelte --- packages/builder/src/pages/builder/invite/index.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/invite/index.svelte b/packages/builder/src/pages/builder/invite/index.svelte index 2b9e9592f..ffc2b09e8 100644 --- a/packages/builder/src/pages/builder/invite/index.svelte +++ b/packages/builder/src/pages/builder/invite/index.svelte @@ -8,9 +8,9 @@ const inviteCode = $params["?code"] let password, error - + $: company = $organisation.company || "Budibase" - + async function acceptInvite() { try { await users.acceptInvite(inviteCode, password) @@ -20,7 +20,7 @@ notifications.error(error.message) } } - + onMount(async () => { try { await organisation.init() From 404e5414b542c2786b33e65b8ee8e5073f1eee8b Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 12 Aug 2022 11:29:57 +0100 Subject: [PATCH 126/272] Delete attachments on field clear --- packages/bbui/src/Form/Core/Dropzone.svelte | 2 ++ .../components/app/forms/AttachmentField.svelte | 12 ++++++++++++ packages/frontend-core/src/api/attachments.js | 14 ++++++++++++++ .../server/src/api/controllers/static/index.ts | 6 +++++- packages/server/src/api/routes/static.ts | 6 ++++++ packages/server/src/utilities/fileSystem/index.js | 2 ++ 6 files changed, 41 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte index 36515acbc..80f51f5da 100644 --- a/packages/bbui/src/Form/Core/Dropzone.svelte +++ b/packages/bbui/src/Form/Core/Dropzone.svelte @@ -17,6 +17,7 @@ export let disabled = false export let fileSizeLimit = BYTES_IN_MB * 20 export let processFiles = null + export let deleteAttachments = null export let handleFileTooLarge = null export let handleTooManyFiles = null export let gallery = true @@ -95,6 +96,7 @@ value.filter((x, idx) => idx !== selectedImageIdx) ) selectedImageIdx = 0 + await deleteAttachments(value.map(item => item.key)) } function navigateLeft() { diff --git a/packages/client/src/components/app/forms/AttachmentField.svelte b/packages/client/src/components/app/forms/AttachmentField.svelte index 5023e77ae..8a98f92d8 100644 --- a/packages/client/src/components/app/forms/AttachmentField.svelte +++ b/packages/client/src/components/app/forms/AttachmentField.svelte @@ -47,6 +47,17 @@ } } + const deleteAttachments = async fileList => { + try { + return await API.deleteAttachments({ + keys: fileList, + tableId: formContext?.dataSource?.tableId, + }) + } catch (error) { + return [] + } + } + const handleChange = e => { fieldApi.setValue(e.detail) if (onChange) { @@ -72,6 +83,7 @@ error={fieldState.error} on:change={handleChange} {processFiles} + {deleteAttachments} {handleFileTooLarge} {handleTooManyFiles} {maximum} diff --git a/packages/frontend-core/src/api/attachments.js b/packages/frontend-core/src/api/attachments.js index e3b1b74e5..1a24785a8 100644 --- a/packages/frontend-core/src/api/attachments.js +++ b/packages/frontend-core/src/api/attachments.js @@ -61,5 +61,19 @@ export const buildAttachmentEndpoints = API => { }) return { publicUrl } }, + + /** + * Deletes attachments from the bucket. + * @param keys the attachments to delete + * @param tableId the associated table ID + */ + deleteAttachments: async ({ keys, tableId }) => { + return await API.post({ + url: `/api/attachments/${tableId}/delete`, + body: { + keys, + }, + }) + }, } } diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index 7aeea98ad..c4d51293b 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -12,7 +12,7 @@ const { } = require("../../../utilities/fileSystem") const env = require("../../../environment") const { clientLibraryPath } = require("../../../utilities") -const { upload } = require("../../../utilities/fileSystem") +const { upload, deleteFiles } = require("../../../utilities/fileSystem") const { attachmentsRelativeURL } = require("../../../utilities") const { DocumentType } = require("../../../db/utils") const { getAppDB, getAppId } = require("@budibase/backend-core/context") @@ -97,6 +97,10 @@ export const uploadFile = async function (ctx: any) { ctx.body = await Promise.all(uploads) } +export const deleteObjects = async function (ctx: any) { + ctx.body = await deleteFiles(ObjectStoreBuckets.APPS, ctx.request.body.keys) +} + export const serveApp = async function (ctx: any) { const db = getAppDB({ skip_setup: true }) const appInfo = await db.get(DocumentType.APP_METADATA) diff --git a/packages/server/src/api/routes/static.ts b/packages/server/src/api/routes/static.ts index 61cf2b124..7cf3f5e14 100644 --- a/packages/server/src/api/routes/static.ts +++ b/packages/server/src/api/routes/static.ts @@ -45,6 +45,12 @@ router authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), controller.uploadFile ) + .post( + "/api/attachments/:tableId/delete", + paramResource("tableId"), + authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), + controller.deleteObjects + ) .get("/:appId/:path*", controller.serveApp) .get("/app/:appUrl/:path*", controller.serveApp) .post( diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js index f4aebd11a..1223ea55f 100644 --- a/packages/server/src/utilities/fileSystem/index.js +++ b/packages/server/src/utilities/fileSystem/index.js @@ -15,6 +15,7 @@ const { streamUpload, deleteFolder, downloadTarball, + deleteFiles, } = require("./utilities") const { updateClientLibrary } = require("./clientLibrary") const env = require("../../environment") @@ -327,5 +328,6 @@ exports.cleanup = appIds => { exports.upload = upload exports.retrieve = retrieve exports.retrieveToTmp = retrieveToTmp +exports.deleteFiles = deleteFiles exports.TOP_LEVEL_PATH = TOP_LEVEL_PATH exports.NODE_MODULES_PATH = NODE_MODULES_PATH From df620fb9f729bf79512242cd6a30267e34d7bbb4 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 12 Aug 2022 11:43:39 +0100 Subject: [PATCH 127/272] Delete the selected file only --- packages/bbui/src/Form/Core/Dropzone.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte index 80f51f5da..68882fe81 100644 --- a/packages/bbui/src/Form/Core/Dropzone.svelte +++ b/packages/bbui/src/Form/Core/Dropzone.svelte @@ -95,8 +95,10 @@ "change", value.filter((x, idx) => idx !== selectedImageIdx) ) + await deleteAttachments( + value.filter((x, idx) => idx === selectedImageIdx).map(item => item.key) + ) selectedImageIdx = 0 - await deleteAttachments(value.map(item => item.key)) } function navigateLeft() { From 58abbb6c8899474d54f71c7a7b5b748127aa8e45 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 11:19:01 +0000 Subject: [PATCH 128/272] v1.2.39-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 92a1d5913..1b1ff243c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.38", + "version": "1.2.39-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 780c157ae..4a2d4800d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.38", + "version": "1.2.39-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.2.38", + "@budibase/types": "1.2.39-alpha.0", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 2483b8b66..ab2291154 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.38", + "version": "1.2.39-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.2.38", + "@budibase/string-templates": "1.2.39-alpha.0", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 6c8d837a5..610f8bd0d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.38", + "version": "1.2.39-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.2.38", - "@budibase/client": "^1.2.38", - "@budibase/frontend-core": "^1.2.38", - "@budibase/string-templates": "^1.2.38", + "@budibase/bbui": "1.2.39-alpha.0", + "@budibase/client": "1.2.39-alpha.0", + "@budibase/frontend-core": "1.2.39-alpha.0", + "@budibase/string-templates": "1.2.39-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 06de78e3c..7642a66af 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.38", + "version": "1.2.39-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 0dd03497e..b0af1cf3d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.38", + "version": "1.2.39-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.2.38", - "@budibase/frontend-core": "^1.2.38", - "@budibase/string-templates": "^1.2.38", + "@budibase/bbui": "1.2.39-alpha.0", + "@budibase/frontend-core": "1.2.39-alpha.0", + "@budibase/string-templates": "1.2.39-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index c6aa01030..1a9d9ffeb 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.38", + "version": "1.2.39-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.2.38", + "@budibase/bbui": "1.2.39-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 13b0d1b67..54622ee8b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.38", + "version": "1.2.39-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.2.38", - "@budibase/client": "^1.2.38", + "@budibase/backend-core": "1.2.39-alpha.0", + "@budibase/client": "1.2.39-alpha.0", "@budibase/pro": "1.2.38", - "@budibase/string-templates": "^1.2.38", - "@budibase/types": "^1.2.38", + "@budibase/string-templates": "1.2.39-alpha.0", + "@budibase/types": "1.2.39-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index cc4b07f8c..446909410 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.38", + "version": "1.2.39-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 5541ecfe9..ec3f8d7c8 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.38", + "version": "1.2.39-alpha.0", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9d6cad67b..7b731ec13 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.38", + "version": "1.2.39-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.2.38", + "@budibase/backend-core": "1.2.39-alpha.0", "@budibase/pro": "1.2.38", - "@budibase/string-templates": "^1.2.38", - "@budibase/types": "^1.2.38", + "@budibase/string-templates": "1.2.39-alpha.0", + "@budibase/types": "1.2.39-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 55d9e4e939ee77560d32d2f9c6b3ad9ae3ddc8fb Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 11:22:24 +0000 Subject: [PATCH 129/272] Update pro version to 1.2.39-alpha.0 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 31 ++++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 31 ++++++++++++++++--------------- 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 54622ee8b..997710dc6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.39-alpha.0", "@budibase/client": "1.2.39-alpha.0", - "@budibase/pro": "1.2.38", + "@budibase/pro": "1.2.39-alpha.0", "@budibase/string-templates": "1.2.39-alpha.0", "@budibase/types": "1.2.39-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index fb489e5ea..a8dea20e9 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,18 +1094,19 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.38": - version "1.2.38" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.38.tgz#9451ae72f6af8cff3aa0a57dc61fc8d3505a77a0" - integrity sha512-g7m4fHG1tLqNsSvdSltqRHLASOH5n3QBbN5DD7cmSBIVpUtDCA0EMx/L0vkDDhTmbOQApXAW3cyJs6H3QiWtOw== +"@budibase/backend-core@1.2.39-alpha.0": + version "1.2.39-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.0.tgz#52a1d340d28fa714822827aeb843e1f097ad8f60" + integrity sha512-yHvWAUH1j8+UJx8hYl11iAGOpxmkxSbzf7qVCJ8a84Ms46Clmwp+qxtnDzKxMit2KJW72dJM9+PvI+OUG0Bixg== dependencies: - "@budibase/types" "^1.2.38" + "@budibase/types" "1.2.39-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" dotenv "16.0.1" emitter-listener "1.1.2" ioredis "4.28.0" + joi "17.6.0" jsonwebtoken "8.5.1" koa-passport "4.1.4" lodash "4.17.21" @@ -1177,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.38": - version "1.2.38" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.38.tgz#12253371baccab9e29126a296b10c368054497c5" - integrity sha512-VmzceZhgz+TolXKCpgGmxh2E1maBLCX68h6B8OQ0ksNlHFi4x0nn3qBJr1XNta8KhG8fnAVxSteBuMVuixGIfQ== +"@budibase/pro@1.2.39-alpha.0": + version "1.2.39-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.0.tgz#272e3ffd5e2189c787df6b6fbe22b7084832ade7" + integrity sha512-B0XakaUHW2Y1RtkEcrPEBcp8CDFJ8/fC9agLI3WK0ARnTGx9ROd8Liokq3/pW3vmlOgsfijzNHL3LUYcPTMEXw== dependencies: - "@budibase/backend-core" "1.2.38" - "@budibase/types" "1.2.38" + "@budibase/backend-core" "1.2.39-alpha.0" + "@budibase/types" "1.2.39-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1206,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.38", "@budibase/types@^1.2.38": - version "1.2.38" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.38.tgz#472f4ec891242488561a8cfc175961664bc7ac88" - integrity sha512-pMKh4FKhPoa1pge4FKqPi3gbzZp3HJ1RuhM5naKFqC1yompIn/Es+YNft39VC2bTW5tiGbucMcjWzdpMwTSTVw== +"@budibase/types@1.2.39-alpha.0": + version "1.2.39-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.0.tgz#d0d48e4da36a93a4a9354cc49663f38d0181b6c0" + integrity sha512-i+lQeqlKmFORLuKdwmKnlmCCCEXZH6NdXHrOqNcebJzcNlx3Gx342+cHe4ZGYu0L+wCkWWelD5XHFuNMVMcuHg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 7b731ec13..09cdf4464 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.39-alpha.0", - "@budibase/pro": "1.2.38", + "@budibase/pro": "1.2.39-alpha.0", "@budibase/string-templates": "1.2.39-alpha.0", "@budibase/types": "1.2.39-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 587adb9a8..d7d8b6c7a 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,18 +291,19 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.38": - version "1.2.38" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.38.tgz#9451ae72f6af8cff3aa0a57dc61fc8d3505a77a0" - integrity sha512-g7m4fHG1tLqNsSvdSltqRHLASOH5n3QBbN5DD7cmSBIVpUtDCA0EMx/L0vkDDhTmbOQApXAW3cyJs6H3QiWtOw== +"@budibase/backend-core@1.2.39-alpha.0": + version "1.2.39-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.0.tgz#52a1d340d28fa714822827aeb843e1f097ad8f60" + integrity sha512-yHvWAUH1j8+UJx8hYl11iAGOpxmkxSbzf7qVCJ8a84Ms46Clmwp+qxtnDzKxMit2KJW72dJM9+PvI+OUG0Bixg== dependencies: - "@budibase/types" "^1.2.38" + "@budibase/types" "1.2.39-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" dotenv "16.0.1" emitter-listener "1.1.2" ioredis "4.28.0" + joi "17.6.0" jsonwebtoken "8.5.1" koa-passport "4.1.4" lodash "4.17.21" @@ -324,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.38": - version "1.2.38" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.38.tgz#12253371baccab9e29126a296b10c368054497c5" - integrity sha512-VmzceZhgz+TolXKCpgGmxh2E1maBLCX68h6B8OQ0ksNlHFi4x0nn3qBJr1XNta8KhG8fnAVxSteBuMVuixGIfQ== +"@budibase/pro@1.2.39-alpha.0": + version "1.2.39-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.0.tgz#272e3ffd5e2189c787df6b6fbe22b7084832ade7" + integrity sha512-B0XakaUHW2Y1RtkEcrPEBcp8CDFJ8/fC9agLI3WK0ARnTGx9ROd8Liokq3/pW3vmlOgsfijzNHL3LUYcPTMEXw== dependencies: - "@budibase/backend-core" "1.2.38" - "@budibase/types" "1.2.38" + "@budibase/backend-core" "1.2.39-alpha.0" + "@budibase/types" "1.2.39-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.38", "@budibase/types@^1.2.38": - version "1.2.38" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.38.tgz#472f4ec891242488561a8cfc175961664bc7ac88" - integrity sha512-pMKh4FKhPoa1pge4FKqPi3gbzZp3HJ1RuhM5naKFqC1yompIn/Es+YNft39VC2bTW5tiGbucMcjWzdpMwTSTVw== +"@budibase/types@1.2.39-alpha.0": + version "1.2.39-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.0.tgz#d0d48e4da36a93a4a9354cc49663f38d0181b6c0" + integrity sha512-i+lQeqlKmFORLuKdwmKnlmCCCEXZH6NdXHrOqNcebJzcNlx3Gx342+cHe4ZGYu0L+wCkWWelD5XHFuNMVMcuHg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From c113a7b63298fd8f19fd44932657ab4b80caf6a0 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 12:09:27 +0000 Subject: [PATCH 130/272] v1.2.39-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 1b1ff243c..a245b8f8f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4a2d4800d..d2ef37909 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.39-alpha.0", + "@budibase/types": "1.2.39-alpha.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index ab2291154..4a9c1a024 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.39-alpha.0", + "@budibase/string-templates": "1.2.39-alpha.1", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 610f8bd0d..7124def68 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.0", - "@budibase/client": "1.2.39-alpha.0", - "@budibase/frontend-core": "1.2.39-alpha.0", - "@budibase/string-templates": "1.2.39-alpha.0", + "@budibase/bbui": "1.2.39-alpha.1", + "@budibase/client": "1.2.39-alpha.1", + "@budibase/frontend-core": "1.2.39-alpha.1", + "@budibase/string-templates": "1.2.39-alpha.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 7642a66af..676ef3cf1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index b0af1cf3d..498737866 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.0", - "@budibase/frontend-core": "1.2.39-alpha.0", - "@budibase/string-templates": "1.2.39-alpha.0", + "@budibase/bbui": "1.2.39-alpha.1", + "@budibase/frontend-core": "1.2.39-alpha.1", + "@budibase/string-templates": "1.2.39-alpha.1", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 1a9d9ffeb..2a8146665 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.39-alpha.0", + "@budibase/bbui": "1.2.39-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 997710dc6..39dda7071 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.39-alpha.0", - "@budibase/client": "1.2.39-alpha.0", + "@budibase/backend-core": "1.2.39-alpha.1", + "@budibase/client": "1.2.39-alpha.1", "@budibase/pro": "1.2.39-alpha.0", - "@budibase/string-templates": "1.2.39-alpha.0", - "@budibase/types": "1.2.39-alpha.0", + "@budibase/string-templates": "1.2.39-alpha.1", + "@budibase/types": "1.2.39-alpha.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 446909410..8236c3af6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index ec3f8d7c8..e230689f8 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 09cdf4464..87b13d23c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.39-alpha.0", + "version": "1.2.39-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.39-alpha.0", + "@budibase/backend-core": "1.2.39-alpha.1", "@budibase/pro": "1.2.39-alpha.0", - "@budibase/string-templates": "1.2.39-alpha.0", - "@budibase/types": "1.2.39-alpha.0", + "@budibase/string-templates": "1.2.39-alpha.1", + "@budibase/types": "1.2.39-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 9657f01d61e877ce44a6860e03a90340deca4629 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 12:12:39 +0000 Subject: [PATCH 131/272] Update pro version to 1.2.39-alpha.1 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 39dda7071..21bb9fbdc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.39-alpha.1", "@budibase/client": "1.2.39-alpha.1", - "@budibase/pro": "1.2.39-alpha.0", + "@budibase/pro": "1.2.39-alpha.1", "@budibase/string-templates": "1.2.39-alpha.1", "@budibase/types": "1.2.39-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index a8dea20e9..bd6cdee80 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.0": - version "1.2.39-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.0.tgz#52a1d340d28fa714822827aeb843e1f097ad8f60" - integrity sha512-yHvWAUH1j8+UJx8hYl11iAGOpxmkxSbzf7qVCJ8a84Ms46Clmwp+qxtnDzKxMit2KJW72dJM9+PvI+OUG0Bixg== +"@budibase/backend-core@1.2.39-alpha.1": + version "1.2.39-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.1.tgz#7e5293670cf39f05e31eaaabbc3d7abc7f9837ca" + integrity sha512-mfHGyLc2FZ63cF8f4VX8GdJe7ciLCX4kZ+NK1yzBG0rRzHSTWJb2CVRq0rXNsZbwAVt9llHH58ysSHd+ggw9hg== dependencies: - "@budibase/types" "1.2.39-alpha.0" + "@budibase/types" "1.2.39-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.39-alpha.0": - version "1.2.39-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.0.tgz#272e3ffd5e2189c787df6b6fbe22b7084832ade7" - integrity sha512-B0XakaUHW2Y1RtkEcrPEBcp8CDFJ8/fC9agLI3WK0ARnTGx9ROd8Liokq3/pW3vmlOgsfijzNHL3LUYcPTMEXw== +"@budibase/pro@1.2.39-alpha.1": + version "1.2.39-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.1.tgz#12612de95dfa8407717c765fa6fbdf5985697a3d" + integrity sha512-A9Tg1yL9vA35riH2F7OwRhtSSC7sY2SZlojhJq0+JQuTJFmsey/5va2f+2AcH46u8bFrcRts/CERkOCS2vsGRQ== dependencies: - "@budibase/backend-core" "1.2.39-alpha.0" - "@budibase/types" "1.2.39-alpha.0" + "@budibase/backend-core" "1.2.39-alpha.1" + "@budibase/types" "1.2.39-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.39-alpha.0": - version "1.2.39-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.0.tgz#d0d48e4da36a93a4a9354cc49663f38d0181b6c0" - integrity sha512-i+lQeqlKmFORLuKdwmKnlmCCCEXZH6NdXHrOqNcebJzcNlx3Gx342+cHe4ZGYu0L+wCkWWelD5XHFuNMVMcuHg== +"@budibase/types@1.2.39-alpha.1": + version "1.2.39-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.1.tgz#1758c5c7b8a1d754b4c391fc2dc699d6e249980b" + integrity sha512-b3YKkNf0+ImO/HvNbDS0biaMY2uu5ClphBLtA34hOd1I8hjjNj1kguuiQvgW7zqTYvMRK0hBNtTCnSa90uI7Fg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 87b13d23c..5ff7f8bd9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.39-alpha.1", - "@budibase/pro": "1.2.39-alpha.0", + "@budibase/pro": "1.2.39-alpha.1", "@budibase/string-templates": "1.2.39-alpha.1", "@budibase/types": "1.2.39-alpha.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d7d8b6c7a..29984bf54 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.0": - version "1.2.39-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.0.tgz#52a1d340d28fa714822827aeb843e1f097ad8f60" - integrity sha512-yHvWAUH1j8+UJx8hYl11iAGOpxmkxSbzf7qVCJ8a84Ms46Clmwp+qxtnDzKxMit2KJW72dJM9+PvI+OUG0Bixg== +"@budibase/backend-core@1.2.39-alpha.1": + version "1.2.39-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.1.tgz#7e5293670cf39f05e31eaaabbc3d7abc7f9837ca" + integrity sha512-mfHGyLc2FZ63cF8f4VX8GdJe7ciLCX4kZ+NK1yzBG0rRzHSTWJb2CVRq0rXNsZbwAVt9llHH58ysSHd+ggw9hg== dependencies: - "@budibase/types" "1.2.39-alpha.0" + "@budibase/types" "1.2.39-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.39-alpha.0": - version "1.2.39-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.0.tgz#272e3ffd5e2189c787df6b6fbe22b7084832ade7" - integrity sha512-B0XakaUHW2Y1RtkEcrPEBcp8CDFJ8/fC9agLI3WK0ARnTGx9ROd8Liokq3/pW3vmlOgsfijzNHL3LUYcPTMEXw== +"@budibase/pro@1.2.39-alpha.1": + version "1.2.39-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.1.tgz#12612de95dfa8407717c765fa6fbdf5985697a3d" + integrity sha512-A9Tg1yL9vA35riH2F7OwRhtSSC7sY2SZlojhJq0+JQuTJFmsey/5va2f+2AcH46u8bFrcRts/CERkOCS2vsGRQ== dependencies: - "@budibase/backend-core" "1.2.39-alpha.0" - "@budibase/types" "1.2.39-alpha.0" + "@budibase/backend-core" "1.2.39-alpha.1" + "@budibase/types" "1.2.39-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.39-alpha.0": - version "1.2.39-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.0.tgz#d0d48e4da36a93a4a9354cc49663f38d0181b6c0" - integrity sha512-i+lQeqlKmFORLuKdwmKnlmCCCEXZH6NdXHrOqNcebJzcNlx3Gx342+cHe4ZGYu0L+wCkWWelD5XHFuNMVMcuHg== +"@budibase/types@1.2.39-alpha.1": + version "1.2.39-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.1.tgz#1758c5c7b8a1d754b4c391fc2dc699d6e249980b" + integrity sha512-b3YKkNf0+ImO/HvNbDS0biaMY2uu5ClphBLtA34hOd1I8hjjNj1kguuiQvgW7zqTYvMRK0hBNtTCnSa90uI7Fg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 8a0537f5f80677b3d79c1010242b218cd56a4b89 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 12 Aug 2022 14:37:52 +0100 Subject: [PATCH 132/272] Remove unused barSeparator --- packages/client/manifest.json | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index f5848356d..14f02cbe5 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -1487,7 +1487,6 @@ "type": "color", "label": "C1", "key": "c1", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1497,7 +1496,6 @@ "type": "color", "label": "C2", "key": "c2", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1507,7 +1505,6 @@ "type": "color", "label": "C3", "key": "c3", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1517,7 +1514,6 @@ "type": "color", "label": "C4", "key": "c4", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1527,7 +1523,6 @@ "type": "color", "label": "C5", "key": "c5", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1653,7 +1648,6 @@ "type": "color", "label": "C1", "key": "c1", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1663,7 +1657,6 @@ "type": "color", "label": "C2", "key": "c2", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1673,7 +1666,6 @@ "type": "color", "label": "C3", "key": "c3", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1683,7 +1675,6 @@ "type": "color", "label": "C4", "key": "c4", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1693,7 +1684,6 @@ "type": "color", "label": "C5", "key": "c5", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1818,7 +1808,6 @@ "type": "color", "label": "C1", "key": "c1", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1828,7 +1817,6 @@ "type": "color", "label": "C2", "key": "c2", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1838,7 +1826,6 @@ "type": "color", "label": "C3", "key": "c3", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1848,7 +1835,6 @@ "type": "color", "label": "C4", "key": "c4", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1858,7 +1844,6 @@ "type": "color", "label": "C5", "key": "c5", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1974,7 +1959,6 @@ "type": "color", "label": "C1", "key": "c1", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1984,7 +1968,6 @@ "type": "color", "label": "C2", "key": "c2", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -1994,7 +1977,6 @@ "type": "color", "label": "C3", "key": "c3", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -2004,7 +1986,6 @@ "type": "color", "label": "C4", "key": "c4", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -2014,7 +1995,6 @@ "type": "color", "label": "C5", "key": "c5", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -2107,7 +2087,6 @@ "type": "color", "label": "C1", "key": "c1", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -2117,7 +2096,6 @@ "type": "color", "label": "C2", "key": "c2", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -2127,7 +2105,6 @@ "type": "color", "label": "C3", "key": "c3", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -2137,7 +2114,6 @@ "type": "color", "label": "C4", "key": "c4", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" @@ -2147,7 +2123,6 @@ "type": "color", "label": "C5", "key": "c5", - "barSeparator": false, "dependsOn": { "setting": "palette", "value": "Custom" From 8445acff4cace06c1c3e2bbdc00d6ffd667fefec Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 14:14:56 +0000 Subject: [PATCH 133/272] v1.2.39-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index a245b8f8f..d28b533b6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d2ef37909..ab51fd042 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.39-alpha.1", + "@budibase/types": "1.2.39-alpha.2", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4a9c1a024..e352b48d0 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.39-alpha.1", + "@budibase/string-templates": "1.2.39-alpha.2", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 7124def68..2d5843879 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.1", - "@budibase/client": "1.2.39-alpha.1", - "@budibase/frontend-core": "1.2.39-alpha.1", - "@budibase/string-templates": "1.2.39-alpha.1", + "@budibase/bbui": "1.2.39-alpha.2", + "@budibase/client": "1.2.39-alpha.2", + "@budibase/frontend-core": "1.2.39-alpha.2", + "@budibase/string-templates": "1.2.39-alpha.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 676ef3cf1..86ee213bd 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 498737866..307f46166 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.1", - "@budibase/frontend-core": "1.2.39-alpha.1", - "@budibase/string-templates": "1.2.39-alpha.1", + "@budibase/bbui": "1.2.39-alpha.2", + "@budibase/frontend-core": "1.2.39-alpha.2", + "@budibase/string-templates": "1.2.39-alpha.2", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 2a8146665..64b3874d0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.39-alpha.1", + "@budibase/bbui": "1.2.39-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 21bb9fbdc..9a1f5ee28 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.39-alpha.1", - "@budibase/client": "1.2.39-alpha.1", + "@budibase/backend-core": "1.2.39-alpha.2", + "@budibase/client": "1.2.39-alpha.2", "@budibase/pro": "1.2.39-alpha.1", - "@budibase/string-templates": "1.2.39-alpha.1", - "@budibase/types": "1.2.39-alpha.1", + "@budibase/string-templates": "1.2.39-alpha.2", + "@budibase/types": "1.2.39-alpha.2", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 8236c3af6..54e9019ae 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index e230689f8..d0606abe8 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5ff7f8bd9..00a8d0f21 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.39-alpha.1", + "version": "1.2.39-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.39-alpha.1", + "@budibase/backend-core": "1.2.39-alpha.2", "@budibase/pro": "1.2.39-alpha.1", - "@budibase/string-templates": "1.2.39-alpha.1", - "@budibase/types": "1.2.39-alpha.1", + "@budibase/string-templates": "1.2.39-alpha.2", + "@budibase/types": "1.2.39-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ce639f213d1428a3070a6dd1dc6fbc47c1a547a5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 14:17:57 +0000 Subject: [PATCH 134/272] Update pro version to 1.2.39-alpha.2 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 9a1f5ee28..9ad4c1740 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.39-alpha.2", "@budibase/client": "1.2.39-alpha.2", - "@budibase/pro": "1.2.39-alpha.1", + "@budibase/pro": "1.2.39-alpha.2", "@budibase/string-templates": "1.2.39-alpha.2", "@budibase/types": "1.2.39-alpha.2", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index bd6cdee80..ce3adbe5b 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.1": - version "1.2.39-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.1.tgz#7e5293670cf39f05e31eaaabbc3d7abc7f9837ca" - integrity sha512-mfHGyLc2FZ63cF8f4VX8GdJe7ciLCX4kZ+NK1yzBG0rRzHSTWJb2CVRq0rXNsZbwAVt9llHH58ysSHd+ggw9hg== +"@budibase/backend-core@1.2.39-alpha.2": + version "1.2.39-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.2.tgz#80734d9d5dbaedf23f8590fd6ea50e72dcc0546a" + integrity sha512-ujkBXCEAaButsm0Qu1wSfR9o6eyY8ofhVpVr7RhKlnrrVCvWlwqSjQdYmJFu4rZGXNeMVr0cvIjw3M1lrbSV2w== dependencies: - "@budibase/types" "1.2.39-alpha.1" + "@budibase/types" "1.2.39-alpha.2" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.39-alpha.1": - version "1.2.39-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.1.tgz#12612de95dfa8407717c765fa6fbdf5985697a3d" - integrity sha512-A9Tg1yL9vA35riH2F7OwRhtSSC7sY2SZlojhJq0+JQuTJFmsey/5va2f+2AcH46u8bFrcRts/CERkOCS2vsGRQ== +"@budibase/pro@1.2.39-alpha.2": + version "1.2.39-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.2.tgz#7453a08e6e12acfa18bf5bacbd3ea87d16eee765" + integrity sha512-MuV3isu+/XlxJuDqmXNC1LQa0mnfa79XmfAFneT9NKZs7iZSi6oQm3esb33TB9zNEIhpJ+hUHTxT5udtxhwPtA== dependencies: - "@budibase/backend-core" "1.2.39-alpha.1" - "@budibase/types" "1.2.39-alpha.1" + "@budibase/backend-core" "1.2.39-alpha.2" + "@budibase/types" "1.2.39-alpha.2" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.39-alpha.1": - version "1.2.39-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.1.tgz#1758c5c7b8a1d754b4c391fc2dc699d6e249980b" - integrity sha512-b3YKkNf0+ImO/HvNbDS0biaMY2uu5ClphBLtA34hOd1I8hjjNj1kguuiQvgW7zqTYvMRK0hBNtTCnSa90uI7Fg== +"@budibase/types@1.2.39-alpha.2": + version "1.2.39-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.2.tgz#f10f01213c4c4cf5601550569c1460a482d94d6f" + integrity sha512-rTlT3YuXNHsnAmeOWIifmzKhd5aQTyFCn1jP6fHZS8BAjjML0bDdcNc2qxeUGtjWoEZZv7C09IOEkYImFq/Xbw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 00a8d0f21..be529942a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.39-alpha.2", - "@budibase/pro": "1.2.39-alpha.1", + "@budibase/pro": "1.2.39-alpha.2", "@budibase/string-templates": "1.2.39-alpha.2", "@budibase/types": "1.2.39-alpha.2", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 29984bf54..8e6ffaf3f 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.1": - version "1.2.39-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.1.tgz#7e5293670cf39f05e31eaaabbc3d7abc7f9837ca" - integrity sha512-mfHGyLc2FZ63cF8f4VX8GdJe7ciLCX4kZ+NK1yzBG0rRzHSTWJb2CVRq0rXNsZbwAVt9llHH58ysSHd+ggw9hg== +"@budibase/backend-core@1.2.39-alpha.2": + version "1.2.39-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.2.tgz#80734d9d5dbaedf23f8590fd6ea50e72dcc0546a" + integrity sha512-ujkBXCEAaButsm0Qu1wSfR9o6eyY8ofhVpVr7RhKlnrrVCvWlwqSjQdYmJFu4rZGXNeMVr0cvIjw3M1lrbSV2w== dependencies: - "@budibase/types" "1.2.39-alpha.1" + "@budibase/types" "1.2.39-alpha.2" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.39-alpha.1": - version "1.2.39-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.1.tgz#12612de95dfa8407717c765fa6fbdf5985697a3d" - integrity sha512-A9Tg1yL9vA35riH2F7OwRhtSSC7sY2SZlojhJq0+JQuTJFmsey/5va2f+2AcH46u8bFrcRts/CERkOCS2vsGRQ== +"@budibase/pro@1.2.39-alpha.2": + version "1.2.39-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.2.tgz#7453a08e6e12acfa18bf5bacbd3ea87d16eee765" + integrity sha512-MuV3isu+/XlxJuDqmXNC1LQa0mnfa79XmfAFneT9NKZs7iZSi6oQm3esb33TB9zNEIhpJ+hUHTxT5udtxhwPtA== dependencies: - "@budibase/backend-core" "1.2.39-alpha.1" - "@budibase/types" "1.2.39-alpha.1" + "@budibase/backend-core" "1.2.39-alpha.2" + "@budibase/types" "1.2.39-alpha.2" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.39-alpha.1": - version "1.2.39-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.1.tgz#1758c5c7b8a1d754b4c391fc2dc699d6e249980b" - integrity sha512-b3YKkNf0+ImO/HvNbDS0biaMY2uu5ClphBLtA34hOd1I8hjjNj1kguuiQvgW7zqTYvMRK0hBNtTCnSa90uI7Fg== +"@budibase/types@1.2.39-alpha.2": + version "1.2.39-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.2.tgz#f10f01213c4c4cf5601550569c1460a482d94d6f" + integrity sha512-rTlT3YuXNHsnAmeOWIifmzKhd5aQTyFCn1jP6fHZS8BAjjML0bDdcNc2qxeUGtjWoEZZv7C09IOEkYImFq/Xbw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 5b6260ec486f361c8adeeb3f94cc0eee207d96fd Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 14:43:32 +0000 Subject: [PATCH 135/272] v1.2.39-alpha.3 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index d28b533b6..1a4f8e497 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ab51fd042..90a1a6d16 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.39-alpha.2", + "@budibase/types": "1.2.39-alpha.3", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e352b48d0..94f1e2c15 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.39-alpha.2", + "@budibase/string-templates": "1.2.39-alpha.3", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 2d5843879..674a62c50 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.2", - "@budibase/client": "1.2.39-alpha.2", - "@budibase/frontend-core": "1.2.39-alpha.2", - "@budibase/string-templates": "1.2.39-alpha.2", + "@budibase/bbui": "1.2.39-alpha.3", + "@budibase/client": "1.2.39-alpha.3", + "@budibase/frontend-core": "1.2.39-alpha.3", + "@budibase/string-templates": "1.2.39-alpha.3", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 86ee213bd..9d6d2105c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 307f46166..9bd7f8516 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.2", - "@budibase/frontend-core": "1.2.39-alpha.2", - "@budibase/string-templates": "1.2.39-alpha.2", + "@budibase/bbui": "1.2.39-alpha.3", + "@budibase/frontend-core": "1.2.39-alpha.3", + "@budibase/string-templates": "1.2.39-alpha.3", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 64b3874d0..24cf9b496 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.39-alpha.2", + "@budibase/bbui": "1.2.39-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 9ad4c1740..a0f4fa9b9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.39-alpha.2", - "@budibase/client": "1.2.39-alpha.2", + "@budibase/backend-core": "1.2.39-alpha.3", + "@budibase/client": "1.2.39-alpha.3", "@budibase/pro": "1.2.39-alpha.2", - "@budibase/string-templates": "1.2.39-alpha.2", - "@budibase/types": "1.2.39-alpha.2", + "@budibase/string-templates": "1.2.39-alpha.3", + "@budibase/types": "1.2.39-alpha.3", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 54e9019ae..35e513044 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index d0606abe8..cfad6c442 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index be529942a..a5a4d1170 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.39-alpha.2", + "version": "1.2.39-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.39-alpha.2", + "@budibase/backend-core": "1.2.39-alpha.3", "@budibase/pro": "1.2.39-alpha.2", - "@budibase/string-templates": "1.2.39-alpha.2", - "@budibase/types": "1.2.39-alpha.2", + "@budibase/string-templates": "1.2.39-alpha.3", + "@budibase/types": "1.2.39-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 005132be9677220c32f8bed0972afb9aa8b662a6 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 14:46:31 +0000 Subject: [PATCH 136/272] Update pro version to 1.2.39-alpha.3 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index a0f4fa9b9..7e1490de0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.39-alpha.3", "@budibase/client": "1.2.39-alpha.3", - "@budibase/pro": "1.2.39-alpha.2", + "@budibase/pro": "1.2.39-alpha.3", "@budibase/string-templates": "1.2.39-alpha.3", "@budibase/types": "1.2.39-alpha.3", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ce3adbe5b..e9a466674 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.2": - version "1.2.39-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.2.tgz#80734d9d5dbaedf23f8590fd6ea50e72dcc0546a" - integrity sha512-ujkBXCEAaButsm0Qu1wSfR9o6eyY8ofhVpVr7RhKlnrrVCvWlwqSjQdYmJFu4rZGXNeMVr0cvIjw3M1lrbSV2w== +"@budibase/backend-core@1.2.39-alpha.3": + version "1.2.39-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.3.tgz#d440557d6c39d01e249fdee65ea967c6129243c2" + integrity sha512-WRcX3XdTVDF10pZFRygzD/xfibxqbwHQBXOvDhBo3lJl6pqahjtGPlN7iCzLR/9hwojlLs8XnLYN6aYPBFqCxg== dependencies: - "@budibase/types" "1.2.39-alpha.2" + "@budibase/types" "1.2.39-alpha.3" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.39-alpha.2": - version "1.2.39-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.2.tgz#7453a08e6e12acfa18bf5bacbd3ea87d16eee765" - integrity sha512-MuV3isu+/XlxJuDqmXNC1LQa0mnfa79XmfAFneT9NKZs7iZSi6oQm3esb33TB9zNEIhpJ+hUHTxT5udtxhwPtA== +"@budibase/pro@1.2.39-alpha.3": + version "1.2.39-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.3.tgz#3ad51ef8a5d9f40e74b914101baf268b84522c40" + integrity sha512-7NUZksg6svo4b9hgLU71CrA7Y8kfWFd8ZvsD7VAEgoxnapd7N9jc/bTQ0SrF9tT6Eoza6ZepLHQf7A8fkZV41Q== dependencies: - "@budibase/backend-core" "1.2.39-alpha.2" - "@budibase/types" "1.2.39-alpha.2" + "@budibase/backend-core" "1.2.39-alpha.3" + "@budibase/types" "1.2.39-alpha.3" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.39-alpha.2": - version "1.2.39-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.2.tgz#f10f01213c4c4cf5601550569c1460a482d94d6f" - integrity sha512-rTlT3YuXNHsnAmeOWIifmzKhd5aQTyFCn1jP6fHZS8BAjjML0bDdcNc2qxeUGtjWoEZZv7C09IOEkYImFq/Xbw== +"@budibase/types@1.2.39-alpha.3": + version "1.2.39-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.3.tgz#697132ae426c689d20260d1ad806fc6b675287e1" + integrity sha512-XEVA/i3kEjS/HoW8dsOK3oTL6ule9FbUdBDPD87TQdWwvNEM2g3nLM5Lw7O7ztFEQx1B0nP+0vZjQnZfjbjFAQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index a5a4d1170..c3054cbcb 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.39-alpha.3", - "@budibase/pro": "1.2.39-alpha.2", + "@budibase/pro": "1.2.39-alpha.3", "@budibase/string-templates": "1.2.39-alpha.3", "@budibase/types": "1.2.39-alpha.3", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 8e6ffaf3f..7b652a489 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.2": - version "1.2.39-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.2.tgz#80734d9d5dbaedf23f8590fd6ea50e72dcc0546a" - integrity sha512-ujkBXCEAaButsm0Qu1wSfR9o6eyY8ofhVpVr7RhKlnrrVCvWlwqSjQdYmJFu4rZGXNeMVr0cvIjw3M1lrbSV2w== +"@budibase/backend-core@1.2.39-alpha.3": + version "1.2.39-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.3.tgz#d440557d6c39d01e249fdee65ea967c6129243c2" + integrity sha512-WRcX3XdTVDF10pZFRygzD/xfibxqbwHQBXOvDhBo3lJl6pqahjtGPlN7iCzLR/9hwojlLs8XnLYN6aYPBFqCxg== dependencies: - "@budibase/types" "1.2.39-alpha.2" + "@budibase/types" "1.2.39-alpha.3" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.39-alpha.2": - version "1.2.39-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.2.tgz#7453a08e6e12acfa18bf5bacbd3ea87d16eee765" - integrity sha512-MuV3isu+/XlxJuDqmXNC1LQa0mnfa79XmfAFneT9NKZs7iZSi6oQm3esb33TB9zNEIhpJ+hUHTxT5udtxhwPtA== +"@budibase/pro@1.2.39-alpha.3": + version "1.2.39-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.3.tgz#3ad51ef8a5d9f40e74b914101baf268b84522c40" + integrity sha512-7NUZksg6svo4b9hgLU71CrA7Y8kfWFd8ZvsD7VAEgoxnapd7N9jc/bTQ0SrF9tT6Eoza6ZepLHQf7A8fkZV41Q== dependencies: - "@budibase/backend-core" "1.2.39-alpha.2" - "@budibase/types" "1.2.39-alpha.2" + "@budibase/backend-core" "1.2.39-alpha.3" + "@budibase/types" "1.2.39-alpha.3" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.39-alpha.2": - version "1.2.39-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.2.tgz#f10f01213c4c4cf5601550569c1460a482d94d6f" - integrity sha512-rTlT3YuXNHsnAmeOWIifmzKhd5aQTyFCn1jP6fHZS8BAjjML0bDdcNc2qxeUGtjWoEZZv7C09IOEkYImFq/Xbw== +"@budibase/types@1.2.39-alpha.3": + version "1.2.39-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.3.tgz#697132ae426c689d20260d1ad806fc6b675287e1" + integrity sha512-XEVA/i3kEjS/HoW8dsOK3oTL6ule9FbUdBDPD87TQdWwvNEM2g3nLM5Lw7O7ztFEQx1B0nP+0vZjQnZfjbjFAQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From e7c4cd4deb6989316757b1f629032a103d64b358 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 16:31:16 +0000 Subject: [PATCH 137/272] v1.2.39-alpha.4 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 1a4f8e497..75073637e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 90a1a6d16..8ed764ef7 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.39-alpha.3", + "@budibase/types": "1.2.39-alpha.4", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 94f1e2c15..8521974e9 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.39-alpha.3", + "@budibase/string-templates": "1.2.39-alpha.4", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 674a62c50..15fff57f2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.3", - "@budibase/client": "1.2.39-alpha.3", - "@budibase/frontend-core": "1.2.39-alpha.3", - "@budibase/string-templates": "1.2.39-alpha.3", + "@budibase/bbui": "1.2.39-alpha.4", + "@budibase/client": "1.2.39-alpha.4", + "@budibase/frontend-core": "1.2.39-alpha.4", + "@budibase/string-templates": "1.2.39-alpha.4", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9d6d2105c..2c11d0c59 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 9bd7f8516..cecfa239f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.3", - "@budibase/frontend-core": "1.2.39-alpha.3", - "@budibase/string-templates": "1.2.39-alpha.3", + "@budibase/bbui": "1.2.39-alpha.4", + "@budibase/frontend-core": "1.2.39-alpha.4", + "@budibase/string-templates": "1.2.39-alpha.4", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 24cf9b496..1c472b082 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.39-alpha.3", + "@budibase/bbui": "1.2.39-alpha.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 7e1490de0..5bc27f08b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.39-alpha.3", - "@budibase/client": "1.2.39-alpha.3", + "@budibase/backend-core": "1.2.39-alpha.4", + "@budibase/client": "1.2.39-alpha.4", "@budibase/pro": "1.2.39-alpha.3", - "@budibase/string-templates": "1.2.39-alpha.3", - "@budibase/types": "1.2.39-alpha.3", + "@budibase/string-templates": "1.2.39-alpha.4", + "@budibase/types": "1.2.39-alpha.4", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 35e513044..0ebbfbfa6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index cfad6c442..ed4201d5a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index c3054cbcb..27fad39df 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.39-alpha.3", + "version": "1.2.39-alpha.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.39-alpha.3", + "@budibase/backend-core": "1.2.39-alpha.4", "@budibase/pro": "1.2.39-alpha.3", - "@budibase/string-templates": "1.2.39-alpha.3", - "@budibase/types": "1.2.39-alpha.3", + "@budibase/string-templates": "1.2.39-alpha.4", + "@budibase/types": "1.2.39-alpha.4", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 8e4ceb036b2c992a7fa94bccebb62602b1c14033 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Fri, 12 Aug 2022 17:31:35 +0100 Subject: [PATCH 138/272] Updating createApp test command In some cases Cypress is running too fast, meaning that the test runs ahead of what is actual seen on Budibase. This issue mainly occurs at the start of the smoke build and around logging in. I am attempting to combat this by ensuring the url includes 'apps' after logging in --- .../builder/cypress/integration/addMultiOptionDatatype.spec.js | 2 +- packages/builder/cypress/support/commands.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js index f84440295..f436f3ff3 100644 --- a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js +++ b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js @@ -2,7 +2,7 @@ import filterTests from "../support/filterTests" const interact = require('../support/interact') filterTests(['all'], () => { - xcontext("Add Multi-Option Datatype", () => { + context("Add Multi-Option Datatype", () => { before(() => { cy.login() cy.createTestApp() diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index d33bd516c..acb56a0bc 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -164,7 +164,7 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => { typeof addDefaultTable != "boolean" ? true : addDefaultTable cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 }) - cy.wait(1000) + cy.url({ timeout: 30000 }).should("include", "/apps") cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({ force: true }) // If apps already exist From f5df98d95ab90c797439849829a7e5c9d08c75f8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 16:34:16 +0000 Subject: [PATCH 139/272] Update pro version to 1.2.39-alpha.4 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5bc27f08b..b64e5a100 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.39-alpha.4", "@budibase/client": "1.2.39-alpha.4", - "@budibase/pro": "1.2.39-alpha.3", + "@budibase/pro": "1.2.39-alpha.4", "@budibase/string-templates": "1.2.39-alpha.4", "@budibase/types": "1.2.39-alpha.4", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index e9a466674..d9ae8ea88 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.3": - version "1.2.39-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.3.tgz#d440557d6c39d01e249fdee65ea967c6129243c2" - integrity sha512-WRcX3XdTVDF10pZFRygzD/xfibxqbwHQBXOvDhBo3lJl6pqahjtGPlN7iCzLR/9hwojlLs8XnLYN6aYPBFqCxg== +"@budibase/backend-core@1.2.39-alpha.4": + version "1.2.39-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.4.tgz#7d9323a4581ee8134279f0a671f1d1134055b208" + integrity sha512-XzKVnv16F/1E1i2RZparCEDtH1HMJJTf0xE9HjZ76C/Q+6oCR/PNfBxUugC9Gm6oyVdAts59pUTxBLgq/Vfynw== dependencies: - "@budibase/types" "1.2.39-alpha.3" + "@budibase/types" "1.2.39-alpha.4" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.39-alpha.3": - version "1.2.39-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.3.tgz#3ad51ef8a5d9f40e74b914101baf268b84522c40" - integrity sha512-7NUZksg6svo4b9hgLU71CrA7Y8kfWFd8ZvsD7VAEgoxnapd7N9jc/bTQ0SrF9tT6Eoza6ZepLHQf7A8fkZV41Q== +"@budibase/pro@1.2.39-alpha.4": + version "1.2.39-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.4.tgz#fbb5c07baac4b3b10409da339ad32ef63b9ca96e" + integrity sha512-F1QOIe/QSvnprdkcuyvNat7kXXQSYUx6HBu1b/QKokOXrp9pHge9MD5tHh1/ympQTI/R+eT1aucYbOBTkY2FkQ== dependencies: - "@budibase/backend-core" "1.2.39-alpha.3" - "@budibase/types" "1.2.39-alpha.3" + "@budibase/backend-core" "1.2.39-alpha.4" + "@budibase/types" "1.2.39-alpha.4" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.39-alpha.3": - version "1.2.39-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.3.tgz#697132ae426c689d20260d1ad806fc6b675287e1" - integrity sha512-XEVA/i3kEjS/HoW8dsOK3oTL6ule9FbUdBDPD87TQdWwvNEM2g3nLM5Lw7O7ztFEQx1B0nP+0vZjQnZfjbjFAQ== +"@budibase/types@1.2.39-alpha.4": + version "1.2.39-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.4.tgz#5710f788bfb6ba9af9594d1478cea664ac36869c" + integrity sha512-AAUiSWLElfl1FDFvF2fyG/fjujvxnkEvToe8rgy1t21lrZOkuONsmO87cvPtFVEEq5hWl9GgUzXHwG0Vb/EXPg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 27fad39df..cd039c738 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.39-alpha.4", - "@budibase/pro": "1.2.39-alpha.3", + "@budibase/pro": "1.2.39-alpha.4", "@budibase/string-templates": "1.2.39-alpha.4", "@budibase/types": "1.2.39-alpha.4", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 7b652a489..84e7baff8 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.3": - version "1.2.39-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.3.tgz#d440557d6c39d01e249fdee65ea967c6129243c2" - integrity sha512-WRcX3XdTVDF10pZFRygzD/xfibxqbwHQBXOvDhBo3lJl6pqahjtGPlN7iCzLR/9hwojlLs8XnLYN6aYPBFqCxg== +"@budibase/backend-core@1.2.39-alpha.4": + version "1.2.39-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.4.tgz#7d9323a4581ee8134279f0a671f1d1134055b208" + integrity sha512-XzKVnv16F/1E1i2RZparCEDtH1HMJJTf0xE9HjZ76C/Q+6oCR/PNfBxUugC9Gm6oyVdAts59pUTxBLgq/Vfynw== dependencies: - "@budibase/types" "1.2.39-alpha.3" + "@budibase/types" "1.2.39-alpha.4" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.39-alpha.3": - version "1.2.39-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.3.tgz#3ad51ef8a5d9f40e74b914101baf268b84522c40" - integrity sha512-7NUZksg6svo4b9hgLU71CrA7Y8kfWFd8ZvsD7VAEgoxnapd7N9jc/bTQ0SrF9tT6Eoza6ZepLHQf7A8fkZV41Q== +"@budibase/pro@1.2.39-alpha.4": + version "1.2.39-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.4.tgz#fbb5c07baac4b3b10409da339ad32ef63b9ca96e" + integrity sha512-F1QOIe/QSvnprdkcuyvNat7kXXQSYUx6HBu1b/QKokOXrp9pHge9MD5tHh1/ympQTI/R+eT1aucYbOBTkY2FkQ== dependencies: - "@budibase/backend-core" "1.2.39-alpha.3" - "@budibase/types" "1.2.39-alpha.3" + "@budibase/backend-core" "1.2.39-alpha.4" + "@budibase/types" "1.2.39-alpha.4" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.39-alpha.3": - version "1.2.39-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.3.tgz#697132ae426c689d20260d1ad806fc6b675287e1" - integrity sha512-XEVA/i3kEjS/HoW8dsOK3oTL6ule9FbUdBDPD87TQdWwvNEM2g3nLM5Lw7O7ztFEQx1B0nP+0vZjQnZfjbjFAQ== +"@budibase/types@1.2.39-alpha.4": + version "1.2.39-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.4.tgz#5710f788bfb6ba9af9594d1478cea664ac36869c" + integrity sha512-AAUiSWLElfl1FDFvF2fyG/fjujvxnkEvToe8rgy1t21lrZOkuONsmO87cvPtFVEEq5hWl9GgUzXHwG0Vb/EXPg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 311fc7841e00395ab06de99de5cb62b8ee4961a6 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 12 Aug 2022 17:42:46 +0100 Subject: [PATCH 140/272] roll out release services after deployment --- .github/workflows/deploy-release.yml | 2 +- .github/workflows/release-develop.yml | 7 +++++++ .../src/components/backend/DataTable/DataTable.svelte | 1 + .../backend/DataTable/buttons/ImportButton.svelte | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index 0fb8a5fea..ac579b43d 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -58,7 +58,7 @@ jobs: helm: helm3 values: | globals: - appVersion: develop + appVersion: ${{ env.RELEASE_VERSION }} ingress: enabled: true nginx: true diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 631308d94..f9158c03d 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -120,6 +120,13 @@ jobs: env: KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}' + - name: Re roll the services + uses: actions-hub/kubectl@master + env: + KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG }} + with: + args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase + - name: Discord Webhook Action uses: tsickert/discord-webhook@v4.0.0 with: diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index 37742626c..7cb368830 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -167,6 +167,7 @@ {/if} diff --git a/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte index 6b9c3dd6d..99d39a0d4 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte @@ -3,11 +3,12 @@ import ImportModal from "../modals/ImportModal.svelte" export let tableId + export let disabled let modal - + Import From fc59d1b59197d6357d2aac68013315636ede3bab Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 12 Aug 2022 17:45:31 +0100 Subject: [PATCH 141/272] reset appVersion to develop --- .github/workflows/deploy-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index ac579b43d..0fb8a5fea 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -58,7 +58,7 @@ jobs: helm: helm3 values: | globals: - appVersion: ${{ env.RELEASE_VERSION }} + appVersion: develop ingress: enabled: true nginx: true From e47f60d371c48b4b0de813dd449dbe99383c698c Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 12 Aug 2022 17:48:50 +0100 Subject: [PATCH 142/272] add to release job --- .github/workflows/deploy-release.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index 0fb8a5fea..024b97597 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -68,6 +68,13 @@ jobs: ] env: KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}' + + - name: Re roll the services + uses: actions-hub/kubectl@master + env: + KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG }} + with: + args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase - name: Discord Webhook Action uses: tsickert/discord-webhook@v4.0.0 From 72a8248a0f2d4a1f10716de69329bd6ffc67464f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 17:16:26 +0000 Subject: [PATCH 143/272] v1.2.39-alpha.5 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 75073637e..389d00264 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 8ed764ef7..93484c3b1 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.39-alpha.4", + "@budibase/types": "1.2.39-alpha.5", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8521974e9..cedd4722a 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.39-alpha.4", + "@budibase/string-templates": "1.2.39-alpha.5", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 15fff57f2..82ae021e1 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.4", - "@budibase/client": "1.2.39-alpha.4", - "@budibase/frontend-core": "1.2.39-alpha.4", - "@budibase/string-templates": "1.2.39-alpha.4", + "@budibase/bbui": "1.2.39-alpha.5", + "@budibase/client": "1.2.39-alpha.5", + "@budibase/frontend-core": "1.2.39-alpha.5", + "@budibase/string-templates": "1.2.39-alpha.5", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2c11d0c59..add9d0b43 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index cecfa239f..48bd077cc 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.4", - "@budibase/frontend-core": "1.2.39-alpha.4", - "@budibase/string-templates": "1.2.39-alpha.4", + "@budibase/bbui": "1.2.39-alpha.5", + "@budibase/frontend-core": "1.2.39-alpha.5", + "@budibase/string-templates": "1.2.39-alpha.5", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 1c472b082..8276e223f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.39-alpha.4", + "@budibase/bbui": "1.2.39-alpha.5", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index b64e5a100..30f355418 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.39-alpha.4", - "@budibase/client": "1.2.39-alpha.4", + "@budibase/backend-core": "1.2.39-alpha.5", + "@budibase/client": "1.2.39-alpha.5", "@budibase/pro": "1.2.39-alpha.4", - "@budibase/string-templates": "1.2.39-alpha.4", - "@budibase/types": "1.2.39-alpha.4", + "@budibase/string-templates": "1.2.39-alpha.5", + "@budibase/types": "1.2.39-alpha.5", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0ebbfbfa6..36854f364 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index ed4201d5a..745592620 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index cd039c738..a1e891511 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.39-alpha.4", + "version": "1.2.39-alpha.5", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.39-alpha.4", + "@budibase/backend-core": "1.2.39-alpha.5", "@budibase/pro": "1.2.39-alpha.4", - "@budibase/string-templates": "1.2.39-alpha.4", - "@budibase/types": "1.2.39-alpha.4", + "@budibase/string-templates": "1.2.39-alpha.5", + "@budibase/types": "1.2.39-alpha.5", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 34043f28103878b70f942d24c0973f8ba2b116a1 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 12 Aug 2022 17:19:35 +0000 Subject: [PATCH 144/272] Update pro version to 1.2.39-alpha.5 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 30f355418..a277247cc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.39-alpha.5", "@budibase/client": "1.2.39-alpha.5", - "@budibase/pro": "1.2.39-alpha.4", + "@budibase/pro": "1.2.39-alpha.5", "@budibase/string-templates": "1.2.39-alpha.5", "@budibase/types": "1.2.39-alpha.5", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index d9ae8ea88..b3bfe2e52 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.4": - version "1.2.39-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.4.tgz#7d9323a4581ee8134279f0a671f1d1134055b208" - integrity sha512-XzKVnv16F/1E1i2RZparCEDtH1HMJJTf0xE9HjZ76C/Q+6oCR/PNfBxUugC9Gm6oyVdAts59pUTxBLgq/Vfynw== +"@budibase/backend-core@1.2.39-alpha.5": + version "1.2.39-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.5.tgz#fbadac10657e44fb05641a43aa8d9481b86418e9" + integrity sha512-bZPmKqWUnQ+OVwf2z35WXPfPuxwuL0vlZJNyTgLX7hdhjYfPB4LA0vMftPbvtRFO9k6SdB0XpBOJCm2u5k5KsQ== dependencies: - "@budibase/types" "1.2.39-alpha.4" + "@budibase/types" "1.2.39-alpha.5" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.39-alpha.4": - version "1.2.39-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.4.tgz#fbb5c07baac4b3b10409da339ad32ef63b9ca96e" - integrity sha512-F1QOIe/QSvnprdkcuyvNat7kXXQSYUx6HBu1b/QKokOXrp9pHge9MD5tHh1/ympQTI/R+eT1aucYbOBTkY2FkQ== +"@budibase/pro@1.2.39-alpha.5": + version "1.2.39-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.5.tgz#cd652a06bf691ae00c2bf8cd9351e46b684939a5" + integrity sha512-6M0Mj+AbJi+HpFRJJD1bZDwuWlCq1I3m8vrG4A3Rm/VnJigb1Zi7XTMlwzgCiUaWvowstiJVGHG6Af0Mix4zdQ== dependencies: - "@budibase/backend-core" "1.2.39-alpha.4" - "@budibase/types" "1.2.39-alpha.4" + "@budibase/backend-core" "1.2.39-alpha.5" + "@budibase/types" "1.2.39-alpha.5" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.39-alpha.4": - version "1.2.39-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.4.tgz#5710f788bfb6ba9af9594d1478cea664ac36869c" - integrity sha512-AAUiSWLElfl1FDFvF2fyG/fjujvxnkEvToe8rgy1t21lrZOkuONsmO87cvPtFVEEq5hWl9GgUzXHwG0Vb/EXPg== +"@budibase/types@1.2.39-alpha.5": + version "1.2.39-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.5.tgz#632ef72b248d105cb69f4a133d78d3a293e5404e" + integrity sha512-MgJayPh6t7VGB6ErUwM0sJmJoxG91h3z24fWSE+q3bbH2MKbnkpuNCbOh1wlKyFWqzdRofuFpJGK/O9zWXvRwg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index a1e891511..aaeff3c56 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.39-alpha.5", - "@budibase/pro": "1.2.39-alpha.4", + "@budibase/pro": "1.2.39-alpha.5", "@budibase/string-templates": "1.2.39-alpha.5", "@budibase/types": "1.2.39-alpha.5", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 84e7baff8..380d80a74 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.4": - version "1.2.39-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.4.tgz#7d9323a4581ee8134279f0a671f1d1134055b208" - integrity sha512-XzKVnv16F/1E1i2RZparCEDtH1HMJJTf0xE9HjZ76C/Q+6oCR/PNfBxUugC9Gm6oyVdAts59pUTxBLgq/Vfynw== +"@budibase/backend-core@1.2.39-alpha.5": + version "1.2.39-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.5.tgz#fbadac10657e44fb05641a43aa8d9481b86418e9" + integrity sha512-bZPmKqWUnQ+OVwf2z35WXPfPuxwuL0vlZJNyTgLX7hdhjYfPB4LA0vMftPbvtRFO9k6SdB0XpBOJCm2u5k5KsQ== dependencies: - "@budibase/types" "1.2.39-alpha.4" + "@budibase/types" "1.2.39-alpha.5" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.39-alpha.4": - version "1.2.39-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.4.tgz#fbb5c07baac4b3b10409da339ad32ef63b9ca96e" - integrity sha512-F1QOIe/QSvnprdkcuyvNat7kXXQSYUx6HBu1b/QKokOXrp9pHge9MD5tHh1/ympQTI/R+eT1aucYbOBTkY2FkQ== +"@budibase/pro@1.2.39-alpha.5": + version "1.2.39-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.5.tgz#cd652a06bf691ae00c2bf8cd9351e46b684939a5" + integrity sha512-6M0Mj+AbJi+HpFRJJD1bZDwuWlCq1I3m8vrG4A3Rm/VnJigb1Zi7XTMlwzgCiUaWvowstiJVGHG6Af0Mix4zdQ== dependencies: - "@budibase/backend-core" "1.2.39-alpha.4" - "@budibase/types" "1.2.39-alpha.4" + "@budibase/backend-core" "1.2.39-alpha.5" + "@budibase/types" "1.2.39-alpha.5" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.39-alpha.4": - version "1.2.39-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.4.tgz#5710f788bfb6ba9af9594d1478cea664ac36869c" - integrity sha512-AAUiSWLElfl1FDFvF2fyG/fjujvxnkEvToe8rgy1t21lrZOkuONsmO87cvPtFVEEq5hWl9GgUzXHwG0Vb/EXPg== +"@budibase/types@1.2.39-alpha.5": + version "1.2.39-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.5.tgz#632ef72b248d105cb69f4a133d78d3a293e5404e" + integrity sha512-MgJayPh6t7VGB6ErUwM0sJmJoxG91h3z24fWSE+q3bbH2MKbnkpuNCbOh1wlKyFWqzdRofuFpJGK/O9zWXvRwg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From a6108d1c8b0f6326a91081476e43049b337dbd72 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Sun, 14 Aug 2022 14:42:25 +0100 Subject: [PATCH 145/272] Block child button onClick if container hasOnClick --- packages/client/src/components/app/Button.svelte | 5 +++++ packages/client/src/components/app/Container.svelte | 7 ++++++- packages/client/src/utils/buttonActions.js | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/app/Button.svelte b/packages/client/src/components/app/Button.svelte index 018f21c58..a10b99256 100644 --- a/packages/client/src/components/app/Button.svelte +++ b/packages/client/src/components/app/Button.svelte @@ -4,6 +4,7 @@ const { styleable, builderStore } = getContext("sdk") const component = getContext("component") + const containerClickableStore = getContext("containerClickable") export let disabled = false export let text = "" @@ -18,6 +19,10 @@ let node + containerClickableStore.subscribe(hasOnClick => { + disabled = hasOnClick + }) + $: $component.editing && node?.focus() $: componentText = getComponentText(text, $builderStore, $component) diff --git a/packages/client/src/components/app/Container.svelte b/packages/client/src/components/app/Container.svelte index a5c8ce6d4..e8e757bc3 100644 --- a/packages/client/src/components/app/Container.svelte +++ b/packages/client/src/components/app/Container.svelte @@ -1,9 +1,13 @@
{ + if (actions && actions.length === 0) { + return null + } + // Prevent button actions in the builder preview if (!actions || get(builderStore).inBuilder) { return () => {} From 3d55b60add55e48a4a890d2de591b689d8f564b1 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 15 Aug 2022 14:11:15 +0100 Subject: [PATCH 146/272] Added unit tests for internalSearch --- .../src/api/controllers/row/internalSearch.js | 8 +++++-- .../api/routes/tests/internalSearch.spec.js | 21 ++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js index 94b29cb31..41686c676 100644 --- a/packages/server/src/api/controllers/row/internalSearch.js +++ b/packages/server/src/api/controllers/row/internalSearch.js @@ -184,9 +184,12 @@ class QueryBuilder { } const contains = (key, value, mode = "AND") => { - if (!Array.isArray(value) || value.length === 0) { + if (Array.isArray(value) && value.length === 0) { return null } + if (!Array.isArray(value)) { + return `${key}:${value}` + } let statement = `${builder.preprocess(value[0], { escape: true })}` for (let i = 1; i < value.length; i++) { statement += ` ${mode} ${builder.preprocess(value[i], { @@ -197,7 +200,8 @@ class QueryBuilder { } const notContains = (key, value) => { - return "*:* AND NOT " + contains(key, value) + const allPrefix = allOr === "" ? "*:* AND" : "" + return allPrefix + "NOT " + contains(key, value) } const containsAny = (key, value) => { diff --git a/packages/server/src/api/routes/tests/internalSearch.spec.js b/packages/server/src/api/routes/tests/internalSearch.spec.js index 50ee2b26a..3b478eda1 100644 --- a/packages/server/src/api/routes/tests/internalSearch.spec.js +++ b/packages/server/src/api/routes/tests/internalSearch.spec.js @@ -129,9 +129,10 @@ describe("internal search", () => { const response = await search.paginatedSearch({ contains: { "column": "a", + "colArr": [1, 2, 3], }, }, PARAMS) - checkLucene(response, `*:* AND column:a`, PARAMS) + checkLucene(response, `*:* AND column:a AND colArr:(1 AND 2 AND 3)`, PARAMS) }) it("test multiple of same column", async () => { @@ -154,4 +155,22 @@ describe("internal search", () => { }, PARAMS) checkLucene(response, `*:* AND 1\\:column:"a"`, PARAMS) }) + + it("test containsAny query", async () => { + const response = await search.paginatedSearch({ + containsAny: { + "column": ["a", "b", "c"] + }, + }, PARAMS) + checkLucene(response, `*:* AND column:(a OR b OR c)`, PARAMS) + }) + + it("test notContains query", async () => { + const response = await search.paginatedSearch({ + notContains: { + "column": ["a", "b", "c"] + }, + }, PARAMS) + checkLucene(response, `*:* AND NOT column:(a AND b AND c)`, PARAMS) + }) }) \ No newline at end of file From 6f3ad479b3d5b89fe7cf93779c1678b664a5112d Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 15 Aug 2022 14:11:42 +0100 Subject: [PATCH 147/272] lint --- packages/server/src/api/controllers/row/internalSearch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js index 41686c676..3cf60fbcc 100644 --- a/packages/server/src/api/controllers/row/internalSearch.js +++ b/packages/server/src/api/controllers/row/internalSearch.js @@ -188,7 +188,7 @@ class QueryBuilder { return null } if (!Array.isArray(value)) { - return `${key}:${value}` + return `${key}:${value}` } let statement = `${builder.preprocess(value[0], { escape: true })}` for (let i = 1; i < value.length; i++) { From 68ab1f529626e218019b1a7257f010ea21766251 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 15 Aug 2022 13:55:15 +0000 Subject: [PATCH 148/272] v1.2.39-alpha.6 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 389d00264..74c71b720 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 93484c3b1..f64d277b8 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.39-alpha.5", + "@budibase/types": "1.2.39-alpha.6", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index cedd4722a..38c2222c7 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.39-alpha.5", + "@budibase/string-templates": "1.2.39-alpha.6", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 82ae021e1..a5e845d17 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.5", - "@budibase/client": "1.2.39-alpha.5", - "@budibase/frontend-core": "1.2.39-alpha.5", - "@budibase/string-templates": "1.2.39-alpha.5", + "@budibase/bbui": "1.2.39-alpha.6", + "@budibase/client": "1.2.39-alpha.6", + "@budibase/frontend-core": "1.2.39-alpha.6", + "@budibase/string-templates": "1.2.39-alpha.6", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index add9d0b43..09d4ab867 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 48bd077cc..ce707c0c7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.5", - "@budibase/frontend-core": "1.2.39-alpha.5", - "@budibase/string-templates": "1.2.39-alpha.5", + "@budibase/bbui": "1.2.39-alpha.6", + "@budibase/frontend-core": "1.2.39-alpha.6", + "@budibase/string-templates": "1.2.39-alpha.6", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 8276e223f..8948820e2 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.39-alpha.5", + "@budibase/bbui": "1.2.39-alpha.6", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index a277247cc..aba219f06 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.39-alpha.5", - "@budibase/client": "1.2.39-alpha.5", + "@budibase/backend-core": "1.2.39-alpha.6", + "@budibase/client": "1.2.39-alpha.6", "@budibase/pro": "1.2.39-alpha.5", - "@budibase/string-templates": "1.2.39-alpha.5", - "@budibase/types": "1.2.39-alpha.5", + "@budibase/string-templates": "1.2.39-alpha.6", + "@budibase/types": "1.2.39-alpha.6", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 36854f364..d4584d236 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 745592620..c64986ac5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index aaeff3c56..116840b93 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.39-alpha.5", + "version": "1.2.39-alpha.6", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.39-alpha.5", + "@budibase/backend-core": "1.2.39-alpha.6", "@budibase/pro": "1.2.39-alpha.5", - "@budibase/string-templates": "1.2.39-alpha.5", - "@budibase/types": "1.2.39-alpha.5", + "@budibase/string-templates": "1.2.39-alpha.6", + "@budibase/types": "1.2.39-alpha.6", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7fd94d8fe01d1f9ec158be7fbc8dfab7d3605df9 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 15 Aug 2022 13:59:15 +0000 Subject: [PATCH 149/272] Update pro version to 1.2.39-alpha.6 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index aba219f06..3b1dbe9ec 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.39-alpha.6", "@budibase/client": "1.2.39-alpha.6", - "@budibase/pro": "1.2.39-alpha.5", + "@budibase/pro": "1.2.39-alpha.6", "@budibase/string-templates": "1.2.39-alpha.6", "@budibase/types": "1.2.39-alpha.6", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index b3bfe2e52..1b5395161 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.5": - version "1.2.39-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.5.tgz#fbadac10657e44fb05641a43aa8d9481b86418e9" - integrity sha512-bZPmKqWUnQ+OVwf2z35WXPfPuxwuL0vlZJNyTgLX7hdhjYfPB4LA0vMftPbvtRFO9k6SdB0XpBOJCm2u5k5KsQ== +"@budibase/backend-core@1.2.39-alpha.6": + version "1.2.39-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.6.tgz#ebfddd4fa74fff043a60df7cba335b5fcdb84d51" + integrity sha512-1kz9K3MSe5E4d/dSm6jD4BMIX/SSW58d8U787N+1BfzvSkIEd32j7HFs5ij0w9sromvK9FEjpFBfZKqSDRp+5g== dependencies: - "@budibase/types" "1.2.39-alpha.5" + "@budibase/types" "1.2.39-alpha.6" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.39-alpha.5": - version "1.2.39-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.5.tgz#cd652a06bf691ae00c2bf8cd9351e46b684939a5" - integrity sha512-6M0Mj+AbJi+HpFRJJD1bZDwuWlCq1I3m8vrG4A3Rm/VnJigb1Zi7XTMlwzgCiUaWvowstiJVGHG6Af0Mix4zdQ== +"@budibase/pro@1.2.39-alpha.6": + version "1.2.39-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.6.tgz#94a19338c6f59755f34b4bf181ba15ac5eba5404" + integrity sha512-l5IcibGGpd9VCIzY5vZU6rYeJa+1AYNCsWWKMnm7ZeZQgiD62Hyus53pv9GvT4pwpUF60pxybAoTWhbbityCPQ== dependencies: - "@budibase/backend-core" "1.2.39-alpha.5" - "@budibase/types" "1.2.39-alpha.5" + "@budibase/backend-core" "1.2.39-alpha.6" + "@budibase/types" "1.2.39-alpha.6" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.39-alpha.5": - version "1.2.39-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.5.tgz#632ef72b248d105cb69f4a133d78d3a293e5404e" - integrity sha512-MgJayPh6t7VGB6ErUwM0sJmJoxG91h3z24fWSE+q3bbH2MKbnkpuNCbOh1wlKyFWqzdRofuFpJGK/O9zWXvRwg== +"@budibase/types@1.2.39-alpha.6": + version "1.2.39-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.6.tgz#5c6dc1a130913fb1c7ac6999fc6e03d970d0142f" + integrity sha512-0FHmwsfvAL80PGQM0OSJ6n9CDCtQQrbX8PRdcWOSIhRNlJXNcTsPcBsPbQpZPbgT57GHX/86Fo1rljiMWDwNpw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 116840b93..01560d677 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.39-alpha.6", - "@budibase/pro": "1.2.39-alpha.5", + "@budibase/pro": "1.2.39-alpha.6", "@budibase/string-templates": "1.2.39-alpha.6", "@budibase/types": "1.2.39-alpha.6", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 380d80a74..5636a7f2a 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.5": - version "1.2.39-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.5.tgz#fbadac10657e44fb05641a43aa8d9481b86418e9" - integrity sha512-bZPmKqWUnQ+OVwf2z35WXPfPuxwuL0vlZJNyTgLX7hdhjYfPB4LA0vMftPbvtRFO9k6SdB0XpBOJCm2u5k5KsQ== +"@budibase/backend-core@1.2.39-alpha.6": + version "1.2.39-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.6.tgz#ebfddd4fa74fff043a60df7cba335b5fcdb84d51" + integrity sha512-1kz9K3MSe5E4d/dSm6jD4BMIX/SSW58d8U787N+1BfzvSkIEd32j7HFs5ij0w9sromvK9FEjpFBfZKqSDRp+5g== dependencies: - "@budibase/types" "1.2.39-alpha.5" + "@budibase/types" "1.2.39-alpha.6" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.39-alpha.5": - version "1.2.39-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.5.tgz#cd652a06bf691ae00c2bf8cd9351e46b684939a5" - integrity sha512-6M0Mj+AbJi+HpFRJJD1bZDwuWlCq1I3m8vrG4A3Rm/VnJigb1Zi7XTMlwzgCiUaWvowstiJVGHG6Af0Mix4zdQ== +"@budibase/pro@1.2.39-alpha.6": + version "1.2.39-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.6.tgz#94a19338c6f59755f34b4bf181ba15ac5eba5404" + integrity sha512-l5IcibGGpd9VCIzY5vZU6rYeJa+1AYNCsWWKMnm7ZeZQgiD62Hyus53pv9GvT4pwpUF60pxybAoTWhbbityCPQ== dependencies: - "@budibase/backend-core" "1.2.39-alpha.5" - "@budibase/types" "1.2.39-alpha.5" + "@budibase/backend-core" "1.2.39-alpha.6" + "@budibase/types" "1.2.39-alpha.6" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.39-alpha.5": - version "1.2.39-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.5.tgz#632ef72b248d105cb69f4a133d78d3a293e5404e" - integrity sha512-MgJayPh6t7VGB6ErUwM0sJmJoxG91h3z24fWSE+q3bbH2MKbnkpuNCbOh1wlKyFWqzdRofuFpJGK/O9zWXvRwg== +"@budibase/types@1.2.39-alpha.6": + version "1.2.39-alpha.6" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.6.tgz#5c6dc1a130913fb1c7ac6999fc6e03d970d0142f" + integrity sha512-0FHmwsfvAL80PGQM0OSJ6n9CDCtQQrbX8PRdcWOSIhRNlJXNcTsPcBsPbQpZPbgT57GHX/86Fo1rljiMWDwNpw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 1f66cf9a83453643ac38bab9e2c9bd82b7e42613 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 15 Aug 2022 15:46:55 +0100 Subject: [PATCH 150/272] Allow delete attachments from builder data section --- packages/bbui/src/Form/Core/Dropzone.svelte | 8 +++++--- packages/bbui/src/Form/Dropzone.svelte | 2 ++ .../builder/src/components/common/Dropzone.svelte | 9 +++++++++ packages/frontend-core/src/api/attachments.js | 13 +++++++++++++ packages/server/src/api/routes/static.ts | 5 +++++ 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte index 68882fe81..ffdac0840 100644 --- a/packages/bbui/src/Form/Core/Dropzone.svelte +++ b/packages/bbui/src/Form/Core/Dropzone.svelte @@ -95,9 +95,11 @@ "change", value.filter((x, idx) => idx !== selectedImageIdx) ) - await deleteAttachments( - value.filter((x, idx) => idx === selectedImageIdx).map(item => item.key) - ) + if (deleteAttachments) { + await deleteAttachments( + value.filter((x, idx) => idx === selectedImageIdx).map(item => item.key) + ) + } selectedImageIdx = 0 } diff --git a/packages/bbui/src/Form/Dropzone.svelte b/packages/bbui/src/Form/Dropzone.svelte index f1b548f7f..5b82c0ebe 100644 --- a/packages/bbui/src/Form/Dropzone.svelte +++ b/packages/bbui/src/Form/Dropzone.svelte @@ -10,6 +10,7 @@ export let error = null export let fileSizeLimit = undefined export let processFiles = undefined + export let deleteAttachments = undefined export let handleFileTooLarge = undefined export let handleTooManyFiles = undefined export let gallery = true @@ -30,6 +31,7 @@ {value} {fileSizeLimit} {processFiles} + {deleteAttachments} {handleFileTooLarge} {handleTooManyFiles} {gallery} diff --git a/packages/builder/src/components/common/Dropzone.svelte b/packages/builder/src/components/common/Dropzone.svelte index 9a86554b4..fd2359fd9 100644 --- a/packages/builder/src/components/common/Dropzone.svelte +++ b/packages/builder/src/components/common/Dropzone.svelte @@ -27,6 +27,14 @@ return [] } } + + async function deleteAttachments(fileList) { + try { + return await API.deleteBuilderAttachments(fileList) + } catch (error) { + return [] + } + } diff --git a/packages/frontend-core/src/api/attachments.js b/packages/frontend-core/src/api/attachments.js index 1a24785a8..f79b46157 100644 --- a/packages/frontend-core/src/api/attachments.js +++ b/packages/frontend-core/src/api/attachments.js @@ -75,5 +75,18 @@ export const buildAttachmentEndpoints = API => { }, }) }, + + /** + * Deletes attachments from the builder bucket. + * @param keys the attachments to delete + */ + deleteBuilderAttachments: async keys => { + return await API.post({ + url: `/api/attachments/delete`, + body: { + keys, + }, + }) + }, } } diff --git a/packages/server/src/api/routes/static.ts b/packages/server/src/api/routes/static.ts index 7cf3f5e14..c94ff5470 100644 --- a/packages/server/src/api/routes/static.ts +++ b/packages/server/src/api/routes/static.ts @@ -38,6 +38,11 @@ router // TODO: for now this builder endpoint is not authorized/secured, will need to be .get("/builder/:file*", controller.serveBuilder) .post("/api/attachments/process", authorized(BUILDER), controller.uploadFile) + .post( + "/api/attachments/delete", + authorized(BUILDER), + controller.deleteObjects + ) .post("/api/beta/:feature", controller.toggleBetaUiFeature) .post( "/api/attachments/:tableId/upload", From 90cb5b3d42b21cf5d87770c5458d9cf7f8b8047b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 16 Aug 2022 09:27:48 +0000 Subject: [PATCH 151/272] v1.2.39-alpha.7 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 74c71b720..2ad36f4f7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f64d277b8..575c3357f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.39-alpha.6", + "@budibase/types": "1.2.39-alpha.7", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 38c2222c7..0b8c664de 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.39-alpha.6", + "@budibase/string-templates": "1.2.39-alpha.7", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index a5e845d17..224541f83 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.6", - "@budibase/client": "1.2.39-alpha.6", - "@budibase/frontend-core": "1.2.39-alpha.6", - "@budibase/string-templates": "1.2.39-alpha.6", + "@budibase/bbui": "1.2.39-alpha.7", + "@budibase/client": "1.2.39-alpha.7", + "@budibase/frontend-core": "1.2.39-alpha.7", + "@budibase/string-templates": "1.2.39-alpha.7", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 09d4ab867..0706a6566 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index ce707c0c7..73c16c466 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.6", - "@budibase/frontend-core": "1.2.39-alpha.6", - "@budibase/string-templates": "1.2.39-alpha.6", + "@budibase/bbui": "1.2.39-alpha.7", + "@budibase/frontend-core": "1.2.39-alpha.7", + "@budibase/string-templates": "1.2.39-alpha.7", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 8948820e2..fc71f1fc3 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.39-alpha.6", + "@budibase/bbui": "1.2.39-alpha.7", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 3b1dbe9ec..a92954807 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.39-alpha.6", - "@budibase/client": "1.2.39-alpha.6", + "@budibase/backend-core": "1.2.39-alpha.7", + "@budibase/client": "1.2.39-alpha.7", "@budibase/pro": "1.2.39-alpha.6", - "@budibase/string-templates": "1.2.39-alpha.6", - "@budibase/types": "1.2.39-alpha.6", + "@budibase/string-templates": "1.2.39-alpha.7", + "@budibase/types": "1.2.39-alpha.7", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d4584d236..f4a699531 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index c64986ac5..472e727ff 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 01560d677..e1a958605 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.39-alpha.6", + "version": "1.2.39-alpha.7", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.39-alpha.6", + "@budibase/backend-core": "1.2.39-alpha.7", "@budibase/pro": "1.2.39-alpha.6", - "@budibase/string-templates": "1.2.39-alpha.6", - "@budibase/types": "1.2.39-alpha.6", + "@budibase/string-templates": "1.2.39-alpha.7", + "@budibase/types": "1.2.39-alpha.7", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 4da5d2bdaf4d2a836b0f29fc301339436bd8d3f2 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 16 Aug 2022 09:30:46 +0000 Subject: [PATCH 152/272] Update pro version to 1.2.39-alpha.7 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index a92954807..19b9c20c6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.39-alpha.7", "@budibase/client": "1.2.39-alpha.7", - "@budibase/pro": "1.2.39-alpha.6", + "@budibase/pro": "1.2.39-alpha.7", "@budibase/string-templates": "1.2.39-alpha.7", "@budibase/types": "1.2.39-alpha.7", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 1b5395161..7fd0fde8b 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.6": - version "1.2.39-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.6.tgz#ebfddd4fa74fff043a60df7cba335b5fcdb84d51" - integrity sha512-1kz9K3MSe5E4d/dSm6jD4BMIX/SSW58d8U787N+1BfzvSkIEd32j7HFs5ij0w9sromvK9FEjpFBfZKqSDRp+5g== +"@budibase/backend-core@1.2.39-alpha.7": + version "1.2.39-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.7.tgz#79c2b3c1b02b6e5c9a42f5bf7e76ea6b2498a971" + integrity sha512-1UVfEetO3sbfa7tC7rOXTWrYjpaTZtYpijZMz1CtdOYJKzCimHVbIWWCmEO8BgSOejtWTvIARjoqCfy6oWFM6w== dependencies: - "@budibase/types" "1.2.39-alpha.6" + "@budibase/types" "1.2.39-alpha.7" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.39-alpha.6": - version "1.2.39-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.6.tgz#94a19338c6f59755f34b4bf181ba15ac5eba5404" - integrity sha512-l5IcibGGpd9VCIzY5vZU6rYeJa+1AYNCsWWKMnm7ZeZQgiD62Hyus53pv9GvT4pwpUF60pxybAoTWhbbityCPQ== +"@budibase/pro@1.2.39-alpha.7": + version "1.2.39-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.7.tgz#e913b91168f73859ffc78824dc7bd2c4cb7514ef" + integrity sha512-HHlAoH4A35p/5nepHVtQ79IrGAG4U3fPzaX6/gz0Ws/tutYRS8vfvGG0OCXom9mBy8X1xcO/X8+KPrHi0oVpQg== dependencies: - "@budibase/backend-core" "1.2.39-alpha.6" - "@budibase/types" "1.2.39-alpha.6" + "@budibase/backend-core" "1.2.39-alpha.7" + "@budibase/types" "1.2.39-alpha.7" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.39-alpha.6": - version "1.2.39-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.6.tgz#5c6dc1a130913fb1c7ac6999fc6e03d970d0142f" - integrity sha512-0FHmwsfvAL80PGQM0OSJ6n9CDCtQQrbX8PRdcWOSIhRNlJXNcTsPcBsPbQpZPbgT57GHX/86Fo1rljiMWDwNpw== +"@budibase/types@1.2.39-alpha.7": + version "1.2.39-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.7.tgz#d68d5c83d7368a7a5596c0fa70dea3cc1f8629f0" + integrity sha512-R5zOze0jD68M6zbEMRCCy46jBjbktcD9cb/U0YPbaHSQNILPgmrsEdXEhHK7JGByfLtPsmPVd9ccDGWV9kaqNw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index e1a958605..bfb28ccaa 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.39-alpha.7", - "@budibase/pro": "1.2.39-alpha.6", + "@budibase/pro": "1.2.39-alpha.7", "@budibase/string-templates": "1.2.39-alpha.7", "@budibase/types": "1.2.39-alpha.7", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 5636a7f2a..c6d779b37 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.6": - version "1.2.39-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.6.tgz#ebfddd4fa74fff043a60df7cba335b5fcdb84d51" - integrity sha512-1kz9K3MSe5E4d/dSm6jD4BMIX/SSW58d8U787N+1BfzvSkIEd32j7HFs5ij0w9sromvK9FEjpFBfZKqSDRp+5g== +"@budibase/backend-core@1.2.39-alpha.7": + version "1.2.39-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.7.tgz#79c2b3c1b02b6e5c9a42f5bf7e76ea6b2498a971" + integrity sha512-1UVfEetO3sbfa7tC7rOXTWrYjpaTZtYpijZMz1CtdOYJKzCimHVbIWWCmEO8BgSOejtWTvIARjoqCfy6oWFM6w== dependencies: - "@budibase/types" "1.2.39-alpha.6" + "@budibase/types" "1.2.39-alpha.7" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.39-alpha.6": - version "1.2.39-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.6.tgz#94a19338c6f59755f34b4bf181ba15ac5eba5404" - integrity sha512-l5IcibGGpd9VCIzY5vZU6rYeJa+1AYNCsWWKMnm7ZeZQgiD62Hyus53pv9GvT4pwpUF60pxybAoTWhbbityCPQ== +"@budibase/pro@1.2.39-alpha.7": + version "1.2.39-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.7.tgz#e913b91168f73859ffc78824dc7bd2c4cb7514ef" + integrity sha512-HHlAoH4A35p/5nepHVtQ79IrGAG4U3fPzaX6/gz0Ws/tutYRS8vfvGG0OCXom9mBy8X1xcO/X8+KPrHi0oVpQg== dependencies: - "@budibase/backend-core" "1.2.39-alpha.6" - "@budibase/types" "1.2.39-alpha.6" + "@budibase/backend-core" "1.2.39-alpha.7" + "@budibase/types" "1.2.39-alpha.7" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.39-alpha.6": - version "1.2.39-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.6.tgz#5c6dc1a130913fb1c7ac6999fc6e03d970d0142f" - integrity sha512-0FHmwsfvAL80PGQM0OSJ6n9CDCtQQrbX8PRdcWOSIhRNlJXNcTsPcBsPbQpZPbgT57GHX/86Fo1rljiMWDwNpw== +"@budibase/types@1.2.39-alpha.7": + version "1.2.39-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.7.tgz#d68d5c83d7368a7a5596c0fa70dea3cc1f8629f0" + integrity sha512-R5zOze0jD68M6zbEMRCCy46jBjbktcD9cb/U0YPbaHSQNILPgmrsEdXEhHK7JGByfLtPsmPVd9ccDGWV9kaqNw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From ef8b6a80c4e4cf5b4c647088076583e9874c1266 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 16 Aug 2022 13:37:03 +0000 Subject: [PATCH 153/272] v1.2.39-alpha.8 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 2ad36f4f7..c64b8325c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 575c3357f..74cfbc856 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.39-alpha.7", + "@budibase/types": "1.2.39-alpha.8", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 0b8c664de..1d9abb815 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.39-alpha.7", + "@budibase/string-templates": "1.2.39-alpha.8", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 224541f83..a00386358 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.7", - "@budibase/client": "1.2.39-alpha.7", - "@budibase/frontend-core": "1.2.39-alpha.7", - "@budibase/string-templates": "1.2.39-alpha.7", + "@budibase/bbui": "1.2.39-alpha.8", + "@budibase/client": "1.2.39-alpha.8", + "@budibase/frontend-core": "1.2.39-alpha.8", + "@budibase/string-templates": "1.2.39-alpha.8", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 0706a6566..9288d9237 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 73c16c466..628e63be9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.39-alpha.7", - "@budibase/frontend-core": "1.2.39-alpha.7", - "@budibase/string-templates": "1.2.39-alpha.7", + "@budibase/bbui": "1.2.39-alpha.8", + "@budibase/frontend-core": "1.2.39-alpha.8", + "@budibase/string-templates": "1.2.39-alpha.8", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index fc71f1fc3..5fb3a6d96 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.39-alpha.7", + "@budibase/bbui": "1.2.39-alpha.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 19b9c20c6..4942a3d8e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.39-alpha.7", - "@budibase/client": "1.2.39-alpha.7", + "@budibase/backend-core": "1.2.39-alpha.8", + "@budibase/client": "1.2.39-alpha.8", "@budibase/pro": "1.2.39-alpha.7", - "@budibase/string-templates": "1.2.39-alpha.7", - "@budibase/types": "1.2.39-alpha.7", + "@budibase/string-templates": "1.2.39-alpha.8", + "@budibase/types": "1.2.39-alpha.8", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f4a699531..8118726a9 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 472e727ff..377e1d893 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index bfb28ccaa..a7f88a898 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.39-alpha.7", + "version": "1.2.39-alpha.8", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.39-alpha.7", + "@budibase/backend-core": "1.2.39-alpha.8", "@budibase/pro": "1.2.39-alpha.7", - "@budibase/string-templates": "1.2.39-alpha.7", - "@budibase/types": "1.2.39-alpha.7", + "@budibase/string-templates": "1.2.39-alpha.8", + "@budibase/types": "1.2.39-alpha.8", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 069859bb79d7db4cbf74aae133fe1b75e182d4cc Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 16 Aug 2022 13:40:15 +0000 Subject: [PATCH 154/272] Update pro version to 1.2.39-alpha.8 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 4942a3d8e..c2d46b548 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.39-alpha.8", "@budibase/client": "1.2.39-alpha.8", - "@budibase/pro": "1.2.39-alpha.7", + "@budibase/pro": "1.2.39-alpha.8", "@budibase/string-templates": "1.2.39-alpha.8", "@budibase/types": "1.2.39-alpha.8", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 7fd0fde8b..05ff8d616 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.7": - version "1.2.39-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.7.tgz#79c2b3c1b02b6e5c9a42f5bf7e76ea6b2498a971" - integrity sha512-1UVfEetO3sbfa7tC7rOXTWrYjpaTZtYpijZMz1CtdOYJKzCimHVbIWWCmEO8BgSOejtWTvIARjoqCfy6oWFM6w== +"@budibase/backend-core@1.2.39-alpha.8": + version "1.2.39-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.8.tgz#70c4d3de7c68feaa3d7b183e4c9cfb1baf3d3d47" + integrity sha512-vBGPIei1qVPmbrHKGD4Swf7ECOWGXV+2buRIOkr0gRawK8oLOXc2xYV1zsDM7jd7rTMwtyF86fL/lhaSkXWwKA== dependencies: - "@budibase/types" "1.2.39-alpha.7" + "@budibase/types" "1.2.39-alpha.8" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.39-alpha.7": - version "1.2.39-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.7.tgz#e913b91168f73859ffc78824dc7bd2c4cb7514ef" - integrity sha512-HHlAoH4A35p/5nepHVtQ79IrGAG4U3fPzaX6/gz0Ws/tutYRS8vfvGG0OCXom9mBy8X1xcO/X8+KPrHi0oVpQg== +"@budibase/pro@1.2.39-alpha.8": + version "1.2.39-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.8.tgz#11433da0dba0e6c81ad93d6cabc5ce165db94e0f" + integrity sha512-1N3FnVPhUwh2KR0IGiN+EjbY3LpF563Ac2FyT/JgyS9wG6NTP0hV/ugA7TZIvkv2XaYroYMYSPBa/wYtWh4xBQ== dependencies: - "@budibase/backend-core" "1.2.39-alpha.7" - "@budibase/types" "1.2.39-alpha.7" + "@budibase/backend-core" "1.2.39-alpha.8" + "@budibase/types" "1.2.39-alpha.8" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.39-alpha.7": - version "1.2.39-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.7.tgz#d68d5c83d7368a7a5596c0fa70dea3cc1f8629f0" - integrity sha512-R5zOze0jD68M6zbEMRCCy46jBjbktcD9cb/U0YPbaHSQNILPgmrsEdXEhHK7JGByfLtPsmPVd9ccDGWV9kaqNw== +"@budibase/types@1.2.39-alpha.8": + version "1.2.39-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.8.tgz#2999dac33da64b41f222d0fe73cfd387957952d9" + integrity sha512-UbknZ3Pnl8tdCPy5XKkuW3OQb1T/L+n1slY8/orm8KpR/TOEhK4Q20JRxENqQo5f9Za8bX4COesLjwAmae426Q== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index a7f88a898..2404b8762 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.39-alpha.8", - "@budibase/pro": "1.2.39-alpha.7", + "@budibase/pro": "1.2.39-alpha.8", "@budibase/string-templates": "1.2.39-alpha.8", "@budibase/types": "1.2.39-alpha.8", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index c6d779b37..9b29ca8dc 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.7": - version "1.2.39-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.7.tgz#79c2b3c1b02b6e5c9a42f5bf7e76ea6b2498a971" - integrity sha512-1UVfEetO3sbfa7tC7rOXTWrYjpaTZtYpijZMz1CtdOYJKzCimHVbIWWCmEO8BgSOejtWTvIARjoqCfy6oWFM6w== +"@budibase/backend-core@1.2.39-alpha.8": + version "1.2.39-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.8.tgz#70c4d3de7c68feaa3d7b183e4c9cfb1baf3d3d47" + integrity sha512-vBGPIei1qVPmbrHKGD4Swf7ECOWGXV+2buRIOkr0gRawK8oLOXc2xYV1zsDM7jd7rTMwtyF86fL/lhaSkXWwKA== dependencies: - "@budibase/types" "1.2.39-alpha.7" + "@budibase/types" "1.2.39-alpha.8" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.39-alpha.7": - version "1.2.39-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.7.tgz#e913b91168f73859ffc78824dc7bd2c4cb7514ef" - integrity sha512-HHlAoH4A35p/5nepHVtQ79IrGAG4U3fPzaX6/gz0Ws/tutYRS8vfvGG0OCXom9mBy8X1xcO/X8+KPrHi0oVpQg== +"@budibase/pro@1.2.39-alpha.8": + version "1.2.39-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.8.tgz#11433da0dba0e6c81ad93d6cabc5ce165db94e0f" + integrity sha512-1N3FnVPhUwh2KR0IGiN+EjbY3LpF563Ac2FyT/JgyS9wG6NTP0hV/ugA7TZIvkv2XaYroYMYSPBa/wYtWh4xBQ== dependencies: - "@budibase/backend-core" "1.2.39-alpha.7" - "@budibase/types" "1.2.39-alpha.7" + "@budibase/backend-core" "1.2.39-alpha.8" + "@budibase/types" "1.2.39-alpha.8" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.39-alpha.7": - version "1.2.39-alpha.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.7.tgz#d68d5c83d7368a7a5596c0fa70dea3cc1f8629f0" - integrity sha512-R5zOze0jD68M6zbEMRCCy46jBjbktcD9cb/U0YPbaHSQNILPgmrsEdXEhHK7JGByfLtPsmPVd9ccDGWV9kaqNw== +"@budibase/types@1.2.39-alpha.8": + version "1.2.39-alpha.8" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.8.tgz#2999dac33da64b41f222d0fe73cfd387957952d9" + integrity sha512-UbknZ3Pnl8tdCPy5XKkuW3OQb1T/L+n1slY8/orm8KpR/TOEhK4Q20JRxENqQo5f9Za8bX4COesLjwAmae426Q== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 99cb7761a6c7292b8e2d7fe28174bf21fb1c2b85 Mon Sep 17 00:00:00 2001 From: Jonny McCullagh Date: Tue, 16 Aug 2022 15:08:00 +0100 Subject: [PATCH 155/272] fix sed apostrophe error and couchdb path --- hosting/scripts/build-target-paths.sh | 8 ++++++-- hosting/single/couch/local.ini | 4 ++-- hosting/single/healthcheck.sh | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/hosting/scripts/build-target-paths.sh b/hosting/scripts/build-target-paths.sh index 6d5a8429f..ee314c1ce 100644 --- a/hosting/scripts/build-target-paths.sh +++ b/hosting/scripts/build-target-paths.sh @@ -11,6 +11,10 @@ if [[ "${TARGETBUILD}" = "aas" ]]; then apt-get install -y openssh-server sed -i "s/#Port 22/Port 2222/" /etc/ssh/sshd_config /etc/init.d/ssh restart -fi + sed -i "s#DATA_DIR#/home#g" /opt/clouseau/clouseau.ini + sed -i "s#DATA_DIR#/home#g" /opt/couchdb/etc/local.ini +else + sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini + sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini -sed -i 's#DATA_DIR#$DATA_DIR#' /opt/clouseau/clouseau.ini /opt/couchdb/etc/local.ini +fi \ No newline at end of file diff --git a/hosting/single/couch/local.ini b/hosting/single/couch/local.ini index 266c0d4b6..35f0383df 100644 --- a/hosting/single/couch/local.ini +++ b/hosting/single/couch/local.ini @@ -1,5 +1,5 @@ ; CouchDB Configuration Settings [couchdb] -database_dir = DATA_DIR/couch/dbs -view_index_dir = DATA_DIR/couch/views +database_dir = DATA_DIR/couchdb/dbs +view_index_dir = DATA_DIR/couchdb/views diff --git a/hosting/single/healthcheck.sh b/hosting/single/healthcheck.sh index b92cd153a..592b3e94f 100644 --- a/hosting/single/healthcheck.sh +++ b/hosting/single/healthcheck.sh @@ -3,6 +3,11 @@ healthy=true if [ -f "/data/.env" ]; then export $(cat /data/.env | xargs) +elif [ -f "/home/.env" ]; then + export $(cat /home/.env | xargs) +else + echo "No .env file found" + healthy=false fi if [[ $(curl -Lfk -s -w "%{http_code}\n" http://localhost/ -o /dev/null) -ne 200 ]]; then From 3120f90e92b0608afdf4e3096ba4767928d68661 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 16 Aug 2022 14:50:58 +0000 Subject: [PATCH 156/272] v1.2.41-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 4 ++-- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lerna.json b/lerna.json index c1e2022b3..9fedf86f9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.40", + "version": "1.2.41-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 3eb7ca78a..27246f182 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.40", + "version": "1.2.41-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.40", + "@budibase/types": "1.2.41-alpha.0", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 16eb2cb50..79234a65f 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.40", + "version": "1.2.41-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.40", + "@budibase/string-templates": "1.2.41-alpha.0", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 72a27a0b7..959f302fe 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.40", + "version": "1.2.41-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.40", - "@budibase/client": "1.2.40", - "@budibase/frontend-core": "1.2.40", - "@budibase/string-templates": "1.2.40", + "@budibase/bbui": "1.2.41-alpha.0", + "@budibase/client": "1.2.41-alpha.0", + "@budibase/frontend-core": "1.2.41-alpha.0", + "@budibase/string-templates": "1.2.41-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9f5c117a2..230d28b8d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.40", + "version": "1.2.41-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,7 +26,7 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "1.2.40", + "@budibase/backend-core": "1.2.41-alpha.0", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 821c64c77..876bd0782 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.40", + "version": "1.2.41-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.40", - "@budibase/frontend-core": "1.2.40", - "@budibase/string-templates": "1.2.40", + "@budibase/bbui": "1.2.41-alpha.0", + "@budibase/frontend-core": "1.2.41-alpha.0", + "@budibase/string-templates": "1.2.41-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index f1c0009f1..f0173e9fb 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.40", + "version": "1.2.41-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.40", + "@budibase/bbui": "1.2.41-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 546d4466c..090f63c88 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.40", + "version": "1.2.41-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.40", - "@budibase/client": "1.2.40", + "@budibase/backend-core": "1.2.41-alpha.0", + "@budibase/client": "1.2.41-alpha.0", "@budibase/pro": "1.2.40", - "@budibase/string-templates": "1.2.40", - "@budibase/types": "^1.2.40", + "@budibase/string-templates": "1.2.41-alpha.0", + "@budibase/types": "1.2.41-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index db1aed095..586e4d5d3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.40", + "version": "1.2.41-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 1463a7578..ed22b489c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.40", + "version": "1.2.41-alpha.0", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index e2d2a5633..501a478f8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.40", + "version": "1.2.41-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.40", + "@budibase/backend-core": "1.2.41-alpha.0", "@budibase/pro": "1.2.40", - "@budibase/string-templates": "1.2.40", - "@budibase/types": "1.2.40", + "@budibase/string-templates": "1.2.41-alpha.0", + "@budibase/types": "1.2.41-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 08a8631cfd290546b46e9928b2839b4ca7e95207 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 16 Aug 2022 14:53:58 +0000 Subject: [PATCH 157/272] Update pro version to 1.2.41-alpha.0 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 090f63c88..53b68f1a0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.41-alpha.0", "@budibase/client": "1.2.41-alpha.0", - "@budibase/pro": "1.2.40", + "@budibase/pro": "1.2.41-alpha.0", "@budibase/string-templates": "1.2.41-alpha.0", "@budibase/types": "1.2.41-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 05ff8d616..6217a94e9 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.8": - version "1.2.39-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.8.tgz#70c4d3de7c68feaa3d7b183e4c9cfb1baf3d3d47" - integrity sha512-vBGPIei1qVPmbrHKGD4Swf7ECOWGXV+2buRIOkr0gRawK8oLOXc2xYV1zsDM7jd7rTMwtyF86fL/lhaSkXWwKA== +"@budibase/backend-core@1.2.41-alpha.0": + version "1.2.41-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.41-alpha.0.tgz#ee3bc032ae89e347b9fb220303a9d040df6f5823" + integrity sha512-x6wJpBBFj6a1pGu2OR1vBPHiA4LvdQpVxr6f1lZa2+nAhuXVtEhrdnvBVzK2hJ52dOTTTGaw2A5tTkbf7861CA== dependencies: - "@budibase/types" "1.2.39-alpha.8" + "@budibase/types" "1.2.41-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.39-alpha.8": - version "1.2.39-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.8.tgz#11433da0dba0e6c81ad93d6cabc5ce165db94e0f" - integrity sha512-1N3FnVPhUwh2KR0IGiN+EjbY3LpF563Ac2FyT/JgyS9wG6NTP0hV/ugA7TZIvkv2XaYroYMYSPBa/wYtWh4xBQ== +"@budibase/pro@1.2.41-alpha.0": + version "1.2.41-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.41-alpha.0.tgz#4f27dbeee24ddc58e2a4e75cd90b53543f742722" + integrity sha512-LiKuO7/9GGzf3xfMmNTZQl2r4jmGgqnUf7fA5ub/MRyWYM7ZjPWEKW1V9OAk3vXwv9a+4V6FUxJQ1sDUZ3DT/Q== dependencies: - "@budibase/backend-core" "1.2.39-alpha.8" - "@budibase/types" "1.2.39-alpha.8" + "@budibase/backend-core" "1.2.41-alpha.0" + "@budibase/types" "1.2.41-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.39-alpha.8": - version "1.2.39-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.8.tgz#2999dac33da64b41f222d0fe73cfd387957952d9" - integrity sha512-UbknZ3Pnl8tdCPy5XKkuW3OQb1T/L+n1slY8/orm8KpR/TOEhK4Q20JRxENqQo5f9Za8bX4COesLjwAmae426Q== +"@budibase/types@1.2.41-alpha.0": + version "1.2.41-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.41-alpha.0.tgz#01071ce6ecef6799b04b1defce2b38e81b615f9f" + integrity sha512-2jkeToXsujYUXb6P2DFTFUOFv56GgImJ4webP8xr5cPGL0/xmhWGMd/lLxLt96RtMQp43UmVWZm1BA7TZw4fJg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 501a478f8..ddff762a9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.41-alpha.0", - "@budibase/pro": "1.2.40", + "@budibase/pro": "1.2.41-alpha.0", "@budibase/string-templates": "1.2.41-alpha.0", "@budibase/types": "1.2.41-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 9b29ca8dc..b47534021 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.39-alpha.8": - version "1.2.39-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.8.tgz#70c4d3de7c68feaa3d7b183e4c9cfb1baf3d3d47" - integrity sha512-vBGPIei1qVPmbrHKGD4Swf7ECOWGXV+2buRIOkr0gRawK8oLOXc2xYV1zsDM7jd7rTMwtyF86fL/lhaSkXWwKA== +"@budibase/backend-core@1.2.41-alpha.0": + version "1.2.41-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.41-alpha.0.tgz#ee3bc032ae89e347b9fb220303a9d040df6f5823" + integrity sha512-x6wJpBBFj6a1pGu2OR1vBPHiA4LvdQpVxr6f1lZa2+nAhuXVtEhrdnvBVzK2hJ52dOTTTGaw2A5tTkbf7861CA== dependencies: - "@budibase/types" "1.2.39-alpha.8" + "@budibase/types" "1.2.41-alpha.0" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.39-alpha.8": - version "1.2.39-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.8.tgz#11433da0dba0e6c81ad93d6cabc5ce165db94e0f" - integrity sha512-1N3FnVPhUwh2KR0IGiN+EjbY3LpF563Ac2FyT/JgyS9wG6NTP0hV/ugA7TZIvkv2XaYroYMYSPBa/wYtWh4xBQ== +"@budibase/pro@1.2.41-alpha.0": + version "1.2.41-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.41-alpha.0.tgz#4f27dbeee24ddc58e2a4e75cd90b53543f742722" + integrity sha512-LiKuO7/9GGzf3xfMmNTZQl2r4jmGgqnUf7fA5ub/MRyWYM7ZjPWEKW1V9OAk3vXwv9a+4V6FUxJQ1sDUZ3DT/Q== dependencies: - "@budibase/backend-core" "1.2.39-alpha.8" - "@budibase/types" "1.2.39-alpha.8" + "@budibase/backend-core" "1.2.41-alpha.0" + "@budibase/types" "1.2.41-alpha.0" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.39-alpha.8": - version "1.2.39-alpha.8" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.8.tgz#2999dac33da64b41f222d0fe73cfd387957952d9" - integrity sha512-UbknZ3Pnl8tdCPy5XKkuW3OQb1T/L+n1slY8/orm8KpR/TOEhK4Q20JRxENqQo5f9Za8bX4COesLjwAmae426Q== +"@budibase/types@1.2.41-alpha.0": + version "1.2.41-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.41-alpha.0.tgz#01071ce6ecef6799b04b1defce2b38e81b615f9f" + integrity sha512-2jkeToXsujYUXb6P2DFTFUOFv56GgImJ4webP8xr5cPGL0/xmhWGMd/lLxLt96RtMQp43UmVWZm1BA7TZw4fJg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 8423fcaab968a07fe967aa95b0d3cee9cba3bd59 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 17 Aug 2022 14:46:38 +0100 Subject: [PATCH 158/272] Add XS size for icons --- packages/bbui/src/Icon/Icon.svelte | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/bbui/src/Icon/Icon.svelte b/packages/bbui/src/Icon/Icon.svelte index 9c99178fd..f2cae14f0 100644 --- a/packages/bbui/src/Icon/Icon.svelte +++ b/packages/bbui/src/Icon/Icon.svelte @@ -83,4 +83,9 @@ transform: translateX(-50%); text-align: center; } + + .spectrum-Icon--sizeXS { + width: 10px; + height: 10px; + } From 16a7593f055a68c7aa9c76267fcc80886d4234c4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 17 Aug 2022 14:47:07 +0100 Subject: [PATCH 159/272] SUpport using icons for keybind indicators in menu items --- packages/bbui/src/Menu/Item.svelte | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/bbui/src/Menu/Item.svelte b/packages/bbui/src/Menu/Item.svelte index ba103460c..cffbccc90 100644 --- a/packages/bbui/src/Menu/Item.svelte +++ b/packages/bbui/src/Menu/Item.svelte @@ -1,5 +1,6 @@
{ - if (actions && actions.length === 0) { - return null - } - // Prevent button actions in the builder preview if (!actions || get(builderStore).inBuilder) { return () => {} From bb9146b93ff6356669f80c7f954b53b8ecfaedc7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 17 Aug 2022 15:43:25 +0100 Subject: [PATCH 163/272] Return nullish button action function for empty arrays --- packages/client/src/utils/buttonActions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js index c6f46d1c6..558cab8f2 100644 --- a/packages/client/src/utils/buttonActions.js +++ b/packages/client/src/utils/buttonActions.js @@ -334,8 +334,8 @@ const confirmTextMap = { */ export const enrichButtonActions = (actions, context) => { // Prevent button actions in the builder preview - if (!actions || get(builderStore).inBuilder) { - return () => {} + if (!actions?.length || get(builderStore).inBuilder) { + return null } // If this is a function then it has already been enriched From 750eef9231df6316ffb1a10c87c72c50f5e34f17 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 17 Aug 2022 15:43:42 +0100 Subject: [PATCH 164/272] Disable pointer events for all components nested inside a clickable container --- packages/client/src/components/app/Container.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/app/Container.svelte b/packages/client/src/components/app/Container.svelte index a5c8ce6d4..ee0dd4778 100644 --- a/packages/client/src/components/app/Container.svelte +++ b/packages/client/src/components/app/Container.svelte @@ -28,7 +28,7 @@
From 569cea90af60fa53ebb86ffbdd901218961c6ccb Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 17 Aug 2022 15:47:50 +0100 Subject: [PATCH 165/272] Hide on click setting for root screen component --- .../_components/settings/ComponentSettingsSection.svelte | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte index d8dc9bf06..b4c8e7aba 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte @@ -36,7 +36,12 @@ } } - const canRenderControl = setting => { + const canRenderControl = (setting, isScreen) => { + // Prevent rendering on click setting for screens + if (setting?.type === "event" && isScreen) { + return false + } + const control = getComponentForSetting(setting) if (!control) { return false @@ -87,7 +92,7 @@ /> {/if} {#each section.settings as setting (setting.key)} - {#if canRenderControl(setting)} + {#if canRenderControl(setting, isScreen)} Date: Wed, 17 Aug 2022 15:21:29 +0000 Subject: [PATCH 166/272] v1.2.41-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 4 ++-- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lerna.json b/lerna.json index 9fedf86f9..eb7490492 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 27246f182..557d1b972 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.41-alpha.0", + "@budibase/types": "1.2.41-alpha.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 79234a65f..a05cbf8ea 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.41-alpha.0", + "@budibase/string-templates": "1.2.41-alpha.1", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 959f302fe..2f981fa26 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.41-alpha.0", - "@budibase/client": "1.2.41-alpha.0", - "@budibase/frontend-core": "1.2.41-alpha.0", - "@budibase/string-templates": "1.2.41-alpha.0", + "@budibase/bbui": "1.2.41-alpha.1", + "@budibase/client": "1.2.41-alpha.1", + "@budibase/frontend-core": "1.2.41-alpha.1", + "@budibase/string-templates": "1.2.41-alpha.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 230d28b8d..d9563c7d3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,7 +26,7 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "1.2.41-alpha.0", + "@budibase/backend-core": "1.2.41-alpha.1", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 876bd0782..03ee9e736 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.41-alpha.0", - "@budibase/frontend-core": "1.2.41-alpha.0", - "@budibase/string-templates": "1.2.41-alpha.0", + "@budibase/bbui": "1.2.41-alpha.1", + "@budibase/frontend-core": "1.2.41-alpha.1", + "@budibase/string-templates": "1.2.41-alpha.1", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index f0173e9fb..bf946be5c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.41-alpha.0", + "@budibase/bbui": "1.2.41-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 53b68f1a0..584028070 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.41-alpha.0", - "@budibase/client": "1.2.41-alpha.0", + "@budibase/backend-core": "1.2.41-alpha.1", + "@budibase/client": "1.2.41-alpha.1", "@budibase/pro": "1.2.41-alpha.0", - "@budibase/string-templates": "1.2.41-alpha.0", - "@budibase/types": "1.2.41-alpha.0", + "@budibase/string-templates": "1.2.41-alpha.1", + "@budibase/types": "1.2.41-alpha.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 586e4d5d3..ab9b72677 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index ed22b489c..55bb3a74a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index ddff762a9..d3295c63b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.41-alpha.0", + "version": "1.2.41-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.41-alpha.0", + "@budibase/backend-core": "1.2.41-alpha.1", "@budibase/pro": "1.2.41-alpha.0", - "@budibase/string-templates": "1.2.41-alpha.0", - "@budibase/types": "1.2.41-alpha.0", + "@budibase/string-templates": "1.2.41-alpha.1", + "@budibase/types": "1.2.41-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 4658ba3387f7ca579e1f6f8454cc77cb0197c035 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 17 Aug 2022 15:24:26 +0000 Subject: [PATCH 167/272] Update pro version to 1.2.41-alpha.1 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 584028070..80c06c96b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.41-alpha.1", "@budibase/client": "1.2.41-alpha.1", - "@budibase/pro": "1.2.41-alpha.0", + "@budibase/pro": "1.2.41-alpha.1", "@budibase/string-templates": "1.2.41-alpha.1", "@budibase/types": "1.2.41-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 6217a94e9..5d7a0e66a 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.41-alpha.0": - version "1.2.41-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.41-alpha.0.tgz#ee3bc032ae89e347b9fb220303a9d040df6f5823" - integrity sha512-x6wJpBBFj6a1pGu2OR1vBPHiA4LvdQpVxr6f1lZa2+nAhuXVtEhrdnvBVzK2hJ52dOTTTGaw2A5tTkbf7861CA== +"@budibase/backend-core@1.2.41-alpha.1": + version "1.2.41-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.41-alpha.1.tgz#8ca8f4e4c2d6d861bb139c9aa1a34fa965d1e8a1" + integrity sha512-qeElGlRK5mIIeLQ4QjHk1XCEkIKnwXfZoM/f4m1WEuiv3pfe8YCAMG0SiD0PFOSsR/TZKJT8zRTkYuKhDDMlqg== dependencies: - "@budibase/types" "1.2.41-alpha.0" + "@budibase/types" "1.2.41-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.41-alpha.0": - version "1.2.41-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.41-alpha.0.tgz#4f27dbeee24ddc58e2a4e75cd90b53543f742722" - integrity sha512-LiKuO7/9GGzf3xfMmNTZQl2r4jmGgqnUf7fA5ub/MRyWYM7ZjPWEKW1V9OAk3vXwv9a+4V6FUxJQ1sDUZ3DT/Q== +"@budibase/pro@1.2.41-alpha.1": + version "1.2.41-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.41-alpha.1.tgz#c114b866f34e9cc4d73f1c8a6ec65fb57e8916a9" + integrity sha512-EGj4CL+35FeOLR+TkLgpQVzLjcqwoRByM5dp7+kZSkqaWRfyV3bX726SqpW0jIEk9JBsq8YUtjqBXmEiV7tdYg== dependencies: - "@budibase/backend-core" "1.2.41-alpha.0" - "@budibase/types" "1.2.41-alpha.0" + "@budibase/backend-core" "1.2.41-alpha.1" + "@budibase/types" "1.2.41-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.41-alpha.0": - version "1.2.41-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.41-alpha.0.tgz#01071ce6ecef6799b04b1defce2b38e81b615f9f" - integrity sha512-2jkeToXsujYUXb6P2DFTFUOFv56GgImJ4webP8xr5cPGL0/xmhWGMd/lLxLt96RtMQp43UmVWZm1BA7TZw4fJg== +"@budibase/types@1.2.41-alpha.1": + version "1.2.41-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.41-alpha.1.tgz#d8ef38b04c0bbf057b948daa997fb5cc3544b3c6" + integrity sha512-38plLPSrIi2YPyfVPcD2jr+MgohuGHELMlEspqqoc6CMfVBw+YnBOyoctFTPjLW0ka8uB4mnLGzenbU/xY2hrw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index d3295c63b..3b4088ad6 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.41-alpha.1", - "@budibase/pro": "1.2.41-alpha.0", + "@budibase/pro": "1.2.41-alpha.1", "@budibase/string-templates": "1.2.41-alpha.1", "@budibase/types": "1.2.41-alpha.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index b47534021..a3cb905e9 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.41-alpha.0": - version "1.2.41-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.41-alpha.0.tgz#ee3bc032ae89e347b9fb220303a9d040df6f5823" - integrity sha512-x6wJpBBFj6a1pGu2OR1vBPHiA4LvdQpVxr6f1lZa2+nAhuXVtEhrdnvBVzK2hJ52dOTTTGaw2A5tTkbf7861CA== +"@budibase/backend-core@1.2.41-alpha.1": + version "1.2.41-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.41-alpha.1.tgz#8ca8f4e4c2d6d861bb139c9aa1a34fa965d1e8a1" + integrity sha512-qeElGlRK5mIIeLQ4QjHk1XCEkIKnwXfZoM/f4m1WEuiv3pfe8YCAMG0SiD0PFOSsR/TZKJT8zRTkYuKhDDMlqg== dependencies: - "@budibase/types" "1.2.41-alpha.0" + "@budibase/types" "1.2.41-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.41-alpha.0": - version "1.2.41-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.41-alpha.0.tgz#4f27dbeee24ddc58e2a4e75cd90b53543f742722" - integrity sha512-LiKuO7/9GGzf3xfMmNTZQl2r4jmGgqnUf7fA5ub/MRyWYM7ZjPWEKW1V9OAk3vXwv9a+4V6FUxJQ1sDUZ3DT/Q== +"@budibase/pro@1.2.41-alpha.1": + version "1.2.41-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.41-alpha.1.tgz#c114b866f34e9cc4d73f1c8a6ec65fb57e8916a9" + integrity sha512-EGj4CL+35FeOLR+TkLgpQVzLjcqwoRByM5dp7+kZSkqaWRfyV3bX726SqpW0jIEk9JBsq8YUtjqBXmEiV7tdYg== dependencies: - "@budibase/backend-core" "1.2.41-alpha.0" - "@budibase/types" "1.2.41-alpha.0" + "@budibase/backend-core" "1.2.41-alpha.1" + "@budibase/types" "1.2.41-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.41-alpha.0": - version "1.2.41-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.41-alpha.0.tgz#01071ce6ecef6799b04b1defce2b38e81b615f9f" - integrity sha512-2jkeToXsujYUXb6P2DFTFUOFv56GgImJ4webP8xr5cPGL0/xmhWGMd/lLxLt96RtMQp43UmVWZm1BA7TZw4fJg== +"@budibase/types@1.2.41-alpha.1": + version "1.2.41-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.41-alpha.1.tgz#d8ef38b04c0bbf057b948daa997fb5cc3544b3c6" + integrity sha512-38plLPSrIi2YPyfVPcD2jr+MgohuGHELMlEspqqoc6CMfVBw+YnBOyoctFTPjLW0ka8uB4mnLGzenbU/xY2hrw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 38f5b81fbe16edc53e54a2d98a772bc93342bcde Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 17 Aug 2022 15:46:45 +0000 Subject: [PATCH 168/272] v1.2.41-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 4 ++-- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lerna.json b/lerna.json index eb7490492..4ad24b5c8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 557d1b972..f6a5a9a5e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.41-alpha.1", + "@budibase/types": "1.2.41-alpha.2", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index a05cbf8ea..9e9315578 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.41-alpha.1", + "@budibase/string-templates": "1.2.41-alpha.2", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 2f981fa26..3a5d77dff 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.41-alpha.1", - "@budibase/client": "1.2.41-alpha.1", - "@budibase/frontend-core": "1.2.41-alpha.1", - "@budibase/string-templates": "1.2.41-alpha.1", + "@budibase/bbui": "1.2.41-alpha.2", + "@budibase/client": "1.2.41-alpha.2", + "@budibase/frontend-core": "1.2.41-alpha.2", + "@budibase/string-templates": "1.2.41-alpha.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index d9563c7d3..1c79813a6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,7 +26,7 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "1.2.41-alpha.1", + "@budibase/backend-core": "1.2.41-alpha.2", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 03ee9e736..24b557ed7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.41-alpha.1", - "@budibase/frontend-core": "1.2.41-alpha.1", - "@budibase/string-templates": "1.2.41-alpha.1", + "@budibase/bbui": "1.2.41-alpha.2", + "@budibase/frontend-core": "1.2.41-alpha.2", + "@budibase/string-templates": "1.2.41-alpha.2", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index bf946be5c..800ae7e46 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.41-alpha.1", + "@budibase/bbui": "1.2.41-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 80c06c96b..e8a1cd992 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.41-alpha.1", - "@budibase/client": "1.2.41-alpha.1", + "@budibase/backend-core": "1.2.41-alpha.2", + "@budibase/client": "1.2.41-alpha.2", "@budibase/pro": "1.2.41-alpha.1", - "@budibase/string-templates": "1.2.41-alpha.1", - "@budibase/types": "1.2.41-alpha.1", + "@budibase/string-templates": "1.2.41-alpha.2", + "@budibase/types": "1.2.41-alpha.2", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ab9b72677..903ffadb8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 55bb3a74a..e14b6fc3d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3b4088ad6..52dfc5fb0 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.41-alpha.1", + "version": "1.2.41-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.41-alpha.1", + "@budibase/backend-core": "1.2.41-alpha.2", "@budibase/pro": "1.2.41-alpha.1", - "@budibase/string-templates": "1.2.41-alpha.1", - "@budibase/types": "1.2.41-alpha.1", + "@budibase/string-templates": "1.2.41-alpha.2", + "@budibase/types": "1.2.41-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 38effd9d3f14c8c53ac4846edef46f8448d4b5b4 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 17 Aug 2022 16:01:36 +0000 Subject: [PATCH 169/272] v1.2.41-alpha.3 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 4 ++-- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lerna.json b/lerna.json index 4ad24b5c8..7c2189d70 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f6a5a9a5e..490da9c19 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.41-alpha.2", + "@budibase/types": "1.2.41-alpha.3", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 9e9315578..6f4703fc2 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.41-alpha.2", + "@budibase/string-templates": "1.2.41-alpha.3", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3a5d77dff..33104ad8f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.41-alpha.2", - "@budibase/client": "1.2.41-alpha.2", - "@budibase/frontend-core": "1.2.41-alpha.2", - "@budibase/string-templates": "1.2.41-alpha.2", + "@budibase/bbui": "1.2.41-alpha.3", + "@budibase/client": "1.2.41-alpha.3", + "@budibase/frontend-core": "1.2.41-alpha.3", + "@budibase/string-templates": "1.2.41-alpha.3", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 1c79813a6..14fd145b4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,7 +26,7 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "1.2.41-alpha.2", + "@budibase/backend-core": "1.2.41-alpha.3", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 24b557ed7..066241ba0 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.41-alpha.2", - "@budibase/frontend-core": "1.2.41-alpha.2", - "@budibase/string-templates": "1.2.41-alpha.2", + "@budibase/bbui": "1.2.41-alpha.3", + "@budibase/frontend-core": "1.2.41-alpha.3", + "@budibase/string-templates": "1.2.41-alpha.3", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 800ae7e46..e8d579be6 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.41-alpha.2", + "@budibase/bbui": "1.2.41-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index e8a1cd992..652cd283f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.41-alpha.2", - "@budibase/client": "1.2.41-alpha.2", + "@budibase/backend-core": "1.2.41-alpha.3", + "@budibase/client": "1.2.41-alpha.3", "@budibase/pro": "1.2.41-alpha.1", - "@budibase/string-templates": "1.2.41-alpha.2", - "@budibase/types": "1.2.41-alpha.2", + "@budibase/string-templates": "1.2.41-alpha.3", + "@budibase/types": "1.2.41-alpha.3", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 903ffadb8..54660e9b0 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index e14b6fc3d..08ee57f91 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 52dfc5fb0..4760296cd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.41-alpha.2", + "version": "1.2.41-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.41-alpha.2", + "@budibase/backend-core": "1.2.41-alpha.3", "@budibase/pro": "1.2.41-alpha.1", - "@budibase/string-templates": "1.2.41-alpha.2", - "@budibase/types": "1.2.41-alpha.2", + "@budibase/string-templates": "1.2.41-alpha.3", + "@budibase/types": "1.2.41-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 9af33e2fc0300354254414746ba5cc1c7faeabae Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 17 Aug 2022 16:04:43 +0000 Subject: [PATCH 170/272] Update pro version to 1.2.41-alpha.3 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 652cd283f..d5c6a6bbc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.41-alpha.3", "@budibase/client": "1.2.41-alpha.3", - "@budibase/pro": "1.2.41-alpha.1", + "@budibase/pro": "1.2.41-alpha.3", "@budibase/string-templates": "1.2.41-alpha.3", "@budibase/types": "1.2.41-alpha.3", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5d7a0e66a..66aa44d3f 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.41-alpha.1": - version "1.2.41-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.41-alpha.1.tgz#8ca8f4e4c2d6d861bb139c9aa1a34fa965d1e8a1" - integrity sha512-qeElGlRK5mIIeLQ4QjHk1XCEkIKnwXfZoM/f4m1WEuiv3pfe8YCAMG0SiD0PFOSsR/TZKJT8zRTkYuKhDDMlqg== +"@budibase/backend-core@1.2.41-alpha.3": + version "1.2.41-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.41-alpha.3.tgz#12f1b80565683e9d5bfc6a2b05288ddf424bfecd" + integrity sha512-aylQ27Ly3NE2dAccKF7d2DNIPxi30FqT/opvnV6e4oBjU2v68HloG2P/5dqTpUtp1irHUCS2YqmkHWuM5Q82cA== dependencies: - "@budibase/types" "1.2.41-alpha.1" + "@budibase/types" "1.2.41-alpha.3" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.41-alpha.1": - version "1.2.41-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.41-alpha.1.tgz#c114b866f34e9cc4d73f1c8a6ec65fb57e8916a9" - integrity sha512-EGj4CL+35FeOLR+TkLgpQVzLjcqwoRByM5dp7+kZSkqaWRfyV3bX726SqpW0jIEk9JBsq8YUtjqBXmEiV7tdYg== +"@budibase/pro@1.2.41-alpha.3": + version "1.2.41-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.41-alpha.3.tgz#cc80bb7bd5ebddb8bb0bddaffe66416c5a811088" + integrity sha512-B3lEicrKfTP770+JDcAJ50VCRekiIRClab/4oDkd45iveidnx+O0nMfyBfLPU+0RzUUvq9OSS65GSsJXEwaPhg== dependencies: - "@budibase/backend-core" "1.2.41-alpha.1" - "@budibase/types" "1.2.41-alpha.1" + "@budibase/backend-core" "1.2.41-alpha.3" + "@budibase/types" "1.2.41-alpha.3" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.41-alpha.1": - version "1.2.41-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.41-alpha.1.tgz#d8ef38b04c0bbf057b948daa997fb5cc3544b3c6" - integrity sha512-38plLPSrIi2YPyfVPcD2jr+MgohuGHELMlEspqqoc6CMfVBw+YnBOyoctFTPjLW0ka8uB4mnLGzenbU/xY2hrw== +"@budibase/types@1.2.41-alpha.3": + version "1.2.41-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.41-alpha.3.tgz#3f9ff9279491caebcccee383841c7ec9738572d8" + integrity sha512-O2fvsQaQUENL2XfHtv2iaaj6moqeVwUdHqBS4Jbe+7/UmJIULamCv9oNkjbqEuElhaCi2hyPZEFCPcrN5zJO4A== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 4760296cd..8d1d34500 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.41-alpha.3", - "@budibase/pro": "1.2.41-alpha.1", + "@budibase/pro": "1.2.41-alpha.3", "@budibase/string-templates": "1.2.41-alpha.3", "@budibase/types": "1.2.41-alpha.3", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index a3cb905e9..29808e970 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.41-alpha.1": - version "1.2.41-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.41-alpha.1.tgz#8ca8f4e4c2d6d861bb139c9aa1a34fa965d1e8a1" - integrity sha512-qeElGlRK5mIIeLQ4QjHk1XCEkIKnwXfZoM/f4m1WEuiv3pfe8YCAMG0SiD0PFOSsR/TZKJT8zRTkYuKhDDMlqg== +"@budibase/backend-core@1.2.41-alpha.3": + version "1.2.41-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.41-alpha.3.tgz#12f1b80565683e9d5bfc6a2b05288ddf424bfecd" + integrity sha512-aylQ27Ly3NE2dAccKF7d2DNIPxi30FqT/opvnV6e4oBjU2v68HloG2P/5dqTpUtp1irHUCS2YqmkHWuM5Q82cA== dependencies: - "@budibase/types" "1.2.41-alpha.1" + "@budibase/types" "1.2.41-alpha.3" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.41-alpha.1": - version "1.2.41-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.41-alpha.1.tgz#c114b866f34e9cc4d73f1c8a6ec65fb57e8916a9" - integrity sha512-EGj4CL+35FeOLR+TkLgpQVzLjcqwoRByM5dp7+kZSkqaWRfyV3bX726SqpW0jIEk9JBsq8YUtjqBXmEiV7tdYg== +"@budibase/pro@1.2.41-alpha.3": + version "1.2.41-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.41-alpha.3.tgz#cc80bb7bd5ebddb8bb0bddaffe66416c5a811088" + integrity sha512-B3lEicrKfTP770+JDcAJ50VCRekiIRClab/4oDkd45iveidnx+O0nMfyBfLPU+0RzUUvq9OSS65GSsJXEwaPhg== dependencies: - "@budibase/backend-core" "1.2.41-alpha.1" - "@budibase/types" "1.2.41-alpha.1" + "@budibase/backend-core" "1.2.41-alpha.3" + "@budibase/types" "1.2.41-alpha.3" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.41-alpha.1": - version "1.2.41-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.41-alpha.1.tgz#d8ef38b04c0bbf057b948daa997fb5cc3544b3c6" - integrity sha512-38plLPSrIi2YPyfVPcD2jr+MgohuGHELMlEspqqoc6CMfVBw+YnBOyoctFTPjLW0ka8uB4mnLGzenbU/xY2hrw== +"@budibase/types@1.2.41-alpha.3": + version "1.2.41-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.41-alpha.3.tgz#3f9ff9279491caebcccee383841c7ec9738572d8" + integrity sha512-O2fvsQaQUENL2XfHtv2iaaj6moqeVwUdHqBS4Jbe+7/UmJIULamCv9oNkjbqEuElhaCi2hyPZEFCPcrN5zJO4A== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 9a677fce72affba2854415709da526ecec6d5bea Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 18 Aug 2022 10:59:40 +0100 Subject: [PATCH 171/272] Added scope customisation to the OIDC SSO configuration. Users can add or remove whichever scopes they like except 'openid'. They can revert to our core default values if they run into any issues --- packages/bbui/src/Tags/Tag.svelte | 3 +- .../builder/portal/manage/auth/index.svelte | 203 +++++++++++++++++- .../worker/src/api/controllers/global/auth.ts | 15 +- .../worker/src/api/routes/global/configs.js | 1 + 4 files changed, 219 insertions(+), 3 deletions(-) diff --git a/packages/bbui/src/Tags/Tag.svelte b/packages/bbui/src/Tags/Tag.svelte index f7089decd..9c4cb6e58 100644 --- a/packages/bbui/src/Tags/Tag.svelte +++ b/packages/bbui/src/Tags/Tag.svelte @@ -8,6 +8,7 @@ export let invalid = false export let disabled = false export let closable = false + export let onClick
{#if closable} - + {/if}
diff --git a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte index bc77329a3..ffc5bed7c 100644 --- a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte @@ -18,6 +18,8 @@ Body, Select, Toggle, + Tag, + Tags, } from "@budibase/bbui" import { onMount } from "svelte" import { API } from "api" @@ -208,6 +210,7 @@ providers[res.type]._id = res._id }) notifications.success(`Settings saved`) + scopesFields[0].editing = false }) .catch(() => { notifications.error("Failed to update auth settings") @@ -215,6 +218,21 @@ } } + let defaultScopes = ["profile", "email", "offline_access"] + + const refreshScopes = idx => { + providers.oidc.config.configs[idx]["scopes"] = + providers.oidc.config.configs[idx]["scopes"] + } + + let scopesFields = [ + { + editing: false, + inputText: null, + error: null, + }, + ] + onMount(async () => { try { await organisation.init() @@ -276,7 +294,7 @@ if (!oidcDoc?._id) { providers.oidc = { type: ConfigTypes.OIDC, - config: { configs: [{ activated: true }] }, + config: { configs: [{ activated: true, scopes: defaultScopes }] }, } } else { originalOidcDoc = cloneDeep(oidcDoc) @@ -397,10 +415,193 @@ />
+ + + +
Advanced
+ + + Changes to your authentication scopes will only take effect when you + next log in. Please refer to your vendor documentation before + modification. + + +
+ + {#if scopesFields[0].editing} + + { + if (!scopesFields[0].inputText) { + scopesFields[0].error = null + } + if ( + e.key === "Enter" || + e.keyCode === 13 || + e.code == "Space" || + e.keyCode == 32 + ) { + let scopes = providers.oidc.config.configs[0]["scopes"] + ? providers.oidc.config.configs[0]["scopes"] + : [...defaultScopes] + + let update = scopesFields[0].inputText.trim() + + if (/[\\"\s]/.test(update)) { + scopesFields[0].error = + "Auth scopes cannot contain spaces, double quotes or backslashes" + return + } else if (scopes.indexOf(update) > -1) { + scopesFields[0].error = "Auth scope already exists" + return + } else if (!update.length) { + scopesFields[0].inputText = null + scopesFields[0].error = null + return + } else { + scopesFields[0].error = null + } + + if (scopes.indexOf(update) == -1) { + scopes.push(update) + providers.oidc.config.configs[0]["scopes"] = scopes + } + scopesFields[0].inputText = null + } + }} + /> + + {/if} + +
+ + + openid + + {#each providers.oidc.config.configs[0]["scopes"] || [...defaultScopes] as tag, idx} + { + let idxScopes = providers.oidc.config.configs[0]["scopes"] + if (idxScopes.length == 1) { + idxScopes.pop() + } else { + idxScopes.splice(idx, 1) + refreshScopes(0) + } + }} + > + {tag} + + {/each} + + {#if !scopesFields[0].editing} + { + if (!providers.oidc.config.configs[0]) { + providers.oidc.config.configs[0]["scopes"] = [ + ...defaultScopes, + ] + } + scopesFields[0].editing = !scopesFields[0].editing + }} + > + Edit + + {/if} + +
+ + {#if scopesFields[0].editing} +
+ + +
+ {/if} +
+ + {/if} - - - - - -` diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index c4d51293b..bec06d0bf 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -102,6 +102,7 @@ export const deleteObjects = async function (ctx: any) { } export const serveApp = async function (ctx: any) { + console.log("SERVE APP") const db = getAppDB({ skip_setup: true }) const appInfo = await db.get(DocumentType.APP_METADATA) let appId = getAppId() @@ -128,6 +129,22 @@ export const serveApp = async function (ctx: any) { } } +export const serveBuilderPreview = async function (ctx: any) { + const db = getAppDB({ skip_setup: true }) + const appInfo = await db.get(DocumentType.APP_METADATA) + + if (!env.isJest()) { + let appId = getAppId() + const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`) + ctx.body = await processString(previewHbs, { + clientLibPath: clientLibraryPath(appId, appInfo.version, ctx), + }) + } else { + // just return the app info for jest to assert on + ctx.body = { ...appInfo, builderPreview: true } + } +} + export const serveClientLibrary = async function (ctx: any) { return send(ctx, "budibase-client.js", { root: join(NODE_MODULES_PATH, "@budibase", "client", "dist"), diff --git a/packages/server/src/api/controllers/static/templates/preview.hbs b/packages/server/src/api/controllers/static/templates/preview.hbs new file mode 100644 index 000000000..28908df50 --- /dev/null +++ b/packages/server/src/api/controllers/static/templates/preview.hbs @@ -0,0 +1,103 @@ + + + Budibase Builder Preview + + + + + + + + + + \ No newline at end of file diff --git a/packages/server/src/api/routes/static.ts b/packages/server/src/api/routes/static.ts index c94ff5470..9a5348668 100644 --- a/packages/server/src/api/routes/static.ts +++ b/packages/server/src/api/routes/static.ts @@ -56,6 +56,7 @@ router authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), controller.deleteObjects ) + .get("/preview", authorized(BUILDER), controller.serveBuilderPreview) .get("/:appId/:path*", controller.serveApp) .get("/app/:appUrl/:path*", controller.serveApp) .post( diff --git a/packages/server/src/api/routes/tests/static.spec.js b/packages/server/src/api/routes/tests/static.spec.js index 37176f5cf..812b88329 100644 --- a/packages/server/src/api/routes/tests/static.spec.js +++ b/packages/server/src/api/routes/tests/static.spec.js @@ -40,7 +40,6 @@ describe("/static", () => { }) describe("/app", () => { - beforeEach(() => { jest.clearAllMocks() }) @@ -60,7 +59,7 @@ describe("/static", () => { it("should serve the app by url", async () => { const headers = config.defaultHeaders() delete headers[constants.Headers.APP_ID] - + const res = await request .get(`/app${config.prodApp.url}`) .set(headers) @@ -82,7 +81,7 @@ describe("/static", () => { describe("/attachments", () => { describe("generateSignedUrls", () => { let datasource - + beforeEach(async () => { datasource = await config.createDatasource({ datasource: { @@ -93,7 +92,7 @@ describe("/static", () => { }, }) }) - + it("should be able to generate a signed upload URL", async () => { const bucket = "foo" const key = "bar" @@ -108,7 +107,7 @@ describe("/static", () => { `https://${bucket}.s3.eu-west-1.amazonaws.com/${key}` ) }) - + it("should handle an invalid datasource ID", async () => { const res = await request .post(`/api/attachments/foo/url`) @@ -123,7 +122,7 @@ describe("/static", () => { "The specified datasource could not be found" ) }) - + it("should require a bucket parameter", async () => { const res = await request .post(`/api/attachments/${datasource._id}/url`) @@ -136,7 +135,7 @@ describe("/static", () => { .expect(400) expect(res.body.message).toEqual("bucket and key values are required") }) - + it("should require a key parameter", async () => { const res = await request .post(`/api/attachments/${datasource._id}/url`) @@ -151,4 +150,17 @@ describe("/static", () => { }) }) + describe("/preview", () => { + beforeEach(() => { + jest.clearAllMocks() + }) + + it("should serve the builder preview", async () => { + const headers = config.defaultHeaders() + const res = await request.get(`/preview`).set(headers).expect(200) + + expect(res.body.appId).toBe(config.appId) + expect(res.body.builderPreview).toBe(true) + }) + }) }) From ed2496c686696b6eaf80220e5189ebc72c92e109 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Sat, 20 Aug 2022 13:51:32 +0100 Subject: [PATCH 189/272] Remove log --- packages/server/src/api/controllers/static/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index bec06d0bf..3b748a659 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -102,7 +102,6 @@ export const deleteObjects = async function (ctx: any) { } export const serveApp = async function (ctx: any) { - console.log("SERVE APP") const db = getAppDB({ skip_setup: true }) const appInfo = await db.get(DocumentType.APP_METADATA) let appId = getAppId() From f212051014deaf287f839731a0c61a2778ae4e45 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 22 Aug 2022 09:19:26 +0000 Subject: [PATCH 190/272] v1.2.44-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 1724a4ec0..28379208f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c03de431d..b95a33703 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "1.2.44-alpha.0", + "@budibase/types": "1.2.44-alpha.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 63b8cd984..99f58a045 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "1.2.44-alpha.0", + "@budibase/string-templates": "1.2.44-alpha.1", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ccfa0fc27..569a6c161 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.44-alpha.0", - "@budibase/client": "1.2.44-alpha.0", - "@budibase/frontend-core": "1.2.44-alpha.0", - "@budibase/string-templates": "1.2.44-alpha.0", + "@budibase/bbui": "1.2.44-alpha.1", + "@budibase/client": "1.2.44-alpha.1", + "@budibase/frontend-core": "1.2.44-alpha.1", + "@budibase/string-templates": "1.2.44-alpha.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4ff8c2134..0be473c5f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index d5264fa2b..b8e6301de 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "1.2.44-alpha.0", - "@budibase/frontend-core": "1.2.44-alpha.0", - "@budibase/string-templates": "1.2.44-alpha.0", + "@budibase/bbui": "1.2.44-alpha.1", + "@budibase/frontend-core": "1.2.44-alpha.1", + "@budibase/string-templates": "1.2.44-alpha.1", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 32c6ff803..a08e6120c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.2.44-alpha.0", + "@budibase/bbui": "1.2.44-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index ce1bbe2c1..89b5972f5 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "1.2.44-alpha.0", - "@budibase/client": "1.2.44-alpha.0", + "@budibase/backend-core": "1.2.44-alpha.1", + "@budibase/client": "1.2.44-alpha.1", "@budibase/pro": "1.2.44-alpha.0", - "@budibase/string-templates": "1.2.44-alpha.0", - "@budibase/types": "1.2.44-alpha.0", + "@budibase/string-templates": "1.2.44-alpha.1", + "@budibase/types": "1.2.44-alpha.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f852a8333..b6d7806a5 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 4ea683920..4be607158 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 13a7c8c32..b3d904ef8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.44-alpha.0", + "version": "1.2.44-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.2.44-alpha.0", + "@budibase/backend-core": "1.2.44-alpha.1", "@budibase/pro": "1.2.44-alpha.0", - "@budibase/string-templates": "1.2.44-alpha.0", - "@budibase/types": "1.2.44-alpha.0", + "@budibase/string-templates": "1.2.44-alpha.1", + "@budibase/types": "1.2.44-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From fe3d9f40f65bea90b766e25956f4785c8f480f31 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 22 Aug 2022 09:22:23 +0000 Subject: [PATCH 191/272] Update pro version to 1.2.44-alpha.1 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 89b5972f5..c3a602459 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "1.2.44-alpha.1", "@budibase/client": "1.2.44-alpha.1", - "@budibase/pro": "1.2.44-alpha.0", + "@budibase/pro": "1.2.44-alpha.1", "@budibase/string-templates": "1.2.44-alpha.1", "@budibase/types": "1.2.44-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 0301c561e..94fcf222a 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.44-alpha.0": - version "1.2.44-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.0.tgz#5fa2161c43e0686ab4b71a6e4a7689e19f28f050" - integrity sha512-6d+lTxjHM5/awdlEqJojA3PybWYFEwo1UXg2WG8Rk4dB4s3v/1QAMdlbX7rSX2BZyojYwZFiPzellJpTH/44qg== +"@budibase/backend-core@1.2.44-alpha.1": + version "1.2.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.1.tgz#255c8550302ea0d4b10b231519e12021d008ad33" + integrity sha512-9ceN00ioBD5iUc2Wbcs9Pyvh5gaSfkg1v4Qn9QdRwAG36eo3XVK8kiYWF0q0hkzgcTViJw6xq/1jqMa2InKv6g== dependencies: - "@budibase/types" "1.2.44-alpha.0" + "@budibase/types" "1.2.44-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.44-alpha.0": - version "1.2.44-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.0.tgz#7722dd571befe5663c27a36a4d63ec9ea96fa3e4" - integrity sha512-pxlIkrntNhmXC7dcsCvJNxtUXPH2K8M5WyjpD4hdjbm5JbRhRilCR5fRciKKjMYa8pLupOd8P7K/qcB+C/qvsw== +"@budibase/pro@1.2.44-alpha.1": + version "1.2.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.1.tgz#d9e919b1df96f3d3d5cf37753721d41348279f59" + integrity sha512-KaclS4qv4+hWenvuVwF2HxcPWkrDyR7IVyLKLMVUqCnaMoXMvEOe9KuQ+lXLbsLIBsCsCFkzE/WHsdmoaGqa0g== dependencies: - "@budibase/backend-core" "1.2.44-alpha.0" - "@budibase/types" "1.2.44-alpha.0" + "@budibase/backend-core" "1.2.44-alpha.1" + "@budibase/types" "1.2.44-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.44-alpha.0": - version "1.2.44-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.0.tgz#350b51e961c5c3c25febe421c35e5f05e6cc6102" - integrity sha512-gM4WM+BQa1UZeV4TKnhQndAwTgpYBXLePichuOw0kehTY5xu96dACtVfMDlHFIANdv701dDzi+Zr/T27sKpS4Q== +"@budibase/types@1.2.44-alpha.1": + version "1.2.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.1.tgz#6150d4494326438b46dd7354e5dd0fc7fdbfcc49" + integrity sha512-1eLGH5ym4oYbuRZRkD0slNqHlZ1EV0JHLkmoA47i7L/u8E8QRIyDIHyeZKC8ben33oQS4NX3IebD7zZ2JFhgcA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index b3d904ef8..3983cc773 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "1.2.44-alpha.1", - "@budibase/pro": "1.2.44-alpha.0", + "@budibase/pro": "1.2.44-alpha.1", "@budibase/string-templates": "1.2.44-alpha.1", "@budibase/types": "1.2.44-alpha.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index bc93b01fe..c1935eb87 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.2.44-alpha.0": - version "1.2.44-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.0.tgz#5fa2161c43e0686ab4b71a6e4a7689e19f28f050" - integrity sha512-6d+lTxjHM5/awdlEqJojA3PybWYFEwo1UXg2WG8Rk4dB4s3v/1QAMdlbX7rSX2BZyojYwZFiPzellJpTH/44qg== +"@budibase/backend-core@1.2.44-alpha.1": + version "1.2.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.1.tgz#255c8550302ea0d4b10b231519e12021d008ad33" + integrity sha512-9ceN00ioBD5iUc2Wbcs9Pyvh5gaSfkg1v4Qn9QdRwAG36eo3XVK8kiYWF0q0hkzgcTViJw6xq/1jqMa2InKv6g== dependencies: - "@budibase/types" "1.2.44-alpha.0" + "@budibase/types" "1.2.44-alpha.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.44-alpha.0": - version "1.2.44-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.0.tgz#7722dd571befe5663c27a36a4d63ec9ea96fa3e4" - integrity sha512-pxlIkrntNhmXC7dcsCvJNxtUXPH2K8M5WyjpD4hdjbm5JbRhRilCR5fRciKKjMYa8pLupOd8P7K/qcB+C/qvsw== +"@budibase/pro@1.2.44-alpha.1": + version "1.2.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.1.tgz#d9e919b1df96f3d3d5cf37753721d41348279f59" + integrity sha512-KaclS4qv4+hWenvuVwF2HxcPWkrDyR7IVyLKLMVUqCnaMoXMvEOe9KuQ+lXLbsLIBsCsCFkzE/WHsdmoaGqa0g== dependencies: - "@budibase/backend-core" "1.2.44-alpha.0" - "@budibase/types" "1.2.44-alpha.0" + "@budibase/backend-core" "1.2.44-alpha.1" + "@budibase/types" "1.2.44-alpha.1" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.44-alpha.0": - version "1.2.44-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.0.tgz#350b51e961c5c3c25febe421c35e5f05e6cc6102" - integrity sha512-gM4WM+BQa1UZeV4TKnhQndAwTgpYBXLePichuOw0kehTY5xu96dACtVfMDlHFIANdv701dDzi+Zr/T27sKpS4Q== +"@budibase/types@1.2.44-alpha.1": + version "1.2.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.1.tgz#6150d4494326438b46dd7354e5dd0fc7fdbfcc49" + integrity sha512-1eLGH5ym4oYbuRZRkD0slNqHlZ1EV0JHLkmoA47i7L/u8E8QRIyDIHyeZKC8ben33oQS4NX3IebD7zZ2JFhgcA== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From ab0d6bd6ed1a902cb4a7181387453d2a5b7f1543 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 22 Aug 2022 11:00:51 +0100 Subject: [PATCH 192/272] Add action for showing a custom notification --- .../src/builderStore/store/frontend.js | 1 + .../actions/ShowNotification.svelte | 54 +++++++++++++++++++ .../ButtonActionEditor/actions/index.js | 1 + .../controls/ButtonActionEditor/manifest.json | 6 +++ packages/client/manifest.json | 3 +- packages/client/src/utils/buttonActions.js | 9 ++++ 6 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index c7795d4b5..4d0653208 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -40,6 +40,7 @@ const INITIAL_FRONTEND_STATE = { devicePreview: false, messagePassing: false, continueIfAction: false, + showNotificationAction: false, }, errors: [], hasAppPackage: false, diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte new file mode 100644 index 000000000..ed4ecc273 --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte @@ -0,0 +1,54 @@ + + +
+ + - + (parameters.message = e.detail)} /> +