From f40065ffd1d9665741c12364e8c4dbe2c407d5e1 Mon Sep 17 00:00:00 2001 From: romankko2 Date: Wed, 8 Nov 2023 18:13:06 +0100 Subject: [PATCH] [toast] adding parsing function --- app/src/plugins/app/_layout/app/_components/a-header.vue | 2 +- app/src/plugins/app/_layout/app/app.layout.vue | 2 +- .../forgot-password/_components/a-forgot-password-form.vue | 2 +- .../reset-password/_components/a-reset-password-form.vue | 2 +- app/src/plugins/lib@search/search/search.vue | 2 +- app/src/plugins/tm@modal/_components/read-only/z-files.vue | 2 +- app/src/plugins/tm@modal/blocker/z-blocker-modal.vue | 4 ++-- app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue | 2 +- .../tm@modal/master-task/z-complete-master-task-modal.vue | 2 +- .../tm@modal/master-task/z-delete-master-task-modal.vue | 2 +- .../tm@modal/master-task/z-delete-team-member-modal.vue | 2 +- app/src/plugins/tm@modal/master-task/z-master-task-modal.vue | 2 +- app/src/plugins/tm@modal/task/z-complete-task-modal.vue | 2 +- app/src/plugins/tm@modal/task/z-delete-task-modal.vue | 2 +- app/src/plugins/tm@modal/task/z-task-modal.vue | 4 ++-- app/src/plugins/tm@modal/team/z-delete-team-modal.vue | 2 +- app/src/plugins/tm@modal/team/z-team-modal.vue | 4 ++-- app/src/plugins/tm@profile/profile/my-profile.vue | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/src/plugins/app/_layout/app/_components/a-header.vue b/app/src/plugins/app/_layout/app/_components/a-header.vue index ab87ab0..4bac408 100644 --- a/app/src/plugins/app/_layout/app/_components/a-header.vue +++ b/app/src/plugins/app/_layout/app/_components/a-header.vue @@ -74,7 +74,7 @@ export default { this.$router.push('/') this.$toast.success('Boli ste odhlásený') } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } }, diff --git a/app/src/plugins/app/_layout/app/app.layout.vue b/app/src/plugins/app/_layout/app/app.layout.vue index 3a6d38c..98519ee 100644 --- a/app/src/plugins/app/_layout/app/app.layout.vue +++ b/app/src/plugins/app/_layout/app/app.layout.vue @@ -34,7 +34,7 @@ export default { try { await this.$store.dispatch('tm/initialize') } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } finally { this.loader?.hide() } diff --git a/app/src/plugins/lib@auth/forgot-password/_components/a-forgot-password-form.vue b/app/src/plugins/lib@auth/forgot-password/_components/a-forgot-password-form.vue index 2f7c4fe..64dcf84 100644 --- a/app/src/plugins/lib@auth/forgot-password/_components/a-forgot-password-form.vue +++ b/app/src/plugins/lib@auth/forgot-password/_components/a-forgot-password-form.vue @@ -47,7 +47,7 @@ export default { await this.$store.dispatch('auth/forgotPassword', this.credentials) this.$router.push({name: 'Forgot success', query: {email: this.credentials.email}}) } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } } } diff --git a/app/src/plugins/lib@auth/reset-password/_components/a-reset-password-form.vue b/app/src/plugins/lib@auth/reset-password/_components/a-reset-password-form.vue index 6699710..6c83e3b 100644 --- a/app/src/plugins/lib@auth/reset-password/_components/a-reset-password-form.vue +++ b/app/src/plugins/lib@auth/reset-password/_components/a-reset-password-form.vue @@ -60,7 +60,7 @@ export default { this.$router.push({ name: 'Login' }) this.$toast.success('Your password has been successfully changed.') } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } } } diff --git a/app/src/plugins/lib@search/search/search.vue b/app/src/plugins/lib@search/search/search.vue index 981bb13..0cfdde5 100644 --- a/app/src/plugins/lib@search/search/search.vue +++ b/app/src/plugins/lib@search/search/search.vue @@ -75,7 +75,7 @@ export default { const { mastertasks, subtasks, teams} = await this.$axios.get_auth(`v1/search?q=${search}`) this.searchResults = {mastertasks: mastertasks.data, subtasks: subtasks.data, teams: teams.data} } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) this.searchResults = {error} } }, 300) diff --git a/app/src/plugins/tm@modal/_components/read-only/z-files.vue b/app/src/plugins/tm@modal/_components/read-only/z-files.vue index 0660ba9..c14797e 100644 --- a/app/src/plugins/tm@modal/_components/read-only/z-files.vue +++ b/app/src/plugins/tm@modal/_components/read-only/z-files.vue @@ -43,7 +43,7 @@ export default { const blob = await response.blob() FileSaver.saveAs(blob, file.name) } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } finally { file.isLoading = false } diff --git a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue index 475a1cd..eda6ef9 100644 --- a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue +++ b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue @@ -120,7 +120,7 @@ export default { } } } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } }, @@ -142,7 +142,7 @@ export default { this.$events.emit("blocker-created") this.closeModal() } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } }, diff --git a/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue b/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue index 35efa01..09c5341 100644 --- a/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue +++ b/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue @@ -55,7 +55,7 @@ export default { this.$emit('on-blocker-deleted', this.blocker) this.closeModal() } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } finally { this.isDeleting = false } diff --git a/app/src/plugins/tm@modal/master-task/z-complete-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-complete-master-task-modal.vue index 77e5033..6c3d833 100644 --- a/app/src/plugins/tm@modal/master-task/z-complete-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-complete-master-task-modal.vue @@ -46,7 +46,7 @@ export default { this.$emit('master-task-edited', mastertask) this.$events.emit('close-both-modals') } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } } } diff --git a/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue index 2e2e82d..fdcc9df 100644 --- a/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue @@ -54,7 +54,7 @@ export default { this.$emit('on-mastertask-deleted', this.mastertask) this.closeModal() } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } finally { this.isDeleting = false } diff --git a/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue b/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue index e67c24b..758e802 100644 --- a/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue @@ -66,7 +66,7 @@ export default { this.$events.emit('master-task:team-member-deleted', { teamId: this.team.id, memberId: this.member.id }) this.closeModal() } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } }, diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue index cab59a9..d786a4a 100644 --- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue @@ -324,7 +324,7 @@ export default { this.$emit('master-task-edited', this.mastertask) this.closeModal() } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } finally { this.isSaving = false } diff --git a/app/src/plugins/tm@modal/task/z-complete-task-modal.vue b/app/src/plugins/tm@modal/task/z-complete-task-modal.vue index 8c54fa1..17c6ccd 100644 --- a/app/src/plugins/tm@modal/task/z-complete-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-complete-task-modal.vue @@ -48,7 +48,7 @@ export default { this.visible = false this.$emit('on-subtask-edited', subtask) } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } }, diff --git a/app/src/plugins/tm@modal/task/z-delete-task-modal.vue b/app/src/plugins/tm@modal/task/z-delete-task-modal.vue index 3e78084..75f35c8 100644 --- a/app/src/plugins/tm@modal/task/z-delete-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-delete-task-modal.vue @@ -56,7 +56,7 @@ export default { this.closeModal() this.$emit('on-subtask-deleted', this.subtask) } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } finally { this.isDeleting = false } diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue index 7727a92..04cc629 100644 --- a/app/src/plugins/tm@modal/task/z-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-task-modal.vue @@ -238,7 +238,7 @@ export default { this.editMode = editMode || !this.subtask.id } catch (error) { console.error('ERROR', error) - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } }, @@ -288,7 +288,7 @@ export default { this.closeModal() } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } finally { this.isSaving = false } diff --git a/app/src/plugins/tm@modal/team/z-delete-team-modal.vue b/app/src/plugins/tm@modal/team/z-delete-team-modal.vue index 452a33e..58c6417 100644 --- a/app/src/plugins/tm@modal/team/z-delete-team-modal.vue +++ b/app/src/plugins/tm@modal/team/z-delete-team-modal.vue @@ -51,7 +51,7 @@ export default { this.$emit('update', this.team) this.$store.commit('tm/delete_team', this.team) } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } finally { this.isDeleting = false } diff --git a/app/src/plugins/tm@modal/team/z-team-modal.vue b/app/src/plugins/tm@modal/team/z-team-modal.vue index a00cae7..e090422 100644 --- a/app/src/plugins/tm@modal/team/z-team-modal.vue +++ b/app/src/plugins/tm@modal/team/z-team-modal.vue @@ -98,7 +98,7 @@ export default { this.team = { employees: [] } } } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } }, @@ -125,7 +125,7 @@ export default { this.closeModal() } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } }, diff --git a/app/src/plugins/tm@profile/profile/my-profile.vue b/app/src/plugins/tm@profile/profile/my-profile.vue index 637f975..cbb5c27 100644 --- a/app/src/plugins/tm@profile/profile/my-profile.vue +++ b/app/src/plugins/tm@profile/profile/my-profile.vue @@ -63,7 +63,7 @@ export default { await this.$store.dispatch('auth/updateUserInfo', data) this.$toast.success('Profil bol úspešne zmenený') } catch (error) { - this.$toast.error(error) + this.$toast.error(this.$parseError(error)) } },