Skip to content

Commit 7ca1070

Browse files
committed
validation error in edit form
1 parent f091640 commit 7ca1070

File tree

3 files changed

+40
-35
lines changed

3 files changed

+40
-35
lines changed

test/test-data.js

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -566,14 +566,15 @@ export default {
566566
.then(function (response) {
567567
t.$router.push('/dogs')
568568
}).catch( function (res) {
569-
if (res.response && res.response.data && res.response.data.errors) {
570-
t.errors = res.response.data.errors
571-
} else {
572-
var err = (res && res.response && res.response.data && res.response
573-
.data.message ?
574-
res.response.data.message : res)
575-
t.$root.$emit('globalError', err)
576-
t.$router.push('/')
569+
if(res.response && res.response.data && res.response.data.errors && (res.response.data.errors[0].message === "Validation error")){
570+
t.errors = res.response.data.errors[0];
571+
}else{
572+
let msg = res;
573+
if(res && res.response && res.response.data && res.response.data.message){
574+
msg = res.response.data.message
575+
}
576+
t.$root.$emit('globalError', msg)
577+
t.$router.push('/home')
577578
}
578579
})
579580
},
@@ -1892,21 +1893,23 @@ export default {
18921893
this.getAssociationsIds();
18931894
Queries.Book.update({url:url, variables:t.book})
18941895
.then(function (response) {
1895-
t.$router.push('/books')
1896+
t.$router.push('/books')
18961897
}).catch( function (res) {
1897-
if (res.response && res.response.data && res.response.data.errors) {
1898-
t.errors = res.response.data.errors
1899-
} else {
1900-
var err = (res && res.response && res.response.data && res.response
1901-
.data.message ?
1902-
res.response.data.message : res)
1903-
t.$root.$emit('globalError', err)
1904-
t.$router.push('/')
1898+
if(res.response && res.response.data && res.response.data.errors && (res.response.data.errors[0].message === "Validation error")){
1899+
t.errors = res.response.data.errors[0];
1900+
}else{
1901+
let msg = res;
1902+
if(res && res.response && res.response.data && res.response.data.message){
1903+
msg = res.response.data.message
1904+
}
1905+
t.$root.$emit('globalError', msg)
1906+
t.$router.push('/home')
19051907
}
19061908
})
19071909
},
1910+
19081911
getOnlyIds(array){
1909-
return array.map((item)=>{ return item.id; });
1912+
return array.map((item)=>{ return item.id; });
19101913
},
19111914
19121915
getAssociationsIds(){
@@ -2063,14 +2066,15 @@ export default {
20632066
.then(function (response) {
20642067
t.$router.push('/people')
20652068
}).catch( function (res) {
2066-
if (res.response && res.response.data && res.response.data.errors) {
2067-
t.errors = res.response.data.errors
2068-
} else {
2069-
var err = (res && res.response && res.response.data && res.response
2070-
.data.message ?
2071-
res.response.data.message : res)
2072-
t.$root.$emit('globalError', err)
2073-
t.$router.push('/')
2069+
if(res.response && res.response.data && res.response.data.errors && (res.response.data.errors[0].message === "Validation error")){
2070+
t.errors = res.response.data.errors[0];
2071+
}else{
2072+
let msg = res;
2073+
if(res && res.response && res.response.data && res.response.data.message){
2074+
msg = res.response.data.message
2075+
}
2076+
t.$root.$emit('globalError', msg)
2077+
t.$router.push('/home')
20742078
}
20752079
})
20762080
},

test/test-features.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ describe('VueTable GraphQl Query', function(){
189189

190190
let modelsObjBook = funks.fillOptionsForViews(models.book) ;
191191

192-
it('BookEditForm - update hasMany',async function(){
192+
it('BookEditForm - update hasMany - validation error',async function(){
193193
let file = await funks.renderTemplate('editForm',modelsObjBook);
194194
let created_editForm = file.replace(/\s/g, '');
195195
let test_editForm = testData.BookEdit.replace(/\s/g, '');

views/pages/editForm.ejs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@ export default {
5959
.then(function (response) {
6060
t.$router.push('/<%- namePlLc -%>')
6161
}).catch( function (res) {
62-
if (res.response && res.response.data && res.response.data.errors) {
63-
t.errors = res.response.data.errors
64-
} else {
65-
var err = (res && res.response && res.response.data && res.response
66-
.data.message ?
67-
res.response.data.message : res)
68-
t.$root.$emit('globalError', err)
69-
t.$router.push('/')
62+
if(res.response && res.response.data && res.response.data.errors && (res.response.data.errors[0].message === "Validation error")){
63+
t.errors = res.response.data.errors[0];
64+
}else{
65+
let msg = res;
66+
if(res && res.response && res.response.data && res.response.data.message){
67+
msg = res.response.data.message
68+
}
69+
t.$root.$emit('globalError', msg)
70+
t.$router.push('/home')
7071
}
7172
})
7273
},

0 commit comments

Comments
 (0)