Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit 277db9e

Browse files
authored
Merge pull request #525 from FlowzPlatform/524_NetworkFailureaHandle
Handle network failure and give proper error message
2 parents e138491 + c24f5fb commit 277db9e

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

client/src/components/SchemaView.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ export default {
606606
if (e.response.data.message) {
607607
this.$Notice.error({title: 'Error', desc: e.response.data.message.toString()})
608608
} else {
609-
this.$Notice.error({title: 'Error', desc: 'Instace Not Generated'})
609+
this.$Notice.error({title: 'Error', desc: e.message})
610610
}
611611
})
612612
} else {
@@ -656,11 +656,11 @@ export default {
656656
}, 1000)
657657
})
658658
.catch((err) => {
659+
this.$Notice.error({duration: '3', title: err.message, desc: ''})
659660
setTimeout(() => {
660661
this.sendDataEmail = this.$refs.schemasubformview.$el.outerHTML
661662
this.email = true
662663
this.loadEmail = false
663-
console.log(err)
664664
}, 1000)
665665
})
666666
} else {
@@ -770,7 +770,7 @@ export default {
770770
this.validErr = []
771771
this.isEmailDone = false
772772
}).catch(err => {
773-
console.log('Error', err)
773+
this.$Notice.error({duration: '3', title: err.message, desc: ''})
774774
this.$Loading.finish()
775775
this.bLoading = false
776776
this.email = false
@@ -935,7 +935,7 @@ export default {
935935
.then((res) => {
936936
return (res.data.data[0])
937937
}).catch(err => {
938-
console.log('Error: ', err)
938+
this.$Notice.error({duration: '3', title: err.message, desc: ''})
939939
this.dataLoading = false
940940
return
941941
})
@@ -945,7 +945,7 @@ export default {
945945
return schemaModel.getAll(this.flowzData.schema).then(res => {
946946
return res
947947
}).catch(err => {
948-
console.log('Error: ', err)
948+
this.$Notice.error({duration: '3', title: err.message, desc: ''})
949949
this.dataLoading = false
950950
return
951951
})
@@ -991,7 +991,7 @@ export default {
991991
this.$Loading.finish()
992992
}
993993
}).catch(err => {
994-
console.error('Error: ', err)
994+
this.$Notice.error({duration: '3', title: err.message, desc: ''})
995995
this.$Loading.error()
996996
this.dataLoading = false
997997
})

client/src/components/emailtemplate.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<h2 class="heading">Templates</h2>
55
<Table border highlight-row :columns="columns7" class="tableCss" :data="data6"></Table>
66
</div>
7-
<div class="editor" v-if="newTemplate">
7+
<div class="editor" v-if="newTemplate && flag">
88
<h2 class="heading">Create Template</h2>
99
<keep-alive>
1010
<editor v-model="GetHtmlOfEditor" api-key="ppzi01crrfo3pvd43s3do89pguwkhowrwajpjdqdkginzj7k" :toolbar="toolbar1" :plugins="plugins" :init="settings" :initial-value="gethtmlcontent"></editor>
@@ -29,6 +29,7 @@ import _ from 'lodash'
2929
export default {
3030
data () {
3131
return {
32+
flag: false,
3233
updateTemplateid: '',
3334
newTemplate: true,
3435
templateName: '',
@@ -179,10 +180,12 @@ export default {
179180
'user': this.$store.state.user._id
180181
})
181182
.then((res) => {
183+
this.flag = true
182184
this.data6 = res.data.data
183185
})
184186
.catch((err) => {
185187
console.log(err)
188+
this.$Notice.error({duration: '3', title: err.message, desc: ''})
186189
})
187190
},
188191
feathers: {

client/src/pages/Login.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export default {
145145
if (error.response) {
146146
this.$Message.error(error.response.data)
147147
} else {
148-
this.$Message.error('Fail login.')
148+
this.$Message.error(error.message)
149149
}
150150
return
151151
})

client/src/pages/Register.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ export default {
9999
}
100100
})
101101
.catch(e => {
102-
this.$Message.error(e.response.data)
103102
this.loading = false
103+
this.$Message.error(e.message)
104104
})
105105
} else {
106106
this.$Message.error('Form validation failed!')

client/src/pages/flow/List.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ export default {
721721
})
722722
.catch(error => {
723723
this.loading = false
724-
this.$Notice({duration: '3', title: 'Network Error', desc: ''})
724+
this.$Notice.error({duration: '3', title: error.message, desc: ''})
725725
console.log(error)
726726
})
727727
},

client/src/pages/schema/schemaList.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@
193193
return res.data.data
194194
}).catch(err => {
195195
console.log(err)
196+
this.$Notice.error({duration: '3', title: err.message, desc: ''})
196197
this.loading = false
197198
return []
198199
}))

0 commit comments

Comments
 (0)