@subiz/widget-v4 4.1.199 → 4.1.200

package/assets/less/message.less

@@ -821,7 +821,7 @@ a.product_attachment__title {
 	z-index: 10;
 
 	&.ended {
-		bottom: 14px;
+		bottom: -10px;
 	}
 }
 

package/assets/less/widget_header.less

@@ -85,7 +85,6 @@
 	}
 
 	.widget-header--description {
-		color: red;
 		position: relative; // for tooltip
 		text-align: center;
 		margin-top: 15px;

package/compiled_src/chatbox/Event.js

@@ -490,7 +490,7 @@ class Event extends _common.Com {
       onClick: () => this.onSendReaction(hasDislike ? 'remove_dislike' : 'dislike')
     }, (0, _preact.h)("div", {
       class: "message-event-action-btn-svg dislike"
-    }))), _index.default.get(this.props.event, 'is_end') && (0, _preact.h)("div", {
+    }))), _index.default.get(this.props.event, 'is_end') && !this.props.isConvoEnded && (0, _preact.h)("div", {
       class: "message-event-actions-static"
     }, (0, _preact.h)("div", {
       class: likecls,

package/compiled_src/chatbox/Events.js

@@ -151,7 +151,7 @@ class Events extends _common.Com {
     processEvents(convo, events);
     events.push(fakeev);
     let $events = _index.default.map(events, ev => {
-      let isLast = ev.is_last_message_send;
+      let isLast = ev.is_last_message_send && _index.default.get(convo, 'state') !== 'ended';
       return (0, _preact.h)(_Event.default, {
         isLast: isLast,
         chatbox: this.props.chatbox,
@@ -162,6 +162,7 @@ class Events extends _common.Com {
         onPostback: this.props.onPostback,
         onFocusSourceEventFromQuote: this.onFocusSourceEventFromQuote,
         ref: ele => this.setEventChildRef(ele, ev.ev.id),
+        isConvoEnded: _index.default.get(convo, 'state') === 'ended',
         event: ev,
         t: this.props.t,
         key: ev.ev.id

package/compiled_src/lib.js

@@ -77,6 +77,7 @@ class Widget {
     let accid = param.account_id;
     let ref = param.ref;
     let user = await this.store.init(accid, undefined, ref, param);
+    if (this.store.isDead()) return user;
     _index.default.setTimeout(() => window.postMessage({
       type: 'widget_loaded',
       account_id: accid

package/compiled_src/plugin.js

@@ -17,6 +17,7 @@ function Plugin(plugin, store, $container, lib) {
   if (!$container) throw '$div must is a valid html node';
   var $div = document.createElement('div');
   $div.id = plugin.id;
+  if (store.isDead()) return;
   let acc = store.matchAccount();
   $div.setAttribute('sbz-plugin-type', plugin.type);
   $div.setAttribute('sbz-plugin-account-id', acc.id);

package/compiled_src/store/store.js

@@ -1282,6 +1282,9 @@ class Store {
     if (this.cache) this.cache.destroy();
     this.pubsub.publish('destroy');
   }
+  isDead() {
+    return this._die;
+  }
   destroy() {
     this._die = true;
     this.clearBrowserData();

package/compiled_src/util/common.js

@@ -7,6 +7,7 @@ exports.XMLHttpRequest = exports.Date = exports.DEF_CHAT_BUTTON_BACKGROUND_IMAGE
 exports.agentsOfConvo = agentsOfConvo;
 exports.blockToText = blockToText;
 exports.checkRunConditions = checkRunConditions;
+exports.checkUrlCondition = checkUrlCondition;
 exports.clearTimeout = exports.clearInterval = void 0;
 exports.cloneDeep = cloneDeep;
 exports.convoOfEv = convoOfEv;
@@ -832,20 +833,7 @@ function checkRunConditions(freq, conds, lastrun, store) {
     var cond = conds[i];
     switch (cond.key) {
       case 'url':
-        let exclude_urls = filter(cond.exclude_urls, url => norm(url));
-        if (size(exclude_urls) > 0) {
-          let found = find(exclude_urls, url => {
-            return norm(window.location.href).indexOf(norm(url)) > -1;
-          });
-          if (found) return false;
-        }
-        let urls = filter(cond.urls, url => norm(url));
-        if (size(urls) > 0) {
-          let found = find(urls, url => {
-            return norm(window.location.href).indexOf(norm(url)) > -1;
-          });
-          if (!found) return false;
-        }
+        if (!checkUrlCondition(cond, window.location.href)) return false;
         break;
       case 'url_path':
         let excludePaths = filter(cond.exclude_url_paths, url => norm(url));
@@ -1343,4 +1331,29 @@ function isEmptyAttachment(msg) {
     }
     return true;
   })) == 0;
+}
+function checkUrlCondition(cond, href) {
+  let exclude_urls = filter(cond.exclude_urls, url => norm(url));
+  let foundExclude = false;
+  let excludeLen = 0;
+  map(exclude_urls, url => {
+    if (norm(href).indexOf(url) > -1) {
+      if (excludeLen < size(url)) excludeLen = size(url);
+      foundExclude = true;
+    }
+  });
+  let includeLen = 0;
+  let urls = filter(cond.urls, url => norm(url));
+  let foundInclude = size(urls) == 0;
+  map(urls, url => {
+    if (norm(href).indexOf(url) > -1) {
+      if (includeLen < size(url)) includeLen = size(url);
+      foundInclude = true;
+    }
+  });
+  if (foundExclude) {
+    if (excludeLen >= includeLen) return false;
+  }
+  if (!foundInclude) return false;
+  return true;
 }

package/compiled_src/util/common.test.js

@@ -1,137 +1,47 @@
 "use strict";
 
-const test = require('tape');
-const util = require('./common.js');
-test('util.getNotiDescription', t => {
-  var tcs = [{
-    desc: 'not a message sent',
-    event: {
-      type: 'conversation_updated'
-    },
-    text: ''
-  }, {
-    desc: 'an email',
-    event: {
-      type: 'message_sent',
-      data: {
-        message: {
-          fields: [{
-            key: 'from',
-            value: '"thanh"'
-          }, {
-            key: 'to',
-            value: '"van"'
-          }]
-        }
-      }
-    },
-    text: 'sent an email'
-  }, {
-    desc: 'empty msg',
-    event: {},
-    text: ''
-  }, {
-    desc: 'markdown',
-    event: {
-      type: 'message_sent',
-      data: {
-        message: {
-          format: 'markdown',
-          text: 'xin chao'
-        }
-      }
-    },
-    text: 'sent a message'
-  }, {
-    desc: 'html',
-    event: {
-      type: 'message_sent',
-      data: {
-        message: {
-          format: 'html',
-          text: '<b>xin chao</b>'
-        }
-      }
-    },
-    text: 'sent a message'
-  }, {
-    desc: 'multiple attachemnts',
-    event: {
-      type: 'message_sent',
-      data: {
-        message: {
-          attachments: [{}, {}, {}]
-        }
-      }
-    },
-    text: 'sent a message with 3 attachments'
-  }, {
-    desc: 'text with attachment',
-    event: {
-      type: 'message_sent',
-      data: {
-        message: {
-          type: 'text',
-          text: 'xin chao',
-          attachments: [{}]
-        }
-      }
-    },
-    text: 'sent a message with 1 attachments'
-  }, {
-    desc: '1 attachment no type',
-    event: {
-      type: 'message_sent',
-      data: {
-        message: {
-          attachments: [{}]
-        }
-      }
-    },
-    text: 'sent an attachment'
-  }, {
-    desc: 'audio ',
-    event: {
-      type: 'message_sent',
-      data: {
-        message: {
-          attachments: [{
-            mimetype: 'audio/mp3'
-          }]
-        }
-      }
-    },
-    text: 'sent an audio'
-  }, {
-    desc: 'video',
-    event: {
-      type: 'message_sent',
-      data: {
-        message: {
-          attachments: [{
-            mimetype: 'video/ogg'
-          }]
-        }
-      }
-    },
-    text: 'sent a video'
-  }, {
-    desc: 'image',
-    event: {
-      type: 'message_sent',
-      data: {
-        message: {
-          attachments: [{
-            mimetype: 'image/jpeg'
-          }]
-        }
+var _module = require("module");
+const _require = (0, _module.createRequire)(import.meta.url);
+global.require = _require;
+global.XMLHttpRequest = {
+  prototype: {
+    open: function () {}
+  }
+};
+global.document = {
+  JSON: JSON,
+  body: {
+    appendChild: function () {}
+  },
+  documentElement: {
+    appendChild: function () {}
+  },
+  createElement: function () {
+    return {
+      contentWindow: global,
+      contentDocument: global.document,
+      style: {
+        display: false
       }
+    };
+  }
+};
+const test = _require('tape');
+const util = _require('./common.js');
+test('util.checkUrlCondition', t => {
+  var tcs = [{
+    name: 'minvoice',
+    cond: {
+      key: 'url',
+      urls: ['qlhd.minvoice.com.vn'],
+      exclude_urls: ['minvoice.com.vn', 'minvoice.net', 'hdt.minvoice.com.vn']
     },
-    text: 'sent a picture'
+    href: 'https://qlhd.minvoice.com.vn/#/login',
+    pass: true
   }];
   tcs.map(tc => {
-    var out = util.getNotiDescription(tc.event);
-    t.equal(out, tc.text);
+    var out = util.checkUrlCondition(tc.cond, tc.href);
+    t.equal(out, tc.pass);
   });
   t.end();
 });
@@ -361,17 +271,17 @@ test('test insert message', t => {
 });
 test('mapizeDeep a map', t => {
   var topicM = {
-    '0': {
+    0: {
       topic: 'account.acqcsmrppbftadjzxnvo.conversation.csqlxnairroppcktrg',
       read: false,
       updated: 1570586074000
     },
-    '1': {
+    1: {
       topic: 'account.acqcsmrppbftadjzxnvo.conversation.csqlxmkozwryrgjvag',
       read: false,
       updated: 1570551305000
     },
-    '2': {
+    2: {
       topic: 'account.acqcsmrppbftadjzxnvo.conversation.csqlvkqgspihkfzsnm',
       read: false,
       updated: 1570289320000
@@ -400,11 +310,11 @@ test('mapizeDeep a map', t => {
 });
 test('mapize a map', t => {
   var topicM = {
-    '0': {
+    0: {
       topic: 't1',
       updated: 157
     },
-    '1': {
+    1: {
       topic: 't2',
       updated: 158
     }

package/dist/132.js

@@ -2509,27 +2509,6 @@ class Popup extends common/* Com */.Mw {
 
 /***/ },
 
-/***/ 2931
-(module, __unused_webpack_exports, __webpack_require__) {
-
-module.exports = __webpack_require__.p + "assets/img/Zalo.6845707.png";
-
-/***/ },
-
-/***/ 4707
-(module, __unused_webpack_exports, __webpack_require__) {
-
-module.exports = __webpack_require__.p + "assets/img/Facebook.64607ec.png";
-
-/***/ },
-
-/***/ 8271
-(module, __unused_webpack_exports, __webpack_require__) {
-
-module.exports = __webpack_require__.p + "assets/img/fb_inverse_circle.36c2cfc.png";
-
-/***/ },
-
 /***/ 9459
 (module) {
 
@@ -2797,6 +2776,27 @@ module.exports = function () {
   return module.exports;
 }();
 
+/***/ },
+
+/***/ 4707
+(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "assets/img/Facebook.64607ec.png";
+
+/***/ },
+
+/***/ 2931
+(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "assets/img/Zalo.6845707.png";
+
+/***/ },
+
+/***/ 8271
+(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "assets/img/fb_inverse_circle.36c2cfc.png";
+
 /***/ }
 
 }]);

package/dist/185.js

@@ -1,40 +1,5 @@
 (self["webpackChunk_subiz_widget_v4"] = self["webpackChunk_subiz_widget_v4"] || []).push([[185],{
 
-/***/ 185
-(module, __unused_webpack_exports, __webpack_require__) {
-
-module.exports = __webpack_require__.p + "assets/img/loader.37000a7.svg";
-
-/***/ },
-
-/***/ 1113
-(module, __unused_webpack_exports, __webpack_require__) {
-
-module.exports = __webpack_require__.p + "assets/img/ghn.070f8e3.svg";
-
-/***/ },
-
-/***/ 2523
-(module, __unused_webpack_exports, __webpack_require__) {
-
-module.exports = __webpack_require__.p + "assets/img/shop_faded.df7845a.svg";
-
-/***/ },
-
-/***/ 3080
-(module, __unused_webpack_exports, __webpack_require__) {
-
-module.exports = __webpack_require__.p + "assets/img/x.26fdfa3.svg";
-
-/***/ },
-
-/***/ 3142
-(module, __unused_webpack_exports, __webpack_require__) {
-
-module.exports = __webpack_require__.p + "assets/img/not_found_search.2ddb8d1.png";
-
-/***/ },
-
 /***/ 4185
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -1761,38 +1726,38 @@ class Order extends common/* Com */.Mw {
 
 /***/ },
 
-/***/ 5244
+/***/ 7741
 (module, __unused_webpack_exports, __webpack_require__) {
 
-module.exports = __webpack_require__.p + "assets/img/shop.f7dc7d8.svg";
+module.exports = __webpack_require__.p + "assets/img/caret.998eb8f.svg";
 
 /***/ },
 
-/***/ 5452
+/***/ 5860
 (module, __unused_webpack_exports, __webpack_require__) {
 
-module.exports = __webpack_require__.p + "assets/img/search.f9705ff.svg";
+module.exports = __webpack_require__.p + "assets/img/done_green.b817fd4.svg";
 
 /***/ },
 
-/***/ 5860
+/***/ 6907
 (module, __unused_webpack_exports, __webpack_require__) {
 
-module.exports = __webpack_require__.p + "assets/img/done_green.b817fd4.svg";
+module.exports = __webpack_require__.p + "assets/img/empty_1.0b98af0.svg";
 
 /***/ },
 
-/***/ 6857
+/***/ 1113
 (module, __unused_webpack_exports, __webpack_require__) {
 
-module.exports = __webpack_require__.p + "assets/img/package_fade.763c001.svg";
+module.exports = __webpack_require__.p + "assets/img/ghn.070f8e3.svg";
 
 /***/ },
 
-/***/ 6907
+/***/ 7362
 (module, __unused_webpack_exports, __webpack_require__) {
 
-module.exports = __webpack_require__.p + "assets/img/empty_1.0b98af0.svg";
+module.exports = __webpack_require__.p + "assets/img/ghtk.326eac1.svg";
 
 /***/ },
 
@@ -1803,17 +1768,17 @@ module.exports = __webpack_require__.p + "assets/img/info.ebce7ea.svg";
 
 /***/ },
 
-/***/ 7362
+/***/ 185
 (module, __unused_webpack_exports, __webpack_require__) {
 
-module.exports = __webpack_require__.p + "assets/img/ghtk.326eac1.svg";
+module.exports = __webpack_require__.p + "assets/img/loader.37000a7.svg";
 
 /***/ },
 
-/***/ 7741
+/***/ 3142
 (module, __unused_webpack_exports, __webpack_require__) {
 
-module.exports = __webpack_require__.p + "assets/img/caret.998eb8f.svg";
+module.exports = __webpack_require__.p + "assets/img/not_found_search.2ddb8d1.png";
 
 /***/ },
 
@@ -1822,6 +1787,41 @@ module.exports = __webpack_require__.p + "assets/img/caret.998eb8f.svg";
 
 module.exports = __webpack_require__.p + "assets/img/package.8d37d0f.svg";
 
+/***/ },
+
+/***/ 6857
+(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "assets/img/package_fade.763c001.svg";
+
+/***/ },
+
+/***/ 5452
+(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "assets/img/search.f9705ff.svg";
+
+/***/ },
+
+/***/ 5244
+(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "assets/img/shop.f7dc7d8.svg";
+
+/***/ },
+
+/***/ 2523
+(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "assets/img/shop_faded.df7845a.svg";
+
+/***/ },
+
+/***/ 3080
+(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "assets/img/x.26fdfa3.svg";
+
 /***/ }
 
 }]);