MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Widening the allowance criteria for handlebars validity, check for any errors which suggest a simple type error from the context and allowing these through.

This commit is contained in:
Michael Drury 2021-02-02 20:28:27 +00:00
parent 7a386ac1b5
commit 7e4e0db30f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/string-templates/src/index.js
View File

@ -110,7 +110,7 @@ module.exports.makePropSafe = property => {
* @returns {boolean} Whether or not the input string is valid. * @returns {boolean} Whether or not the input string is valid.
*/ */
module.exports.isValid = string => { module.exports.isValid = string => {
const specialCases = ["isNumber", "expected a number"] const specialCases = ["string", "number", "object", "array"]
// don't really need a real context to check if its valid // don't really need a real context to check if its valid
const context = {} const context = {}
try { try {
@ -118,7 +118,7 @@ module.exports.isValid = string => {
return true return true
} catch (err) { } catch (err) {
const msg = err ? err.message : "" const msg = err ? err.message : ""
const foundCase = specialCases.find(spCase => msg.includes(spCase)) const foundCase = specialCases.find(spCase => msg.toLowerCase().includes(spCase))
// special case for maths functions - don't have inputs yet // special case for maths functions - don't have inputs yet
return !!foundCase return !!foundCase
} }

5
packages/string-templates/test/helpers.spec.js
View File

@ -311,4 +311,9 @@ describe("Cover a few complex use cases", () => {
const output = await processString(`{{first ( split "a-b-c" "-") 2}}`, {}) const output = await processString(`{{first ( split "a-b-c" "-") 2}}`, {})
expect(output).toBe(`a,b`) expect(output).toBe(`a,b`)
}) })
it("should confirm a subtraction validity", () => {
const validity = isValid("{{ subtract [c390c23a7f1b6441c98d2fe2a51248ef3].[total profit] [c390c23a7f1b6441c98d2fe2a51248ef3].[total revenue] }}")
expect(validity).toBe(true)
})
}) })