@subiz/widget-v4 4.0.83 → 4.0.87

package/.prettierrc.js

@@ -4,7 +4,7 @@ module.exports = {
 	embeddedLanguageFormatting: 'auto',
 	htmlWhitespaceSensitivity: 'css',
 	insertPragma: false,
-	jsxBracketSameLine: true,
+	//jsxBracketSameLine: true,
 	jsxSingleQuote: true,
 	printWidth: 120,
 	proseWrap: 'preserve',

package/compiled_src/chatbox/AgentsAvatar.js

@@ -20,6 +20,26 @@ class AgentsAvatar extends _common.Com {
 
   render() {
     let accountSetting = this.props.plugin.chatbox;
+    let acc = this.props.store.matchAccount();
+    var tooltippos = this.props.tooltipPos || 'bottom';
+    var mode = this.props.mode || 'primary';
+
+    if (accountSetting && accountSetting.hide_agent_profile) {
+      return (0, _preact.h)("div", {
+        class: `group-avatar group-avatar--${mode}`
+      }, (0, _preact.h)("div", {
+        class: "d-inline-block pos-relative",
+        "data-tooltip": acc.name,
+        "data-tooltip-position": tooltippos
+      }, (0, _preact.h)("img", {
+        width: 35,
+        height: 35,
+        alt: "agent avatar left",
+        class: "avatar group-avatar--agent-left",
+        src: this.props.store.replaceFileUrl(acc.logo_url) || require('../../assets/img/image_default.png')
+      })));
+    }
+
     let agentM = this.props.store.matchAgent('*');
 
     var agents = _index.default.map(this.props.agent_ids, id => agentM[id]);
@@ -37,9 +57,6 @@ class AgentsAvatar extends _common.Com {
     }
 
     agents = _index.default.filter(agents, ag => !!ag);
-    let acc = this.props.store.matchAccount();
-    var tooltippos = this.props.tooltipPos || 'bottom';
-    var mode = this.props.mode || 'primary';
 
     if (agents.length === 0) {
       return (0, _preact.h)("div", {

package/compiled_src/chatbox/ChatButton.js

@@ -214,6 +214,13 @@ class ChatButton extends _common.Com {
       position = _index.default.get(accountSetting, 'mobile_button.position') || position;
     }
 
+    if (accountSetting && accountSetting.hide_agent_profile) {
+      agent = Object.assign({}, account, {
+        avatar_url: account.logo_url || require('../../assets/img/image_default.png'),
+        fullname: account.name || this.props.t('agent')
+      });
+    }
+
     let cls = 'widget-preview widget-preview--' + position;
     if (!this.state.displayPreview) cls += ' widget-preview--hidden';
     var tags = this.renderMessagePreview(this.state.previewEvent, this.props.t('sent_you_a_message'));
@@ -247,21 +254,17 @@ class ChatButton extends _common.Com {
   }
 
   onProfileReady() {
-    if (this.state.buttonLoaded) this.setState({
+    if (this._buttonLoaded) this.setState({
       opacity: 1
     });
-    this.setState({
-      profileLoaded: true
-    });
+    this._profileLoaded = true;
   }
 
   onButtonReady() {
-    if (this.state.profileLoaded) this.setState({
+    if (this._profileLoaded) this.setState({
       opacity: 1
     });
-    this.setState({
-      buttonLoaded: true
-    });
+    this._buttonLoaded = true;
   }
 
   renderButton() {

package/compiled_src/chatbox/Event.js

@@ -128,6 +128,18 @@ class Event extends _common.Com {
 
     var uri = acc.logo_url || require('../../assets/img/image_default.png');
 
+    if (true || _index.default.get(this.props, 'chatbox.hide_agent_profile')) {
+      return (0, _preact.h)("div", {
+        class: "message-sender"
+      }, (0, _preact.h)("img", {
+        alt: "sender",
+        class: "message-sender-avatar",
+        src: this.props.store.replaceFileUrl(uri)
+      }), (0, _preact.h)("p", {
+        class: "message-sender-name"
+      }, acc.name));
+    }
+
     let agentM = this.props.store.matchAgent('*');
 
     if (byid !== 'system' || bytype !== 'dummy') {

package/compiled_src/chatbox/Events.js

@@ -68,6 +68,7 @@ class Events extends _common.Com {
     processEvents(convo, events);
 
     let $events = _index.default.map(events, ev => (0, _preact.h)(_Event.default, {
+      chatbox: this.props.chatbox,
       onLink: this.props.onLink,
       store: this.props.store,
       onFormSubmit: this.props.onFormSubmit,

package/compiled_src/chatbox/MessageInput.js

@@ -46,6 +46,12 @@ class MessageInput extends _common.Com {
     }, 5);
   }
 
+  blur() {
+    const $input = this.refMessageInput.current;
+    if (!$input) return;
+    $input.blur();
+  }
+
   render() {
     var buttons = (0, _preact.h)("div", {
       class: "d-flex flex-row align-self-end"

package/compiled_src/chatbox/Typing.js

@@ -41,7 +41,7 @@ class Typing extends _common.Com {
         return;
       }
 
-      let ag = this.props.store.matchAgent(ev.by.id);
+      let ag = this.props.store.matchAgent(ev.by.id) || {};
       if (ag.type == 'agent') return;
       if (_index.default.get(ev, 'type') !== 'conversation_typing') return;
       this.setState({

package/compiled_src/chatbox/Widget.js

@@ -51,6 +51,40 @@ class Widget extends _common.Com {
   constructor(props) {
     super(props);
 
+    _defineProperty(this, "msgInput", (0, _preact.createRef)());
+
+    _defineProperty(this, "sendMessage", async message => {
+      let text = message.text;
+
+      if (!this.props.cid) {
+        this.creating = true;
+        const {
+          convo,
+          error
+        } = await this.props.store.startConvo({
+          locale: this.props.t.locale(),
+          message: text,
+          initial_by: this.props.store.matchUser().id
+        });
+
+        if (error) {}
+
+        this.creating = false;
+        this.props.store.sendConvoEvent(convo.id, 'message_sent', {
+          message
+        });
+        this.props.onGo({
+          view: 'chat',
+          cid: convo.id
+        });
+        return;
+      }
+
+      this.props.store.sendConvoEvent(this.props.cid, 'message_sent', {
+        message
+      });
+    });
+
     _defineProperty(this, "onLink", (e, url) => {
       if (!url) return e.preventDefault();
       let noschemeurl = url.replace(/(^\w+:|^)\/\//, '');
@@ -189,11 +223,14 @@ class Widget extends _common.Com {
 
     let user = _index.default.cloneDeep(this.props.store.matchUser());
 
+    let is_lead = false;
+
     _index.default.map(data, (field, key) => {
       if (!key.startsWith('attr:')) return;
       var attr = {
         key: key.substr(5)
       };
+      is_lead = is_lead || key == 'emails' || key == 'phones';
       if (field.type === 'number') attr.number = parseInt(field.value);
       if (field.type === 'datetime') attr.datetime = new _index.default.Date(field.value).toISOString();
       if (field.type === 'list') attr.list = field.value;
@@ -202,6 +239,11 @@ class Widget extends _common.Com {
       _index.default.setUserAttr(user, attr);
     });
 
+    if (is_lead) _index.default.setUserAttr(user, {
+      key: 'lead_source',
+      text: 'widget'
+    });
+
     let firstmsg = _index.default.get(data, 'question.value');
 
     let groupid = _index.default.get(data, 'group.value', '');
@@ -241,11 +283,11 @@ class Widget extends _common.Com {
     this.setState({
       creatingError: null
     });
+    await this.props.store.setUser(user);
     const {
       error,
       convo
     } = await this.props.store.startConvo(req);
-    this.props.store.setUser(user);
 
     if (error) {
       this.setState({
@@ -564,7 +606,7 @@ class Widget extends _common.Com {
 
   blur() {
     if (this.props.store.isPreview) return;
-    var $input = this.msgInput;
+    var $input = this.msgInput.current;
     if (!$input) return;
     setTimeout(() => $input && $input.blur());
     setTimeout(() => $input && $input.blur(), 300);
@@ -590,7 +632,7 @@ class Widget extends _common.Com {
       return;
     }
 
-    var $input = this.msgInput;
+    var $input = this.msgInput.current;
     if (!$input) return;
     setTimeout(() => $input.focus());
     setTimeout(() => $input.focus(), 300);
@@ -606,38 +648,6 @@ class Widget extends _common.Com {
     this.focusInput();
   }
 
-  async sendMessage(message) {
-    let text = message.text;
-
-    if (!this.props.cid) {
-      this.creating = true;
-      const {
-        convo,
-        error
-      } = await this.props.store.startConvo({
-        locale: this.props.t.locale(),
-        message: text,
-        initial_by: this.props.store.matchUser().id
-      });
-
-      if (error) {}
-
-      this.creating = false;
-      this.props.store.sendConvoEvent(convo.id, 'message_sent', {
-        message
-      });
-      this.props.onGo({
-        view: 'chat',
-        cid: convo.id
-      });
-      return;
-    }
-
-    this.props.store.sendConvoEvent(this.props.cid, 'message_sent', {
-      message
-    });
-  }
-
   createPostback(postback) {
     this.props.store.createPostback(this.props.cid, postback);
   }
@@ -645,9 +655,9 @@ class Widget extends _common.Com {
   renderChat() {
     let $input = (0, _preact.h)(_MessageInput.default, {
       store: this.props.store,
-      ref: ref => this.msgInput = ref,
+      ref: this.msgInput,
       cid: this.props.cid,
-      onSend: e => this.sendMessage(e),
+      onSend: this.sendMessage,
       t: this.props.t
     });
     let convo = this.props.store.matchConvo(this.props.cid) || {};
@@ -670,6 +680,7 @@ class Widget extends _common.Com {
       isShow: this.props.isShow,
       onLink: this.onLink,
       store: this.props.store,
+      chatbox: this.props.plugin.chatbox || {},
       onFormSubmit: e => this.onEventFormSubmit(e),
       ref: ref => this.events = ref,
       cid: this.props.cid,
@@ -740,6 +751,7 @@ class Widget extends _common.Com {
   }
 
   renderConvoSummary(convo) {
+    let accountSetting = this.props.plugin.chatbox || {};
     let agentM = this.props.store.matchAgent('*');
 
     let ags = _index.default.filter(convo.members, m => {
@@ -757,7 +769,7 @@ class Widget extends _common.Com {
 
     var name = _index.default.each(agents, ag => ag.fullname).join(', ');
 
-    if (!name) name = this.props.store.matchAccount().name;
+    if (accountSetting.hide_agent_profile || !name) name = this.props.store.matchAccount().name;
     if (!name) name = this.props.t('agent');
     var $you = null;
 

package/compiled_src/chatbox/main.js

@@ -142,6 +142,16 @@ class Main extends _common.Com {
     }
 
     p = p || {};
+
+    if (!p.view && !p.cid) {
+      let convoM = this.props.store.matchConvo('*');
+
+      let redconvo = _index.default.find(convoM, convo => !_index.default.isConvoSeen(convo, this.props.store.matchUser().id));
+
+      p.cid = _index.default.get(redconvo, 'id', _index.default.get(convoM, '0.id'));
+      p.view = 'chat';
+    }
+
     if (this.props.store.isMobile()) modifyViewport();
     this.setState({
       widgetConvoId: p.cid,

package/compiled_src/popup/popup.js

@@ -280,15 +280,29 @@ class Popup extends _common.Com {
 
       let user = _index.default.cloneDeep(this.props.store.matchUser());
 
+      let is_lead = false;
+      let modifiedPairs = {};
+
       for (var pair of formData.entries()) {
+        if (modifiedPairs[pair[0]]) {
+          let currentValue = _index.default.get(modifiedPairs, `${pair[0]}.1`, '');
+
+          currentValue += `,${pair[1]}`;
+
+          _index.default.set(modifiedPairs, `${pair[0]}.1`, currentValue);
+        } else {
+          modifiedPairs[pair[0]] = [pair[0], pair[1]];
+        }
+      }
+
+      for (const [_, pair] of Object.entries(modifiedPairs)) {
         let page = _index.default.get(this.props.plugin.popup, `pages.${this.getPageIndex()}`);
 
         let form = _index.default.find(page.components, com => com.type === 'form');
 
         let fields = _index.default.get(form, 'form.fields', []);
 
-        let field = _index.default.find(fields, field => field.key === pair[0]);
-
+        let field = _index.default.find(fields, field => field.key === pair[0]) || {};
         if (!field.type) return;
         summitFields.push({
           key: pair[0],
@@ -298,6 +312,7 @@ class Popup extends _common.Com {
         let key = pair[0];
         if (key === 'email') key = 'emails';
         if (key === 'phone') key = 'phones';
+        is_lead = is_lead || key == 'emails' || key == 'phones';
 
         _index.default.setUserAttr(user, {
           key: key,
@@ -305,6 +320,10 @@ class Popup extends _common.Com {
         });
       }
 
+      if (is_lead) _index.default.setUserAttr(user, {
+        key: 'lead_source',
+        text: 'plugin.' + this.props.plugin.id
+      });
       this.props.store.sendConversion(this.props.plugin.id, summitFields, this.impressionToken);
       this.props.store.setUser(user);
     }

package/compiled_src/store/store.js

@@ -50,8 +50,6 @@ class Store {
 
     _defineProperty(this, "suggest_addresses", keyword => this.api.suggest_address(keyword));
 
-    _defineProperty(this, "matchSession", () => this.kv.match('session') || {});
-
     _defineProperty(this, "matchAccount", () => this.cache.match('account'));
 
     _defineProperty(this, "matchPaymentMethods", () => this.cache.match('payment_methods'));
@@ -145,6 +143,8 @@ class Store {
       };
     });
 
+    _defineProperty(this, "matchLocation", () => this.cache.match('location') || {});
+
     _defineProperty(this, "matchBot", () => this.cache.match('bot') || {});
 
     _defineProperty(this, "readyGate", new _index.default.Gate());
@@ -172,6 +172,8 @@ class Store {
 
     _defineProperty(this, "seenQueue", []);
 
+    _defineProperty(this, "matchTrafficSource", () => this.kv.match('traffic_source'));
+
     _defineProperty(this, "_typing", _index.default.throttle(convoid => this.api.sendTyping(convoid), 3000, {
       trailing: false
     }));
@@ -279,7 +281,7 @@ class Store {
   }
 
   isInsync(key) {
-    return _index.default.Date.now() - (this.g_sync[key] || 0) < 300000;
+    return _index.default.Date.now() - (this.g_sync[key] || 0) < 600000;
   }
 
   async fetchShippingAddresses() {
@@ -562,24 +564,6 @@ class Store {
 
     if (setting.user) {
       setting.user.account_id = setting.account.id;
-      let oldsession = this.matchSession();
-      let session = setting.user.session;
-
-      if (session) {
-        if (session.id === oldsession.id) {
-          session._urls = oldsession._urls;
-        } else {}
-      } else {
-        session = oldsession;
-      }
-
-      session._urls = session._urls || [];
-
-      session._urls.push(location.href);
-
-      while (session._urls.length > 1000) session._urls.shift();
-
-      this.kv.put('session', session);
       delete setting.user.session;
 
       this._setUser(setting.user);
@@ -592,6 +576,10 @@ class Store {
       delete setting.account;
     }
 
+    let location = _index.default.get(setting, 'location', []);
+
+    this.cache.put('location', location);
+
     let bots = _index.default.get(setting, 'bots', []);
 
     let botM = {};
@@ -637,7 +625,11 @@ class Store {
 
   async track() {
     let user = this.kv.match('user') || {};
-    await this.api.sendContentView(this.device, location.href, document.title, this._currentViewingProduct.id, this._currentViewingProduct.source_id, this._currentViewingProduct.sku);
+    let out = await this.api.sendContentView(this.device, location.href, document.title, this._currentViewingProduct.id, this._currentViewingProduct.source_id, this._currentViewingProduct.sku);
+
+    let traffic_source = _index.default.get(out, 'body.by.device.source', '');
+
+    if (traffic_source) this.kv.put('traffic_source', traffic_source);
     this.sendPresence();
   }
 
@@ -983,12 +975,10 @@ class Store {
   }
 
   logBotRun(botid) {
-    let session = this.matchSession();
     let log = this.kv.match('bot_run_logs') || {};
     log[botid] = {
       bot_id: botid,
-      created: this.now(),
-      session_id: session.id
+      created: this.now()
     };
     this.kv.put('bot_run_logs', log);
   }
@@ -996,11 +986,9 @@ class Store {
   sendImpression(id) {
     let user = this.kv.match('user') || {};
     let log = this.kv.match('plugin_run_logs') || {};
-    let session = this.matchSession();
     log[id] = {
       web_plugin_id: id,
-      created: this.now(),
-      session_id: session.id
+      created: this.now()
     };
     this.kv.put('plugin_run_logs', log);
     return this.api.sendImpression({
@@ -1009,8 +997,7 @@ class Store {
       web_plugin_id: id,
       user_id: user.id,
       url: window.location.href,
-      device: this.device,
-      session_id: session.id
+      device: this.device
     });
   }
 
@@ -1032,8 +1019,7 @@ class Store {
       url: window.location.href,
       device: this.device,
       submission,
-      impression_token: impressionToken,
-      session_id: this.matchSession().id
+      impression_token: impressionToken
     });
   }
 
@@ -1079,7 +1065,7 @@ class Store {
   async loopTime() {
     let startms = _index.default.Date.now();
 
-    if (!_index.default.get(this.kv.match('user'), 'id')) return setTimeout(() => this.loopTime(), 120000);
+    if (!_index.default.get(this.kv.match('user'), 'id')) return setTimeout(() => this.loopTime(), 240000);
     let {
       body: t,
       error
@@ -1091,7 +1077,7 @@ class Store {
     var localMs = _index.default.Date.now();
 
     this.timeDiff = Math.floor(serverMs - localMs);
-    setTimeout(() => this.loopTime(), 120000);
+    setTimeout(() => this.loopTime(), 240000);
   }
 
   replaceFileUrl(src) {
@@ -1232,7 +1218,10 @@ function sendToFBPixel(category, action, label) {
 }
 
 function sendToGA(category, action, label) {
-  console.log('SENT.', category, action, label);
+  if (window.gtag) window.gtag('event', category, {
+    Action: action,
+    Label: label
+  });
 
   if (window.ga && window.ga.getAll) {
     const allTrackers = window.ga.getAll() || [];
@@ -1240,11 +1229,6 @@ function sendToGA(category, action, label) {
       const name = tracker.get('name');
       window.ga(name + '.send', 'event', category, action, label);
     });
-  } else {
-    if (window.gtag) window.gtag('event', category, {
-      Action: action,
-      Label: label
-    });
   }
 }
 

package/compiled_src/util/common.js

@@ -750,10 +750,9 @@ function osName() {
 function check_frequently(freq, lastrun, store) {
   if (!lastrun) return true;
   if (op.get(freq, 'once_per_user')) return false;
-  var session = store.matchSession() || {};
 
   if (op.get(freq, 'once_per_session')) {
-    if (lastrun.session_id === session.id) return false;
+    if (sameDay(lastrun.created, Date.now())) return false;
   }
 
   if (op.get(freq, 'interval_sec')) {
@@ -766,7 +765,7 @@ function check_frequently(freq, lastrun, store) {
 
 function checkRunConditions(freq, conds, lastrun, store) {
   var acc = store.matchAccount() || {};
-  var session = store.matchSession() || {};
+  var location = store.matchLocation() || {};
   if (!check_frequently(freq, lastrun, store)) return false;
 
   for (var i = 0; i < size(conds); i++) {
@@ -806,15 +805,15 @@ function checkRunConditions(freq, conds, lastrun, store) {
         if (size(cond.exclude_locations) > 0) {
           let found = find(cond.exclude_locations, loc => {
             if (loc.city_name && loc.country_code) {
-              if (loc.city_name === session.city_name && loc.country_code === session.country_code) return true;
+              if (loc.city_name === location.city_name && loc.country_code === location.country_code) return true;
             }
 
             if (loc.city_name && !loc.country_code) {
-              if (loc.city_name === session.city_name) return true;
+              if (loc.city_name === location.city_name) return true;
             }
 
             if (!loc.city_name && loc.country_code) {
-              if (loc.country_code === session.country_code) return true;
+              if (loc.country_code === location.country_code) return true;
             }
           });
           if (found) return false;
@@ -823,15 +822,15 @@ function checkRunConditions(freq, conds, lastrun, store) {
         if (size(cond.locations) > 0) {
           let found = find(cond.locations, loc => {
             if (loc.city_name && loc.country_code) {
-              if (loc.city_name === session.city_name && loc.country_code === session.country_code) return true;
+              if (loc.city_name === location.city_name && loc.country_code === location.country_code) return true;
             }
 
             if (loc.city_name && !loc.country_code) {
-              if (loc.city_name === session.city_name) return true;
+              if (loc.city_name === location.city_name) return true;
             }
 
             if (!loc.city_name && loc.country_code) {
-              if (loc.country_code === session.country_code) return true;
+              if (loc.country_code === location.country_code) return true;
             }
           });
           if (!found) return false;
@@ -895,7 +894,8 @@ function checkRunConditions(freq, conds, lastrun, store) {
 
       case 'source':
         if (size(cond.sources) > 0) {
-          if (!find(cond.sources, src => norm(src) === norm(session.source))) return false;
+          let source = store.matchTrafficSource();
+          if (!find(cond.sources, src => norm(src) === norm(source))) return false;
         }
 
         break;