Catch all swal dismissals

LibCrowds · Apr 9, 2018 · 30d5f7c · 30d5f7c
1 parent f65662b
commit 30d5f7c
Show file tree

Hide file tree

Showing 17 changed files with 87 additions and 19 deletions.
diff --git a/components/forms/PybossaForm.vue b/components/forms/PybossaForm.vue
@@ -227,6 +227,10 @@ export default {
         preConfirm: () => {
           return this.process()
         }
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     },
 

diff --git a/components/presenters/IIIFAnnotation.vue b/components/presenters/IIIFAnnotation.vue
@@ -176,6 +176,10 @@ export default {
             }
             resolve()
           })
+        }).catch(err => {
+          if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+            this.$nuxt.error(err)
+          }
         })
       }
 

diff --git a/components/presenters/Z3950.vue b/components/presenters/Z3950.vue
@@ -512,6 +512,10 @@ export default {
             comments: this.$refs.comments.value
           })
         }
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     },
 

diff --git a/mixins/deleteDomainObject.js b/mixins/deleteDomainObject.js
@@ -21,6 +21,10 @@ export const deleteDomainObject = {
           })
           callback()
         }
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     }
   }

diff --git a/pages/account/_name/templates/_id/delete.vue b/pages/account/_name/templates/_id/delete.vue
@@ -103,6 +103,10 @@ export default {
             name: this.currentUser.name
           }
         })
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     }
   }

diff --git a/pages/account/register/index.vue b/pages/account/register/index.vue
@@ -145,12 +145,16 @@ export default {
      */
     onSuccess (data) {
       if (data.status === 'sent') {
-        this.$swal(
-          'Confirm your email',
-          'To complete your registration please click the confirmation ' +
-          'link in the email that we just sent you',
-          'success'
-        )
+        this.$swal({
+          title: 'Confirm your email',
+          text: 'To complete your registration please click the ' +
+            'confirmation link in the email that we just sent you',
+          type: 'success'
+        }).catch(err => {
+          if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+            this.$nuxt.error(err)
+          }
+        })
       }
     }
   }

diff --git a/pages/account/reset-password.vue b/pages/account/reset-password.vue
@@ -92,6 +92,10 @@ export default {
           has expired.</p><p>Please try submitting the password reset form
           again.</p>`,
         type: 'warning'
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     }
   }

diff --git a/pages/admin/collection/_short_name/celebrations.vue b/pages/admin/collection/_short_name/celebrations.vue
@@ -134,8 +134,10 @@ export default {
       }).then(() => {
         this.$confetti.stop()
       }).catch(err => {
-        console.debug(err)
         this.$confetti.stop()
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     }
   }

diff --git a/pages/admin/collection/_short_name/exports/index.vue b/pages/admin/collection/_short_name/exports/index.vue
@@ -133,6 +133,10 @@ export default {
           })
           this.$store.dispatch('UPDATE_CURRENT_COLLECTION', data)
         }
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     }
   }

diff --git a/pages/admin/collection/_short_name/tags.vue b/pages/admin/collection/_short_name/tags.vue
@@ -121,6 +121,10 @@ export default {
           this.$notifications.success({ message: `Tag deleted` })
           this.refresh()
         }
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     },
 

diff --git a/pages/admin/collection/_short_name/volumes/index.vue b/pages/admin/collection/_short_name/volumes/index.vue
@@ -111,11 +111,7 @@ export default {
             'cannot be deleted.',
           type: 'warning'
         }).catch(err => {
-          // Refactor if vue-sweetalert gets updated to swal v.7
-          if (
-            !(typeof err === 'string' ||
-            (typeof err === 'object' && err.hasOwnProperty('dismiss')))
-          ) {
+          if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
             this.$nuxt.error(err)
           }
         })
@@ -148,11 +144,7 @@ export default {
           this.volumes = this.volumes.filter(vol => (vol.id !== id))
         }
       }).catch(err => {
-        // Refactor if vue-sweetalert gets updated to swal v.7
-        if (
-          !(typeof err === 'string' ||
-          (typeof err === 'object' && err.hasOwnProperty('dismiss')))
-        ) {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
           this.$nuxt.error(err)
         }
       }).then(() => {

diff --git a/pages/admin/project/_short_name/publish.vue b/pages/admin/project/_short_name/publish.vue
@@ -117,6 +117,10 @@ export default {
             }
           })
         }
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     }
   }

diff --git a/pages/admin/project/_short_name/results.vue b/pages/admin/project/_short_name/results.vue
@@ -100,6 +100,10 @@ export default {
         if (result) {
           this.$notifications.success({ message: result.message })
         }
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     },
 

diff --git a/pages/admin/project/_short_name/template.vue b/pages/admin/project/_short_name/template.vue
@@ -118,7 +118,9 @@ export default {
           this.analyseAllResults()
         }
       }).catch(err => {
-        this.$nuxt.error(err)
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     },
 
@@ -148,6 +150,10 @@ export default {
         if (result) {
           this.$notifications.success({ message: result.message })
         }
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     }
   }

diff --git a/pages/admin/site/results.vue b/pages/admin/site/results.vue
@@ -104,6 +104,10 @@ export default {
         }
       }).then(data => {
         this.$notifications.flash(data)
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     },
 
@@ -130,6 +134,10 @@ export default {
         }
       }).then(data => {
         this.$notifications.flash(data)
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     }
   }

diff --git a/pages/admin/site/templates.vue b/pages/admin/site/templates.vue
@@ -111,6 +111,10 @@ export default {
         this.removeTemplateFromTable(template)
         this.$notifications.flash(data)
         this.$store.dispatch('UPDATE_N_PENDING_TEMPLATES', this.$axios)
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     },
 
@@ -143,6 +147,10 @@ export default {
         this.removeTemplateFromTable(template)
         this.$notifications.flash(data)
         this.$store.dispatch('UPDATE_N_PENDING_TEMPLATES', this.$axios)
+      }).catch(err => {
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
       })
     },
 

diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue
@@ -267,14 +267,18 @@ export default {
       this.$confetti.start({
         shape: this.currentCollection.info.celebrations.confetti
       })
+
       this.$swal({
         html: marked(msg)
       }).then(() => {
         this.$confetti.stop()
       }).catch(err => {
-        console.debug(err)
+        if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+          this.$nuxt.error(err)
+        }
         this.$confetti.stop()
       })
+
       this.$router.push({
         name: 'collection-short_name-projects',
         params: {
@@ -319,6 +323,10 @@ export default {
             title: 'Thank you!',
             html: 'Your contribution has been saved successfully and will ' +
                   'directly help enable future research.'
+          }).catch(err => {
+            if (typeof err === 'object' && err.hasOwnProperty('dismiss')) {
+              this.$nuxt.error(err)
+            }
           })
         } else {
           this.$notifications.answerSaved()