From 9f7cba6c6ccb76d3fc71946563045e390a78af62 Mon Sep 17 00:00:00 2001
From: Cyril Dubuisson <cyril.dubuisson@gmail.com>
Date: Wed, 1 Apr 2020 16:03:04 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20:=20add=20modal=20service=20to=20di?=
 =?UTF-8?q?splay=20notifications?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/client/app/pages/login/login.vue     | 11 ++------
 .../pages/modules/import/registry-import.vue  | 15 +++++------
 src/main/client/app/pages/modules/module.vue  | 27 ++++++-------------
 .../client/app/pages/settings/settings.vue    | 12 +++------
 src/main/client/app/pages/users/users.vue     | 12 +++------
 .../app/shared/services/modal-service.js      |  8 ++++++
 6 files changed, 30 insertions(+), 55 deletions(-)
 create mode 100644 src/main/client/app/shared/services/modal-service.js

diff --git a/src/main/client/app/pages/login/login.vue b/src/main/client/app/pages/login/login.vue
index f3021907b..6c2523577 100644
--- a/src/main/client/app/pages/login/login.vue
+++ b/src/main/client/app/pages/login/login.vue
@@ -71,6 +71,7 @@
 
 <script>
   import AppLoginOauthSignin from '@/pages/login/login-oauth-signin.vue';
+  import { displayNotification } from '@/shared/services/modal-service';
 
   export default {
     name: 'AppLoginForm',
@@ -92,15 +93,7 @@
         this.$store.dispatch('session/login', formData)
           .then(() => this.$router.push({ name: 'home' }, null, () => {
           }))
-          .catch((error) => this.displayErrorMessage(error.response.data));
-      },
-      displayErrorMessage(error) {
-        this.$bvToast.toast(error.error, {
-          solid: true,
-          toaster: 'b-toaster-top-center',
-          title: error.message,
-          variant: 'warning',
-        });
+          .catch(({ error, message }) => displayNotification(this, { title: error, message, variant: 'warning' }));
       },
     },
   };
diff --git a/src/main/client/app/pages/modules/import/registry-import.vue b/src/main/client/app/pages/modules/import/registry-import.vue
index 1e9232672..30ce0ae75 100644
--- a/src/main/client/app/pages/modules/import/registry-import.vue
+++ b/src/main/client/app/pages/modules/import/registry-import.vue
@@ -44,7 +44,11 @@
 </template>
 
 <script>
