CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-07 23:35:49 +12:00
Code Issues Projects Releases Wiki Activity

fix optional chaining error and adds guard for no model selected.

Browse source
This commit is contained in:
kevmodrome 2020-10-08 17:45:47 +02:00
parent d9c8e6cd96
commit 38e42c0e9e
4 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
View file

@ -113,7 +113,6 @@
</div> </div>
</div> </div>
<DropdownMenu <DropdownMenu
class="menu"
bind:this={dropdown} bind:this={dropdown}
on:click={hideDropdown} on:click={hideDropdown}
width="170px" width="170px"

6
packages/standard-components/package.json
View file

@ -16,13 +16,13 @@
"@budibase/client": "^0.1.25", "@budibase/client": "^0.1.25",
"@rollup/plugin-commonjs": "^11.1.0", "@rollup/plugin-commonjs": "^11.1.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"rollup": "^1.11.0", "rollup": "^2.11.2",
"rollup-plugin-commonjs": "^10.0.2", "rollup-plugin-commonjs": "^10.0.2",
"rollup-plugin-json": "^4.0.0", "rollup-plugin-json": "^4.0.0",
"rollup-plugin-livereload": "^1.0.1", "rollup-plugin-livereload": "^1.0.1",
"rollup-plugin-node-resolve": "^5.0.0", "rollup-plugin-node-resolve": "^5.0.0",
"rollup-plugin-postcss": "^3.1.5", "rollup-plugin-postcss": "^3.1.5",
"rollup-plugin-svelte": "^5.0.0", "rollup-plugin-svelte": "^5.0.3",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"shortid": "^2.2.15", "shortid": "^2.2.15",
"sirv-cli": "^0.4.4", "sirv-cli": "^0.4.4",
@ -48,4 +48,4 @@
"svelte-flatpickr": "^2.4.0", "svelte-flatpickr": "^2.4.0",
"svelte-fusioncharts": "^1.0.0" "svelte-fusioncharts": "^1.0.0"
} }
} }

2
packages/standard-components/rollup.config.js
View file

@ -2,6 +2,7 @@ import svelte from "rollup-plugin-svelte"
import resolve from "rollup-plugin-node-resolve" import resolve from "rollup-plugin-node-resolve"
import commonjs from "@rollup/plugin-commonjs" import commonjs from "@rollup/plugin-commonjs"
import postcss from "rollup-plugin-postcss" import postcss from "rollup-plugin-postcss"
import { terser } from "rollup-plugin-terser";
const lodash_fp_exports = ["isEmpty"] const lodash_fp_exports = ["isEmpty"]
@ -16,6 +17,7 @@ export default {
}, },
], ],
plugins: [ plugins: [
terser(),
postcss({ postcss({
plugins: [], plugins: [],
}), }),

47
packages/standard-components/src/DataGrid/Component.svelte
View file

@ -24,29 +24,32 @@
let model let model
onMount(async () => { onMount(async () => {
const jsonModel = await _bb.api.get(`/api/models/${datasource.modelId}`) if (datasource.modelId) {
model = await jsonModel.json() const jsonModel = await _bb.api.get(`/api/models/${datasource.modelId}`)
const { schema } = model model = await jsonModel.json()
console.log(schema) const { schema } = model
if (!isEmpty(datasource)) { console.log(schema)
data = await fetchData(datasource) if (!isEmpty(datasource)) {
columnDefs = Object.keys(schema).map((key, i) => { data = await fetchData(datasource)
return { columnDefs = Object.keys(schema).map((key, i) => {
headerCheckboxSelection: i === 0, return {
checkboxSelection: i === 0, headerCheckboxSelection: i === 0,
valueSetter: setters.get(schema[key].type), checkboxSelection: i === 0,
headerName: key.charAt(0).toUpperCase() + key.slice(1), valueSetter: setters.get(schema[key].type),
field: key, headerName: key.charAt(0).toUpperCase() + key.slice(1),
hide: shouldHideField(key), field: key,
sortable: true, hide: shouldHideField(key),
editable: sortable: true,
schema[key].type !== "boolean" && schema[key].type !== "attachment", editable:
cellRenderer: renderers.get(schema[key].type), schema[key].type !== "boolean" &&
autoHeight: schema[key].type === "attachment", schema[key].type !== "attachment",
} cellRenderer: renderers.get(schema[key].type),
}) autoHeight: schema[key].type === "attachment",
}
})
}
dataLoaded = true
} }
dataLoaded = true
}) })
const shouldHideField = name => { const shouldHideField = name => {