Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Share template variables between pages and models in scaffold #7894

Merged
merged 4 commits into from
Mar 24, 2023
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
278 changes: 143 additions & 135 deletions packages/cli/src/commands/generate/scaffold/scaffold.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,147 @@ const formatters = async (name, isTypescript) => {
}
}

const modelRelatedVariables = (model) => {
const componentMetadata = {
Enum: {
componentName: 'RadioField',
defaultProp: 'defaultChecked',
validation: () => false,
listDisplayFunction: 'formatEnum',
displayFunction: 'formatEnum',
},
EnumList: {
componentName: 'CheckboxField',
defaultProp: 'defaultChecked',
validation: () => false,
listDisplayFunction: 'formatEnum',
displayFunction: 'formatEnum',
},
Boolean: {
componentName: 'CheckboxField',
defaultProp: 'defaultChecked',
validation: () => false,
listDisplayFunction: 'checkboxInputTag',
displayFunction: 'checkboxInputTag',
},
DateTime: {
componentName: 'DatetimeLocalField',
deserializeFunction: 'formatDatetime',
listDisplayFunction: 'timeTag',
displayFunction: 'timeTag',
},
Int: {
componentName: 'NumberField',
},
Json: {
componentName: 'TextAreaField',
validation: (isRequired) =>
`{{ valueAsJSON: true${isRequired ? ', required: true' : ''} }}`,
displayFunction: 'jsonDisplay',
listDisplayFunction: 'jsonTruncate',
deserializeFunction: 'JSON.stringify',
},
Float: {
validation: (isRequired) =>
`{{ valueAsNumber: true${isRequired ? ', required: true' : ''} }}`,
},
Decimal: {
validation: (isRequired) =>
`{{ valueAsNumber: true${isRequired ? ', required: true' : ''} }}`,
},
default: {
componentName: 'TextField',
defaultProp: 'defaultValue',
deserializeFunction: '',
validation: '{{ required: true }}',
displayFunction: undefined,
listDisplayFunction: 'truncate',
},
}

const columns = model.fields
.filter((field) => field.kind !== 'object')
.map((column) => {
let validation

if (componentMetadata[column.type]?.validation) {
validation = componentMetadata[column.type]?.validation(
column?.isRequired
)
} else {
validation = column?.isRequired
? componentMetadata.default.validation
: null
}

const isEnum = column.kind === 'enum'
const isList = column.isList
const enumType = isEnum && isList ? 'EnumList' : 'Enum'
const metadataKey = isEnum ? enumType : column.type

return {
...column,
label: humanize(column.name),
component:
componentMetadata[metadataKey]?.componentName ||
componentMetadata.default.componentName,
defaultProp:
componentMetadata[metadataKey]?.defaultProp ||
componentMetadata.default.defaultProp,
deserializeFunction:
componentMetadata[metadataKey]?.deserializeFunction ||
componentMetadata.default.deserializeFunction,
validation,
listDisplayFunction:
componentMetadata[metadataKey]?.listDisplayFunction ||
componentMetadata.default.listDisplayFunction,
displayFunction:
componentMetadata[metadataKey]?.displayFunction ||
componentMetadata.default.displayFunction,
values: column.enumValues || [],
isList,
isEnum,
}
})
const editableColumns = columns
.filter((column) => {
return NON_EDITABLE_COLUMNS.indexOf(column.name) === -1
})
.filter(filterAutoGeneratedColumnsForScaffold)
const fieldsToImport = Object.keys(
editableColumns.reduce((accumulator, column) => {
accumulator[column.component] = true
return accumulator
}, {})
)

if (!fieldsToImport.length) {
throw new Error(`There are no editable fields in the ${model.name} model`)
}

const formattersImports = columns
.map((column) => column.displayFunction)
.sort()
// filter out duplicates, so we only keep unique import names
.filter((name, index, array) => array.indexOf(name) === index)
.join(', ')

const listFormattersImports = columns
.map((column) => column.listDisplayFunction)
.sort()
// filter out duplicates, so we only keep unique import names
.filter((name, index, array) => array.indexOf(name) === index)
.join(', ')

return {
columns,
fieldsToImport,
editableColumns,
listFormattersImports,
formattersImports,
}
}

const layoutFiles = (name, force, generateTypescript, templateStrings) => {
let fileList = {}

Expand Down Expand Up @@ -384,6 +525,7 @@ const pageFiles = async (
name,
pascalScaffoldPath,
...templateStrings,
...modelRelatedVariables(model),
}
)

