Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion src/components/RequestGroupComposition/RequestGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<custom-field
v-model="requestGroup.name"
field="name"
:label="getFromObject(formConfig, ['requestGroup', 'name', 'label'], 'Name')"
:label="getFromObject(formConfig, ['requestGroup', 'name', 'label'], 'Request Name')"
:desc="getFromObject(formConfig, ['requestGroup', 'name', 'desc'], '')"
:hide="getFromObject(formConfig, ['requestGroup', 'name', 'hide'], false)"
:errors="errors.name"
Expand Down
7 changes: 6 additions & 1 deletion src/components/RequestGroupComposition/Window.vue
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,12 @@ export default {
},
computed: {
topLevelErrors: function() {
return extractTopLevelErrors(this.errors);
let combinedError = extractTopLevelErrors(this.errors);
Copy link
Member Author

Choose a reason for hiding this comment

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

this.errors comes from a prop passed down from the parent, and will have errors on specific fields. The airmassData can also have an error (if there is an error with visibility), in which case this code below should include that in the error list shown at the top of this component.

// If showAirmass is false, it means that the airmassData is actually an error message returned from the endpoint
if (!this.showAirmass) {
combinedError = _.concat(combinedError, extractTopLevelErrors(this.airmassData));
}
return combinedError;
}
},
methods: {
Expand Down