CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-09-15 16:59:43 +12:00
Code Issues Projects Releases Wiki Activity

Fix issue with schema mutation in grids. Use displayName to represent grid column labels. Allow deletion of duplicated user columns

Browse source
This commit is contained in:
Andrew Kingston 2023-05-23 16:02:05 +01:00
parent eb899cecac
commit 65abee10d0
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/builder/src/components/backend/DataTable/DataTable.svelte
View file

@ -16,11 +16,11 @@
import GridEditColumnModal from "components/backend/DataTable/modals/grid/GridEditColumnModal.svelte" import GridEditColumnModal from "components/backend/DataTable/modals/grid/GridEditColumnModal.svelte"
const userSchemaOverrides = { const userSchemaOverrides = {
firstName: { name: "First name", disabled: true }, firstName: { displayName: "First name", disabled: true },
lastName: { name: "Last name", disabled: true }, lastName: { displayName: "Last name", disabled: true },
email: { name: "Email", disabled: true }, email: { displayName: "Email", disabled: true },
roleId: { name: "Role", disabled: true }, roleId: { displayName: "Role", disabled: true },
status: { name: "Status", disabled: true }, status: { displayName: "Status", disabled: true },
} }
$: id = $tables.selected?._id $: id = $tables.selected?._id

20
packages/frontend-core/src/components/grid/stores/columns.js
View file

@ -116,10 +116,24 @@ export const initialise = context => {
const schema = derived( const schema = derived(
[table, schemaOverrides], [table, schemaOverrides],
([$table, $schemaOverrides]) => { ([$table, $schemaOverrides]) => {
let newSchema = $table?.schema if (!$table?.schema) {
if (!newSchema) {
return null return null
} }
let newSchema = { ...$table?.schema }
// Edge case to temporarily allow deletion of duplicated user
// fields that were saved with the "disabled" flag set.
// By overriding the saved schema we ensure only overrides can
// set the disabled flag.
// TODO: remove in future
Object.keys(newSchema).forEach(field => {
newSchema[field] = {
...newSchema[field],
disabled: false,
}
})
// Apply schema overrides
Object.keys($schemaOverrides || {}).forEach(field => { Object.keys($schemaOverrides || {}).forEach(field => {
if (newSchema[field]) { if (newSchema[field]) {
newSchema[field] = { newSchema[field] = {
@ -160,7 +174,7 @@ export const initialise = context => {
fields fields
.map(field => ({ .map(field => ({
name: field, name: field,
label: $schema[field].name || field, label: $schema[field].displayName || field,
schema: $schema[field], schema: $schema[field],
width: $schema[field].width || DefaultColumnWidth, width: $schema[field].width || DefaultColumnWidth,
visible: $schema[field].visible ?? true, visible: $schema[field].visible ?? true,