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

Field overrides fix #450

Merged
merged 3 commits into from
Sep 3, 2024
Merged

Field overrides fix #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa5b675
Update CHANGELOG.md
beepsoft Sep 3, 2024
b26ea1d
Merge remote-tracking branch 'origin/development' into development
beepsoft Sep 3, 2024
07eb474
Fix case when config.fieldOverrides is undefined
beepsoft Sep 3, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 0.17.3

...

## 0.17.2

- Fix tests, upgrade minor versions of mobx, mobx-state-tree
Expand Down
9 changes: 6 additions & 3 deletions generator/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,19 @@ exports.mergeConfigs = function mergeConfigs(args, config) {
!!args["--useIdentifierNumber"] || config.useIdentifierNumber,
fieldOverrides: args["--fieldOverrides"]
? parseFieldOverrides(args["--fieldOverrides"])
: parseFieldOverrides(config.fieldOverrides),
: config.fieldOverrides
? parseFieldOverrides(config.fieldOverrides)
: [],
dynamicArgs: !!args["--dynamicArgs"] || config.dynamicArgs,
debug: !!args["--debug"] || config.debug,
disableLogColors: !!args["--disableLogColors"] || config.disableLogColors
}
}

const parseFieldOverrides = (fieldOverrides) => {
const _fieldOverrides =
Array.isArray(fieldOverrides) ? fieldOverrides : fieldOverrides.split(",");
const _fieldOverrides = Array.isArray(fieldOverrides)
? fieldOverrides
: fieldOverrides.split(",")

return _fieldOverrides
.map((s) => s.trim())
Expand Down