@subiz/widget-v4 4.1.197 → 4.1.199

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.197",
+	"version": "4.1.199",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -13,7 +13,7 @@
 		"@subiz/flow": "^1.1.0",
 		"@subiz/wsclient": "^4.0.34",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.47.0",
+		"core-js": "^3.48.0",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.5.1",
@@ -22,16 +22,16 @@
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.28.6",
-		"@babel/core": "^7.28.6",
+		"@babel/core": "^7.29.0",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
 		"@babel/plugin-transform-react-jsx": "^7.28.6",
-		"@babel/preset-env": "^7.28.6",
+		"@babel/preset-env": "^7.29.0",
 		"babel-loader": "^10.0.0",
 		"babel-plugin-syntax-jsx": "^6.18.0",
-		"html-webpack-plugin": "^5.6.5",
-		"puppeteer": "^24.35.0",
-		"webpack": "^5.104.1",
-		"webpack-bundle-analyzer": "^5.1.1",
+		"html-webpack-plugin": "^5.6.6",
+		"puppeteer": "^24.37.0",
+		"webpack": "^5.105.0",
+		"webpack-bundle-analyzer": "^5.2.0",
 		"webpack-cli": "^6.0.1",
 		"webpack-dev-server": "^5.2.3"
 	}

package/src/bot.js

