From e0d24e0a73c67d61fc6b312bdb0173ed1910e3cd Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 31 Jan 2022 22:55:51 -0800
Subject: [PATCH] chore: Use globalConfig in NetworkNotification (#3871)

---
 .../dashboard/components/NetworkNotification.vue | 16 +++++++++++++++-
 .../widgets/WootWriter/ReplyBottomPanel.vue      | 13 ++++++++-----
 .../components/widgets/conversation/ReplyBox.vue | 11 +++++++----
 .../widget/components/ChatAttachment.vue         |  9 +++++++--
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/app/javascript/dashboard/components/NetworkNotification.vue b/app/javascript/dashboard/components/NetworkNotification.vue
index 767bb7a84..deb5931c4 100644
--- a/app/javascript/dashboard/components/NetworkNotification.vue
+++ b/app/javascript/dashboard/components/NetworkNotification.vue
@@ -4,7 +4,12 @@
       <div class="ui-notification">
         <fluent-icon icon="wifi-off" />
         <p class="ui-notification-text">
-          {{ $t('NETWORK.NOTIFICATION.TEXT') }}
+          {{
+            useInstallationName(
+              $t('NETWORK.NOTIFICATION.TEXT'),
+              globalConfig.installationName
+            )
+          }}
         </p>
         <woot-button variant="clear" size="small" @click="refreshPage">
           {{ $t('NETWORK.BUTTON.REFRESH') }}
@@ -23,13 +28,22 @@
 </template>
 
 <script>
+import globalConfigMixin from 'shared/mixins/globalConfigMixin';
+import { mapGetters } from 'vuex';
+
 export default {
+  mixins: [globalConfigMixin],
+
   data() {
     return {
       showNotification: !navigator.onLine,
     };
   },
 
+  computed: {
+    ...mapGetters({ globalConfig: 'globalConfig/get' }),
+  },
+
   mounted() {
     window.addEventListener('offline', this.updateOnlineStatus);
   },
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index f53cfcfc5..1d71f82a0 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -19,7 +19,10 @@
         :multiple="enableMultipleFileUpload"
         :drop="true"
         :drop-directory="false"
-        :data="{ direct_upload_url: '/rails/active_storage/direct_uploads', direct_upload: true }"
+        :data="{
+          direct_upload_url: '/rails/active_storage/direct_uploads',
+          direct_upload: true,
+        }"
         @input-file="onDirectFileUpload"
       >
         <woot-button
@@ -81,7 +84,7 @@
 
 <script>
 import FileUpload from 'vue-upload-component';
-import * as ActiveStorage from "activestorage";
+import * as ActiveStorage from 'activestorage';
 import {
   hasPressedAltAndWKey,
   hasPressedAltAndAKey,
@@ -152,9 +155,6 @@ export default {
       default: true,
     },
   },
-  mounted() {
-    ActiveStorage.start();
-  },
   computed: {
     isNote() {
       return this.mode === REPLY_EDITOR_MODES.NOTE;
@@ -176,6 +176,9 @@ export default {
       return ALLOWED_FILE_TYPES;
     },
   },
+  mounted() {
+    ActiveStorage.start();
+  },
   methods: {
     handleKeyEvents(e) {
       if (hasPressedAltAndWKey(e)) {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 71e9ed478..b1fba6ce4 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -456,12 +456,15 @@ export default {
         return;
       }
       if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
-        const upload = new DirectUpload(file.file, '/rails/active_storage/direct_uploads', null, file.file.name);
+        const upload = new DirectUpload(
+          file.file,
+          '/rails/active_storage/direct_uploads',
+          null,
+          file.file.name
+        );
         upload.create((error, blob) => {
           if (error) {
-            this.showAlert(
-              error
-            );
+            this.showAlert(error);
           } else {
             this.attachedFiles.push({
               currentChatId: this.currentChat.id,
diff --git a/app/javascript/widget/components/ChatAttachment.vue b/app/javascript/widget/components/ChatAttachment.vue
index e1f5b6af3..1625a41a2 100755
--- a/app/javascript/widget/components/ChatAttachment.vue
+++ b/app/javascript/widget/components/ChatAttachment.vue
@@ -54,7 +54,12 @@ export default {
       this.isUploading = true;
       try {
         if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
-          const upload = new DirectUpload(file.file, '/rails/active_storage/direct_uploads', null, file.file.name);
+          const upload = new DirectUpload(
+            file.file,
+            '/rails/active_storage/direct_uploads',
+            null,
+            file.file.name
+          );
 
           upload.create((error, blob) => {
             if (error) {
@@ -64,7 +69,7 @@ export default {
             } else {
               this.onAttach({
                 fileType: blob.content_type,
-                file: blob.signed_id
+                file: blob.signed_id,
               });
             }
           });