Skip to content

issue-710 fixed array of objects not validating #711

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
LindsayHill merged 2 commits into from
May 31, 2019
Merged

issue-710 fixed array of objects not validating #711

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e392ae
initial fix of array of object field validation issue
May 14, 2019
15e02e5
fixing compatibility issue with type of string and number
May 14, 2019
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
6 changes: 5 additions & 1 deletion modules/st2-auto-form/fields/array.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const typeChecks = (type, value) => {
case 'integer':
return !validator.isInt(v) && `'${v}' is not an integer`;
case 'object':
return !_.isPlainObject(v) && `'${v}' is not an object`;
return !_.isPlainObject(value) && `'${v}' is not an object`;
case 'string':
default:
return false;
Expand Down Expand Up @@ -79,6 +79,10 @@ export default class ArrayField extends BaseTextField {
return v;
}

if (Array.isArray(v) && this.props.spec.items.type === 'object') {
Copy link
Contributor

@VineeshJain VineeshJain Jun 3, 2019

Choose a reason for hiding this comment

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

This is the offending line in the scenario where actions may not above spec.items defined

Copy link
Author

@jdmeyer3 jdmeyer3 Jun 3, 2019

Choose a reason for hiding this comment

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

You guys are right, I did not test with the yaml definition not having the type of item. Let me take another look on how I can distinguish what type of items are in the array.

return JSON.stringify(v);
}

const { secret } = this.props.spec || {};
if (secret && v && !Array.isArray(v)) {
return v;
Expand Down