@subiz/widget-v4 4.1.21 → 4.1.25

package/compiled_src/chatbox/Widget.js

@@ -585,7 +585,7 @@ class Widget extends _common.Com {
     let convoM = this.props.store.matchConvo('*');
     var convos = _index.default.map(convoM, convo => this.props.store.matchConvo(convo.id));
     convos = _index.default.filter(convos, convo => !!convo);
-    convos = _index.default.orderBy(convos, 'created', 'desc');
+    convos = _index.default.orderBy(convos, 'actived', 'desc');
     var $convos = _index.default.map(convos, convo => {
       let ags = _index.default.filter(convo.members, m => {
         return (m.type === 'agent' || m.type === 'bot') && m.membership === 'active';

package/compiled_src/store/api_fake.js

@@ -66,7 +66,11 @@ class _default {
     _defineProperty(this, "getUser", _ => Promise.resolve({
       code: 200,
       body: {
-        id: '-'
+        id: 'usqzgtgfake',
+        attributes: [{
+          key: 'fullname',
+          text: 'Kiều Thanh'
+        }]
       }
     }));
     _defineProperty(this, "getAccountSetting", () => this.apireq.get(`/accounts/${this.accid}/settings`));
@@ -85,7 +89,11 @@ class _default {
     this.uid = obj.uid;
     return {
       account_id: this.accid,
-      id: 'usqzgtgfake'
+      id: 'usqzgtgfake',
+      attributes: [{
+        key: 'fullname',
+        text: 'Kiều Thanh'
+      }]
     };
   }
 }

package/compiled_src/store/store.js

@@ -78,7 +78,6 @@ class Store {
     _defineProperty(this, "list_provinces", () => this.api.list_provinces());
     _defineProperty(this, "list_districts", p => this.api.list_districts(p));
     _defineProperty(this, "list_wards", p => this.api.list_wards(p));
-    _defineProperty(this, "list_provices", void 0);
     _defineProperty(this, "listEvents", id => {
       if (!id || id === '*' || typeof id !== 'string') return;
       if (!this.isInsync('events' + id)) {
@@ -325,9 +324,6 @@ class Store {
   async init(accid, mask, userRef) {
     this.readyGate.close();
     accid = (accid || '').trim();
-    this.api.setAuth({
-      accid: accid
-    });
     this.g_sync = {};
     if (!userRef) {
       try {
@@ -353,6 +349,12 @@ class Store {
         }
       }
     }
+    if (this.cookie.get('__sbref', userRef) != userRef) {
+      cleanMyLocalStorage();
+    }
+    this.api.setAuth({
+      accid: accid
+    });
     if (userRef) this.cookie.set('__sbref', userRef);
     let user = await this.api.setAuth({
       accid: accid,
@@ -1060,4 +1062,18 @@ let cleanLocalStorage = () => {
       }
     }
   });
+};
+let cleanMyLocalStorage = () => {
+  try {
+    localStorage;
+  } catch (e) {
+    return;
+  }
+  _index.default.setTimeout(() => {
+    for (var key in localStorage) {
+      if (key && (key.startsWith('cbz2020') || key.startsWith('sbz2020') || key.startsWith('sbz2022') || key.startsWith('sbz2023'))) {
+        localStorage.removeItem(key);
+      }
+    }
+  });
 };

package/compiled_src/util/campaign.js

@@ -44,7 +44,7 @@ function trackAreaClicked(selector, cb) {
     });
   });
 }
-function trackInactivity(seconds, cb) {
+function trackInactivity(seconds = 0, cb) {
   let events = ['scroll', 'keyup', 'keydown', 'mousemove', 'mousewheel', 'mouseenter', 'mouseover', 'mousedown', 'touchstart', 'touchmove', 'touchenter'];
   let inactiveSeconds = 0;
   let resetTime = () => {
@@ -67,7 +67,7 @@ let timeOnPage = 0;
 common.setInterval(() => {
   timeOnPage += 5;
 }, 5000);
-function trackTimeOnPage(seconds, cb) {
+function trackTimeOnPage(seconds = 0, cb) {
   if (seconds < 1) {
     return common.setTimeout(function () {
       cb(seconds);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.21",
+	"version": "4.1.25",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",

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, 'created', 'desc')
+		convos = sb.orderBy(convos, 'actived', 'desc')
 
 		var $convos = sb.map(convos, (convo) => {
 			let ags = sb.filter(convo.members, (m) => {

package/src/store/api_fake.js

@@ -28,7 +28,16 @@ export default class {
 		this.accid = obj.accid
 		this.mask = obj.mask
 		this.uid = obj.uid
-		return {account_id: this.accid, id: 'usqzgtgfake'}
+		return {
+			account_id: this.accid,
+			id: 'usqzgtgfake',
+			attributes: [
+				{
+					key: 'fullname',
+					text: 'Kiều Thanh',
+				},
+			],
+		}
 	}
 
 	listConversations = (_) => {
@@ -68,7 +77,19 @@ export default class {
 	time = (_) => Promise.resolve({code: 200, body: new sb.Date().toISOString()})
 	updateUser = (data) => OK200
 
-	getUser = (_) => Promise.resolve({code: 200, body: {id: '-'}})
+	getUser = (_) =>
+		Promise.resolve({
+			code: 200,
+			body: {
+				id: 'usqzgtgfake',
+				attributes: [
+					{
+						key: 'fullname',
+						text: 'Kiều Thanh',
+					},
+				],
+			},
+		})
 	getAccountSetting = () => this.apireq.get(`/accounts/${this.accid}/settings`)
 	getIsOnline = () => this.apireq.get(`/accounts/${this.accid}/is_online`)
 

package/src/store/store.js

@@ -290,7 +290,6 @@ export default class Store {
 	list_districts = (p) => this.api.list_districts(p)
 	list_wards = (p) => this.api.list_wards(p)
 
-	list_provices
 	listEvents = (id) => {
 		if (!id || id === '*' || typeof id !== 'string') return
 		if (!this.isInsync('events' + id)) {
@@ -374,8 +373,8 @@ export default class Store {
 	async init(accid, mask, userRef) {
 		this.readyGate.close()
 		accid = (accid || '').trim()
-		this.api.setAuth({accid: accid})
 		this.g_sync = {}
+
 		if (!userRef) {
 			// try to find userRef in cookie
 			try {
@@ -408,6 +407,11 @@ export default class Store {
 			}
 		}
 
+		if (this.cookie.get('__sbref', userRef) != userRef) {
+			cleanMyLocalStorage()
+		}
+
+		this.api.setAuth({accid: accid})
 		// set cookie forever
 		if (userRef) this.cookie.set('__sbref', userRef)
 
@@ -1274,3 +1278,24 @@ let cleanLocalStorage = () => {
 		}
 	})
 }
+
+let cleanMyLocalStorage = () => {
+	try {
+		localStorage
+	} catch (e) {
+		return
+	}
+	sb.setTimeout(() => {
+		for (var key in localStorage) {
+			if (
+				key &&
+				(key.startsWith('cbz2020') ||
+					key.startsWith('sbz2020') ||
+					key.startsWith('sbz2022') ||
+					key.startsWith('sbz2023'))
+			) {
+				localStorage.removeItem(key)
+			}
+		}
+	})
+}

package/src/util/campaign.js

@@ -47,7 +47,7 @@ export function trackAreaClicked(selector, cb) {
 }
 
 // callback when user has stopped all activity (clicking, scrolling, ...)
-export function trackInactivity(seconds, cb) {
+export function trackInactivity(seconds = 0, cb) {
 	let events = [
 		'scroll',
 		'keyup',
@@ -86,7 +86,7 @@ common.setInterval(() => {
 }, 5000)
 
 // when user has been on the page for at least X seconds
-export function trackTimeOnPage(seconds, cb) {
+export function trackTimeOnPage(seconds = 0, cb) {
 	if (seconds < 1) {
 		return common.setTimeout(function () {
 			cb(seconds)