@subiz/widget-v4 4.1.74 → 4.1.76

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.74",
+	"version": "4.1.76",
 	"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.1",
 		"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.8.2",
 		"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

@@ -3,8 +3,6 @@ import sb from '../util/index.js'
 const ajax = require('@subiz/ajax/src/ajax.js')
 ajax.env.XMLHttpRequest = window.XMLHttpRequest
 
-const findAnswer = (challenge) => challenge.answer
-
 function jsonifyTextPlain(param, done) {
 	let req = param.request
 	if (req.content_type === 'text/plain' && req.body !== undefined) req.body = sb.stringify(req.body)
@@ -31,12 +29,7 @@ export default class {
 		return {
 			account_id: this.accid,
 			id: 'usqzgtgfake',
-			attributes: [
-				{
-					key: 'fullname',
-					text: 'Kiều Thanh',
-				},
-			],
+			attributes: [{key: 'fullname', text: 'Kiều Thanh'}],
 		}
 	}
 
@@ -75,7 +68,6 @@ export default class {
 	sendContentView = (data) => OK200
 
 	uploadToS3 = async (file) => OK200
-	getChallenge = (accid) => OK200
 
 	time = (_) => Promise.resolve({code: 200, body: new sb.Date().toISOString()})
 	updateUser = (data) => OK200
@@ -124,14 +116,6 @@ function makeFakeConvo(accid, convoid, userid, agentid) {
 		],
 		ended: 1610454875505,
 		state: 'ended',
-		integration: {
-			account_id: accid,
-			connector_id: 'subikon',
-			name: 'Subiz Widget',
-			connector_type: 'subiz',
-			state: 'activated',
-			id: inteid,
-		},
 		actived: 1610453070259,
 		last_message_sent: {
 			id: 'evqyiykaoizbwnkaecwphttwk',
@@ -158,6 +142,22 @@ function makeFakeConvo(accid, convoid, userid, agentid) {
 
 function makeFakeMessages(accid, convoid, userid, agentid) {
 	let inteid = accid + '.subizv4.subikon'
+	let usermember = {
+		type: 'user',
+		id: userid,
+		last_page_view_url: 'https://subiz.com.vn/',
+		conversation_id: convoid,
+		membership: 'active',
+		invited_by: {id: userid, type: 'user'},
+	}
+
+	let agentmember = {
+		type: 'agent',
+		conversation_id: convoid,
+		id: agentid,
+		membership: 'active',
+		invited_by: {id: userid, type: 'user'},
+	}
 	return [
 		{
 			id: 'evqyiyjmxrjsylftvnrghrfmq',
@@ -169,15 +169,7 @@ function makeFakeMessages(accid, convoid, userid, agentid) {
 				conversation: {
 					id: convoid,
 					account_id: accid,
-					members: [
-						{
-							type: 'user',
-							id: userid,
-							last_page_view_url: 'https://subiz.com.vn/',
-							membership: 'observer',
-							invited_by: {id: userid, type: 'user'},
-						},
-					],
+					members: [usermember],
 					state: 'pending',
 				},
 			},
@@ -192,15 +184,7 @@ function makeFakeMessages(accid, convoid, userid, agentid) {
 				conversation: {
 					id: convoid,
 					account_id: accid,
-					members: [
-						{
-							type: 'agent',
-							id: agentid,
-							conversation_id: convoid,
-							membership: 'observer',
-							invited_by: {id: userid, type: 'user'},
-						},
-					],
+					members: [agentmember],
 					state: 'pending',
 					source: 'https://subiz.com.vn/vi/',
 				},
@@ -214,7 +198,6 @@ function makeFakeMessages(accid, convoid, userid, agentid) {
 			by: {id: userid, type: 'user'},
 			data: {conversation: {id: convoid, account_id: accid, state: 'active'}},
 		},
-
 		{
 			id: 'evqyiyjmzaozvqgbkljbwywdl',
 			account_id: accid,
@@ -222,18 +205,7 @@ function makeFakeMessages(accid, convoid, userid, agentid) {
 			type: 'conversation_joined',
 			by: {id: userid, type: 'user'},
 			data: {
-				conversation: {
-					id: convoid,
-					members: [
-						{
-							type: 'user',
-							id: userid,
-							last_page_view_url: 'https://subiz.com.vn/',
-							membership: 'active',
-							invited_by: {id: userid, type: 'user'},
-						},
-					],
-				},
+				conversation: {id: convoid, members: [usermember]},
 			},
 		},
 		{
@@ -247,7 +219,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}],
 				},
@@ -259,20 +231,7 @@ function makeFakeMessages(accid, convoid, userid, agentid) {
 			created: 1616213237491,
 			type: 'conversation_joined',
 			by: {id: userid, type: 'user'},
-			data: {
-				conversation: {
-					id: convoid,
-					members: [
-						{
-							type: 'agent',
-							id: agentid,
-							conversation_id: convoid,
-							membership: 'active',
-							invited_by: {id: userid, type: 'user'},
-						},
-					],
-				},
-			},
+			data: {conversation: {id: convoid, members: [agentmember]}},
 		},
 		{
 			id: 'evqyiyjrhtroknjyakrlrwhgr',

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, '')
 }