Merge branch 'release/2.5.0' into develop

app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json

@@ -398,8 +398,8 @@
       "MESSENGER_SUB_HEAD": "ضع هذا الكود داخل وسم الـ body في موقعك",
       "INBOX_AGENTS": "موظف الدعم",
       "INBOX_AGENTS_SUB_TEXT": "إضافة أو إزالة موظفين من قناة التواصل هذه",
-      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT": "إسناد المحادثات",
-      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "تحديث إعدادات إسناد المحادثات",
       "UPDATE": "تحديث",
       "ENABLE_EMAIL_COLLECT_BOX": "تفعيل صندوق جمع البريد الإلكتروني",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "تمكين أو تعطيل مربع جمع البريد الإلكتروني في محادثة جديدة",

app/javascript/dashboard/i18n/locale/ar/settings.json

@@ -151,7 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "مشاهدة حاليا:",
-    "SWITCH": "Switch",
+    "SWITCH": "تبديل",
     "CONVERSATIONS": "المحادثات",
     "ALL_CONVERSATIONS": "كل المحادثات",
     "MENTIONED_CONVERSATIONS": "الإشارات",

app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue

@@ -8,7 +8,6 @@
     </span>
     <contact-info
       :show-avatar="showAvatar"
-      show-new-message
       :contact="contact"
       @panel-close="onClose"
     />

app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue

@@ -65,7 +65,6 @@
       </div>
       <div class="contact-actions">
         <woot-button
-          v-if="showNewMessage"
           v-tooltip="$t('CONTACT_PANEL.NEW_MESSAGE')"
           title="$t('CONTACT_PANEL.NEW_MESSAGE')"
           class="new-message"
@@ -172,10 +171,6 @@ export default {
       type: String,
       default: '',
     },
-    showNewMessage: {
-      type: Boolean,
-      default: false,
-    },
     showAvatar: {
       type: Boolean,
       default: true,

app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue

@@ -52,6 +52,10 @@ export default {
     },
     async onSubmit(contactItem) {
       await this.$store.dispatch('contacts/update', contactItem);
+      await this.$store.dispatch(
+        'contacts/fetchContactableInbox',
+        this.contact.id
+      );
     },
   },
 };

app/javascript/packs/application.js

@@ -39,6 +39,7 @@ import {
 } from '../dashboard/helper/scriptHelpers';
 import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';
 import VueDOMPurifyHTML from 'vue-dompurify-html';
+import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
 
 Vue.config.env = process.env;
 
@@ -55,7 +56,8 @@ if (window.analyticsConfig) {
     api_host: window.analyticsConfig.host,
   });
 }
-Vue.use(VueDOMPurifyHTML);
+
+Vue.use(VueDOMPurifyHTML, domPurifyConfig);
 Vue.use(VueRouter);
 Vue.use(VueI18n);
 Vue.use(WootUiKit);

app/javascript/packs/widget.js

@@ -9,9 +9,10 @@ import ActionCableConnector from '../widget/helpers/actionCable';
 import i18n from '../widget/i18n';
 import { isPhoneE164OrEmpty } from 'shared/helpers/Validators';
 import router from '../widget/router';
+import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
 Vue.use(VueI18n);
 Vue.use(Vuelidate);
-Vue.use(VueDOMPurifyHTML);
+Vue.use(VueDOMPurifyHTML, domPurifyConfig);
 
 const i18nConfig = new VueI18n({
   locale: 'en',

app/javascript/shared/helpers/HTMLSanitizer.js

@@ -6,3 +6,15 @@ export const escapeHtml = (unsafe = '') => {
     .replace(/"/g, '"')
     .replace(/'/g, ''');
 };
+
+export const afterSanitizeAttributes = currentNode => {
+  if ('target' in currentNode) {
+    currentNode.setAttribute('target', '_blank');
+  }
+};
+
+export const domPurifyConfig = {
+  hooks: {
+    afterSanitizeAttributes,
+  },
+};

app/javascript/shared/helpers/MessageFormatter.js

@@ -1,6 +1,6 @@
 import { marked } from 'marked';
 import DOMPurify from 'dompurify';
-import { escapeHtml } from './HTMLSanitizer';
+import { escapeHtml, afterSanitizeAttributes } from './HTMLSanitizer';
 
 const TWITTER_USERNAME_REGEX = /(^|[^@\w])@(\w{1,15})\b/g;
 const TWITTER_USERNAME_REPLACEMENT =
@@ -48,9 +48,7 @@ class MessageFormatter {
       const markedDownOutput = marked(withHash);
       return markedDownOutput;
     }
-    DOMPurify.addHook('afterSanitizeAttributes', node => {
+    DOMPurify.addHook('afterSanitizeAttributes', afterSanitizeAttributes);
-      if ('target' in node) node.setAttribute('target', '_blank');
-    });
     return DOMPurify.sanitize(
       marked(this.message, { breaks: true, gfm: true })
     );

config/app.yml

@@ -1,5 +1,5 @@
 shared: &shared
-  version: '2.4.1'
+  version: '2.5.0'
 
 development:
   <<: *shared

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue} --fix",
@@ -63,7 +63,7 @@
     "vue-chartjs": "3.5.1",
     "vue-clickaway": "~2.1.0",
     "vue-color": "2.8.1",
-    "vue-dompurify-html": "^2.5.1",
+    "vue-dompurify-html": "^2.5.2",
     "vue-easytable": "2.5.5",
     "vue-i18n": "8.24.3",
     "vue-loader": "15.9.6",

yarn.lock

@@ -15284,10 +15284,10 @@ vue-docgen-loader@^1.5.0:
     loader-utils "^1.2.3"
     querystring "^0.2.0"
 
-vue-dompurify-html@^2.5.1:
+vue-dompurify-html@^2.5.2:
-  version "2.5.1"
+  version "2.5.2"
-  resolved "https://registry.npmjs.org/vue-dompurify-html/-/vue-dompurify-html-2.5.1.tgz#a754f4ac7b18eb8fe41f461cb2bb1c4956a9bd2d"
+  resolved "https://registry.yarnpkg.com/vue-dompurify-html/-/vue-dompurify-html-2.5.2.tgz#f547d4eacae4640f95eb0e9308e7ef8e223887c6"
-  integrity sha512-B8rQj2jAPJJhtKHHa6jg5B3/RoKBmmUl/awP/GxWXGu75j4Y7+MHqv0DG52v0Uz0taEpHyZun34KEYMAfrPWnA==
+  integrity sha512-G6I135+BhlACJ9xftqK7fvhXyjNrgHCI594qHnUW5e2Bmp8BOTV1kz7cxwI37b4BJnHkj9IY10RwMPOtJqw+pw==
   dependencies:
     dompurify "^2.3.4"