Skip to content

chore/SOF-1549: Enable user to specify target k-point density per 1/Angstrom #42

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

Merged
merged 2 commits into from
Mar 14, 2023
Merged

chore/SOF-1549: Enable user to specify target k-point density per 1/Angstrom #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa84a73
fix: classname contains undefined
azech-hqs Feb 28, 2023
708c510
chore: adjust logic of default class names and field styles
azech-hqs Mar 8, 2023
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: 2 additions & 2 deletions src/context/json_schema_provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ class JSONSchemaFormDataProvider extends ContextProvider {
const schema = this.uiSchema;
return _.each(schema, (v, k, l) => {
l[k] = { ...v, ...this.defaultFieldStyles };
// retain any prior class attributes
l[k].classNames = `${v.classNames} ${this.defaultClassNames}`;
l[k].classNames = `${v.classNames || ""} ${this.defaultClassNames || ""}`;
return null;
Copy link
Member

@timurbazhirov timurbazhirov Mar 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what happened here...

Copy link
Contributor Author

@azech-hqs azech-hqs Mar 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously, it would add undefined to the default class name if the UI schema did not have a classNames property for the given field. I just changed the logic to only add classNames to the string if it is actually defined.

While working on this, I found the behavior of this function a bit counterintuitive, and perhaps we want to consider changing it so that whenever classNames is present in the UI schema, it overwrites rather than prepends the default class names.

Copy link
Member

@timurbazhirov timurbazhirov Mar 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. The above could be done with just:
l[k].classNames = `${v.classNames || ''} ${this.defaultClassNames || ''}`;
  1. It seems that you changes the logic for ...this.defaultFieldStyles also - is that intentional?

Copy link
Contributor Author

@azech-hqs azech-hqs Mar 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regarding 2, defaultFieldStyles already contains classNames and it seemed redundant, but I will change it back so that one may implement a custom version locally (which is not currently the case).

});
}
}
Expand Down