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

Merge branch 'master' into feature/sql-query-aliasing

This commit is contained in:
Michael Drury 2024-02-27 14:54:46 +00:00 committed by GitHub
parent fac9f18bc2 2a8bb872ad
commit abf68fdd36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.20.11", "version": "2.20.12",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

3
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
View File

@ -106,11 +106,12 @@
/> />
<Label small>Export columns</Label> <Label small>Export columns</Label>
<ColumnEditor <ColumnEditor
bind:value={parameters.columns} value={parameters.columns}
allowCellEditing={false} allowCellEditing={false}
componentInstance={selectedTable} componentInstance={selectedTable}
on:change={e => { on:change={e => {
const columns = e.detail const columns = e.detail
parameters.columns = columns
parameters.customHeaders = columns.reduce((headerMap, column) => { parameters.customHeaders = columns.reduce((headerMap, column) => {
return { return {
[column.name]: column.displayName, [column.name]: column.displayName,

6
packages/builder/src/helpers/data/utils.js
View File

@ -17,6 +17,10 @@ export function breakQueryString(qs) {
return paramObj return paramObj
} }
function isEncoded(str) {
return typeof str == "string" && decodeURIComponent(str) !== str
}
export function buildQueryString(obj) { export function buildQueryString(obj) {
let str = "" let str = ""
if (obj) { if (obj) {
@ -35,7 +39,7 @@ export function buildQueryString(obj) {
value = value.replace(binding, marker) value = value.replace(binding, marker)
bindingMarkers[marker] = binding bindingMarkers[marker] = binding
}) })
let encoded = encodeURIComponent(value || "") let encoded = isEncoded(value) ? value : encodeURIComponent(value || "")
Object.entries(bindingMarkers).forEach(([marker, binding]) => { Object.entries(bindingMarkers).forEach(([marker, binding]) => {
encoded = encoded.replace(marker, binding) encoded = encoded.replace(marker, binding)
}) })

7
packages/builder/src/helpers/tests/dataUtils.test.js
View File

@ -39,4 +39,11 @@ describe("check query string utils", () => {
expect(broken.key1).toBe(obj2.key1) expect(broken.key1).toBe(obj2.key1)
expect(broken.key2).toBe(obj2.key2) expect(broken.key2).toBe(obj2.key2)
}) })
it("should not encode a URL more than once when building the query string", () => {
const queryString = buildQueryString({
values: "a%2Cb%2Cc",
})
expect(queryString).toBe("values=a%2Cb%2Cc")
})
}) })