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.

Sign up for GitHub

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

Jump to bottom

scaffold: Use checkbox to display boolean value #732

Merged
merged 4 commits into from
Jun 24, 2020
Merged

scaffold: Use checkbox to display boolean value #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe97b12
scaffold: Use checkbox to display boolean value
Tobbe Jun 21, 2020
212228e
Merge branch 'main' into tobbe-scaffolds-display-checkbox
cannikin Jun 23, 2020
81ba79c
Merge branch 'main' into tobbe-scaffolds-display-checkbox
cannikin Jun 24, 2020
46cbc9b
Merge branch 'main' into tobbe-scaffolds-display-checkbox
cannikin Jun 24, 2020
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
3 changes: 3 additions & 0 deletions packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@
.rw-table tbody tr:nth-child(even) {
background-color: #fff;
}
.rw-table input {
margin-left: 0;
}
.rw-table-actions {
display: flex;
justify-content: flex-end;
Expand Down
6 changes: 5 additions & 1 deletion packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ const timeTag = (datetime) => {
)
}

const checkboxInputTag = (checked) => {
return <input type="checkbox" checked={checked} disabled />
}

const PostsList = ({ posts }) => {
const { addMessage } = useFlash()
const [deletePost] = useMutation(DELETE_POST_MUTATION, {
Expand Down Expand Up @@ -66,7 +70,7 @@ const PostsList = ({ posts }) => {
<td>{truncate(post.author)}</td>
<td>{truncate(post.body)}</td>
<td>{truncate(post.image)}</td>
<td>{truncate(post.isPinned)}</td>
<td>{checkboxInputTag(post.isPinned)}</td>
<td>{timeTag(post.postedAt)}</td>
<td>
<nav className="rw-table-actions">
Expand Down
30 changes: 19 additions & 11 deletions packages/cli/src/commands/generate/scaffold/scaffold.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,37 +194,45 @@ const componentFiles = async (name, scaffoldPath = '') => {
const singularName = pascalcase(pluralize.singular(name))
const model = await getSchema(singularName)
const idType = getIdType(model)
const columns = model.fields.filter((field) => field.kind !== 'object')
const intForeignKeys = intForeignKeysForModel(model)
let fileList = {}
const fieldComponents = {
const componentMetadata = {
Boolean: {
name: 'CheckboxField',
defaultProp: 'defaultChecked',
validation: false,
displayFunction: 'checkboxInputTag',
},
DateTime: {
displayFunction: 'timeTag',
},
String: {
name: 'TextField',
defaultProp: 'defaultValue',
validation: '{{ required: true }}',
displayFunction: 'truncate',
},
}
const editableColumns = columns
.filter((column) => {
return NON_EDITABLE_COLUMNS.indexOf(column.name) === -1
})
const columns = model.fields
.filter((field) => field.kind !== 'object')
.map((column) => ({
...column,
label: humanize(column.name),
component:
fieldComponents[column.type]?.name || fieldComponents.String.name,
componentMetadata[column.type]?.name || componentMetadata.String.name,
defaultProp:
fieldComponents[column.type]?.defaultProp ||
fieldComponents.String.defaultProp,
componentMetadata[column.type]?.defaultProp ||
componentMetadata.String.defaultProp,
validation:
fieldComponents[column.type]?.validation ??
fieldComponents.String.validation,
componentMetadata[column.type]?.validation ??
componentMetadata.String.validation,
displayFunction:
componentMetadata[column.type]?.displayFunction ||
componentMetadata.String.displayFunction,
}))
const editableColumns = columns.filter((column) => {
return NON_EDITABLE_COLUMNS.indexOf(column.name) === -1
})
const fieldsToImport = Object.keys(
editableColumns.reduce((accumulator, column) => {
accumulator[column.component] = true
Expand Down
3 changes: 3 additions & 0 deletions packages/cli/src/commands/generate/scaffold/templates/assets/scaffold.css.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@
.rw-table tbody tr:nth-child(even) {
background-color: #fff;
}
.rw-table input {
margin-left: 0;
}
.rw-table-actions {
display: flex;
justify-content: flex-end;
Expand Down
6 changes: 5 additions & 1 deletion packages/cli/src/commands/generate/scaffold/templates/components/Names.js.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ const timeTag = (datetime) => {
)
}

const checkboxInputTag = (checked) => {
return <input type="checkbox" checked={checked} disabled />
}

const ${pluralPascalName}List = ({ ${pluralCamelName} }) => {
const { addMessage } = useFlash()
const [delete${singularPascalName}] = useMutation(DELETE_${singularConstantName}_MUTATION, {
Expand All @@ -53,7 +57,7 @@ const ${pluralPascalName}List = ({ ${pluralCamelName} }) => {
<tbody>
{${pluralCamelName}.map((${singularCamelName}) => (
<tr key={${singularCamelName}.id}><% columns.forEach(column => { %>
<td>{<% if (column.type === 'DateTime') { %>timeTag<% } else { %>truncate<% } %>(${singularCamelName}.<%= column.name %>)}</td><% }) %>
<td>{${column.displayFunction}(${singularCamelName}.${column.name})}</td><% }) %>
<td>
<nav className="rw-table-actions">
<Link
Expand Down