Expand All @@ -408,122 +550,6 @@ const componentFiles = async (
const idType = getIdType(model)
const intForeignKeys = intForeignKeysForModel(model)
let fileList = {}
const componentMetadata = {
Enum: {
componentName: 'RadioField',
defaultProp: 'defaultChecked',
validation: () => false,
listDisplayFunction: 'formatEnum',
displayFunction: 'formatEnum',
},
EnumList: {
componentName: 'CheckboxField',
defaultProp: 'defaultChecked',
validation: () => false,
listDisplayFunction: 'formatEnum',
displayFunction: 'formatEnum',
},
Boolean: {
componentName: 'CheckboxField',
defaultProp: 'defaultChecked',
validation: () => false,
listDisplayFunction: 'checkboxInputTag',
displayFunction: 'checkboxInputTag',
},
DateTime: {
componentName: 'DatetimeLocalField',
deserializeFunction: 'formatDatetime',
listDisplayFunction: 'timeTag',
displayFunction: 'timeTag',
},
Int: {
componentName: 'NumberField',
},
Json: {
componentName: 'TextAreaField',
validation: (isRequired) =>
`{{ valueAsJSON: true${isRequired ? ', required: true' : ''} }}`,
displayFunction: 'jsonDisplay',
listDisplayFunction: 'jsonTruncate',
deserializeFunction: 'JSON.stringify',
},
Float: {
validation: (isRequired) =>
`{{ valueAsNumber: true${isRequired ? ', required: true' : ''} }}`,
},
Decimal: {
validation: (isRequired) =>
`{{ valueAsNumber: true${isRequired ? ', required: true' : ''} }}`,
},
default: {
componentName: 'TextField',
defaultProp: 'defaultValue',
deserializeFunction: '',
validation: '{{ required: true }}',
displayFunction: undefined,
listDisplayFunction: 'truncate',
},
}

const columns = model.fields
.filter((field) => field.kind !== 'object')
.map((column) => {
let validation

if (componentMetadata[column.type]?.validation) {
validation = componentMetadata[column.type]?.validation(
column?.isRequired
)
} else {
validation = column?.isRequired
? componentMetadata.default.validation
: null
}

const isEnum = column.kind === 'enum'
const isList = column.isList
const enumType = isEnum && isList ? 'EnumList' : 'Enum'
const metadataKey = isEnum ? enumType : column.type

return {
...column,
label: humanize(column.name),
component:
componentMetadata[metadataKey]?.componentName ||
componentMetadata.default.componentName,
defaultProp:
componentMetadata[metadataKey]?.defaultProp ||
componentMetadata.default.defaultProp,
deserializeFunction:
componentMetadata[metadataKey]?.deserializeFunction ||
componentMetadata.default.deserializeFunction,
validation,
listDisplayFunction:
componentMetadata[metadataKey]?.listDisplayFunction ||
componentMetadata.default.listDisplayFunction,
displayFunction:
componentMetadata[metadataKey]?.displayFunction ||
componentMetadata.default.displayFunction,
values: column.enumValues || [],
isList,
isEnum,
}
})
const editableColumns = columns
.filter((column) => {
return NON_EDITABLE_COLUMNS.indexOf(column.name) === -1
})
.filter(filterAutoGeneratedColumnsForScaffold)
const fieldsToImport = Object.keys(
editableColumns.reduce((accumulator, column) => {
accumulator[column.component] = true
return accumulator
}, {})
)

if (!fieldsToImport.length) {
throw new Error(`There are no editable fields in the ${name} model`)
}

const components = fs.readdirSync(
customOrDefaultTemplatePath({
Expand All @@ -533,20 +559,6 @@ const componentFiles = async (
})
)

const formattersImports = columns
.map((column) => column.displayFunction)
.sort()
// filter out duplicates, so we only keep unique import names
.filter((name, index, array) => array.indexOf(name) === index)
.join(', ')

const listFormattersImports = columns
.map((column) => column.listDisplayFunction)
.sort()
// filter out duplicates, so we only keep unique import names
.filter((name, index, array) => array.indexOf(name) === index)
.join(', ')

await asyncForEach(components, (component) => {
const outputComponentName = component
.replace(/Names/, pluralName)
Expand All @@ -572,15 +584,11 @@ const componentFiles = async (
}),
{
name,
columns,
fieldsToImport,
editableColumns,
idType,
intForeignKeys,
pascalScaffoldPath,
listFormattersImports,
formattersImports,
...templateStrings,
...modelRelatedVariables(model),
}
)

Expand Down