-  import { getRegistriesRepositories, importRegistryRepository } from '@/shared/api/registries-api';
+  import {
+    getRegistriesRepositories,
+    importRegistryRepository,
+  } from '@/shared/api/registries-api';
+  import { displayNotification } from '@/shared/services/modal-service';
 
   export default {
     name: 'RegistryImport',
@@ -81,14 +85,7 @@
       },
       async importRepository() {
         this.isImporting = true;
-
-        this.$bvToast.toast('Importing module from repository', {
-          noCloseButton: true,
-          solid: true,
-          variant: 'info',
-          toaster: 'b-toaster-top-center',
-        });
-
+        displayNotification(this, { message: 'Importing module from repository', variant: 'info' });
         const id = this.selectedRepository.id ? this.selectedRepository.id : this.selectedRepository.fullName;
         const module = await importRegistryRepository(this.registry, id);
         this.$router.push({ name: 'module', params: { moduleId: module.id } });
diff --git a/src/main/client/app/pages/modules/module.vue b/src/main/client/app/pages/modules/module.vue
index 72bba1b89..3ca0ee2f8 100644
--- a/src/main/client/app/pages/modules/module.vue
+++ b/src/main/client/app/pages/modules/module.vue
@@ -132,11 +132,14 @@
 </template>
 
 <script>
-  import { getModule, updateModule } from '@/shared/api/modules-api';
-  import { getTeams } from '@/shared/api/teams-api';
-
   import ModuleVariable from '@/pages/modules/module-variable.vue';
   import TerraformImageInput from '@/pages/modules/terraform-image-input.vue';
+  import {
+    getModule,
+    updateModule,
+  } from '@/shared/api/modules-api';
+  import { getTeams } from '@/shared/api/teams-api';
+  import { displayNotification } from '@/shared/services/modal-service';
 
   export default {
     name: 'AppModule',
@@ -181,22 +184,8 @@
       },
       async save() {
         await updateModule(this.module)
-          .then(() => {
-            this.$bvToast.toast('Module saved', {
-              noCloseButton: true,
-              solid: true,
-              variant: 'success',
-              toaster: 'b-toaster-top-center',
-            });
-          })
-          .catch((error) => {
-            this.$bvToast.toast(error.message, {
-              title: 'Error when saving module',
-              solid: true,
-              variant: 'danger',
-              toaster: 'b-toaster-top-center',
-            });
-          });
+          .then(() => displayNotification(this, { message: 'Module saved', variant: 'success' }))
+          .catch(({ error, message }) => displayNotification(this, { title: error, message, variant: 'danger' }));
       },
       removeVar(variable) {
         this.module.variables.splice(this.module.variables.findIndex((v) => v.name === variable.name), 1);
diff --git a/src/main/client/app/pages/settings/settings.vue b/src/main/client/app/pages/settings/settings.vue
index 7014ebf28..76c5225f7 100644
--- a/src/main/client/app/pages/settings/settings.vue
+++ b/src/main/client/app/pages/settings/settings.vue
@@ -49,6 +49,7 @@
     getSettings,
     saveSettings,
   } from '@/shared/api/settings-api';
+  import { displayNotification } from '@/shared/services/modal-service';
 
   export default {
     name: 'AppSettings',
@@ -68,15 +69,8 @@
       },
       save() {
         saveSettings(this.settings)
-          .then(() => this.displayMessage('Success', 'Settings saved', 'success'))
-          .catch(() => this.displayMessage('Error', 'Error saving settings', 'danger'));
-      },
-      displayMessage(title, message, variant) {
-        this.$bvToast.toast(message, {
-          solid: true,
-          title,
-          variant,
-        });
+          .then(() => displayNotification(this, { message: 'Settings saved', variant: 'success' }))
+          .catch(({ error, message }) => displayNotification(this, { title: error, message, variant: 'danger' }));
       },
     },
   };
diff --git a/src/main/client/app/pages/users/users.vue b/src/main/client/app/pages/users/users.vue
index acdf77039..2d190ef82 100644
--- a/src/main/client/app/pages/users/users.vue
+++ b/src/main/client/app/pages/users/users.vue
@@ -31,6 +31,7 @@
     updateUser,
   } from '@/shared/api/users-api';
   import { getTeams } from '@/shared/api/teams-api';
+  import { displayNotification } from '@/shared/services/modal-service';
 
   export default {
     name: 'AppUsers',
@@ -49,15 +50,8 @@
     methods: {
       saveUser(user) {
         updateUser(user)
-          .then(() => this.displayMessage('Success', 'User saved', 'success'))
-          .catch(() => this.displayMessage('Error', 'Error saving user', 'danger'));
-      },
-      displayMessage(title, message, variant) {
-        this.$bvToast.toast(message, {
-          solid: true,
-          title,
-          variant,
-        });
+          .then(() => displayNotification(this, { message: 'User saved', variant: 'success' }))
+          .catch(({ error, message }) => displayNotification(this, { title: error, message, variant: 'danger' }));
       },
     },
   };
diff --git a/src/main/client/app/shared/services/modal-service.js b/src/main/client/app/shared/services/modal-service.js
new file mode 100644
index 000000000..8e2f18f0c
--- /dev/null
+++ b/src/main/client/app/shared/services/modal-service.js
@@ -0,0 +1,8 @@
+export const displayNotification = (vueContext, options) => {
+  vueContext.$bvToast.toast(options.message, {
+    solid: true,
+    toaster: 'b-toaster-top-center',
+    title: options.title ? `Gaia - ${options.title}` : 'Gaia',
+    variant: options.variant,
+  });
+};