Skip to content
This repository was archived by the owner on May 7, 2021. It is now read-only.

Adaptation au nouveau rapport de validata/Frictionless #67

Open
pierredittgen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adaptation au nouveau rapport de validata/Frictionless #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6de1535
Adapt to change in validation report
Feb 3, 2021
64cfde6
Support legacy and new validation report
Feb 3, 2021
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
12 changes: 11 additions & 1 deletion src/components/FormGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
label-cols-lg="3"
:label="field.name"
:label-for="`field-${field.name}`"
:invalid-feedback="error.content"
:invalid-feedback="errorMessage"
valid-feedback="Ce champ est valide"
:state="isValid"
:label-class="{'required': isRequired}"
Expand All @@ -26,6 +26,16 @@ export default {
mixins: [ValidateField],
components: {
VueMarkdown
},
computed: {
errorMessage() {
// Test order matters.
// legacy report error contains 'content' (fr) and 'message' (en) properties
// New validation report only contains 'message' (fr) property
return this.error.content
? this.error.content // legacy validation report
: this.error.message // new validation report
}
}
}
</script>
8 changes: 6 additions & 2 deletions src/views/SchemaForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ export default {
return factory(StringField, field)
},
dispatchError(error) {
let index = error['column-number']
let index = error.fieldNumber
? error.fieldNumber // new validation report
: error['column-number'] // legacy validation report
this.faultyFields.push(this.fieldNames[index-1])
EventBus.$emit('field-error', this.fieldNames[index-1], error)
},
Expand All @@ -207,7 +209,9 @@ export default {
.then(data => {
this.formValidated = true
this.faultyFields = []
const errors = data.report.tables[0].errors
const errors = data.report.tasks
? data.report.tasks[0].errors // new validation report
: data.report.tables[0].errors // legacy validation report
if (errors && errors.length > 0) {
errors.forEach((error) => {
this.dispatchError(error)
Expand Down