@subiz/widget-v4 4.1.74 → 4.1.75

package/compiled_src/chatbox/Event.js

@@ -198,7 +198,7 @@ class Event extends _common.Com {
         onSelect: e => this.chooseQuickReply(e)
       }));
     }
-    if (_index.default.getMsgField(ev, 'idempotency') === ev.id && this.props.store.now() - ev.created < 900) {
+    if (_index.default.get(ev, 'data.message.idempotency_key') === ev.id && this.props.store.now() - ev.created < 900) {
       _index.default.setTimeout(() => this.setState({
         refresh: this.state.refresh
       }), 1000);
@@ -206,7 +206,7 @@ class Event extends _common.Com {
     let $dot = (0, _preact.h)("div", {
       class: "sending_dot"
     });
-    if (this.props.store.now() - ev.created < 900 || _index.default.getMsgField(ev, 'idempotency') !== ev.id) {
+    if (this.props.store.now() - ev.created < 900 || _index.default.get(ev, 'data.message.idempotency_key') !== ev.id) {
       $dot = (0, _preact.h)("div", {
         class: "sending_dot sending_dot__hide"
       });

package/compiled_src/chatbox/Events.js

@@ -134,7 +134,7 @@ class Events extends _common.Com {
     if (_index.default.convoOfEv(newev) !== this.props.cid) return;
     let isBottom = this.isBottom();
     var byme = false;
-    if (_index.default.get(newev, 'type') === 'message_sent' && newev.id === _index.default.getMsgField(newev, 'idempotency')) byme = true;
+    if (_index.default.get(newev, 'type') === 'message_sent' && newev.id === _index.default.get(newev, 'data.message.idempotency_key')) byme = true;
     if (byme || isBottom) this.scrollToBottom();
   }
   async loadConvo() {

package/compiled_src/store/api_fake.js

@@ -274,10 +274,7 @@ function makeFakeMessages(accid, convoid, userid, agentid) {
         conversation_id: convoid,
         text: 'Xin chào',
         format: 'plaintext',
-        fields: [{
-          key: 'idempotency',
-          value: '"wrueysyjbhqrkiwhsejpqrwqrdkkyaibajdw"'
-        }],
+        idempotency_key: 'wrueysyjbhqrkiwhsejpqrwqrdkkyaibajdw',
         integration_id: inteid,
         pongs: [{
           member_id: userid,

package/compiled_src/store/store.js

@@ -446,7 +446,7 @@ class Store {
         var lastmsgsent = events[_index.default.size(events) - 1];
         if (!lastmsgsent) return;
         if (this.g_haveSentSeenM[lastmsgsent.id]) return;
-        if (lastmsgsent.id === _index.default.getMsgField(lastmsgsent, 'idempotency')) return;
+        if (lastmsgsent.id === lastmsgsent.data.message.idempotency_key) return;
         this.api.markAsSeen(id, lastmsgsent.id);
         let convo = this.cache.match('convo_' + id) || {};
         let mem = _index.default.find(convo.members, m => m.id === user.id);
@@ -683,7 +683,7 @@ class Store {
       this.chain.put(cid, oldev.id, _index.default.getMs(oldev.created), oldev);
     }
     if (ev.type === 'message_sent') {
-      let idemkey = _index.default.getMsgField(ev, 'idempotency');
+      let idemkey = _index.default.get(ev, 'data.message.idempotency_key');
       let found = _index.default.find(this.listEvents(cid), oldev => oldev.id === idemkey);
       if (found) {
         this.chain.del(cid, found.id);
@@ -750,7 +750,7 @@ class Store {
     _index.default.convoToEv(cid, event);
     let files = [];
     if (type === 'message_sent') {
-      _index.default.setMsgField(event, 'idempotency', idempotency);
+      event.data.message.idempotency_key = idempotency;
       event.data.message.conversation_id = cid;
       await flow.map(event.data.message.attachments, 2, async (att, i) => {
         if (att.type !== 'file') return;

package/compiled_src/util/common.js

@@ -20,7 +20,6 @@ exports.formatCurrency = formatCurrency;
 exports.getAgentDisplayName = getAgentDisplayName;
 exports.getDayName = getDayName;
 exports.getMs = getMs;
-exports.getMsgField = getMsgField;
 exports.getUrlParameter = getUrlParameter;
 exports.getUserAttr = getUserAttr;
 exports.includes = includes;
@@ -50,9 +49,7 @@ exports.requestAnimationFrame = void 0;
 exports.sameDay = sameDay;
 exports.scrollIntoViewIfNeeded = scrollIntoViewIfNeeded;
 exports.setCss = setCss;
-exports.setInterval = void 0;
-exports.setMsgField = setMsgField;
-exports.setTimeout = void 0;
+exports.setTimeout = exports.setInterval = void 0;
 exports.setUserAttr = setUserAttr;
 exports.shortTime = shortTime;
 exports.size = size;
@@ -91,16 +88,6 @@ function convoOfEv(ev) {
 function convoToEv(convoid, ev) {
   if (!ev) return '';
   switch (ev.type) {
-    case 'conversation_state_updated':
-    case 'conversation_joined':
-    case 'conversation_invited':
-    case 'conversation_left':
-    case 'conversation_tagged':
-    case 'conversation_untagged':
-    case 'conversation_typing':
-    case 'conversation_rating_requested':
-    case 'conversation_rated':
-      return op.set(ev, 'data.conversation.id', convoid);
     case 'message_sent':
     case 'message_updated':
     case 'message_pong':
@@ -108,27 +95,9 @@ function convoToEv(convoid, ev) {
     case 'ticket_updated':
       return op.set(ev, 'data.ticket.conversation_id', convoid);
     default:
-      return '';
+      return op.set(ev, 'data.conversation.id', convoid);
   }
 }
-function setMsgField(ev, key, value) {
-  var fields = op.get(ev, 'data.message.fields') || [];
-  fields = filter(fields, field => field.key !== key);
-  fields.push({
-    key: key,
-    value: stringify(value)
-  });
-  op.set(ev, 'data.message.fields', fields);
-}
-function getMsgField(ev, fieldName) {
-  var fields = op.get(ev, 'data.message.fields');
-  if (size(fields) === 0) return undefined;
-  let f = fields.find(f => f.key === fieldName);
-  try {
-    if (f) return parse(f.value);
-    return undefined;
-  } catch (e) {}
-}
 function isObject(item) {
   return item && typeof item === 'object' && !Array.isArray(item);
 }
@@ -975,7 +944,7 @@ function replaceFileUrl(src) {
 }
 function unicodeToAscii(str) {
   str = str + '';
-  str = str.replace('đ', 'd').replace('Đ', 'D');
+  str = str.replaceAll('đ', 'd').replaceAll('Đ', 'D');
   return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
 }
 function scrollIntoViewIfNeeded($ele) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.74",
+	"version": "4.1.75",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,7 +14,7 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^4.0.24",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.36.1",
+		"core-js": "^3.37.0",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.2.0",
@@ -22,15 +22,15 @@
 		"preact": "10.19.3"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.24.1",
-		"@babel/core": "^7.24.4",
+		"@babel/cli": "^7.24.5",
+		"@babel/core": "^7.24.5",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
 		"@babel/plugin-transform-react-jsx": "^7.23.4",
-		"@babel/preset-env": "^7.24.4",
+		"@babel/preset-env": "^7.24.5",
 		"babel-loader": "^9.1.3",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.6.0",
-		"puppeteer": "^22.6.4",
+		"puppeteer": "^22.7.1",
 		"webpack": "^5.91.0",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"webpack-cli": "^5.1.4",

package/src/chatbox/Event.js

@@ -185,14 +185,14 @@ export default class Event extends Com {
 			)
 		}
 
-		if (sb.getMsgField(ev, 'idempotency') === ev.id && this.props.store.now() - ev.created < 900) {
+		if (sb.get(ev, 'data.message.idempotency_key') === ev.id && this.props.store.now() - ev.created < 900) {
 			sb.setTimeout(() => this.setState({refresh: this.state.refresh}), 1000)
 		}
 
 		// only show sending while the message is send too long (>300ms) but haven't returned from
 		// the server
 		let $dot = <div class='sending_dot'></div>
-		if (this.props.store.now() - ev.created < 900 || sb.getMsgField(ev, 'idempotency') !== ev.id) {
+		if (this.props.store.now() - ev.created < 900 || sb.get(ev, 'data.message.idempotency_key') !== ev.id) {
 			$dot = <div class='sending_dot sending_dot__hide'></div>
 		}
 

package/src/chatbox/Events.js

@@ -146,7 +146,8 @@ export default class Events extends Com {
 		let isBottom = this.isBottom()
 
 		var byme = false
-		if (sb.get(newev, 'type') === 'message_sent' && newev.id === sb.getMsgField(newev, 'idempotency')) byme = true
+		if (sb.get(newev, 'type') === 'message_sent' && newev.id === sb.get(newev, 'data.message.idempotency_key'))
+			byme = true
 		// scroll to bottom when message is sent by me
 		// auto scroll to bottom on new message when we are at the bottom
 		if (byme || isBottom) this.scrollToBottom()

package/src/store/api_fake.js

@@ -247,7 +247,7 @@ function makeFakeMessages(accid, convoid, userid, agentid) {
 					conversation_id: convoid,
 					text: 'Xin chào',
 					format: 'plaintext',
-					fields: [{key: 'idempotency', value: '"wrueysyjbhqrkiwhsejpqrwqrdkkyaibajdw"'}],
+					idempotency_key: 'wrueysyjbhqrkiwhsejpqrwqrdkkyaibajdw',
 					integration_id: inteid,
 					pongs: [{member_id: userid, type: 'seen', created: 1616213203068}],
 				},

package/src/store/store.js

@@ -505,7 +505,7 @@ export default class Store {
 				if (this.g_haveSentSeenM[lastmsgsent.id]) return
 
 				// ignore sending message
-				if (lastmsgsent.id === sb.getMsgField(lastmsgsent, 'idempotency')) return
+				if (lastmsgsent.id === lastmsgsent.data.message.idempotency_key) return
 
 				// send seen
 				this.api.markAsSeen(id, lastmsgsent.id)
@@ -813,7 +813,7 @@ export default class Store {
 		}
 
 		if (ev.type === 'message_sent') {
-			let idemkey = sb.getMsgField(ev, 'idempotency')
+			let idemkey = sb.get(ev, 'data.message.idempotency_key')
 			let found = sb.find(this.listEvents(cid), (oldev) => oldev.id === idemkey)
 			if (found) {
 				// keeping old created so the ui can be static
@@ -884,7 +884,7 @@ export default class Store {
 		sb.convoToEv(cid, event)
 		let files = []
 		if (type === 'message_sent') {
-			sb.setMsgField(event, 'idempotency', idempotency)
+			event.data.message.idempotency_key = idempotency
 			event.data.message.conversation_id = cid
 
 			// pre upload image files

package/src/util/common.js

@@ -30,16 +30,6 @@ export function convoOfEv(ev) {
 export function convoToEv(convoid, ev) {
 	if (!ev) return ''
 	switch (ev.type) {
-		case 'conversation_state_updated':
-		case 'conversation_joined':
-		case 'conversation_invited':
-		case 'conversation_left':
-		case 'conversation_tagged':
-		case 'conversation_untagged':
-		case 'conversation_typing':
-		case 'conversation_rating_requested':
-		case 'conversation_rated':
-			return op.set(ev, 'data.conversation.id', convoid)
 		case 'message_sent':
 		case 'message_updated':
 		case 'message_pong':
@@ -47,27 +37,10 @@ export function convoToEv(convoid, ev) {
 		case 'ticket_updated':
 			return op.set(ev, 'data.ticket.conversation_id', convoid)
 		default:
-			return ''
+			return op.set(ev, 'data.conversation.id', convoid)
 	}
 }
 
-export function setMsgField(ev, key, value) {
-	var fields = op.get(ev, 'data.message.fields') || []
-	fields = filter(fields, (field) => field.key !== key)
-	fields.push({key: key, value: stringify(value)})
-	op.set(ev, 'data.message.fields', fields)
-}
-
-export function getMsgField(ev, fieldName) {
-	var fields = op.get(ev, 'data.message.fields')
-	if (size(fields) === 0) return undefined
-	let f = fields.find((f) => f.key === fieldName)
-	try {
-		if (f) return parse(f.value)
-		return undefined
-	} catch (e) {}
-}
-
 function isObject(item) {
 	return item && typeof item === 'object' && !Array.isArray(item)
 }
@@ -1124,7 +1097,7 @@ function replaceFileUrl(src) {
 export function unicodeToAscii(str) {
 	str = str + ''
 	// worka round Đ not work
-	str = str.replace('đ', 'd').replace('Đ', 'D')
+	str = str.replaceAll('đ', 'd').replaceAll('Đ', 'D')
 	return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '')
 }