@subiz/widget-v4 4.1.147 → 4.1.149

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.147",
+	"version": "4.1.149",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -22,15 +22,14 @@
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.27.2",
-		"@babel/core": "^7.27.4",
+		"@babel/core": "^7.27.7",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
 		"@babel/plugin-transform-react-jsx": "^7.27.1",
 		"@babel/preset-env": "^7.27.2",
 		"babel-loader": "^10.0.0",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.6.3",
-		"prettier": "^3.5.3",
-		"puppeteer": "^24.10.1",
+		"puppeteer": "^24.11.1",
 		"webpack": "^5.99.9",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"webpack-cli": "^6.0.1",

package/src/chatbox/Event.js

@@ -232,9 +232,9 @@ export default class Event extends Com {
 
 	renderMessageSent() {
 		let ev = this.props.event.ev
-    let attachments = sb.get(ev, 'data.message.attachments')
-    let hasForm = sb.find(attachments, att => att.type === 'form')
-    if (ev.id === 'evshpgaeetsplfqprzmynrvrl') hasForm = true
+		let attachments = sb.get(ev, 'data.message.attachments')
+		let hasForm = sb.find(attachments, (att) => att.type === 'form')
+		if (ev.id === 'evshpgaeetsplfqprzmynrvrl') hasForm = true
 		this.tryLoadOrder(ev)
 		let t = new sb.Date(ev.created).toLocaleString()
 		// message of agent
@@ -244,8 +244,8 @@ export default class Event extends Com {
 			let innercls = 'agent-convo-event-inner'
 			if (this.props.isLast) innercls += ' last'
 
-      let wrappercls = 'agent-convo-event-wrapper'
-      if (hasForm) wrappercls += ' full'
+			let wrappercls = 'agent-convo-event-wrapper'
+			if (hasForm) wrappercls += ' full'
 			return (
 				<div class='convo-event agent-message'>
 					{$sender}
@@ -446,10 +446,11 @@ export default class Event extends Com {
 
 	getSenderName(ev) {
 		let bytype = sb.get(ev, 'by.type')
-		let byid = sb.get(ev, 'by.display_id', sb.get(ev, 'by.id'))
+		let byid = sb.get(ev, 'by.display_id', sb.get(ev, 'by.id')) || ''
 		if (bytype === 'user') return sb.getUserDisplayName(this.props.store.matchUser())
 		let acc = this.props.store.matchAccount()
 		if (bytype === 'agent') return sb.getAgentDisplayName(acc, this.props.store.matchAgent(byid))
+		if (byid.startsWith('at')) return sb.getAgentDisplayName(acc, this.props.store.matchAgent(byid))
 		if (bytype === 'bot') {
 			let bot = this.props.store.matchBot()[byid]
 			if (!bot) return 'Bot'

package/src/chatbox/block.js

@@ -106,6 +106,11 @@ export default class Block extends Com {
 		if (block.type == 'table') {
 			return null
 		}
+		if (block.type === 'image') {
+			ele.tag = 'img'
+			ele.attrs['src'] = sb.get(block, 'image.url')
+			ele.attrs['alt'] = block.alt_text
+		}
 
 		let $body = null
 		if (sb.size(block.content)) {
@@ -138,6 +143,16 @@ export default class Block extends Com {
 			$body = ele.text
 		}
 		switch (ele.tag) {
+			case 'img':
+				return (
+					<a class='message-text-inline-image-wrapper' href={sb.get(ele, 'attrs.src')} target='_blank'>
+						<img
+							class='message-text-inline-image'
+							src={sb.get(ele, 'attrs.src')}
+							alt={sb.get(ele, 'attrs.alt') || ''}
+						/>
+					</a>
+				)
 			case 'div':
 				return <div>{$body}</div>
 			case 'h1':

package/src/store/api.js

@@ -270,25 +270,38 @@ export default class {
 	}
 
 	uploadToS3 = async (file) => {
-		let {body: signed, error} = await this.apireq.post(`/accounts/${this.accid}/files`, {
-			account_id: this.accid,
-			description: 'upload\n user-client: web-widget',
-			name: file.name.replace(/\s+/g, '_'),
-			size: file.size,
-			type: file.type,
-		})
-		if (error) return {body: signed, error}
+		var {body, error} = await ajax
+			.setBaseUrl('https://api5.subiz.com.vn/4.1')
+			.withCredentials(true)
+			.setQuery({
+				description: 'upload\n user-client: web-widget',
+				name: file.name.replace(/\s+/g, '_'),
+				size: file.size,
+				type: file.type,
+			})
+			.setParser('json')
+			.beforeHook((param, done) => {
+				if (this.token_generator) {
+					let user_id = this.profile_id
+					this.token_generator().then((token) => {
+						if (user_id != this.profile_id) return done(true) // outdated
 
-		let contentType = file.type || 'application/octet-stream'
-		;({error} = await ajax.setContentType(contentType).put(signed.signed_url, file))
-		if (error) return {error}
+						if (!token) return done(false)
+						if (token == 'error') return done(false)
+						param.request = param.request.addQuery('x-access-token', token)
+						return done(true)
+					})
+					return
+				}
 
-		// finish uploading
-		let body
-		;({body, error} = await this.apireq.post(`/accounts/${this.accid}/files/${signed.id}`, {account_id: this.accid}))
-		if (error) return {body, error}
+				if (this.ref) param.request = param.request.addQuery('x-user-ref', this.ref)
+				else if (this.mask) param.request = param.request.addQuery('x-user-mask', this.mask) // deprecating
 
-		return {url: body.url}
+				return done(true)
+			})
+			.post('/files', file)
+		if (error) return {body, error}
+		return {url: sb.get(body, 'file.url')}
 	}
 
 	time = (_) => ajax.setBaseUrl(this.ApiURL).withCredentials(true).setParser('json').get('/time')

package/src/store/store.js

@@ -1250,7 +1250,7 @@ export default class Store {
 
 		src = src.replace('https://file.mysubiz.com/', this.FileURL)
 		src = src.replace('http://file.mysubiz.com/', this.FileURL)
-		return src
+		return src.replace('vcdn.subiz-cdn.com', 'cdn.subiz.net')
 	}
 
 	clearBrowserData() {