@subiz/widget-v4 4.1.198 → 4.1.200

package/assets/img/default_logo.svg

@@ -0,0 +1,5 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="200" height="200" fill="#002662"/>
+<path d="M93 35C93 30.5817 96.5817 27 101 27H131C160.271 27 184 50.7289 184 80V200H93V35Z" fill="white" fill-opacity="0.1"/>
+<path d="M22 147C22 119.386 44.3858 97 72 97H115C124.941 97 133 105.059 133 115V200H22V147Z" fill="white" fill-opacity="0.2"/>
+</svg>

package/assets/less/avatar.less

@@ -24,8 +24,8 @@
 .avatar.avatar__account {
 	width: 38px;
 	height: 38px;
-	border-radius: 8px;
-	margin-right: @spacer2;
+	border-radius: 38px;
+	margin-right: @spacer1;
 }
 
 .group-avatar--primary .group-avatar--agent-middle {

package/assets/less/message.less

@@ -821,7 +821,7 @@ a.product_attachment__title {
 	z-index: 10;
 
 	&.ended {
-		bottom: 14px;
+		bottom: -10px;
 	}
 }
 
@@ -1066,3 +1066,8 @@ a.product_attachment__title {
 .file-attachment.just-focused {
 	box-shadow: 0 0 0 2px #000;
 }
+
+.widget_body_empty_img {
+	max-width: 150px;
+	max-height: 150px;
+}

package/assets/less/widget.less

@@ -103,7 +103,7 @@
 }
 
 .convo-list--convo-time span {
-	font-size: 13px;
+	font-size: 14px;
 	line-height: 20px;
 	.color(@black);
 	opacity: 0.6;

package/assets/less/widget_header.less

@@ -50,6 +50,7 @@
 		.color(@text-color);
 		margin-top: 2.5px;
 		position: relative;
+		line-height: 1.5;
 	}
 }
 
@@ -84,7 +85,6 @@
 	}
 
 	.widget-header--description {
-		color: red;
 		position: relative; // for tooltip
 		text-align: center;
 		margin-top: 15px;
@@ -93,6 +93,7 @@
 		-webkit-box-orient: vertical;
 		-webkit-line-clamp: 2;
 		overflow: hidden;
+		line-height: 1.5;
 	}
 }
 

package/compiled_src/bot.js

@@ -17,28 +17,13 @@ function _default(store) {
       run = () => true;
       let match = _index.default.checkRunConditions(bot.initiative_frequency, bot.conditions, store.matchLastBotRun(bot.id), store);
       if (!match) return;
-      if (bot.id.startsWith('at')) {
-        if (!bot.welcome_message) return;
+      let welcomMessages = bot.welcome_messages;
+      if (_index.default.size(welcomMessages)) {
         let {
           error
-        } = await store.startLightConvo(bot.id, bot.welcome_message, common.getLocale(bot, _index.default.detectLang()), false);
-        if (error) return console.error(error);
+        } = await store.startLightConvo(bot.id, bot.welcome_messages, common.getLocale(bot, _index.default.detectLang()), false);
         store.logBotRun(bot.id);
-        return;
       }
-      let {
-        error
-      } = await store.startConvo({
-        initial_by: bot.id,
-        locale: common.getLocale(bot, _index.default.detectLang()),
-        state: 'active',
-        members: [{
-          type: 'bot',
-          id: bot.id
-        }]
-      });
-      if (error) return console.error(error);
-      store.logBotRun(bot.id);
     };
     let triggers = _index.default.get(bot, 'triggers') || [];
     for (let tr of triggers) {

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
@@ -213,6 +214,7 @@ class Events extends _common.Com {
       class: "widget-body--events-container widget-body--events-container__error"
     }, (0, _preact.h)("img", {
       alt: "empty",
+      class: "widget_body_empty_img",
       src: convoemptyimg
     }), (0, _preact.h)("div", {
       class: "widget_body__events__error_msg"

package/compiled_src/chatbox/Header.js

@@ -26,7 +26,7 @@ class Header extends _common.Com {
         width: 38,
         height: 38,
         class: "avatar avatar__account",
-        src: this.props.store.replaceFileUrl(logoUrl) || require('../../assets/img/image_default.png')
+        src: this.props.store.replaceFileUrl(logoUrl) || require('../../assets/img/default_logo.svg')
       });
     });
   }
