Improve snackbar.js: add support for custom timeouts & small refactor

timesketch/frontend-ng/src/mixins/snackBar.js

@@ -1,55 +1,52 @@
-
 /*
 Copyright 2022 Google Inc. All rights reserved.
-
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-
     http://www.apache.org/licenses/LICENSE-2.0
-
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
 import Vue from 'vue'
-
 const defaultTimeout = 5000
-const defaultSnackBar = {
-    "message": "",
-    "color": "info",
-    "timeout": defaultTimeout
-}
 
-// These methids will be available to all components without any further imports.
+// These methods will be available to all components without any further imports.
 Vue.mixin({
     methods: {
-        successSnackBar(message) {
-            let snackbar = defaultSnackBar
-            snackbar.message = message
-            snackbar.color = "success"
+        successSnackBar(message, timeout = defaultTimeout) {
+            const snackbar = {
+                message: message,
+                color: "success",
+                timeout: timeout
+            }
+            this.$store.dispatch('setSnackBar', snackbar)
+        },
+        errorSnackBar(message, timeout = defaultTimeout) {
+            const snackbar = {
+                message: message,
+                color: "error",
+                timeout: timeout
+            }
             this.$store.dispatch('setSnackBar', snackbar)
         },
-        errorSnackBar(message) {
-            let snackbar = defaultSnackBar
-            snackbar.message = message
-            snackbar.color = "error"
+        warningSnackBar(message, timeout = defaultTimeout) {
+            const snackbar = {
+                message: message,
+                color: "warning",
+                timeout: timeout
+            }
             this.$store.dispatch('setSnackBar', snackbar)
         },
-        warningSnackBar(message) {
-          let snackbar = defaultSnackBar
-          snackbar.message = message
-          snackbar.color = "warning"
-          this.$store.dispatch('setSnackBar', snackbar)
+        infoSnackBar(message, timeout = 2000) {
+            const snackbar = {
+                message: message,
+                color: "info",
+                timeout: timeout
+            }
+            this.$store.dispatch('setSnackBar', snackbar)
         },
-        infoSnackBar(message) {
-          let snackbar = defaultSnackBar
-          snackbar.message = message
-          snackbar.color = "info"
-          snackbar.timeout = 2000
-          this.$store.dispatch('setSnackBar', snackbar)
-      },
     }
 })

timesketch/frontend-v3/src/mixins.js

@@ -1,39 +1,40 @@
-
 const defaultTimeout = 5000
-const defaultSnackBar = {
-    "message": "",
-    "color": "info",
-    "timeout": defaultTimeout
-}
 
 // These methods will be available to all components without any further imports.
 export const snackBarMixin = {
   methods: {
-    successSnackBar(message) {
-        let snackbar = defaultSnackBar
-        snackbar.message = message
-        snackbar.color = "success"
+    successSnackBar(message, timeout = defaultTimeout) {
+        const snackbar = {
+            message: message,
+            color: "success",
+            timeout: timeout
+        }
         console.log('success snack bar', message)
         this.appStore.setSnackBar(snackbar)
     },
-    errorSnackBar(message) {
-        let snackbar = defaultSnackBar
-        snackbar.message = message
-        snackbar.color = "error"
+    errorSnackBar(message, timeout = defaultTimeout) {
+        const snackbar = {
+            message: message,
+            color: "error",
+            timeout: timeout
+        }
         this.appStore.setSnackBar(snackbar)
     },
-    warningSnackBar(message) {
-      let snackbar = defaultSnackBar
-      snackbar.message = message
-      snackbar.color = "warning"
-      this.appStore.setSnackBar(snackbar)
+    warningSnackBar(message, timeout = defaultTimeout) {
+        const snackbar = {
+            message: message,
+            color: "warning",
+            timeout: timeout
+        }
+        this.appStore.setSnackBar(snackbar)
     },
-    infoSnackBar(message) {
-      let snackbar = defaultSnackBar
-      snackbar.message = message
-      snackbar.color = "info"
-      snackbar.timeout = 2000
-      this.appStore.setSnackBar(snackbar)
+    infoSnackBar(message, timeout = 2000) {
+        const snackbar = {
+            message: message,
+            color: "info",
+            timeout: timeout
+        }
+        this.appStore.setSnackBar(snackbar)
     },
   }
 }