Smarti Widget 0.7.1 (RocketChat#332)

* Smarti-203: Flag widget messages * Smarti-203: Rename widget message flag to skipAnalysis * Smarti-52: Add support for edited messages * redlink-gmbh/smarti#221: Set room topic as support area for conversation * Revert "redlink-gmbh/smarti#221: Set room topic as support area for conversation" This reverts commit c7966a3. * redlink-gmbh/smarti#225: Fix widget footer styling * redlink-gmbh/smarti#220: Improve error handling * SmartiWidgetBackend: Improve error handling
redlink-gmbh · May 14, 2018 · ee465b7 · ee465b7
1 parent 622129d
commit ee465b7
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/packages/assistify-ai/client/public/stylesheets/smarti.css b/packages/assistify-ai/client/public/stylesheets/smarti.css
@@ -65,8 +65,7 @@
 }
 
 .smarti #widgetContainer #widgetWrapper #widgetFooter {
-	position: absolute;
-	bottom: 0;
+	position: relative;
 	background: #f4f4f4;
 	color: #747474;
 	opacity: 1;

diff --git a/packages/assistify-ai/server/SmartiProxy.js b/packages/assistify-ai/server/SmartiProxy.js
@@ -48,6 +48,9 @@ export class SmartiProxy {
 				SystemLogger.debug('Got unexpected result from Smarti', method, 'to', url, 'response', JSON.stringify(response));
 			}
 		} catch (error) {
+			SystemLogger.error('Could not complete', method, 'to', url, error.response);
+			SystemLogger.debug(error);
+
 			if (onError) {
 				const recoveryResult = onError(error);
 				if (recoveryResult !== undefined) {

diff --git a/packages/assistify-ai/server/lib/SmartiAdapter.js b/packages/assistify-ai/server/lib/SmartiAdapter.js
@@ -87,10 +87,16 @@ export class SmartiAdapter {
 			'content': message.msg,
 			'user': {
 				'id': message.u._id
-			}
+			},
+			'metadata': {}
 			//,"private" : false
 		};
 
+		if (message.origin === 'smartiWidget') {
+			requestBodyMessage.metadata.skipAnalysis = true;
+		}
+
+		SystemLogger.debug('RocketChatMessage:', message);
 		SystemLogger.debug('Message:', requestBodyMessage);
 
 		let conversationId = SmartiAdapter._getConversationId(message.rid, message);

diff --git a/packages/assistify-ai/server/methods/SmartiWidgetBackend.js b/packages/assistify-ai/server/methods/SmartiWidgetBackend.js
@@ -33,9 +33,12 @@ Meteor.methods({
 					}
 				}
 			)(verbs.get, `legacy/rocket.chat?channel_id=${ channelId }`, null, (error) => {
-				// 404 is expected if no mapping exists
-				if (error.response.statusCode === 404) {
-					return null;
+				if (error) {
+					// 404 is expected if no mapping exists
+					if (error.response && error.response.statusCode === 404) {
+						return null;
+					}
+					return {errorCode: error.code};
 				}
 			});
 
@@ -84,7 +87,15 @@ Meteor.methods({
 					return !RocketChat.authz.hasPermission(userId, 'send-many-messages');
 				}
 			}
-		)(verbs.get, `conversation/${ conversationId }/analysis`);
+		)(verbs.get, `conversation/${ conversationId }/analysis`, null, (error) => {
+			if (error) {
+				// 404 is expected if no mapping exists
+				if (error.response && error.response.statusCode === 404) {
+					return null;
+				}
+				return {errorCode: error.code};
+			}
+		});
 	},
 
 	/**