btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor: better error prompts

Browse Source
This commit is contained in:
liyasthomas
2021-06-28 17:28:22 +05:30
parent 3992650fd6
commit d5c5fb7435
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
components/teams/Edit.vue
View File

@@ -312,13 +312,26 @@ export default {
}) })
return return
} }
let invalidEmail = false
this.$data.newMembers.forEach((element) => { this.$data.newMembers.forEach((element) => {
if (!this.validateEmail(element.key)) { if (!this.validateEmail(element.key)) {
this.$toast.error(this.$t("invalid_emailID_format"), { this.$toast.error(this.$t("invalid_emailID_format"), {
icon: "error", icon: "error",
}) })
invalidEmail = true
} }
}) })
if (invalidEmail) return
let invalidPermission = false
this.$data.newMembers.forEach((element) => {
if (!element.value) {
this.$toast.error(this.$t("invalid_member_permission"), {
icon: "error",
})
invalidPermission = true
}
})
if (invalidPermission) return
this.$data.newMembers.forEach((element) => { this.$data.newMembers.forEach((element) => {
// Call to the graphql mutation // Call to the graphql mutation
teamUtils teamUtils
@@ -333,17 +346,15 @@ export default {
this.$toast.success(this.$t("team_saved"), { this.$toast.success(this.$t("team_saved"), {
icon: "done", icon: "done",
}) })
this.hideModal()
}) })
.catch((error) => { .catch((error) => {
// Error // Error
this.$toast.error(this.$t("error_occurred"), { this.$toast.error(error, {
icon: "done", icon: "done",
}) })
console.error(error) console.error(error)
}) })
}) })
let messageShown = true
this.members.forEach((element) => { this.members.forEach((element) => {
teamUtils teamUtils
.updateTeamMemberRole( .updateTeamMemberRole(
@@ -354,22 +365,15 @@ export default {
) )
.then(() => { .then(() => {
// Result // Result
if (messageShown) { this.$toast.success(this.$t("role_updated"), {
this.$toast.success(this.$t("role_updated"), { icon: "done",
icon: "done", })
})
messageShown = false
}
this.hideModal()
}) })
.catch((error) => { .catch((error) => {
// Error // Error
if (messageShown) { this.$toast.error(error, {
this.$toast.error(this.$t("error_occurred"), { icon: "done",
icon: "done", })
})
messageShown = false
}
console.error(error) console.error(error)
}) })
}) })
@@ -389,7 +393,6 @@ export default {
this.$toast.success(this.$t("team_saved"), { this.$toast.success(this.$t("team_saved"), {
icon: "done", icon: "done",
}) })
this.hideModal()
}) })
.catch((error) => { .catch((error) => {
// Error // Error

1
lang/en-US.json
View File

@@ -315,6 +315,7 @@
"use_team": "Use Team", "use_team": "Use Team",
"add_one_member": "(add at least one member)", "add_one_member": "(add at least one member)",
"permissions": "Permissions", "permissions": "Permissions",
"invalid_member_permission": "Please provide a valid permission to the team member",
"email": "E-mail", "email": "E-mail",
"create_new_team": "Create new team", "create_new_team": "Create new team",
"new_team_created": "New team created", "new_team_created": "New team created",