@subiz/widget-v4 4.1.68 → 4.1.69

package/compiled_src/chatbox/Rating.js

@@ -142,13 +142,17 @@ class Rating extends _common.Com {
     var rated;
     var ended;
     let user = this.props.store.matchUser();
+    let foundUser = false;
     _index.default.map(this.props.store.listEvents(this.props.cid), ev => {
-      if (_index.default.get(ev, 'type') === 'conversation_state_updated' && _index.default.get(ev, 'data.conversation.state') === 'ended') {
+      if (!ev || !ev.by) return;
+      if (ev.by.type == 'user') foundUser = true;
+      if (ev.type === 'conversation_state_updated' && _index.default.get(ev, 'data.conversation.state') === 'ended') {
         ended = ev;
       }
-      if (_index.default.get(ev, 'type') === 'conversation_rating_requested') requested = ev;
-      if (_index.default.get(ev, 'type') === 'conversation_rated' && _index.default.get(ev, 'by.id') === user.id) rated = ev;
+      if (ev.type === 'conversation_rating_requested') requested = ev;
+      if (ev.type === 'conversation_rated' && ev.by.id === user.id) rated = ev;
     });
+    if (!foundUser) return false;
     if (rated) return false;
     let accountSetting = this.props.plugin.chatbox;
     var auto = accountSetting.auto_request_rating && ended;

package/compiled_src/chatbox/Widget.js

@@ -31,6 +31,20 @@ class Widget extends _common.Com {
   constructor(props) {
     super(props);
     _defineProperty(this, "msgInput", (0, _preact.createRef)());
+    _defineProperty(this, "formMounted", form => {
+      let formData = this.fillForm(form);
+      formData['question'] = {
+        key: 'question',
+        is_required: true,
+        label: this.props.t.i18n(_index.default.get(form, `i18n_question_label`, {})) || form.question_label,
+        type: 'text',
+        value: this.state.quickReplyMessage.text
+      };
+      this.setState({
+        formData
+      });
+      if (!this.props.store.isMobile()) this.focusInput();
+    });
     _defineProperty(this, "sendMessage", async message => {
       let hasPostback = _index.default.find(message.attachments, att => att.type === 'postback');
       if (this.isFormRequired() && hasPostback) {
@@ -308,20 +322,6 @@ class Widget extends _common.Com {
     });
     if (!this.props.store.isMobile()) this.focusInput();
   }
-  formMounted(form) {
-    let formData = this.fillForm(form);
-    formData['question'] = {
-      key: 'question',
-      is_required: true,
-      label: this.props.t.i18n(_index.default.get(form, `i18n_question_label`, {})) || form.question_label,
-      type: 'text',
-      value: this.state.quickReplyMessage.text
-    };
-    this.setState({
-      formData
-    });
-    if (!this.props.store.isMobile()) this.focusInput();
-  }
   onBooleanChange(key, e) {
     this.wasFormInputed = true;
     let formData = _index.default.cloneDeep(this.state.formData);
@@ -595,8 +595,9 @@ class Widget extends _common.Com {
     return (0, _preact.h)("div", {
       class: "widget-body"
     }, (0, _preact.h)(FormMounter, {
+      key: form._updated,
       form: form,
-      onMount: f => this.formMounted(f)
+      onMount: this.formMounted
     }), (0, _preact.h)("div", {
       class: "widget-body--content flex-grow-1 pl-3 pr-3 d-flex flex-column"
     }, (0, _preact.h)("div", {

package/compiled_src/plugin.js

@@ -252,48 +252,39 @@ class PluginMgr {
   }
   getCurrentView() {
     let chatbox = this.findChatbox();
-    if (!chatbox) return;
-    return chatbox.call('getCurrentView');
+    if (chatbox) return chatbox.call('getCurrentView');
   }
   showCurrentChatbox(p) {
     let chatbox = this.findChatbox();
-    if (!chatbox) return;
-    chatbox.call('showWidget', p);
+    if (chatbox) return chatbox.call('showWidget', p);
   }
   showCurrentGreeting() {
     let chatbox = this.findChatbox();
-    if (!chatbox) return;
-    chatbox.call('showGreeting');
+    if (chatbox) return chatbox.call('showGreeting');
   }
   hideCurrentGreeting() {
     let chatbox = this.findChatbox();
-    if (!chatbox) return;
-    chatbox.call('hideGreeting');
+    if (chatbox) return chatbox.call('hideGreeting');
   }
   hideCurrentChatbox() {
     let chatbox = this.findChatbox();
-    if (!chatbox) return;
-    chatbox.call('hideWidget');
+    if (chatbox) return chatbox.call('hideWidget');
   }
   forceUpdateLang(id) {
     let plugin = this.pluginM[id];
-    if (!plugin) return;
-    plugin.forceDownloadLanguage();
+    if (plugin) return plugin.forceDownloadLanguage();
   }
   forceRunPopup(id) {
     let plugin = this.pluginM[id];
-    if (!plugin) return;
-    plugin.forceRunPopup(id);
+    if (plugin) return plugin.forceRunPopup(id);
   }
   setPluginLocale(id, locale) {
     let plugin = this.pluginM[id];
-    if (!plugin) return;
-    return plugin.setLocale(locale);
+    if (plugin) return plugin.setLocale(locale);
   }
   setCurrentChatboxLocale(locale) {
     let chatbox = this.findChatbox();
-    if (!chatbox) return;
-    chatbox.setLocale(locale);
+    if (chatbox) return chatbox.setLocale(locale);
   }
   destroy() {
     _index.default.map(this.pluginM, (conf, id) => {

package/package.json

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

package/src/chatbox/Rating.js

@@ -117,14 +117,18 @@ export default class Rating extends Com {
 		var ended
 
 		let user = this.props.store.matchUser()
+		// user must send message
+		let foundUser = false
 		sb.map(this.props.store.listEvents(this.props.cid), (ev) => {
-			if (sb.get(ev, 'type') === 'conversation_state_updated' && sb.get(ev, 'data.conversation.state') === 'ended') {
+			if (!ev || !ev.by) return
+			if (ev.by.type == 'user') foundUser = true
+			if (ev.type === 'conversation_state_updated' && sb.get(ev, 'data.conversation.state') === 'ended') {
 				ended = ev
 			}
-			if (sb.get(ev, 'type') === 'conversation_rating_requested') requested = ev
-			if (sb.get(ev, 'type') === 'conversation_rated' && sb.get(ev, 'by.id') === user.id) rated = ev
+			if (ev.type === 'conversation_rating_requested') requested = ev
+			if (ev.type === 'conversation_rated' && ev.by.id === user.id) rated = ev
 		})
-
+		if (!foundUser) return false
 		if (rated) return false
 		let accountSetting = this.props.plugin.chatbox
 		var auto = accountSetting.auto_request_rating && ended

package/src/chatbox/Widget.js

@@ -93,7 +93,6 @@ export default class Widget extends Com {
 		// choose form to display
 		let accountSetting = this.props.plugin.chatbox || {}
 		let acc = this.props.store.matchAccount() || {}
-
 		let submitLabel = this.props.t('prechat_form_btn')
 		if (sb.get(accountSetting, 'prechat_form.enabled')) form = accountSetting.prechat_form
 		let offlineEnabled = sb.get(accountSetting, 'offline_form.enabled')
@@ -247,7 +246,7 @@ export default class Widget extends Com {
 		if (!this.props.store.isMobile()) this.focusInput()
 	}
 
-	formMounted(form) {
+	formMounted = (form) => {
 		// waiting for element to be created
 		let formData = this.fillForm(form)
 		formData['question'] = {
@@ -578,7 +577,7 @@ export default class Widget extends Com {
 
 		return (
 			<div class='widget-body'>
-				<FormMounter form={form} onMount={(f) => this.formMounted(f)} />
+				<FormMounter key={form._updated} form={form} onMount={this.formMounted} />
 				<div class='widget-body--content flex-grow-1 pl-3 pr-3 d-flex flex-column'>
 					<div class='flex-grow-1'>
 						<div class='form mt-3 pl-3 pr-3 pt-3 pb-3 d-flex flex-column'>

package/src/plugin.js

@@ -284,56 +284,47 @@ export default class PluginMgr {
 
 	getCurrentView() {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		return chatbox.call('getCurrentView')
+		if (chatbox) return chatbox.call('getCurrentView')
 	}
 
 	showCurrentChatbox(p) {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		chatbox.call('showWidget', p)
+		if (chatbox) return chatbox.call('showWidget', p)
 	}
 
 	showCurrentGreeting() {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		chatbox.call('showGreeting')
+		if (chatbox) return chatbox.call('showGreeting')
 	}
 
 	hideCurrentGreeting() {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		chatbox.call('hideGreeting')
+		if (chatbox) return chatbox.call('hideGreeting')
 	}
 
 	hideCurrentChatbox() {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		chatbox.call('hideWidget')
+		if (chatbox) return chatbox.call('hideWidget')
 	}
 
 	forceUpdateLang(id) {
 		let plugin = this.pluginM[id]
-		if (!plugin) return
-		plugin.forceDownloadLanguage()
+		if (plugin) return plugin.forceDownloadLanguage()
 	}
 
 	forceRunPopup(id) {
 		let plugin = this.pluginM[id]
-		if (!plugin) return
-		plugin.forceRunPopup(id)
+		if (plugin) return plugin.forceRunPopup(id)
 	}
 
 	setPluginLocale(id, locale) {
 		let plugin = this.pluginM[id]
-		if (!plugin) return
-		return plugin.setLocale(locale)
+		if (plugin) return plugin.setLocale(locale)
 	}
 
 	setCurrentChatboxLocale(locale) {
 		let chatbox = this.findChatbox()
-		if (!chatbox) return
-		chatbox.setLocale(locale)
+		if (chatbox) return chatbox.setLocale(locale)
 	}
 
 	destroy() {