Fix: Warning message shown when clicking on LUIS trace (#2160)

srinaath · Srinaath Ravichandran · web-flow · commit dbe375a416b3 · 2020-06-24T10:21:43.000-07:00
* Added logger warn

Signed-off-by: Srinaath Ravichandran &lt;srravich@microsoft.com&gt;

Added preload script

Signed-off-by: Srinaath Ravichandran &lt;srravich@microsoft.com&gt;

* Removed logs

Signed-off-by: Srinaath Ravichandran &lt;srravich@microsoft.com&gt;

Co-authored-by: Srinaath Ravichandran &lt;srravich@microsoft.com&gt;
diff --git a/packages/app/client/src/ui/editor/emulator/parts/inspector/inspector.tsx b/packages/app/client/src/ui/editor/emulator/parts/inspector/inspector.tsx
@@ -420,6 +420,13 @@ export class Inspector extends React.Component<InspectorProps, InspectorState> {
     this.sendInitializationStackToInspector();
   };
 
+  private handleLoggingFromExtension = (logLevel: LogLevel, argument: string): void => {
+    const { documentId } = this.props.document;
+    const inspectorName = this._state.titleOverride || this.state.inspector.name || 'inspector';
+    const text = `[${inspectorName}] ${argument}`;
+    logService.logToDocument(documentId, logEntry(textItem(logLevel, text)));
+  };
+
   private ipcMessageEventHandler = (event: IpcMessageEvent): void => {
     // TODO - localization
     const { channel } = event;
@@ -442,14 +449,16 @@ export class Inspector extends React.Component<InspectorProps, InspectorState> {
         break;
 
       case EmulatorChannel.Log:
-      case EmulatorChannel.LogError: {
-        const logLevel = channel === 'logger.log' ? LogLevel.Info : LogLevel.Error;
-        const { documentId } = this.props.document;
-        const inspectorName = this._state.titleOverride || this.state.inspector.name || 'inspector';
-        const text = `[${inspectorName}] ${event.args[0]}`;
-        logService.logToDocument(documentId, logEntry(textItem(logLevel, text)));
+        this.handleLoggingFromExtension(LogLevel.Info, event.args[0]);
+        break;
+
+      case EmulatorChannel.LogError:
+        this.handleLoggingFromExtension(LogLevel.Error, event.args[0]);
+        break;
+
+      case EmulatorChannel.LogWarn:
+        this.handleLoggingFromExtension(LogLevel.Warn, event.args[0]);
         break;
-      }
 
       case EmulatorChannel.LogLuisDeepLink: {
         const { documentId } = this.props.document;
diff --git a/packages/app/main/src/extensions/inspector-preload.js b/packages/app/main/src/extensions/inspector-preload.js
@@ -86,6 +86,9 @@ window.host = {
     logLuisEditorDeepLink: function(message) {
       ipcRenderer.sendToHost('logger.luis-editor-deep-link', message);
     },
+    warn: function(message) {
+      ipcRenderer.sendToHost('logger.warn', message);
+    },
   },
 
   on: function(event, handler) {
diff --git a/packages/extensions/luis/client/src/App.tsx b/packages/extensions/luis/client/src/App.tsx
@@ -271,7 +271,10 @@ export class App extends Component<any, AppState> {
         }
       } catch (err) {
         // Throw an auth error only if conversation is from a bot file instead of URL.
-        if (!$host.bot && err.statusCode === 401) {
+        if (err.statusCode === 401) {
+          if ($host.bot) {
+            $host.logger.warn(err.message);
+          }
           return;
         }
         $host.logger.error(err.message);
diff --git a/packages/sdk/client/src/extensions/host.ts b/packages/sdk/client/src/extensions/host.ts
@@ -41,6 +41,7 @@ export interface InspectorHost {
   readonly logger: {
     log(message: string): () => void;
     error(message: string): () => void;
+    warn(message: string): () => void;
     logLuisEditorDeepLink(message: string): () => void;
   };
 
diff --git a/packages/sdk/shared/src/types/ipc/extensionChannel.ts b/packages/sdk/shared/src/types/ipc/extensionChannel.ts
@@ -36,6 +36,7 @@ export enum EmulatorChannel {
   EnableAccessory = 'enable-accessory',
   Log = 'logger.log',
   LogError = 'logger.error',
+  LogWarn = 'logger.warn',
   LogLuisDeepLink = 'logger.luis-editor-deep-link',
   SetAccessoryState = 'set-accessory-state',
   SetHightlightedObjects = 'set-highlighted-objects',

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,10 @@ export class App extends Component<any, AppState> {`
`271`	`271`	`}`
`272`	`272`	`} catch (err) {`
`273`	`273`	`// Throw an auth error only if conversation is from a bot file instead of URL.`
`274`		`- if (!$host.bot && err.statusCode === 401) {`
	`274`	`+ if (err.statusCode === 401) {`
	`275`	`+ if ($host.bot) {`
	`276`	`+ $host.logger.warn(err.message);`
	`277`	`+ }`
`275`	`278`	`return;`
`276`	`279`	`}`
`277`	`280`	`$host.logger.error(err.message);`