Magento error params in error notifications (#138)

rapidez · Jun 21, 2022 · 6846951 · 6846951
1 parent 97d1a05
commit 6846951
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/resources/js/app.js b/resources/js/app.js
@@ -1,6 +1,6 @@
 window.axios = require('axios')
 window.debug = process.env.MIX_DEBUG == 'true'
-window.Notify = (message, type) => window.app.$emit('notification-message', message, type);
+window.Notify = (message, type, params = []) => window.app.$emit('notification-message', message, type, params);
 
 require('./lodash')
 require('./vue')

diff --git a/resources/js/components/Notifications/Notification.vue b/resources/js/components/Notifications/Notification.vue
@@ -19,7 +19,7 @@
             })
         },
         created() {
-            this.message = this.notification.message
+            this.message = this.notification.message.includes('%') ? this.format(this.notification.message, this.notification.params) : this.notification.message
             this.show = this.notification.show
             this.type = this.notification.type
         },
@@ -31,12 +31,18 @@
         data: () => ({
             message: null,
             type: null,
-            show: null,
+            show: null
         }),
         methods: {
             close() {
                 this.show = false
+            },
+            format(str, arr) {
+                return str.replace(/%(\d+)/g, function(_,m) {
+                    return arr[--m];
+                });
             }
+
         },
         computed: {
             classes() {

diff --git a/resources/js/components/Notifications/Notifications.vue b/resources/js/components/Notifications/Notifications.vue
@@ -9,9 +9,10 @@
             })
         },
         mounted() {
-            this.$root.$on('notification-message', (message, type) => {
+            this.$root.$on('notification-message', (message, type, params) => {
                 this.notifications.push({
                     message: message,
+                    params: params,
                     type: type,
                     show: true
                 })

diff --git a/resources/js/components/User/mixins/InteractWithUser.js b/resources/js/components/User/mixins/InteractWithUser.js
@@ -75,7 +75,7 @@ export default {
                 })
                 return response.data
             } catch (error) {
-                Notify(error.response.data.message, 'error')
+                Notify(error.response.data.message, 'error', error.response.data.parameters)
                 return false
             }
         },