@@ -40,7 +40,7 @@ class Header extends _common.Com {
       height: 38,
       alt: acc.name,
       class: "avatar avatar__account",
-      src: this.props.store.replaceFileUrl(logo_url) || require('../../assets/img/image_default.png')
+      src: this.props.store.replaceFileUrl(logo_url) || require('../../assets/img/default_logo.svg')
     });
   }
   render() {

package/compiled_src/chatbox/QuickReplies.js

@@ -40,7 +40,8 @@ class QuickReplies extends _common.Com {
     }
     let $replies = _index.default.map(quickreplies, r => (0, _preact.h)("div", {
       class: "message_quick_reply",
-      onClick: e => this.props.onSelect(r)
+      onClick: e => this.props.onSelect(r),
+      title: r.title
     }, r.title));
     return (0, _preact.h)("div", {
       class: "message_quick_replies"

package/compiled_src/chatbox/Widget.js

@@ -117,7 +117,7 @@ class Widget extends _common.Com {
             id: botid,
             bot_version: oldconvo.bot_version
           }],
-          initial_by: this.props.store.matchUser().id,
+          initial_by: botid,
           is_testing: oldconvo.is_testing,
           greeting_message: greeting_msg
         });
@@ -815,6 +815,7 @@ class Widget extends _common.Com {
       }, (0, _preact.h)("div", {
         class: "empty-container"
       }, (0, _preact.h)("img", {
+        class: "widget_body_empty_img",
         alt: "empty",
         src: empty
       }), (0, _preact.h)("div", {

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
@@ -260,7 +261,7 @@ class Widget {
   startConvo(req) {
     req = _index.default.cloneDeep(req) || {};
     if (req.welcome_message) {
-      return this.store.startLightConvo(req.bot_id, req.welcome_message, req.locale, req.is_testing, req.bot_version);
+      return this.store.startLightConvo(req.bot_id, [req.welcome_message], req.locale, req.is_testing, req.bot_version);
     }
     let members = req.members || [];
     if (req.bot_id) {

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

@@ -744,7 +744,7 @@ class Store {
     setting = _index.default.cloneDeep(setting) || {};
     setting.account = Object.assign({}, setting.account, this.forceAcc);
     if (!setting.account.logo_url) {
-      setting.account.logo_url = 'https://vcdn.subiz-cdn.com/file/fiqpezhkmeyesdscyetk-default_logo.jpg';
+      setting.account.logo_url = 'https://vcdn.subiz-cdn.com/widget-v4/public/assets/img/default_logo.dd13a2b.svg';
     }
     if (setting.user) {
       setting.user.account_id = setting.account.id;
@@ -952,7 +952,7 @@ class Store {
     delete this.lightConvos[id];
     this.kv.put('light_convos', this.lightConvos);
   }
-  startLightConvo(botid, message, locale, is_testing, botversion) {
+  startLightConvo(botid, messages, locale, is_testing, botversion) {
     let convoid = 'cslight' + botid + '_' + this.now();
     let user = this.cache.match('user') || {};
     let old = this.lightConvos[convoid];
@@ -960,26 +960,31 @@ class Store {
       convo: old
     };
     let now = this.now();
-    let ev = {};
-    ev.created = now;
-    ev.event_time = now;
-    ev.id = 'evfake' + now;
-    ev.type = 'message_sent';
-    ev.by = {
-      id: botid,
-      type: 'bot'
-    };
-    ev.data = {
-      message: message
-    };
-    ev.data.message.conversation_id = convoid;
+    let lastev = {};
+    let newevs = _index.default.map(messages, (message, idx) => {
+      let ev = {};
+      ev.created = now;
+      ev.event_time = now;
+      ev.id = 'evfake' + now + idx;
+      ev.type = 'message_sent';
+      ev.by = {
+        id: botid,
+        type: 'bot'
+      };
+      ev.data = {
+        message: message
+      };
+      ev.data.message.conversation_id = convoid;
+      lastev = ev;
+      return ev;
+    });
     let newconvo = {
       id: convoid,
       locale: locale,
       initial_by: botid,
       created: now,
       actived: now,
-      last_message_sent: ev,
+      last_message_sent: lastev,
       members: [{
         type: 'user',
         id: user.id
@@ -995,13 +1000,13 @@ class Store {
         source: 'web'
       },
       traffic_source: 'direct',
-      events: [ev],
+      events: newevs,
       is_testing: is_testing,
       bot_versio: botversion
     };
     this.lightConvos[convoid] = newconvo;
     this.kv.put('light_convos', this.lightConvos);
-    this.pubsub.publish('events', ev);
+    this.pubsub.publish('events', lastev);
     return {
       convo: newconvo
     };
@@ -1277,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";
+
 /***/ }
 
 }]);