@@ -11,27 +11,17 @@ export default function (store) {
 			run = () => true // dont run twice
 			let match = sb.checkRunConditions(bot.initiative_frequency, bot.conditions, store.matchLastBotRun(bot.id), store)
 			if (!match) return
-			if (bot.id.startsWith('at')) {
-				if (!bot.welcome_message) return
+
+			let welcomMessages = bot.welcome_messages
+			if (sb.size(welcomMessages)) {
 				let {error} = await store.startLightConvo(
 					bot.id,
-					bot.welcome_message,
+					bot.welcome_messages,
 					common.getLocale(bot, sb.detectLang()),
 					false,
 				)
-				if (error) return console.error(error)
 				store.logBotRun(bot.id)
-				return
 			}
-			// old bot, should deprecated
-			let {error} = await store.startConvo({
-				initial_by: bot.id,
-				locale: common.getLocale(bot, sb.detectLang()),
-				state: 'active',
-				members: [{type: 'bot', id: bot.id}],
-			})
-			if (error) return console.error(error)
-			store.logBotRun(bot.id)
 		}
 
 		let triggers = sb.get(bot, 'triggers') || []

package/src/chatbox/Events.js

@@ -206,7 +206,7 @@ export default class Events extends Com {
 		if (this.state.loading) $tryAgainBtn = <Spinner size='16' mode='blue' />
 		return (
 			<div class='widget-body--events-container widget-body--events-container__error'>
-				<img alt='empty' src={convoemptyimg} />
+				<img alt='empty' class='widget_body_empty_img' src={convoemptyimg} />
 				<div class='widget_body__events__error_msg'>{this.props.t('load_convo_error')}</div>
 				<div class='widget_body__events__error_retry'>{$tryAgainBtn}</div>
 			</div>

package/src/chatbox/Header.js

@@ -20,7 +20,7 @@ export default class Header extends Com {
 				height={38}
 				alt={acc.name}
 				class='avatar avatar__account'
-				src={this.props.store.replaceFileUrl(logo_url) || require('../../assets/img/image_default.png')}
+				src={this.props.store.replaceFileUrl(logo_url) || require('../../assets/img/default_logo.svg')}
 			/>
 		)
 	}
@@ -37,7 +37,7 @@ export default class Header extends Com {
 				width={38}
 				height={38}
 				class='avatar avatar__account'
-				src={this.props.store.replaceFileUrl(logoUrl) || require('../../assets/img/image_default.png')}
+				src={this.props.store.replaceFileUrl(logoUrl) || require('../../assets/img/default_logo.svg')}
 			/>
 		)
 	}

package/src/chatbox/QuickReplies.js

@@ -1,25 +1,25 @@
 import sb from '../util/index.js'
-import { Com } from '../common.js'
-import { h } from 'preact'
+import {Com} from '../common.js'
+import {h} from 'preact'
 
 // 	props: [ ev],
 export default class QuickReplies extends Com {
-	constructor (props) {
+	constructor(props) {
 		super(props)
 	}
 
-	render () {
+	render() {
 		if (sb.get(this.props.ev, 'by.type') === 'user') return null
 
 		let quickreplies = []
-		sb.map(sb.get(this.props.ev, 'data.message.attachments', []), att => {
+		sb.map(sb.get(this.props.ev, 'data.message.attachments', []), (att) => {
 			if (!att) return
 			if (att.type === 'quick_replies') {
 				quickreplies = sb.get(att, 'quick_replies', [])
 			}
 		})
 
-		quickreplies = sb.filter(quickreplies, r => r.title)
+		quickreplies = sb.filter(quickreplies, (r) => r.title)
 
 		if (quickreplies.length === 0) return null
 
@@ -29,7 +29,7 @@ export default class QuickReplies extends Com {
 
 		// has user msg bellow => dont show
 		let events = sb.map(this.props.store.listEvents(cid))
-		events = sb.orderBy(events, 'created', 'asc').filter(ev => ev.type === 'message_sent')
+		events = sb.orderBy(events, 'created', 'asc').filter((ev) => ev.type === 'message_sent')
 		let evindex = 0
 		for (var i = 0; i < events.length; i++) {
 			if (events[i].id === this.props.ev.id) {
@@ -42,12 +42,12 @@ export default class QuickReplies extends Com {
 			if (sb.get(events[i], 'by.type') === 'user') return null
 		}
 
-		let $replies = sb.map(quickreplies, r => (
-			<div class="message_quick_reply" onClick={e => this.props.onSelect(r)}>
+		let $replies = sb.map(quickreplies, (r) => (
+			<div class='message_quick_reply' onClick={(e) => this.props.onSelect(r)} title={r.title}>
 				{r.title}
 			</div>
 		))
 
-		return <div class="message_quick_replies">{$replies}</div>
+		return <div class='message_quick_replies'>{$replies}</div>
 	}
 }

package/src/chatbox/Widget.js

@@ -753,7 +753,7 @@ export default class Widget extends Com {
 			$body = (
 				<div class='convo-list--list'>
 					<div class='empty-container'>
-						<img alt='empty' src={empty} />
+						<img class='widget_body_empty_img' alt='empty' src={empty} />
 						<div class='empty-desc'>{this.props.t('empty_convo')}</div>
 					</div>
 				</div>
@@ -855,7 +855,7 @@ export default class Widget extends Com {
 				locale: this.props.t.locale(),
 				message: text,
 				members: [{type: 'bot', id: botid, bot_version: oldconvo.bot_version}],
-				initial_by: this.props.store.matchUser().id,
+				initial_by: botid,
 				is_testing: oldconvo.is_testing,
 				greeting_message: greeting_msg,
 			})

package/src/lib.js

@@ -214,34 +214,59 @@ 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
 	startConvo(req) {
 		req = sb.cloneDeep(req) || {}
 		if (req.welcome_message) {
-			return this.store.startLightConvo(req.bot_id, req.welcome_message, req.locale, req.is_testing, req.bot_version)
+			return this.store.startLightConvo(req.bot_id, [req.welcome_message], req.locale, req.is_testing, req.bot_version)
 		}
 		let members = req.members || []
 		if (req.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)
 	}
 

package/src/store/store.js

@@ -846,7 +846,7 @@ export default class Store {
 		setting = sb.cloneDeep(setting) || {}
 		setting.account = Object.assign({}, setting.account, this.forceAcc)
 		if (!setting.account.logo_url) {
-			setting.account.logo_url = 'https://vcdn.subiz-cdn.com/file/fiqpezhkmeyesdscyetk-default_logo.jpg'
+			setting.account.logo_url = 'https://vcdn.subiz-cdn.com/widget-v4/public/assets/img/default_logo.dd13a2b.svg'
 		}
 		// user && session
 		if (setting.user) {
@@ -1121,28 +1121,34 @@ export default class Store {
 		this.kv.put('light_convos', this.lightConvos)
 	}
 
-	startLightConvo(botid, message, locale, is_testing, botversion) {
+	startLightConvo(botid, messages, locale, is_testing, botversion) {
 		let convoid = 'cslight' + botid + '_' + this.now()
 		let user = this.cache.match('user') || {}
 
 		let old = this.lightConvos[convoid]
 		if (old) return {convo: old}
 		let now = this.now()
-		let ev = {}
-		ev.created = now
-		ev.event_time = now
-		ev.id = 'evfake' + now
-		ev.type = 'message_sent'
-		ev.by = {id: botid, type: 'bot'}
-		ev.data = {message: message}
-		ev.data.message.conversation_id = convoid
+
+		let lastev = {}
+		let newevs = sb.map(messages, (message, idx) => {
+			let ev = {}
+			ev.created = now
+			ev.event_time = now
+			ev.id = 'evfake' + now + idx
+			ev.type = 'message_sent'
+			ev.by = {id: botid, type: 'bot'}
+			ev.data = {message: message}
+			ev.data.message.conversation_id = convoid
+			lastev = ev
+			return ev
+		})
 		let newconvo = {
 			id: convoid,
 			locale: locale,
 			initial_by: botid,
 			created: now,
 			actived: now,
-			last_message_sent: ev,
+			last_message_sent: lastev,
 			members: [
 				{type: 'user', id: user.id},
 				{type: 'bot', id: botid, membership: 'active'},
@@ -1150,13 +1156,14 @@ export default class Store {
 			state: 'active',
 			touchpoint: {id: convoid, channel: 'subiz', source: 'web'},
 			traffic_source: 'direct',
-			events: [ev],
+			events: newevs,
+			//events: [ev],
 			is_testing: is_testing,
 			bot_versio: botversion,
 		}
 		this.lightConvos[convoid] = newconvo
 		this.kv.put('light_convos', this.lightConvos)
-		this.pubsub.publish('events', ev)
+		this.pubsub.publish('events', lastev)
 		return {convo: newconvo}
 	}