@subiz/widget-v4 4.1.25 → 4.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.25",
+	"version": "4.1.26",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -32,8 +32,8 @@
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
 		"prettier": "^2.8.4",
-		"puppeteer": "^19.7.2",
-		"webpack": "^5.75.0",
+		"puppeteer": "^19.7.3",
+		"webpack": "^5.76.0",
 		"webpack-bundle-analyzer": "^4.8.0",
 		"webpack-cli": "^5.0.1",
 		"webpack-dev-server": "^4.11.1"

package/src/chatbox/Event.js

@@ -182,9 +182,11 @@ export default class Event extends Com {
 
 		let $error = null
 		if (ev._error && ev.type === 'message_sent') {
+			let msg = this.props.t('error_send_message')
+			if (ev._error_message) msg = this.props.t(ev._error_message)
 			$error = (
 				<a class='message_error' src='javascript:;' onClick={(e) => this.resendMessage()}>
-					<div class='message_error__text'>{this.props.t('error_send_message')}</div>
+					<div class='message_error__text'>{msg}</div>
 					<div class='message_error__icon' />
 				</a>
 			)

package/src/chatbox/Widget.js

@@ -586,7 +586,7 @@ export default class Widget extends Com {
 		let convoM = this.props.store.matchConvo('*')
 		var convos = sb.map(convoM, (convo) => this.props.store.matchConvo(convo.id))
 		convos = sb.filter(convos, (convo) => !!convo)
-		convos = sb.orderBy(convos, 'actived', 'desc')
+		convos = sb.orderByF(convos, (convo) => sb.get(convo, 'last_message_sent.created', convo.actived), 'desc')
 
 		var $convos = sb.map(convos, (convo) => {
 			let ags = sb.filter(convo.members, (m) => {

package/src/store/api.js

@@ -252,7 +252,7 @@ export default class {
 			size: file.size,
 			type: file.type,
 		})
-		if (error) return {error}
+		if (error) return {body: signed, error}
 
 		let contentType = file.type || 'application/octet-stream'
 		;({error} = await ajax.setContentType(contentType).put(signed.signed_url, file))
@@ -261,7 +261,7 @@ export default class {
 		// finish uploading
 		let body
 		;({body, error} = await this.apireq.post(`/accounts/${this.accid}/files/${signed.id}`, {account_id: this.accid}))
-		if (error) return {error}
+		if (error) return {body, error}
 
 		return {url: this.FileURL + body.url}
 	}

package/src/store/store.js

@@ -903,7 +903,10 @@ export default class Store {
 		// upload file first
 
 		await flow.map(files, 1, async (att) => {
-			const {url, error} = await this.api.uploadToS3(att._file)
+			const {body, url, error} = await this.api.uploadToS3(att._file)
+			if (sb.get(body, 'code') == 'invalid_field_size') {
+				event._error_message = 'cannot_send_too_big_file'
+			}
 			event._error = error
 			att.url = url
 		})

package/src/util/common.js

@@ -313,6 +313,19 @@ export function orderBy(a, k, d) {
 	return clone
 }
 
+export function orderByF(a, f, d) {
+	var clone = []
+	each(a, (v) => clone.push(v))
+	clone.sort((i, j) => {
+		let ik = f(i)
+		let jk = f(j)
+		if (ik === jk) return 0
+		var r = ik < jk ? -1 : 1
+		return d === 'desc' ? -r : r
+	})
+	return clone
+}
+
 export function isPhone(phone) {
 	var re = /^[\+]?[(]?[0-9]{2,3}[)]?[-\s\.]?[0-9]{3,4}[-\s\.]?[0-9]{4,6}$/im
 	return re.test(String(phone))