Merge branch 'develop' of github.com:Budibase/budibase into BUDI-7240/refetch_relationships

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.7.37-alpha.3",
+  "version": "2.7.37-alpha.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/client/src/components/app/GridBlock.svelte

@@ -26,6 +26,7 @@
     columns?.forEach(column => {
       overrides[column.name] = {
         displayName: column.displayName || column.name,
+        visible: true,
       }
     })
     return overrides

packages/string-templates/manifest.json

@@ -75,7 +75,7 @@
       ],
       "numArgs": 2,
       "example": "{{ multiply 10 5 }} -> 50",
-      "description": "<p>Return the product of <code>a</code> times <code>b</code>.</p>\n"
+      "description": "<p>Multiply number <code>a</code> by number <code>b</code>.</p>\n"
     },
     "plus": {
       "args": [
@@ -128,15 +128,6 @@
       "numArgs": 1,
       "example": "{{ sum [1, 2, 3] }} -> 6",
       "description": "<p>Returns the sum of all numbers in the given array.</p>\n"
-    },
-    "times": {
-      "args": [
-        "a",
-        "b"
-      ],
-      "numArgs": 2,
-      "example": "{{ times 10 5 }} -> 50",
-      "description": "<p>Multiply number <code>a</code> by number <code>b</code>.</p>\n"
     }
   },
   "array": {
@@ -497,19 +488,9 @@
         "str"
       ],
       "numArgs": 1,
-      "example": "{{ escape 'https://myurl?Hello%20There' }} -> https://myurl?Hello+There",
+      "example": "{{ decodeURI 'https://myurl?Hello%20There' }} -> https://myurl?=Hello There",
       "description": "<p>Decode a Uniform Resource Identifier (URI) component.</p>\n"
     },
-    "url_encode": {
-      "args": [],
-      "numArgs": 0,
-      "description": "<p>Alias for <a href=\"#encodeuri\">encodeURI</a>.</p>\n"
-    },
-    "url_decode": {
-      "args": [],
-      "numArgs": 0,
-      "description": "<p>Alias for <a href=\"#decodeuri\">decodeURI</a>.</p>\n"
-    },
     "urlResolve": {
       "args": [
         "base",
@@ -625,7 +606,7 @@
         "length"
       ],
       "numArgs": 2,
-      "example": "{{ellipsis 'foo bar baz' 7}} -> foo bar…",
+      "example": "{{ellipsis 'foo bar baz', 7}} -> foo bar…",
       "description": "<p>Truncates a string to the specified <code>length</code>, and appends it with an elipsis, <code>…</code>.</p>\n"
     },
     "hyphenate": {
@@ -1219,4 +1200,4 @@
       "description": "<p>Produce a humanized duration left/until given an amount of time and the type of time measurement.</p>\n"
     }
   }
-}
+}

packages/string-templates/package.json

@@ -25,7 +25,7 @@
     "manifest": "node ./scripts/gen-collection-info.js"
   },
   "dependencies": {
-    "@budibase/handlebars-helpers": "^0.11.8",
+    "@budibase/handlebars-helpers": "^0.11.9",
     "dayjs": "^1.10.4",
     "handlebars": "^4.7.6",
     "handlebars-utils": "^1.0.6",

packages/string-templates/scripts/gen-collection-info.js

@@ -9,8 +9,8 @@ const marked = require("marked")
  * full list of supported helpers can be found here:
  * https://github.com/budibase/handlebars-helpers
  */
-
-const DIRECTORY = fs.existsSync("node_modules") ? "." : ".."
+const { join } = require("path")
+const DIRECTORY = join(__dirname, "..", "..", "..")
 const COLLECTIONS = [
   "math",
   "array",
@@ -20,7 +20,7 @@ const COLLECTIONS = [
   "comparison",
   "object",
 ]
-const FILENAME = `${DIRECTORY}/manifest.json`
+const FILENAME = join(__dirname, "..", "manifest.json")
 const outputJSON = {}
 const ADDED_HELPERS = {
   date: {

packages/string-templates/test/helpers.spec.js

@@ -48,14 +48,6 @@ describe("test the math helpers", () => {
     })
     expect(parseInt(output)).toBe(2)
   })
-
-  it("should be able to times", async () => {
-    const output = await processString("{{times a b}}", {
-      a: 5,
-      b: 5,
-    })
-    expect(parseInt(output)).toBe(25)
-  })
 })
 
 describe("test the array helpers", () => {