@subiz/widget-v4 4.1.196 → 4.1.198

package/dist/HASH

@@ -1 +1 @@
-19b9941db90
+19bbfd5aa77

package/dist/screenshoot.js

@@ -4248,16 +4248,12 @@ let trackResponseFn = (param, done) => {
     _defineProperty(this, "listConversations", _ => this.apireq.addQuery('user_id', this.uid).addQuery('integration_id', `${this.accid}.subizv4.subikon`).get(`/accounts/${this.accid}/conversations`));
     _defineProperty(this, "listMessages", (cid, limit, start_id) => this.apireq.addQuery('limit', limit).addQuery('start_id', start_id).get(`/accounts/${this.accid}/conversations/${cid}/messages`));
     _defineProperty(this, "ajax", ajax);
-    _defineProperty(this, "start", extraData => {
-      let data = {
-        touchpoint: {
-          channel: 'subiz',
-          source: 'web'
-        }
-      };
-      util/* default */.A.each(extraData, (v, k) => {
-        data[k] = v;
-      });
+    _defineProperty(this, "start", (extraData, tpchannel, tpsource, tpid) => {
+      let data = Object.assign({}, extraData);
+      if (!data.touchpoint) data.touchpoint = {};
+      if (!data.touchpoint.channel) data.touchpoint.channel = 'subiz';
+      if (!data.touchpoint.source) data.touchpoint.source = 'web';
+      data.source = util/* default */.A.get(document, 'location.href');
       return this.apireq.post(`/accounts/${this.accid}/conversations`, data);
     });
     _defineProperty(this, "sendConvoEvent", (cid, ev) => this.apireq.addQuery('x-referer', util/* default */.A.get(location, 'origin', '')).post(`/accounts/${this.accid}/conversations/${cid}/events`, ev));
@@ -5887,7 +5883,7 @@ class Store {
     this.lightConvos = this.kv.match('light_convos') || {};
     this.cache = new kv(new lsdb('sbz2023', true), 'kv');
     if (this.realtime) this.realtime.stop();
-    if (this.fake) this.realtime = new realtime_fake();else this.realtime = new Realtime(this.RealtimeURL, realtimep, xhrsend);
+    if (this.fake) this.realtime = new realtime_fake();else this.realtime = new Realtime(this.RealtimeURL, realtimep, xhrsend, accid);
     this.realtime.onEvent(this.onWs.bind(this));
     this.realtime.onInterrupted(async () => {
       await this.reconnectWs(accid, user.id);
@@ -7500,13 +7496,15 @@ class Header extends common/* Com */.Mw {
   }
   renderAccountAvatar() {
     let acc = this.props.store.matchAccount() || {};
-    if (!acc.logo_url) return null;
+    let accSetting = this.props.plugin.chatbox || {};
+    let logo_url = util/* default */.A.get(accSetting, 'header.logo_url') || util/* default */.A.get(acc, 'logo_url');
+    if (!logo_url) return null;
     return (0,preact_module.h)("img", {
       width: 38,
       height: 38,
       alt: acc.name,
       class: "avatar avatar__account",
-      src: this.props.store.replaceFileUrl(acc.logo_url) || __webpack_require__(3582)
+      src: this.props.store.replaceFileUrl(logo_url) || __webpack_require__(3582)
     });
   }
   render() {
@@ -7601,7 +7599,7 @@ Vui lòng hỏi chúng tôi bất cứ điều gì hoặc chia sẻ phản hồi
     }, (0,preact_module.h)("img", {
       alt: "logo",
       class: "social__account_logo",
-      src: this.props.store.replaceFileUrl(util/* default */.A.get(acc, 'logo_url'))
+      src: this.props.store.replaceFileUrl(util/* default */.A.get(accSetting, 'header.logo_url') || util/* default */.A.get(acc, 'logo_url'))
     }), (0,preact_module.h)("div", null, (0,preact_module.h)("div", {
       class: "social__introduction"
     }, tags), (0,preact_module.h)("div", {
@@ -12834,35 +12832,64 @@ class lib_Widget {
     return impressiontoken;
   }
   async submitForm(formid, values) {
-    if (!formid || !util/* default */.A.startsWith(formid, 'cp')) return;
-    let storeuser = util/* default */.A.cloneDeep(this.store.matchUser());
-    let user = {
-      id: storeuser.id,
-      account_id: storeuser.account_id
-    };
-    let is_lead = false;
-    values = util/* default */.A.map(values, val => {
-      let key = val.key;
-      if (key === 'email') key = 'emails';
-      if (key === 'phone') key = 'phones';
-      is_lead = is_lead || key == 'emails' || key == 'phones';
-      util/* default */.A.setUserAttr(user, {
-        key: key,
-        [val.type || 'text']: val.value
-      });
-      return {
-        key: key,
-        type: val.type || 'text',
-        value: util/* default */.A.stringify(val.value)
+    if (!formid || !values) return;
+    if (util/* default */.A.startsWith(formid, 'cp')) {
+      let storeuser = util/* default */.A.cloneDeep(this.store.matchUser());
+      let user = {
+        id: storeuser.id,
+        account_id: storeuser.account_id
       };
+      let is_lead = false;
+      values = util/* default */.A.map(values, val => {
+        let key = val.key;
+        if (key === 'email') key = 'emails';
+        if (key === 'phone') key = 'phones';
+        is_lead = is_lead || key == 'emails' || key == 'phones';
+        util/* default */.A.setUserAttr(user, {
+          key: key,
+          [val.type || 'text']: val.value
+        });
+        return {
+          key: key,
+          type: val.type || 'text',
+          value: util/* default */.A.stringify(val.value)
+        };
+      });
+      if (is_lead) util/* default */.A.setUserAttr(user, {
+        key: 'lead_source',
+        text: 'plugin.' + formid
+      });
+      let impressiontoken = await this.viewForm(formid);
+      this.store.setUserDiff(user);
+      return this.store.sendConversion(formid, values, impressiontoken);
+    }
+    values = util/* default */.A.filter(values, field => {
+      return field.key && field.value;
     });
-    if (is_lead) util/* default */.A.setUserAttr(user, {
-      key: 'lead_source',
-      text: 'plugin.' + formid
+    let text = 'Khách điền form\n';
+    util/* default */.A.map(values, field => {
+      text += '+ ' + field.key + ': ' + field.value + '\n';
+    });
+    return this.store.startConvo({
+      subject: 'Khách điền form',
+      touchpoint: {
+        channel: 'form',
+        source: window.location.hostname,
+        id: Date.now() + '_' + util/* default */.A.randomString()
+      },
+      form_submission: {
+        id: formid,
+        values: values
+      },
+      message_sent: {
+        data: {
+          message: {
+            format: 'plaintext',
+            text: text
+          }
+        }
+      }
     });
-    let impressiontoken = await this.viewForm(formid);
-    this.store.setUserDiff(user);
-    return this.store.sendConversion(formid, values, impressiontoken);
   }
   startConvo(req) {
     req = util/* default */.A.cloneDeep(req) || {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.196",
+	"version": "4.1.198",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -21,18 +21,18 @@
 		"preact": "10.19.3"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.28.3",
-		"@babel/core": "^7.28.5",
+		"@babel/cli": "^7.28.6",
+		"@babel/core": "^7.28.6",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
-		"@babel/plugin-transform-react-jsx": "^7.27.1",
-		"@babel/preset-env": "^7.28.5",
+		"@babel/plugin-transform-react-jsx": "^7.28.6",
+		"@babel/preset-env": "^7.28.6",
 		"babel-loader": "^10.0.0",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.6.5",
-		"puppeteer": "^24.34.0",
+		"puppeteer": "^24.35.0",
 		"webpack": "^5.104.1",
-		"webpack-bundle-analyzer": "^5.1.0",
+		"webpack-bundle-analyzer": "^5.1.1",
 		"webpack-cli": "^6.0.1",
-		"webpack-dev-server": "^5.2.2"
+		"webpack-dev-server": "^5.2.3"
 	}
 }

package/src/chatbox/Header.js

@@ -11,14 +11,16 @@ export default class Header extends Com {
 
 	renderAccountAvatar() {
 		let acc = this.props.store.matchAccount() || {}
-		if (!acc.logo_url) return null
+		let accSetting = this.props.plugin.chatbox || {}
+		let logo_url = sb.get(accSetting, 'header.logo_url') || sb.get(acc, 'logo_url')
+		if (!logo_url) return null
 		return (
 			<img
 				width={38}
 				height={38}
 				alt={acc.name}
 				class='avatar avatar__account'
-				src={this.props.store.replaceFileUrl(acc.logo_url) || require('../../assets/img/image_default.png')}
+				src={this.props.store.replaceFileUrl(logo_url) || require('../../assets/img/image_default.png')}
 			/>
 		)
 	}
@@ -147,7 +149,7 @@ Vui lòng hỏi chúng tôi bất cứ điều gì hoặc chia sẻ phản hồi
 						<img
 							alt='logo'
 							class='social__account_logo'
-							src={this.props.store.replaceFileUrl(sb.get(acc, 'logo_url'))}
+							src={this.props.store.replaceFileUrl(sb.get(accSetting, 'header.logo_url') || sb.get(acc, 'logo_url'))}
 						/>
 
 						<div>

package/src/lib.js

@@ -214,27 +214,52 @@ class Widget {
 
 	// cpxdf, [{key:'fullname', type:'text', value: 'thanhpk@liec.om'}]
 	async submitForm(formid, values) {
-		if (!formid || !sb.startsWith(formid, 'cp')) return
-		let storeuser = sb.cloneDeep(this.store.matchUser())
-		let user = {id: storeuser.id, account_id: storeuser.account_id}
-
-		let is_lead = false
-
-		values = sb.map(values, (val) => {
-			let key = val.key
-			if (key === 'email') key = 'emails'
-			if (key === 'phone') key = 'phones'
-			is_lead = is_lead || key == 'emails' || key == 'phones'
-			sb.setUserAttr(user, {key: key, [val.type || 'text']: val.value})
-			return {key: key, type: val.type || 'text', value: sb.stringify(val.value)}
-		})
+		if (!formid || !values) return
+		if (sb.startsWith(formid, 'cp')) {
+			let storeuser = sb.cloneDeep(this.store.matchUser())
+			let user = {id: storeuser.id, account_id: storeuser.account_id}
+
+			let is_lead = false
+
+			values = sb.map(values, (val) => {
+				let key = val.key
+				if (key === 'email') key = 'emails'
+				if (key === 'phone') key = 'phones'
+				is_lead = is_lead || key == 'emails' || key == 'phones'
+				sb.setUserAttr(user, {key: key, [val.type || 'text']: val.value})
+				return {key: key, type: val.type || 'text', value: sb.stringify(val.value)}
+			})
 
-		if (is_lead) sb.setUserAttr(user, {key: 'lead_source', text: 'plugin.' + formid})
+			if (is_lead) sb.setUserAttr(user, {key: 'lead_source', text: 'plugin.' + formid})
+
+			// must update user
+			let impressiontoken = await this.viewForm(formid)
+			this.store.setUserDiff(user)
+			return this.store.sendConversion(formid, values, impressiontoken)
+		}
 
-		// must update user
-		let impressiontoken = await this.viewForm(formid)
-		this.store.setUserDiff(user)
-		return this.store.sendConversion(formid, values, impressiontoken)
+		values = sb.filter(values, (field) => {
+			return field.key && field.value
+		})
+		let text = 'Khách điền form\n'
+		sb.map(values, (field) => {
+			text += '+ ' + field.key + ': ' + field.value + '\n'
+		})
+
+		return this.store.startConvo({
+			subject: 'Khách điền form',
+			touchpoint: {
+				channel: 'form',
+				source: window.location.hostname,
+				id: Date.now() + '_' + sb.randomString(),
+			},
+			form_submission: {id: formid, values: values},
+			message_sent: {
+				data: {
+					message: {format: 'plaintext', text: text},
+				},
+			},
+		})
 	}
 
 	// req.bot_id != "" -> start conversation with bot id

package/src/store/api.js

@@ -246,12 +246,12 @@ export default class {
 
 	ajax = ajax
 
-	start = (extraData) => {
-		let data = {touchpoint: {channel: 'subiz', source: 'web'}}
-		sb.each(extraData, (v, k) => {
-			data[k] = v
-		})
-
+	start = (extraData, tpchannel, tpsource, tpid) => {
+		let data = Object.assign({}, extraData)
+		if (!data.touchpoint) data.touchpoint = {}
+		if (!data.touchpoint.channel) data.touchpoint.channel = 'subiz'
+		if (!data.touchpoint.source) data.touchpoint.source = 'web'
+		data.source = sb.get(document, 'location.href')
 		return this.apireq.post(`/accounts/${this.accid}/conversations`, data)
 	}