Merge branch 'main' into dependabot/npm_and_yarn/dot-github/actions/conventional-pr/actions/core-1.9.1

Author: OEvgeny

.config/tsaoptions.json

@@ -0,0 +1,6 @@
+{
+  "azurePath": "Composer/Compliance",
+  "notificationAliases": "[email protected]",
+  "codebaseName": "TSABotFrameworkComposer",
+  "ignoreBranchName": true
+}

Composer/packages/adaptive-flow/src/adaptive-flow-editor/AdaptiveFlowEditor.tsx

@@ -137,14 +137,6 @@ const VisualDesigner: React.FC<VisualDesignerProps> = ({ onFocus, onBlur, schema
     editorEvent && handleEditorEvent(editorEvent.type, editorEvent.payload);
   };
 
-  const marqueeStyles = (_) => {
-    return {
-      root: {
-        width: '100%',
-        height: '100%',
-      },
-    };
-  };
   return (
     <CacheProvider value={emotionCache}>
       <NodeRendererContext.Provider value={nodeContext}>
@@ -158,15 +150,15 @@ const VisualDesigner: React.FC<VisualDesignerProps> = ({ onFocus, onBlur, schema
             {...enableKeyboardCommandAttributes(handleCommand)}
             data-testid="visualdesigner-container"
           >
-            <SelectionContext.Provider value={selectionContext}>
-              <MarqueeSelection isDraggingConstrainedToRoot selection={selection} styles={marqueeStyles}>
-                <FlowToolbar
-                  flowCommentsVisible={flowCommentsVisible}
-                  flowZoomRate={flowZoomRate}
-                  focusedId={focusedId}
-                  toggleFlowComments={toggleFlowComments}
-                  updateFlowZoomRate={updateFlowZoomRate}
-                >
+            <FlowToolbar
+              flowCommentsVisible={flowCommentsVisible}
+              flowZoomRate={flowZoomRate}
+              focusedId={focusedId}
+              toggleFlowComments={toggleFlowComments}
+              updateFlowZoomRate={updateFlowZoomRate}
+            >
+              <SelectionContext.Provider value={selectionContext}>
+                <MarqueeSelection isDraggingConstrainedToRoot selection={selection}>
                   <div
                     className="flow-editor-container"
                     css={{
@@ -200,9 +192,9 @@ const VisualDesigner: React.FC<VisualDesignerProps> = ({ onFocus, onBlur, schema
                       }}
                     />
                   </div>
-                </FlowToolbar>
-              </MarqueeSelection>
-            </SelectionContext.Provider>
+                </MarqueeSelection>
+              </SelectionContext.Provider>
+            </FlowToolbar>
           </div>
         </SelfHostContext.Provider>
       </NodeRendererContext.Provider>

Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json

@@ -3085,7 +3085,7 @@
                   "title": "speak"
                 },
                 "inputHint": {
-                  "description": "Indicates whether your bot is accepting,\nexpecting, or ignoring user input after the message is delivered to the client. Possible\nvalues include: 'acceptingInput', 'ignoringInput', 'expectingInput'",
+                  "description": "Indicates whether your bot is accepting,\nexpecting, or ignoring user input after the message is delivered to the client. Possible\nvalues include: 'acceptingInput', 'ignoringInput', 'expectingInput', 'ignoringSpeechInput', 'ignoringNonSpeechInput'",
                   "type": "string",
                   "title": "inputHint"
                 },

Composer/packages/client/src/recoilModel/dispatchers/publisher.ts

@@ -102,12 +102,6 @@ export const publisherDispatcher = () => {
     const { set, snapshot } = callbackHelpers;
     const { endpointURL, status, port } = data;
 
-    // remove job id in publish storage if published
-    if (status === PUBLISH_SUCCESS || status === PUBLISH_FAILED) {
-      const publishJobIds = publishStorage.get('jobIds') || {};
-      delete publishJobIds[`${projectId}-${target.name}`];
-      publishStorage.set('jobIds', publishJobIds);
-    }
     // the action below only applies to when a bot is being started using the "start bot" button
     // a check should be added to this that ensures this ONLY applies to the "default" profile.
     if (target.name === defaultPublishConfig.name) {

Composer/packages/electron-server/src/preload.js

@@ -1,9 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-const { ipcRenderer } = require('electron'); // eslint-disable-line
+const { ipcRenderer, contextBridge } = require('electron'); // eslint-disable-line
 
 // expose ipcRenderer to the browser
-window.ipcRenderer = ipcRenderer;
+contextBridge.exposeInMainWorld('ipcRenderer', {
+  send: (...args) => ipcRenderer.send(...args),
+  on: (...args) => ipcRenderer.on(...args),
+});
+
 // flag to distinguish electron client from web app client
-window.__IS_ELECTRON__ = true;
+contextBridge.exposeInMainWorld('__IS_ELECTRON__', true);

Composer/packages/integration-tests/cypress/integration/LuisDeploy.spec.ts

@@ -36,7 +36,7 @@ context('Luis Deploy', () => {
       response: 'fixture:luPublish/success',
     });
     cy.findByTestId('startBotButton').click();
-    cy.findByText(/^Starting bot../);
+    cy.findAllByText(/^Starting bot../);
     cy.route('GET', '/api/publish/*/status/default', { endpointURL: 'anything', status: 200 });
     cy.route('PUT', '/api/projects/*/files/appsettings.json', { status: 200 });
   });

Composer/packages/integration-tests/cypress/support/commands.d.ts

@@ -5,6 +5,11 @@
 
 declare namespace Cypress {
   interface Chainable {
+    /**
+     * Get CSRF token
+     * @example cy.getCSRFToken().then(token => ...)
+     */
+    getCSRFToken(): Chainable<string>;
     /**
      * Creates a bot based on empty bot.
      * @example cy.createBot('EmptySample', ()=> {})

Composer/packages/integration-tests/cypress/support/commands.ts

@@ -5,6 +5,49 @@ import '@testing-library/cypress/add-commands';
 
 let TemplateBotProjectId = '';
 
+let csrfToken: string;
+
+Cypress.Commands.add('getCSRFToken', () => {
+  if (csrfToken) {
+    return cy.wrap(csrfToken);
+  }
+  cy.visit('/');
+  return cy
+    .window()
+    .its('__csrf__')
+    .then((csrf) => {
+      csrfToken = csrf;
+      return csrf;
+    });
+});
+
+Cypress.Commands.overwrite('request', (originalFn, ...options) => {
+  return cy.getCSRFToken().then((csrf) => {
+    const headers = {
+      'X-CSRF-Token': csrf,
+    };
+
+    const optionsObject = options[0];
+
+    if (optionsObject === Object(optionsObject)) {
+      optionsObject.headers = {
+        ...headers,
+        ...optionsObject.headers,
+      };
+
+      return originalFn(optionsObject);
+    }
+
+    const [method, url, body] = options;
+    return originalFn({
+      method,
+      url,
+      body,
+      headers,
+    });
+  });
+});
+
 Cypress.Commands.add('createBot', (botName: string, callback?: (bot: any) => void) => {
   const params = {
     description: '',
@@ -60,6 +103,7 @@ Cypress.Commands.add('createTestBot', (botName: string, callback?: (bot: any) =>
     storageId: 'default',
   };
 
+  cy.wrap(TemplateBotProjectId).should('not.be.empty');
   cy.request('post', `/api/projects/${TemplateBotProjectId}/project/saveAs`, params).then((res) => {
     callback?.(res.body);
   });

Composer/packages/integration-tests/cypress/support/index.ts

@@ -5,6 +5,7 @@ import './commands';
 
 before(() => {
   cy.exec('yarn clean-all');
+  cy.getCSRFToken();
   cy.createTemplateBot('EmptySample');
 });
 

Composer/packages/intellisense/src/hooks/useLanguageServer.ts

@@ -52,6 +52,10 @@ export const useLanguageServer = (
     ws.current.onmessage = (messageText) => {
       handleMessage(messageText);
     };
+
+    return () => {
+      ws.current.close();
+    };
   }, [url]);
 
   // If scopes change, update backend with info

Composer/packages/lib/code-editor/src/BaseEditor.tsx

@@ -170,12 +170,24 @@ const BaseEditor: React.FC<BaseEditorProps> = (props) => {
 
   const onEditorMount: EditorDidMount = (getValue, editor) => {
     editorRef.current = editor;
+    const action = editorRef.current.addAction({
+      id: 'escape',
+      label: 'Escape editor',
+      keybindings: [MonacoKeyCode.Escape],
+      keybindingContext: null,
+      contextMenuGroupId: 'navigation',
+      contextMenuOrder: 1.5,
+      run: () => {
+        (document.activeElement as HTMLElement)?.blur();
+      },
+    });
 
     if (typeof editorDidMount === 'function') {
       editorDidMount(getValue, editor);
     }
 
     editor.onDidDispose(() => {
+      action.dispose();
       editorRef.current = undefined;
     });
   };
@@ -220,14 +232,6 @@ const BaseEditor: React.FC<BaseEditorProps> = (props) => {
     }
   }, [onChange, editorRef.current]);
 
-  // Add a command to escape from editor
-  useEffect(() => {
-    if (!editorRef.current) return;
-    editorRef.current.addCommand(MonacoKeyCode.Escape, () => {
-      (document.activeElement as HTMLElement)?.blur();
-    });
-  }, [editorRef.current]);
-
   const errorMsgFromDiagnostics = useMemo(() => {
     const errors = findErrors(diagnostics);
     return errors.length ? combineSimpleMessage(errors) : '';

Composer/packages/lib/code-editor/src/LuEditor.tsx

@@ -193,9 +193,10 @@ const LuEditor: React.FC<LULSPEditorProps> = (props) => {
 
     const uri = get(editor.getModel(), 'uri._formatted', '');
 
+    let webSocket: WebSocket;
     if (!window.monacoLUEditorInstance) {
       const url = createUrl(luServer);
-      const webSocket: WebSocket = createWebSocket(url);
+      webSocket = createWebSocket(url);
       listen({
         webSocket,
         onConnection: (connection: MessageConnection) => {
@@ -242,6 +243,10 @@ const LuEditor: React.FC<LULSPEditorProps> = (props) => {
       }
       sendRequestWithRetry(languageClient, 'initializeDocuments', { luOption, uri });
     }
+
+    return () => {
+      webSocket?.close();
+    };
   }, [editor, onNavigateToLuPage]);
 
   const onInit: OnInit = (monaco) => {

Composer/packages/lib/code-editor/src/lg/LgCodeEditor.tsx

@@ -133,10 +133,11 @@ export const LgCodeEditor = (props: LgCodeEditorProps) => {
     }
 
     const uri = get(editor.getModel(), 'uri._formatted', '');
+    let webSocket: WebSocket;
 
     if (!window.monacoLGEditorInstance) {
       const url = createUrl(lgServer);
-      const webSocket: WebSocket = createWebSocket(url);
+      webSocket = createWebSocket(url);
       listen({
         webSocket,
         onConnection: (connection: MessageConnection) => {
@@ -172,6 +173,10 @@ export const LgCodeEditor = (props: LgCodeEditorProps) => {
         })
       );
     }
+
+    return () => {
+      webSocket?.close();
+    };
   }, [editor, onNavigateToLgPage]);
 
   const onInit: OnInit = (monaco) => {

Composer/packages/lib/code-editor/src/lg/modalityEditors/SpeechModalityEditor.tsx

@@ -79,6 +79,16 @@ const SpeechModalityEditor = React.memo(
           text: formatMessage('Expecting'),
           selected: inputHint === 'expectingInput',
         },
+        {
+          key: 'ignoringSpeechInput',
+          text: formatMessage('Ignoring Speech'),
+          selected: inputHint === 'ignoringSpeechInput',
+        },
+        {
+          key: 'ignoringNonSpeechInput',
+          text: formatMessage('Ignoring Non Speech'),
+          selected: inputHint === 'ignoringNonSpeechInput',
+        },
       ],
       [inputHint]
     );

Composer/packages/lib/code-editor/src/lg/types.ts

@@ -34,7 +34,13 @@ export type CommonModalityEditorProps = {
 /**
  * Structured response types.
  */
-export const acceptedInputHintValues = ['expectingInput', 'ignoringInput', 'acceptingInput'] as const;
+export const acceptedInputHintValues = [
+  'expectingInput',
+  'ignoringInput',
+  'acceptingInput',
+  'ignoringSpeechInput',
+  'ignoringNonSpeechInput',
+] as const;
 export const acceptedAttachmentLayout = ['carousel', 'list'] as const;
 
 export const modalityTypes = ['Text', 'Speak', 'Attachments', 'SuggestedActions'] as const;

Composer/packages/lib/indexers/src/validations/expressionValidation/index.ts

@@ -49,8 +49,12 @@ export const validateExpressions: ValidateFunc = (
     let errorMessage = '';
     let warningMessage = '';
     try {
-      newCache[value] = cache?.[value] ? cache[value] : checkExpression(value, required, types);
-      errorMessage = checkReturnType(newCache[value], types);
+      const valueToValidate = cache?.[path] ? cache[path] : checkExpression(value, required, types);
+      errorMessage = checkReturnType(valueToValidate, types);
+      if (!errorMessage) {
+        //First validate that the types of the value match and then store the type value in newCache using the path as key to avoid overwriting.
+        newCache[path] = valueToValidate;
+      }
     } catch (error) {
       //change the missing custom function error to warning
       warningMessage = filterCustomFunctionError(error.message, customFunctions);

Composer/packages/server/src/directline/middleware/__tests__/attachmentHandler.test.ts

@@ -20,9 +20,14 @@ const mockSend = jest.fn(() => ({
   end: mockEnd,
 }));
 
+const mockType = jest.fn(() => ({
+  send: mockSend,
+}));
+
 const mockStatus = jest.fn(() => ({
   json: mockJsonResponse,
   send: mockSend,
+  type: mockType,
 }));
 
 describe('getAttachment handler', () => {
@@ -54,12 +59,15 @@ describe('getAttachment handler', () => {
       end: jest.fn(),
       send: jest.fn(),
       type: jest.fn(),
+      status: mockStatus,
       json: mockJsonResponse,
     };
 
     getAttachmentHandler(req, res);
 
-    expect(res.send).toHaveBeenCalledWith(StatusCodes.OK, Buffer.from(mockAttachmentData));
+    expect(res.status).toHaveBeenCalledWith(StatusCodes.OK);
+    expect(res.status().type).toHaveBeenCalledWith('text/plain');
+    expect(res.status().type().send).toHaveBeenCalledWith(Buffer.from(mockAttachmentData));
   });
 
   it('should return the attachment content uploaded via the bot', () => {
@@ -80,12 +88,14 @@ describe('getAttachment handler', () => {
       end: jest.fn(),
       type: jest.fn(),
       send: jest.fn(),
-      status: jest.fn(),
+      status: mockStatus,
     };
 
     getAttachmentHandler(req, res);
 
-    expect(res.send).toHaveBeenCalledWith(StatusCodes.OK, Buffer.from(mockAttachmentData.toString(), 'base64'));
+    expect(res.status).toHaveBeenCalledWith(StatusCodes.OK);
+    expect(res.status().type).toHaveBeenCalledWith('text/plain');
+    expect(res.status().type().send).toHaveBeenCalledWith(Buffer.from(mockAttachmentData.toString(), 'base64'));
   });
 
   it('should send an error message if the original view is requested, but missing', () => {

Composer/packages/server/src/directline/middleware/attachmentHandler.ts

@@ -76,8 +76,7 @@ export function createGetAttachmentHandler(state: DLServerState) {
               buffer = Buffer.from(attachmentBase64.toString(), 'base64');
             }
 
-            res.type(attachment.type);
-            res.send(StatusCodes.OK, buffer);
+            res.status(StatusCodes.OK).type(attachment.type).send(buffer);
           } else {
             handleDirectLineErrors(req, res, {
               status: StatusCodes.NOT_FOUND,