feat: Qna recognizer

Composer/cypress/integration/LuisDeploy.spec.ts

@@ -16,7 +16,7 @@ context('Luis Deploy', () => {
     cy.url().should('contain', 'language-understanding/all');
     cy.route({
       method: 'POST',
-      url: 'api/projects/*/luFiles/publish',
+      url: 'api/projects/*/build',
       status: 200,
       response: 'fixture:luPublish/success',
     });
@@ -33,7 +33,7 @@ context('Luis Deploy', () => {
 
     cy.route({
       method: 'POST',
-      url: 'api/projects/*/luFiles/publish',
+      url: 'api/projects/*/build',
       status: 400,
       response: 'fixture:luPublish/error',
     });

Composer/cypress/integration/ToDoBot.spec.ts

@@ -2,9 +2,11 @@
 // Licensed under the MIT License.
 
 context('ToDo Bot', () => {
-  beforeEach(() => {
+  before(() => {
     cy.visit('/home');
     cy.createBot('TodoSample');
+    cy.findByTestId('WelcomeModalCloseIcon').click();
+    cy.findByText('Yes').click();
   });
 
   it('can open the main dialog', () => {
@@ -19,7 +21,6 @@ context('ToDo Bot', () => {
   it('can open the AddToDo dialog', () => {
     cy.findByTestId('ProjectTree').within(() => {
       cy.findByText('addtodo').click();
-      cy.findByText('addtodo').click();
     });
 
     cy.url().should('contain', 'addtodo');
@@ -28,7 +29,6 @@ context('ToDo Bot', () => {
   it('can open the ClearToDos dialog', () => {
     cy.findByTestId('ProjectTree').within(() => {
       cy.findByText('cleartodos').click();
-      cy.findByText('cleartodos').click();
     });
 
     cy.url().should('contain', 'cleartodos');
@@ -37,7 +37,6 @@ context('ToDo Bot', () => {
   it('can open the DeleteToDo dialog', () => {
     cy.findByTestId('ProjectTree').within(() => {
       cy.findByText('deletetodo').click();
-      cy.findByText('deletetodo').click();
     });
 
     cy.url().should('contain', 'deletetodo');
@@ -46,7 +45,6 @@ context('ToDo Bot', () => {
   it('can open the ShowToDos dialog', () => {
     cy.findByTestId('ProjectTree').within(() => {
       cy.findByText('showtodos').click();
-      cy.findByText('showtodos').click();
     });
 
     cy.url().should('contain', 'showtodos');

Composer/packages/client/__tests__/components/TestController/publish-luis-modal.test.tsx

@@ -3,7 +3,7 @@
 import * as React from 'react';
 import { fireEvent } from '@bfc/test-utils';
 
-import { PublishLuisDialog } from '../../../src/components/TestController/publishDialog';
+import { PublishDialog } from '../../../src/components/TestController/publishDialog';
 import { projectIdState, botNameState, settingsState, dispatcherState } from '../../../src/recoilModel';
 import { renderWithRecoil } from '../../testUtils';
 jest.useFakeTimers();
@@ -18,8 +18,10 @@ const luisConfig = {
   defaultLanguage: 'en-us',
   environment: 'composer',
 };
-describe('<PublishLuisDialog />', () => {
-  it('should render the <PublishLuisDialog />', () => {
+const config = { subscriptionKey: '12345', qnaRegion: 'westus', ...luisConfig };
+const qnaConfig = { subscriptionKey: '12345', endpointKey: '12345', qnaRegion: 'westus' };
+describe('<PublishDialog />', () => {
+  it('should render the <PublishDialog />', () => {
     const onDismiss = jest.fn(() => {});
     const onPublish = jest.fn(() => {});
     const setSettingsMock = jest.fn(() => {});
@@ -31,16 +33,11 @@ describe('<PublishLuisDialog />', () => {
       set(botNameState, 'sampleBot0');
       set(settingsState, {
         luis: luisConfig,
+        qna: qnaConfig,
       });
     };
     const { getByText } = renderWithRecoil(
-      <PublishLuisDialog
-        isOpen
-        botName={'sampleBot0'}
-        config={luisConfig}
-        onDismiss={onDismiss}
-        onPublish={onPublish}
-      />,
+      <PublishDialog isOpen botName={'sampleBot0'} config={config} onDismiss={onDismiss} onPublish={onPublish} />,
       recoilInitState
     );
 
@@ -50,14 +47,21 @@ describe('<PublishLuisDialog />', () => {
     fireEvent.click(publishButton);
     expect(onPublish).toBeCalled();
     expect(onPublish).toBeCalledWith({
-      name: 'sampleBot0',
-      authoringKey: '12345',
-      authoringEndpoint: 'testAuthoringEndpoint',
-      endpointKey: '12345',
-      endpoint: 'testEndpoint',
-      authoringRegion: 'westus',
-      defaultLanguage: 'en-us',
-      environment: 'composer',
+      luis: {
+        name: 'sampleBot0',
+        authoringKey: '12345',
+        authoringEndpoint: 'testAuthoringEndpoint',
+        endpointKey: '12345',
+        endpoint: 'testEndpoint',
+        authoringRegion: 'westus',
+        defaultLanguage: 'en-us',
+        environment: 'composer',
+      },
+      qna: {
+        subscriptionKey: '12345',
+        endpointKey: '',
+        qnaRegion: 'westus',
+      },
     });
   });
 });

Composer/packages/client/__tests__/components/skill.test.tsx

@@ -51,6 +51,11 @@ const recoilInitState = ({ set }) => {
       defaultLanguage: 'en-us',
       environment: 'composer',
     },
+    qna: {
+      subscriptionKey: '12345',
+      qnaRegion: 'westus',
+      endpointKey: '',
+    },
   });
 };
 

Composer/packages/client/__tests__/components/triggerCreationModal.test.tsx

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import * as React from 'react';
+import { fireEvent, waitFor } from '@bfc/test-utils';
+
+import { TriggerCreationModal } from '../../src/components/ProjectTree/TriggerCreationModal';
+import { renderWithRecoil } from '../testUtils';
+
+describe('<TriggerCreationModal/>', () => {
+  const onSubmitMock = jest.fn();
+  const onDismissMock = jest.fn();
+
+  function renderComponent() {
+    return renderWithRecoil(
+      <TriggerCreationModal isOpen dialogId={'todobot'} onDismiss={onDismissMock} onSubmit={onSubmitMock} />
+    );
+  }
+
+  it('should render the component', () => {
+    const component = renderComponent();
+    expect(component.container).toBeDefined();
+  });
+
+  it('hould create a Luis Intent recognized', async () => {
+    const component = renderComponent();
+    const triggerType = component.getByTestId('triggerTypeDropDown');
+    fireEvent.click(triggerType);
+
+    const luisOption = component.getByTitle('Intent recognized');
+    fireEvent.click(luisOption);
+    const node = await waitFor(() => component.getByTestId('triggerFormSubmit'));
+    expect(node).toBeDisabled();
+  });
+
+  it('should create a QnA Intent recognized', async () => {
+    const component = renderComponent();
+    const triggerType = component.getByTestId('triggerTypeDropDown');
+    fireEvent.click(triggerType);
+
+    const qnaOption = component.getByTitle('QnA Intent recognized');
+    fireEvent.click(qnaOption);
+
+    const node = await waitFor(() => component.getByTestId('triggerFormSubmit'));
+    expect(node).toBeEnabled();
+  });
+});

Composer/packages/client/__tests__/pages/knowledge-base/QnAPage.test.tsx

@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+/* eslint-disable react-hooks/rules-of-hooks */
+import React from 'react';
+
+import TableView from '../../../src/pages/knowledge-base/table-view';
+import CodeEditor from '../../../src/pages/knowledge-base/code-editor';
+import { renderWithRecoil } from '../../testUtils';
+import {
+  projectIdState,
+  localeState,
+  dialogsState,
+  qnaFilesState,
+  settingsState,
+  schemasState,
+  dispatcherState,
+} from '../../../src/recoilModel';
+import mockProjectResponse from '../../../src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json';
+
+const initialContent = `
+# ?question
+\`\`\`
+answer
+\`\`\`
+`;
+
+const state = {
+  projectId: 'test',
+  dialogs: [{ id: '1' }, { id: '2' }],
+  locale: 'en-us',
+  qnaFiles: [
+    {
+      id: 'a.en-us',
+      content: initialContent,
+      qnaSections: [
+        {
+          Questions: [{ content: 'question', id: 1 }],
+          Answer: 'answer',
+          uuid: 1,
+        },
+      ],
+    },
+  ],
+  settings: {
+    defaultLanguage: 'en-us',
+    languages: ['en-us', 'fr-fr'],
+  },
+};
+
+const updateQnAFileMock = jest.fn();
+
+const initRecoilState = ({ set }) => {
+  set(projectIdState, state.projectId);
+  set(localeState, state.locale);
+  set(dialogsState, state.dialogs);
+  set(qnaFilesState, state.qnaFiles);
+  set(settingsState, state.settings);
+  set(schemasState, mockProjectResponse.schemas);
+  set(dispatcherState, {
+    updateQnAFile: updateQnAFileMock,
+  });
+};
+
+describe('QnA page all up view', () => {
+  it('should render QnA page table view', () => {
+    const { getByText, getByTestId } = renderWithRecoil(<TableView dialogId={'a'} />, initRecoilState);
+    getByTestId('table-view');
+    getByText('question (1)');
+    getByText('answer');
+  });
+
+  it('should render QnA page code editor', () => {
+    renderWithRecoil(<CodeEditor dialogId={'a'} />, initRecoilState);
+  });
+});

Composer/packages/client/__tests__/plugins.test.ts

@@ -58,7 +58,7 @@ describe('mergePluginConfigs', () => {
     };
 
     // @ts-expect-error
-    expect(mergePluginConfigs(config1, config2).recognizers).toEqual(['recognizer 1', 'recognizer 2']);
+    expect(mergePluginConfigs(config1, config2).recognizers).toEqual(['recognizer 2', 'recognizer 1']);
   });
 
   it('replaces other arrays', () => {

Composer/packages/client/__tests__/shell/triggerApi.test.tsx

@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { renderHook } from '@bfc/test-utils/lib/hooks';
+import * as React from 'react';
+import { RecoilRoot } from 'recoil';
+
+import { useTriggerApi } from '../../src/shell/triggerApi';
+import {
+  projectIdState,
+  localeState,
+  luFilesState,
+  lgFilesState,
+  dialogsState,
+  schemasState,
+  dispatcherState,
+} from '../../src/recoilModel';
+import { Dispatcher } from '../../src/recoilModel/dispatchers';
+
+const state = {
+  dialogs: [
+    {
+      id: 'test',
+      content: {},
+    },
+  ],
+  luFiles: [
+    {
+      content: 'test',
+      id: 'test.en-us',
+      intents: [],
+    },
+  ],
+  lgFiles: [
+    {
+      content: 'test',
+      id: 'test.en-us',
+      templates: [],
+    },
+  ],
+  schemas: { sdk: { content: {} } },
+  focusPath: '',
+  locale: 'en-us',
+  projectId: 'test',
+};
+
+describe('use triggerApi hooks', () => {
+  let selectToMock, updateDialogMock, createLgTemplatesMock, createLuIntentMock, result;
+  beforeEach(() => {
+    selectToMock = jest.fn();
+    updateDialogMock = jest.fn();
+    createLgTemplatesMock = jest.fn();
+    createLuIntentMock = jest.fn();
+
+    const initRecoilState = ({ set }) => {
+      set(projectIdState, state.projectId);
+      set(localeState, 'en-us');
+      set(luFilesState, state.luFiles);
+      set(lgFilesState, state.lgFiles);
+      set(dialogsState, state.dialogs);
+      set(schemasState, state.schemas);
+      set(dispatcherState, (current: Dispatcher) => ({
+        ...current,
+        selectTo: selectToMock,
+        updateDialog: updateDialogMock,
+        createLgTemplates: createLgTemplatesMock,
+        createLuIntent: createLuIntentMock,
+      }));
+    };
+
+    const wrapper = (props: { children?: React.ReactNode }) => {
+      const { children } = props;
+      return <RecoilRoot initializeState={initRecoilState}>{children}</RecoilRoot>;
+    };
+    const rendered = renderHook(() => useTriggerApi(), {
+      wrapper,
+    });
+    result = rendered.result;
+  });
+
+  it('should create QnA trigger', async () => {
+    const dialogId = 'test';
+    const formData = {
+      $kind: 'Microsoft.OnQnAMatch',
+      errors: { $kind: '', intent: '', event: '', triggerPhrases: '', regEx: '', activity: '' },
+      event: '',
+      intent: '',
+      regEx: '',
+      triggerPhrases: '',
+    };
+    await result.current.createTrigger(dialogId, formData);
+    expect(createLgTemplatesMock).toBeCalledTimes(1);
+    expect(updateDialogMock).toBeCalledTimes(1);
+    expect(createLgTemplatesMock).toBeCalledTimes(1);
+    expect(updateDialogMock).toBeCalledTimes(1);
+  });
+});

Composer/packages/client/__tests__/utils/dialogUtil.test.js

@@ -186,9 +186,11 @@ describe('getTriggerTypes', () => {
     const triggerTypes = getTriggerTypes();
     expect(triggerTypes).toEqual([
       { key: 'Microsoft.OnIntent', text: 'Intent recognized' },
+      { key: 'Microsoft.OnQnAMatch', text: 'QnA Intent recognized' },
       { key: 'Microsoft.OnUnknownIntent', text: 'Unknown intent' },
       { key: 'Microsoft.OnDialogEvent', text: 'Dialog events' },
       { key: 'Microsoft.OnActivity', text: 'Activities' },
+      { key: 'Microsoft.OnChooseIntent', text: 'Duplicated intents recognized' },
       { key: 'OnCustomEvent', text: 'Custom events' },
     ]);
   });