- )
+ ,
+ ),
).toThrow();
});
});
diff --git a/Composer/packages/client/__tests__/components/getStarted.test.tsx b/Composer/packages/client/__tests__/components/getStarted.test.tsx
index c76459ad11..10bdc42e99 100644
--- a/Composer/packages/client/__tests__/components/getStarted.test.tsx
+++ b/Composer/packages/client/__tests__/components/getStarted.test.tsx
@@ -161,7 +161,7 @@ describe('', () => {
,
({ set }) => {
applyBaseState(set);
- }
+ },
);
const luisNode = await component.queryByText('Set up Language Understanding');
expect(luisNode).toBeNull();
diff --git a/Composer/packages/client/__tests__/components/home.test.tsx b/Composer/packages/client/__tests__/components/home.test.tsx
index 0d32354d18..f90b8397ac 100644
--- a/Composer/packages/client/__tests__/components/home.test.tsx
+++ b/Composer/packages/client/__tests__/components/home.test.tsx
@@ -18,7 +18,7 @@ describe('', () => {
];
const onItemChosen = jest.fn((item) => item.path);
const { container, queryByLabelText } = render(
-
+ ,
);
expect(container).toHaveTextContent('a');
expect(container).toHaveTextContent('b');
@@ -110,7 +110,7 @@ describe('', () => {
href={videoItem.url}
imageCover={videoItem.image}
title={videoItem.title}
- />
+ />,
);
expect(container).toHaveTextContent(videoItem.title);
});
diff --git a/Composer/packages/client/__tests__/components/onboarding.test.tsx b/Composer/packages/client/__tests__/components/onboarding.test.tsx
index b7e632ab04..512b43c0be 100644
--- a/Composer/packages/client/__tests__/components/onboarding.test.tsx
+++ b/Composer/packages/client/__tests__/components/onboarding.test.tsx
@@ -55,7 +55,7 @@ describe('', () => {
,
- onboardingDefaultState
+ onboardingDefaultState,
);
expect(rendered.baseElement).toHaveTextContent('Main dialog');
});
@@ -67,7 +67,7 @@ describe('', () => {
,
- onboardingDefaultState
+ onboardingDefaultState,
);
for (const { title } of stepSets) {
@@ -81,7 +81,7 @@ describe('', () => {
,
- onboardingDefaultState
+ onboardingDefaultState,
);
await findByText('Welcome');
});
diff --git a/Composer/packages/client/__tests__/components/skill.test.tsx b/Composer/packages/client/__tests__/components/skill.test.tsx
index 20afa38035..953b100071 100644
--- a/Composer/packages/client/__tests__/components/skill.test.tsx
+++ b/Composer/packages/client/__tests__/components/skill.test.tsx
@@ -135,7 +135,7 @@ describe('', () => {
projectId={projectId}
onDismiss={onDismiss}
/>,
- recoilInitState
+ recoilInitState,
);
const nextButton = getByTestId('SetAppIdNext');
@@ -153,7 +153,7 @@ describe('', () => {
});
expect(urlInput.getAttribute('value')).toBe(
- 'https://onenote-dev.azurewebsites.net/manifests/OneNoteSync-2-1-preview-1-manifest.json'
+ 'https://onenote-dev.azurewebsites.net/manifests/OneNoteSync-2-1-preview-1-manifest.json',
);
} finally {
jest.runOnlyPendingTimers();
@@ -186,7 +186,7 @@ describe('', () => {
expect(setFormDataErrors).toBeCalledWith(
expect.objectContaining({
manifestUrl: 'URL should start with http:// or https:// or file path of your system',
- })
+ }),
);
expect(setSkillManifest).not.toBeCalled();
});
@@ -257,7 +257,7 @@ describe('', () => {
expect(setFormDataErrors).toBeCalledWith(
expect.objectContaining({
manifestUrl: 'Manifest URL can not be accessed',
- })
+ }),
);
});
});
diff --git a/Composer/packages/client/__tests__/navItem.test.tsx b/Composer/packages/client/__tests__/navItem.test.tsx
index 5b7791bee6..0adce98955 100644
--- a/Composer/packages/client/__tests__/navItem.test.tsx
+++ b/Composer/packages/client/__tests__/navItem.test.tsx
@@ -10,7 +10,7 @@ import { renderWithRecoil } from './testUtils';
describe('', () => {
it('should render a nav item', async () => {
const { findByTestId } = renderWithRecoil(
-
+ ,
);
await findByTestId('ActiveLeftNavItem');
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/AllowedCallers.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/AllowedCallers.test.tsx
index 062dd71b61..d375c07a56 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/AllowedCallers.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/AllowedCallers.test.tsx
@@ -34,7 +34,7 @@ describe('Allowed Callers', () => {
};
const component = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
// Create new caller
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/AppIdAndPassword.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/AppIdAndPassword.test.tsx
index 43aca1a3cc..6be431c7fd 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/AppIdAndPassword.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/AppIdAndPassword.test.tsx
@@ -29,7 +29,7 @@ describe('App Id and Password', () => {
};
const { getByTestId } = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const textField1 = getByTestId('MicrosoftAppId');
await act(async () => {
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/BotLanguage.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/BotLanguage.test.tsx
index 646af0eee1..a45b93caa3 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/BotLanguage.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/BotLanguage.test.tsx
@@ -33,7 +33,7 @@ describe('Bot Language', () => {
};
const { getByTestId } = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const defaultLanguageContainer = getByTestId('defaultLanguage');
expect(within(defaultLanguageContainer).getByText('English (United States)')).toBeInTheDocument();
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectInfo.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectInfo.test.tsx
index 07d09eb7e0..5aeca0cb7a 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectInfo.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectInfo.test.tsx
@@ -44,7 +44,7 @@ describe('', () => {
it('should render correct bot location', async () => {
const component = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const locationNode = await component.findByTestId('botLocationString');
expect(locationNode.textContent).toBe(mockLocation);
@@ -53,7 +53,7 @@ describe('', () => {
it('should open read me', async () => {
const component = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const readMeBtn = component.getByTestId('settingsReadMeBtn');
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectSettings.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectSettings.test.tsx
index 0b41fd2894..16c43d8eed 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectSettings.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectSettings.test.tsx
@@ -57,7 +57,7 @@ describe('', () => {
it('should toggle JSON view', async () => {
const component = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const jsonToggleNode = await component.findByTestId('advancedSettingsToggle');
await act(async () => {
@@ -82,7 +82,7 @@ describe('', () => {
it('should nav to all tabs', async () => {
const component = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const overviewTabNode = await component.findByText('Overview');
await act(async () => {
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/DeleteBotButton.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/DeleteBotButton.test.tsx
index 1af72d07b8..86e519173b 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/DeleteBotButton.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/DeleteBotButton.test.tsx
@@ -15,7 +15,7 @@ const state = {
describe('Delete Bot Button', () => {
it('should render Delete Bot Button', () => {
const { getByText } = renderWithRecoil(
-
+ ,
);
const deleteButton = getByText('Delete');
act(() => {
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/ExternalAdapterSettings.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/ExternalAdapterSettings.test.tsx
index c68d04c971..98bfc6efc5 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/ExternalAdapterSettings.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/ExternalAdapterSettings.test.tsx
@@ -67,14 +67,16 @@ jest.mock('../../../src/utils/navigation', () => ({
navigateTo: (...args) => mockNavigationTo(...args),
}));
-const makeInitialState = (newSettings: {}) => ({ set }) => {
- set(currentProjectIdState, PROJECT_ID);
- set(settingsState(PROJECT_ID), newSettings);
- set(dispatcherState, {
- setSettings: setSettingsMock,
- });
- set(schemasState(PROJECT_ID), mockSchemas);
-};
+const makeInitialState =
+ (newSettings: any) =>
+ ({ set }) => {
+ set(currentProjectIdState, PROJECT_ID);
+ set(settingsState(PROJECT_ID), newSettings);
+ set(dispatcherState, {
+ setSettings: setSettingsMock,
+ });
+ set(schemasState(PROJECT_ID), mockSchemas);
+ };
describe('ExternalAdapterSettings', () => {
let initRecoilState;
@@ -87,7 +89,7 @@ describe('ExternalAdapterSettings', () => {
it('brings up the modal', () => {
const { getByTestId, getByText, queryByTestId } = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const container = getByTestId('adapterSettings');
@@ -108,7 +110,7 @@ describe('ExternalAdapterSettings', () => {
it('sets settings on an adapter', async () => {
const { getByTestId, getByLabelText, queryByTestId } = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const container = getByTestId('adapterSettings');
const configureButton = within(container).queryAllByText('Configure')[0];
@@ -150,7 +152,7 @@ describe('ExternalAdapterSettings', () => {
it('does not proceed if required settings are missing', () => {
const { getByTestId } = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const container = getByTestId('adapterSettings');
const configureButton = within(container).queryAllByText('Configure')[0];
@@ -177,7 +179,7 @@ describe('ExternalAdapterSettings', () => {
const { queryByTestId } = renderWithRecoilAndCustomDispatchers(
,
- makeInitialState(initStateWithAdapter)
+ makeInitialState(initStateWithAdapter),
);
const toggle = queryByTestId('toggle_Adapter.Mock');
@@ -193,7 +195,7 @@ describe('ExternalAdapterSettings', () => {
runtimeSettings: {
adapters: [{ name: 'Adapter.Mock', enabled: false, route: 'mock', type: 'Adapter.Full.Type.Mock' }],
},
- })
+ }),
);
});
@@ -211,7 +213,7 @@ describe('ExternalAdapterSettings', () => {
const { queryByTestId } = renderWithRecoilAndCustomDispatchers(
,
- makeInitialState(initStateWithAdapter)
+ makeInitialState(initStateWithAdapter),
);
const toggle = queryByTestId('toggle_Adapter.Mock');
@@ -227,14 +229,14 @@ describe('ExternalAdapterSettings', () => {
runtimeSettings: {
adapters: [{ name: 'Adapter.Mock', enabled: true, route: 'mock', type: 'Adapter.Full.Type.Mock' }],
},
- })
+ }),
);
});
it('deep link should nav to package manager', async () => {
const { getByTestId } = renderWithRecoilAndCustomDispatchers(
,
- makeInitialState({})
+ makeInitialState({}),
);
fireEvent.click(getByTestId('packageManagerDeepLink'));
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/ExternalService.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/ExternalService.test.tsx
index 2c2af4086a..4663ff2e29 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/ExternalService.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/ExternalService.test.tsx
@@ -22,7 +22,7 @@ describe('', () => {
it('should render root external service view', async () => {
const component = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const skillBotTextNode = await component.queryByTestId('skillQnaAuthoringBtn');
expect(skillBotTextNode).toBeFalsy();
@@ -31,7 +31,7 @@ describe('', () => {
it('should render skill external service view', async () => {
const component = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const skillBotTextNode = await component.queryByTestId('skillQnaAuthoringBtn');
expect(skillBotTextNode).toBeTruthy();
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/GetAppInfoFromPublishProfileDialog.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/GetAppInfoFromPublishProfileDialog.test.tsx
index 2ced0e741e..7314df6848 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/GetAppInfoFromPublishProfileDialog.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/GetAppInfoFromPublishProfileDialog.test.tsx
@@ -48,7 +48,7 @@ describe('', () => {
onCancel={onCancelMock}
onOK={onOkayMock}
/>,
- initRecoilState
+ initRecoilState,
);
const errorNode = await component.findByText('No profiles were found containing a Microsoft App ID.');
expect(errorNode).toBeTruthy();
@@ -72,7 +72,7 @@ describe('', () => {
onCancel={onCancelMock}
onOK={onOkayMock}
/>,
- initRecoilState
+ initRecoilState,
);
const dropdown = component.getByTestId('publishProfileDropdown');
fireEvent.click(dropdown);
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/PublishTarget.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/PublishTarget.test.tsx
index 07902a39da..c5e80aa35c 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/PublishTarget.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/PublishTarget.test.tsx
@@ -36,7 +36,7 @@ describe('Publish Target', () => {
it('should add new publish profile', () => {
const { getByTestId, getByText } = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const addNewPublishProfile = getByTestId('addNewPublishProfile');
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/RootBotExternalService.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/RootBotExternalService.test.tsx
index 70c4ce36d3..de2a0de6de 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/RootBotExternalService.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/RootBotExternalService.test.tsx
@@ -74,7 +74,7 @@ describe('Root Bot External Service', () => {
const { getByTestId, findByText } = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const textFieldAuthoring = getByTestId('rootLUISAuthoringKey');
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/SkillBotExternalService.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/SkillBotExternalService.test.tsx
index cd2fe63aa7..aaba9ef9ab 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/SkillBotExternalService.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/SkillBotExternalService.test.tsx
@@ -110,7 +110,7 @@ describe('', () => {
//test
const component = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const textFieldAuthoring = await component.getByTestId('skillLUISAuthoringKeyField');
@@ -123,7 +123,7 @@ describe('', () => {
it('should allow skill specific luis key that is updated in settings', async () => {
const component = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const useSkillLuisKeyBtn = await component.getByTestId('skillLUISAuthoringKeyBtn');
await act(async () => {
@@ -149,7 +149,7 @@ describe('', () => {
it('should allow skill specific qna key that is updated in settings', async () => {
const component = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const useSkillQnaKeyBtn = await component.getByTestId('skillQnaAuthoringBtn');
await act(async () => {
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/SkillHostEndPoint.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/SkillHostEndPoint.test.tsx
index 3d40d406f8..d3fe3724bc 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/SkillHostEndPoint.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/SkillHostEndPoint.test.tsx
@@ -29,7 +29,7 @@ describe('SkillHostEndPoint', () => {
};
const { getByTestId } = renderWithRecoilAndCustomDispatchers(
,
- initRecoilState
+ initRecoilState,
);
const textField = getByTestId('SkillHostEndPointTextField');
await act(async () => {
diff --git a/Composer/packages/client/__tests__/pages/design/DebugPanel/DiagnosticsContent.test.tsx b/Composer/packages/client/__tests__/pages/design/DebugPanel/DiagnosticsContent.test.tsx
index 8274def0dd..abfa3e9b88 100644
--- a/Composer/packages/client/__tests__/pages/design/DebugPanel/DiagnosticsContent.test.tsx
+++ b/Composer/packages/client/__tests__/pages/design/DebugPanel/DiagnosticsContent.test.tsx
@@ -141,14 +141,14 @@ describe('', () => {
set(schemasState(state.projectId), mockProjectResponse.schemas);
set(
formDialogSchemaIdsState(state.projectId),
- state.formDialogSchemas.map((fds) => fds.id)
+ state.formDialogSchemas.map((fds) => fds.id),
);
};
it('should render the DiagnosticList', () => {
const { container } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
expect(container).toHaveTextContent('server');
});
diff --git a/Composer/packages/client/__tests__/pages/knowledge-base/CreateQnAModal.test.tsx b/Composer/packages/client/__tests__/pages/knowledge-base/CreateQnAModal.test.tsx
index 7393f62acd..7c2b4d10fc 100644
--- a/Composer/packages/client/__tests__/pages/knowledge-base/CreateQnAModal.test.tsx
+++ b/Composer/packages/client/__tests__/pages/knowledge-base/CreateQnAModal.test.tsx
@@ -105,7 +105,7 @@ describe('QnA creation flow', () => {
qnaFiles={state.qnaFiles}
onSubmit={handleSubmit}
/>,
- initRecoilState
+ initRecoilState,
);
const nameField = getByTestId('knowledgeLocationTextField-name');
@@ -131,7 +131,7 @@ describe('QnA creation flow', () => {
qnaFiles={state.qnaFiles}
onSubmit={handleSubmit}
/>,
- initRecoilState
+ initRecoilState,
);
const nameField = getByTestId('knowledgeLocationTextField-name');
@@ -155,7 +155,7 @@ describe('QnA creation flow', () => {
qnaFiles={state.qnaFiles}
onSubmit={handleSubmit}
/>,
- initRecoilState
+ initRecoilState,
);
const nameField = getByTestId('knowledgeLocationTextField-name');
diff --git a/Composer/packages/client/__tests__/pages/knowledge-base/ImportQnAFromUrlModal.test.tsx b/Composer/packages/client/__tests__/pages/knowledge-base/ImportQnAFromUrlModal.test.tsx
index b93b35eae1..3dcdb69bb4 100644
--- a/Composer/packages/client/__tests__/pages/knowledge-base/ImportQnAFromUrlModal.test.tsx
+++ b/Composer/packages/client/__tests__/pages/knowledge-base/ImportQnAFromUrlModal.test.tsx
@@ -24,7 +24,7 @@ const qnaFile = {
describe('QnA page all up view', () => {
it('should render QnA page table view', () => {
const { getByText, getByTestId } = renderWithRecoil(
- {}} onSubmit={handleSubmit} />
+ {}} onSubmit={handleSubmit} />,
);
const urlField = getByTestId('ImportNewUrlToOverwriteQnAFile');
fireEvent.change(urlField, { target: { value: 'http://newUrl.pdf' } });
diff --git a/Composer/packages/client/__tests__/pages/knowledge-base/QnAPage.test.tsx b/Composer/packages/client/__tests__/pages/knowledge-base/QnAPage.test.tsx
index 6f53f962ce..f0f7e5863c 100644
--- a/Composer/packages/client/__tests__/pages/knowledge-base/QnAPage.test.tsx
+++ b/Composer/packages/client/__tests__/pages/knowledge-base/QnAPage.test.tsx
@@ -72,7 +72,7 @@ describe('QnA page all up view', () => {
it('should render QnA page table view', () => {
const { getByTestId, getByText } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
getByTestId('table-view');
getByText('Question');
@@ -81,7 +81,7 @@ describe('QnA page all up view', () => {
it('should render QnA page code editor', () => {
renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
});
@@ -98,7 +98,7 @@ describe('QnA page all up view', () => {
locale={'en-us'}
onChangeLocale={() => {}}
/>,
- initRecoilState
+ initRecoilState,
);
getByText('English (United States)(Default)');
getByText('Chinese (Simplified, China)');
diff --git a/Composer/packages/client/__tests__/pages/knowledge-base/ReplaceQnAFromModal.test.tsx b/Composer/packages/client/__tests__/pages/knowledge-base/ReplaceQnAFromModal.test.tsx
index 751bf6d9d2..0a04350c2f 100644
--- a/Composer/packages/client/__tests__/pages/knowledge-base/ReplaceQnAFromModal.test.tsx
+++ b/Composer/packages/client/__tests__/pages/knowledge-base/ReplaceQnAFromModal.test.tsx
@@ -33,7 +33,7 @@ describe('Replace QnA from portal Modal', () => {
qnaFile={qnaFile}
onDismiss={onDismiss}
onSubmit={handleSubmit}
- />
+ />,
);
const urlField = getByTestId('ImportNewUrlToOverwriteQnAFile');
fireEvent.change(urlField, { target: { value: 'http://newUrl.pdf' } });
@@ -52,7 +52,7 @@ describe('Replace QnA from portal Modal', () => {
qnaFile={qnaFile}
onDismiss={onDismiss}
onSubmit={handleSubmit}
- />
+ />,
);
const secondOption = getByText('Replace with an existing knowledge base from QnA maker portal');
fireEvent.click(secondOption);
@@ -60,7 +60,7 @@ describe('Replace QnA from portal Modal', () => {
fireEvent.click(next);
expect(
- getByText('Select the subscription and resource you want to choose a knowledge base from')
+ getByText('Select the subscription and resource you want to choose a knowledge base from'),
).toBeInTheDocument();
});
});
diff --git a/Composer/packages/client/__tests__/pages/knowledge-base/table-view.test.tsx b/Composer/packages/client/__tests__/pages/knowledge-base/table-view.test.tsx
index 425072fc02..245026a55b 100644
--- a/Composer/packages/client/__tests__/pages/knowledge-base/table-view.test.tsx
+++ b/Composer/packages/client/__tests__/pages/knowledge-base/table-view.test.tsx
@@ -76,7 +76,7 @@ describe('QnA page all up view', () => {
it('should render QnA page table view', () => {
const { getByTestId, getByText } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
const more = getByTestId('knowledgeBaseMore');
fireEvent.click(more);
diff --git a/Composer/packages/client/__tests__/pages/language-generation/LGPage.test.tsx b/Composer/packages/client/__tests__/pages/language-generation/LGPage.test.tsx
index 45b296d81a..b4a133c54c 100644
--- a/Composer/packages/client/__tests__/pages/language-generation/LGPage.test.tsx
+++ b/Composer/packages/client/__tests__/pages/language-generation/LGPage.test.tsx
@@ -60,7 +60,7 @@ describe('LG page all up view', () => {
it('should render lg page table view', () => {
const { getByText, getByTestId } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
getByTestId('table-view');
getByText('Name');
diff --git a/Composer/packages/client/__tests__/pages/language-understanding/LUPage.test.tsx b/Composer/packages/client/__tests__/pages/language-understanding/LUPage.test.tsx
index 909950eb8b..f944e1801b 100644
--- a/Composer/packages/client/__tests__/pages/language-understanding/LUPage.test.tsx
+++ b/Composer/packages/client/__tests__/pages/language-understanding/LUPage.test.tsx
@@ -59,7 +59,7 @@ describe('LU page all up view', () => {
it('should render lu page table view', () => {
const { getByText, getByTestId } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
getByTestId('table-view');
getByText('Intent');
diff --git a/Composer/packages/client/__tests__/pages/publish/CreatePublishProfileDialog.test.tsx b/Composer/packages/client/__tests__/pages/publish/CreatePublishProfileDialog.test.tsx
index bdd5e3cda6..5795405c6f 100644
--- a/Composer/packages/client/__tests__/pages/publish/CreatePublishProfileDialog.test.tsx
+++ b/Composer/packages/client/__tests__/pages/publish/CreatePublishProfileDialog.test.tsx
@@ -10,7 +10,7 @@ describe('CreatePublishProfileDialog', () => {
it("Call param function when 'Create new publish profile' is clicked", async () => {
const onShowPublishProfileDialogMock = jest.fn();
const component = render(
-
+ ,
);
const createNewBtn = component.getByTestId('addNewPublishProfile');
await act(async () => {
diff --git a/Composer/packages/client/__tests__/pages/publish/Publish.test.tsx b/Composer/packages/client/__tests__/pages/publish/Publish.test.tsx
index d4c0e943d8..ea26bd0d7e 100644
--- a/Composer/packages/client/__tests__/pages/publish/Publish.test.tsx
+++ b/Composer/packages/client/__tests__/pages/publish/Publish.test.tsx
@@ -115,7 +115,7 @@ describe('publish page', () => {
onManagePublishProfile={jest.fn()}
onRollbackClick={jest.fn()}
/>,
- initRecoilState
+ initRecoilState,
);
getByText('Bot');
getByText('Date');
@@ -151,7 +151,7 @@ describe('publish page', () => {
];
const { getByText } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
getByText('Publish');
getByText('You are about to publish your bot to the profile below. Do you want to proceed?');
diff --git a/Composer/packages/client/__tests__/recognizer.test.ts b/Composer/packages/client/__tests__/recognizer.test.ts
index 3b3bfd0c4a..6462e5ba93 100644
--- a/Composer/packages/client/__tests__/recognizer.test.ts
+++ b/Composer/packages/client/__tests__/recognizer.test.ts
@@ -21,7 +21,7 @@ describe('Test the generated recognizer dialogs', () => {
],
'qna',
false,
- QnALocales
+ QnALocales,
);
expect(result.id).toBe('test.qna.dialog');
@@ -34,7 +34,7 @@ describe('Test the generated recognizer dialogs', () => {
const result = getCrossTrainedRecognizerDialog(
'test',
[{ id: 'test.en-us', empty: false }] as LuFile[],
- [{ id: 'test.en-us', empty: false }] as QnAFile[]
+ [{ id: 'test.en-us', empty: false }] as QnAFile[],
);
expect(result.id).toBe('test.lu.qna.dialog');
expect(result.content.recognizers[0]).toBe('test.lu');
@@ -108,7 +108,7 @@ describe('Test the generated recognizer dialogs', () => {
[
{ id: 'test.en-us', content: 'test' },
{ id: 'test.fr-fr', empty: false },
- ]
+ ],
);
expect(result.length).toBe(1);
diff --git a/Composer/packages/client/__tests__/testUtils/react-recoil-hooks-testing-library.tsx b/Composer/packages/client/__tests__/testUtils/react-recoil-hooks-testing-library.tsx
index 58206190f0..e2ce6e40f5 100644
--- a/Composer/packages/client/__tests__/testUtils/react-recoil-hooks-testing-library.tsx
+++ b/Composer/packages/client/__tests__/testUtils/react-recoil-hooks-testing-library.tsx
@@ -40,8 +40,8 @@ function recoilStateWrapper(options?: RenderHookOptions) {
};
return result;
},
- {}
- )
+ {},
+ ),
);
useEffect(() => {
@@ -78,7 +78,7 @@ function renderRecoilHook(
callback: (props: P) => R,
options?: RenderHookOptions & {
initialProps?: P;
- }
+ },
): RenderHookResult {
return renderHook(callback, {
...options,
diff --git a/Composer/packages/client/__tests__/testUtils/renderWithRecoil.tsx b/Composer/packages/client/__tests__/testUtils/renderWithRecoil.tsx
index 6d02164a2d..fff0e9a4b4 100644
--- a/Composer/packages/client/__tests__/testUtils/renderWithRecoil.tsx
+++ b/Composer/packages/client/__tests__/testUtils/renderWithRecoil.tsx
@@ -12,13 +12,13 @@ export function renderWithRecoil(subject, initRecoilState: (mutableSnapshot: Mut
return render(
{subject}
-
+ ,
);
}
export function renderWithRecoilAndCustomDispatchers(
subject,
- initRecoilState: (mutableSnapshot: MutableSnapshot) => void = noop
+ initRecoilState: (mutableSnapshot: MutableSnapshot) => void = noop,
) {
return render({subject});
}
diff --git a/Composer/packages/client/__tests__/testUtils/renderWithRecoilAndContext.tsx b/Composer/packages/client/__tests__/testUtils/renderWithRecoilAndContext.tsx
index e41ce3bc7c..2a8ce9375f 100644
--- a/Composer/packages/client/__tests__/testUtils/renderWithRecoilAndContext.tsx
+++ b/Composer/packages/client/__tests__/testUtils/renderWithRecoilAndContext.tsx
@@ -10,11 +10,11 @@ import { DispatcherWrapper } from '../../src/recoilModel';
export function renderWithRecoilAndContext(
subject,
- initRecoilState: (mutableSnapshot: MutableSnapshot) => void = noop
+ initRecoilState: (mutableSnapshot: MutableSnapshot) => void = noop,
) {
return render(
{subject}
-
+ ,
);
}
diff --git a/Composer/packages/client/config/webpack.config.js b/Composer/packages/client/config/webpack.config.js
index 6cb1b2e42e..609da2f8a1 100644
--- a/Composer/packages/client/config/webpack.config.js
+++ b/Composer/packages/client/config/webpack.config.js
@@ -222,23 +222,6 @@ module.exports = function (webpackEnv) {
// Disable require.ensure as it's not a standard language feature.
{ parser: { requireEnsure: false } },
- // First, run the linter.
- // It's important to do this before Babel processes the JS.
- {
- test: /\.(js|mjs|jsx)$/,
- enforce: 'pre',
- use: [
- {
- options: {
- formatter: require.resolve('react-dev-utils/eslintFormatter'),
- eslintPath: require.resolve('eslint'),
- quiet: true,
- },
- loader: require.resolve('eslint-loader'),
- },
- ],
- include: paths.appSrc,
- },
{
test: /\.worker\.ts$/,
use: {
diff --git a/Composer/packages/client/package.json b/Composer/packages/client/package.json
index 141796f035..43f27c8b41 100644
--- a/Composer/packages/client/package.json
+++ b/Composer/packages/client/package.json
@@ -10,7 +10,7 @@
"scripts": {
"start": "node --max_old_space_size=6114 --max-http-header-size=16000 scripts/start.js",
"build": "node --max_old_space_size=6114 scripts/build.js",
- "clean": "rimraf build",
+ "clean": "rimraf build .swc",
"test": "jest",
"lint": "eslint --quiet --ext .js,.jsx,.ts,.tsx ./src ./__tests__",
"lint:fix": "yarn lint --fix",
@@ -78,7 +78,7 @@
"recoil": "^0.0.13",
"sanitize-html": "2.3.3",
"styled-components": "^4.1.3",
- "tslib": "2.4.0",
+ "tslib": "2.6.2",
"uuid": "^8.3.0",
"webpack-bundle-analyzer": "^4.4.2"
},
@@ -89,12 +89,12 @@
"not op_mini all"
],
"devDependencies": {
- "@babel/cli": "7.18.6",
- "@babel/core": "7.18.6",
+ "@babel/cli": "7.23.9",
+ "@babel/core": "7.24.0",
"@babel/runtime": "7.3.4",
"@botframework-composer/test-utils": "*",
"@emotion/babel-plugin": "^11.9.2",
- "@emotion/babel-preset-css-prop": "11.2.0",
+ "@emotion/babel-preset-css-prop": "11.11.0",
"@svgr/webpack": "4.1.0",
"@types/jwt-decode": "^2.2.1",
"@types/lodash": "^4.14.146",
@@ -115,7 +115,6 @@
"dotenv-expand": "4.2.0",
"esbuild-loader": "^2.8.0",
"eslint-config-react-app": "5.2.1",
- "eslint-loader": "4.0.0",
"file-loader": "4.2.0",
"format-message-cli": "6.2.4",
"fs-extra": "7.0.1",
diff --git a/Composer/packages/client/public/index.html b/Composer/packages/client/public/index.html
index 51d64d74e3..98621f2ba5 100644
--- a/Composer/packages/client/public/index.html
+++ b/Composer/packages/client/public/index.html
@@ -22,7 +22,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
- BotFramework Composer
+ Bot Framework Composer
<% if (process.env.NODE_ENV === 'production') { %>
diff --git a/Composer/packages/client/public/manifest.json b/Composer/packages/client/public/manifest.json
index 477da346d6..4eb20470e8 100644
--- a/Composer/packages/client/public/manifest.json
+++ b/Composer/packages/client/public/manifest.json
@@ -1,6 +1,6 @@
{
"short_name": "Composer",
- "name": "BotFramework Composer",
+ "name": "Bot Framework Composer",
"icons": [
{
"src": "composerfavicon.ico",
diff --git a/Composer/packages/client/setupTests.ts b/Composer/packages/client/setupTests.ts
index f56b1db07f..83c7fc286a 100644
--- a/Composer/packages/client/setupTests.ts
+++ b/Composer/packages/client/setupTests.ts
@@ -4,6 +4,10 @@
///
// for tests using Electron IPC to talk to main process
-(window as any).ipcRenderer = { on: jest.fn() };
+(window as any).ipcRenderer = {
+ on: jest.fn(),
+ invoke: jest.fn().mockReturnValue(Promise.resolve({})),
+ send: jest.fn()
+};
jest.mock('./src/utils/httpUtil');
diff --git a/Composer/packages/client/src/App.tsx b/Composer/packages/client/src/App.tsx
index 746f786135..6a2ba902cb 100644
--- a/Composer/packages/client/src/App.tsx
+++ b/Composer/packages/client/src/App.tsx
@@ -1,16 +1,21 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
-import React, { Fragment, useEffect } from 'react';
-import { useRecoilValue } from 'recoil';
+import React, { Fragment, useEffect, useState } from 'react';
+import { useRecoilValue, useRecoilCallback, CallbackInterface } from 'recoil';
+import { useMount, useUnmount } from '@fluentui/react-hooks';
import { Header } from './components/Header';
import { Announcement } from './components/AppComponents/Announcement';
import { MainContainer } from './components/AppComponents/MainContainer';
-import { dispatcherState, userSettingsState } from './recoilModel';
+import { dispatcherState, userSettingsState, lgFileState } from './recoilModel';
import { loadLocale } from './utils/fileUtil';
import { useInitializeLogger } from './telemetry/useInitializeLogger';
import { setupIcons } from './setupIcons';
+import { setOneAuthEnabled } from './utils/oneAuthUtil';
+import { LoadingSpinner } from './components/LoadingSpinner';
+import lgWorker from './recoilModel/parsers/lgWorker';
+import { LgEventType } from './recoilModel/parsers/types';
setupIcons();
@@ -23,13 +28,24 @@ const { ipcRenderer } = window;
export const App: React.FC = () => {
const { appLocale } = useRecoilValue(userSettingsState);
- const {
- fetchExtensions,
- fetchFeatureFlags,
- checkNodeVersion,
- performAppCleanupOnQuit,
- setMachineInfo,
- } = useRecoilValue(dispatcherState);
+ const [isClosing, setIsClosing] = useState(false);
+ const [listener, setListener] = useState<{ destroy(): boolean }>({} as any);
+
+ const { fetchExtensions, fetchFeatureFlags, checkNodeVersion, performAppCleanupOnQuit, setMachineInfo } =
+ useRecoilValue(dispatcherState);
+ const updateFile = useRecoilCallback((callbackHelpers: CallbackInterface) => async ({ projectId, value }) => {
+ callbackHelpers.set(lgFileState({ projectId, lgFileId: value.id }), value);
+ });
+
+ useMount(() => {
+ const listener = lgWorker.listen(LgEventType.OnUpdateLgFile, (msg) => {
+ const { projectId, payload } = msg.data;
+ updateFile({ projectId, value: payload });
+ });
+ setListener(listener);
+ });
+
+ useUnmount(() => listener.destroy());
useEffect(() => {
loadLocale(appLocale);
@@ -39,17 +55,22 @@ export const App: React.FC = () => {
checkNodeVersion();
fetchExtensions();
fetchFeatureFlags();
- ipcRenderer?.on('cleanup', (_event) => {
- performAppCleanupOnQuit();
+
+ ipcRenderer?.invoke('app-init').then(({ machineInfo, isOneAuthEnabled }) => {
+ setMachineInfo(machineInfo);
+ setOneAuthEnabled(isOneAuthEnabled);
});
- ipcRenderer?.on('machine-info', (_event, info) => {
- setMachineInfo(info);
+ ipcRenderer?.on('closing', async () => {
+ setIsClosing(true);
+ await performAppCleanupOnQuit();
+ ipcRenderer.send('closed');
});
}, []);
return (
+ {isClosing && }
diff --git a/Composer/packages/client/src/Onboarding/Onboarding.tsx b/Composer/packages/client/src/Onboarding/Onboarding.tsx
index b223ae2b28..30988750c9 100644
--- a/Composer/packages/client/src/Onboarding/Onboarding.tsx
+++ b/Composer/packages/client/src/Onboarding/Onboarding.tsx
@@ -115,8 +115,8 @@ const Onboarding: React.FC = () => {
const result = await OpenConfirmModal(
formatMessage('Leave Product Tour?'),
formatMessage(
- 'Are you sure you want to exit the Onboarding Product Tour? You can restart the tour in the onboarding settings.'
- )
+ 'Are you sure you want to exit the Onboarding Product Tour? You can restart the tour in the onboarding settings.',
+ ),
);
if (result) {
diff --git a/Composer/packages/client/src/Onboarding/content.tsx b/Composer/packages/client/src/Onboarding/content.tsx
index 160a3000c0..119943f149 100644
--- a/Composer/packages/client/src/Onboarding/content.tsx
+++ b/Composer/packages/client/src/Onboarding/content.tsx
@@ -102,7 +102,7 @@ export const getTeachingBubble = (id: string | undefined): TeachingBubble => {
case 'mainDialog':
return {
content: formatMessage(
- 'The main dialog is the foundation of every bot created in Composer. There is only one main dialog and all other dialogs are children of it. It gets initialized every time your bot runs and is the entry point into the bot.'
+ 'The main dialog is the foundation of every bot created in Composer. There is only one main dialog and all other dialogs are children of it. It gets initialized every time your bot runs and is the entry point into the bot.',
),
headline: formatMessage('Main dialog'),
helpLink: 'https://docs.microsoft.com/en-us/composer/concept-dialog',
@@ -111,7 +111,7 @@ export const getTeachingBubble = (id: string | undefined): TeachingBubble => {
case 'trigger':
return {
content: formatMessage(
- 'Triggers are the main component of a dialog, they are how you catch and respond to events. Each trigger has a condition and a collection of actions to execute when the condition is met.'
+ 'Triggers are the main component of a dialog, they are how you catch and respond to events. Each trigger has a condition and a collection of actions to execute when the condition is met.',
),
headline: formatMessage('Add a new trigger'),
helpLink: 'https://docs.microsoft.com/en-us/composer/concept-events-and-triggers',
@@ -120,7 +120,7 @@ export const getTeachingBubble = (id: string | undefined): TeachingBubble => {
case 'actions':
return {
content: formatMessage(
- 'Actions are the main component of a trigger; they are what enable your bot to take action whether in response to user input or any other event that may occur.'
+ 'Actions are the main component of a trigger; they are what enable your bot to take action whether in response to user input or any other event that may occur.',
),
headline: formatMessage('Actions'),
helpLink: 'https://docs.microsoft.com/en-us/composer/concept-dialog#action',
@@ -129,7 +129,7 @@ export const getTeachingBubble = (id: string | undefined): TeachingBubble => {
case 'userInput':
return {
content: formatMessage(
- 'The User Input page is where the Language Understanding editor locates. From here users can view all the Language Understanding templates and edit them.'
+ 'The User Input page is where the Language Understanding editor locates. From here users can view all the Language Understanding templates and edit them.',
),
headline: formatMessage('User input'),
helpLink: 'https://docs.microsoft.com/en-us/composer/concept-language-understanding',
@@ -138,7 +138,7 @@ export const getTeachingBubble = (id: string | undefined): TeachingBubble => {
case 'botResponses':
return {
content: formatMessage(
- 'The Bot Responses page is where the Language Generation (LG) editor locates. From here users can view all the LG templates and edit them.'
+ 'The Bot Responses page is where the Language Generation (LG) editor locates. From here users can view all the LG templates and edit them.',
),
headline: formatMessage('Bot responses'),
helpLink: 'https://docs.microsoft.com/en-us/composer/concept-language-generation',
@@ -159,7 +159,7 @@ export const getTeachingBubble = (id: string | undefined): TeachingBubble => {
{children}
),
- }
+ },
),
headline: formatMessage('Test with Web Chat or Emulator'),
calloutProps: {
diff --git a/Composer/packages/client/src/components/Adapters/TeamsManifestGeneratorModal.tsx b/Composer/packages/client/src/components/Adapters/TeamsManifestGeneratorModal.tsx
index 7d3dc35739..9c1bed5cd3 100644
--- a/Composer/packages/client/src/components/Adapters/TeamsManifestGeneratorModal.tsx
+++ b/Composer/packages/client/src/components/Adapters/TeamsManifestGeneratorModal.tsx
@@ -86,7 +86,7 @@ export const TeamsManifestGeneratorModal = (props: TeamsManifestGeneratorModalPr
dialogType={DialogTypes.CreateFlow}
isOpen={!props.hidden}
subText={formatMessage(
- 'Your Teams adapter is configured for your published bot. Copy the manifest, open App Studio in Teams and add the manifest so you can test your bot in Teams'
+ 'Your Teams adapter is configured for your published bot. Copy the manifest, open App Studio in Teams and add the manifest so you can test your bot in Teams',
)}
title={formatMessage('Teams Manifest')}
onDismiss={props.onDismiss}
diff --git a/Composer/packages/client/src/components/AddRemoteSkillModal/CreateSkillModal.tsx b/Composer/packages/client/src/components/AddRemoteSkillModal/CreateSkillModal.tsx
index 4781c4cc33..1544d86846 100644
--- a/Composer/packages/client/src/components/AddRemoteSkillModal/CreateSkillModal.tsx
+++ b/Composer/packages/client/src/components/AddRemoteSkillModal/CreateSkillModal.tsx
@@ -117,7 +117,7 @@ export const validateLocalZip = async (files: Record) => {
} else {
result.error = {
manifestUrl: formatMessage(
- 'Endpoints should not be empty or endpoint should have endpoint url field in manifest json'
+ 'Endpoints should not be empty or endpoint should have endpoint url field in manifest json',
),
};
}
@@ -140,7 +140,7 @@ export const getSkillManifest = async (
manifestUrl: string,
setSkillManifest,
setFormDataErrors,
- setShowDetail
+ setShowDetail,
) => {
try {
const { data } = await httpClient.get(`/projects/${projectId}/skill/retrieveSkillManifest`, {
@@ -208,9 +208,13 @@ export const CreateSkillModal: React.FC = (props) => {
const [zipContent, setZipContent] = useState({});
const publishTypes = useRecoilValue(publishTypesState(projectId));
- const { languages, luFeatures, runtime, publishTargets = [], MicrosoftAppId } = useRecoilValue(
- settingsState(projectId)
- );
+ const {
+ languages,
+ luFeatures,
+ runtime,
+ publishTargets = [],
+ MicrosoftAppId,
+ } = useRecoilValue(settingsState(projectId));
const { dialogId } = useRecoilValue(designPageLocationState(projectId));
const rootDialog = useRecoilValue(rootDialogSelector(projectId));
const luFiles = useRecoilValue(luFilesSelectorFamily(projectId));
@@ -243,7 +247,7 @@ export const CreateSkillModal: React.FC = (props) => {
formData: { manifestUrl: currentManifestUrl },
...validationHelpers,
},
- skillUrls
+ skillUrls,
);
setFormData({
...rest,
@@ -261,7 +265,7 @@ export const CreateSkillModal: React.FC = (props) => {
getSkillManifest(projectId, formData.manifestUrl, setSkillManifest, setFormDataErrors, setShowDetail);
setManifestDirPath(localManifestPath.substring(0, localManifestPath.lastIndexOf('/')));
},
- [projectId, formData]
+ [projectId, formData],
);
const handleSubmit = async (event, content: string, enable: boolean) => {
@@ -303,7 +307,7 @@ export const CreateSkillModal: React.FC = (props) => {
setMicrosoftAppProperties(
projectId,
configuration.settings.MicrosoftAppId,
- configuration.settings.MicrosoftAppPassword
+ configuration.settings.MicrosoftAppPassword,
);
setShowSetAppIdDialog(false);
diff --git a/Composer/packages/client/src/components/AddRemoteSkillModal/EnableOrchestrator.tsx b/Composer/packages/client/src/components/AddRemoteSkillModal/EnableOrchestrator.tsx
index 4c2e8d3904..c6da4e3082 100644
--- a/Composer/packages/client/src/components/AddRemoteSkillModal/EnableOrchestrator.tsx
+++ b/Composer/packages/client/src/components/AddRemoteSkillModal/EnableOrchestrator.tsx
@@ -44,7 +44,7 @@ const EnableOrchestrator: React.FC = (props) => {
,
manifestDirPath: string,
- locale: string
+ locale: string,
) => {
const luFiles: Record = {};
try {
diff --git a/Composer/packages/client/src/components/AddRemoteSkillModal/SetAppId.tsx b/Composer/packages/client/src/components/AddRemoteSkillModal/SetAppId.tsx
index e3de730efc..ae0149c46e 100644
--- a/Composer/packages/client/src/components/AddRemoteSkillModal/SetAppId.tsx
+++ b/Composer/packages/client/src/components/AddRemoteSkillModal/SetAppId.tsx
@@ -36,7 +36,7 @@ const getCreateProfileDescription = (botName, handleCreateProfile) => ({
},
title: formatMessage(`Add publishing profile for {botName}`, { botName }),
description: formatMessage(
- 'A publishing profile contains the information necessary to provision and publish your bot, including its App ID. '
+ 'A publishing profile contains the information necessary to provision and publish your bot, including its App ID. ',
),
link: {
text: formatMessage('Create profile'),
@@ -47,14 +47,14 @@ const getCreateProfileDescription = (botName, handleCreateProfile) => ({
const manifestUrl = () => ({
title: formatMessage('Enter skill manifest URL'),
description: formatMessage(
- 'To connect to a skill, your bot needs the information captured in the skill’s manifest. Contact the author or publisher of the skill for this information.'
+ 'To connect to a skill, your bot needs the information captured in the skill’s manifest. Contact the author or publisher of the skill for this information.',
),
});
const appIdInfo = () => ({
title: formatMessage('Ensure your bot’s Microsoft App ID is on the skill’s allowed callers list'),
description: formatMessage(
- 'For security purposes, your bot can only call a skill if its Microsoft App ID is in the skill’s allowed callers list. Once you create a publishing profile, share your bot’s App ID with the skill’s author to add it. You may also need to include the skill’s App Id in the root bot’s allowed callers list.'
+ 'For security purposes, your bot can only call a skill if its Microsoft App ID is in the skill’s allowed callers list. Once you create a publishing profile, share your bot’s App ID with the skill’s author to add it. You may also need to include the skill’s App Id in the root bot’s allowed callers list.',
),
});
@@ -159,7 +159,7 @@ export const SetAppId: React.FC = (props) => {
},
title: formatMessage('Select App ID and password'),
description: formatMessage(
- 'To ensure a secure connection, the remote skill needs to know the Microsoft App ID of your bot. '
+ 'To ensure a secure connection, the remote skill needs to know the Microsoft App ID of your bot. ',
),
link: {
text: formatMessage('Select App ID and password'),
@@ -173,7 +173,7 @@ export const SetAppId: React.FC = (props) => {
if (publishTargets.length === 0) return '';
const { settings } = JSON.parse(
- publishTargets.find((target) => target.name === currentTargetName)?.configuration || '{}'
+ publishTargets.find((target) => target.name === currentTargetName)?.configuration || '{}',
);
return settings?.MicrosoftAppId || '';
}, [publishTargets, currentTargetName]);
@@ -201,7 +201,7 @@ export const SetAppId: React.FC = (props) => {
{renderMicrosoftAppId(
appId,
formatMessage('Your bot’s Microsoft App ID'),
- formatMessage('Microsoft App ID')
+ formatMessage('Microsoft App ID'),
)}
) : (
diff --git a/Composer/packages/client/src/components/AddRemoteSkillModal/helper.ts b/Composer/packages/client/src/components/AddRemoteSkillModal/helper.ts
index 61e49d1951..2bae8a7dc4 100644
--- a/Composer/packages/client/src/components/AddRemoteSkillModal/helper.ts
+++ b/Composer/packages/client/src/components/AddRemoteSkillModal/helper.ts
@@ -12,7 +12,7 @@ import TelemetryClient from '../../telemetry/TelemetryClient';
const conflictConfirmationTitle = formatMessage('Conflicting changes detected');
const conflictConfirmationPrompt = formatMessage(
- 'This operation will overwrite changes made to previously imported files. Do you want to proceed?'
+ 'This operation will overwrite changes made to previously imported files. Do you want to proceed?',
);
/**
@@ -24,7 +24,7 @@ export const importOrchestrator = async (
projectId: string,
runtime: DialogSetting['runtime'],
reloadProject,
- setApplicationLevelError
+ setApplicationLevelError,
) => {
const runtimeInfo = parseRuntimeKey(runtime?.key);
@@ -70,7 +70,7 @@ export const importOrchestrator = async (
TelemetryClient.track('PackageInstallFailed', { ...reqBody, isUpdate: reqBody.isUpdating });
setApplicationLevelError({
status: err.response.status,
- message: err.response && err.response.data.message ? err.response.data.message : err,
+ message: err.response?.data?.message ?? err,
summary: formatMessage('Install Error'),
});
}
diff --git a/Composer/packages/client/src/components/AppComponents/SideBar.tsx b/Composer/packages/client/src/components/AppComponents/SideBar.tsx
index 234af2704f..a590d16501 100644
--- a/Composer/packages/client/src/components/AppComponents/SideBar.tsx
+++ b/Composer/packages/client/src/components/AppComponents/SideBar.tsx
@@ -113,7 +113,11 @@ export const SideBar: React.FC = () => {
);
if (link.isDisabledForPVA) {
- return {navItem};
+ return (
+
+ {navItem}
+
+ );
}
return navItem;
})}
diff --git a/Composer/packages/client/src/components/AppUpdater/AppUpdater.tsx b/Composer/packages/client/src/components/AppUpdater/AppUpdater.tsx
index a89c886ac8..b6d6d47389 100644
--- a/Composer/packages/client/src/components/AppUpdater/AppUpdater.tsx
+++ b/Composer/packages/client/src/components/AppUpdater/AppUpdater.tsx
@@ -95,10 +95,9 @@ type BreakingUpdateMetaData = {
// -------------------- AppUpdater -------------------- //
-export const AppUpdater: React.FC<{}> = () => {
- const { setAppUpdateError, setAppUpdateProgress, setAppUpdateShowing, setAppUpdateStatus } = useRecoilValue(
- dispatcherState
- );
+export const AppUpdater: React.FC = () => {
+ const { setAppUpdateError, setAppUpdateProgress, setAppUpdateShowing, setAppUpdateStatus } =
+ useRecoilValue(dispatcherState);
const { downloadSizeInBytes, error, progressPercent, showing, status, version } = useRecoilValue(appUpdateState);
const [downloadOption, setDownloadOption] = useState(downloadOptions.installAndUpdate);
const [breakingMetaData, setBreakingMetaData] = useState(undefined);
@@ -189,7 +188,7 @@ export const AppUpdater: React.FC<{}> = () => {
default:
break;
}
- }
+ },
);
}, []);
diff --git a/Composer/packages/client/src/components/AppUpdater/breakingUpdates/version1To2.tsx b/Composer/packages/client/src/components/AppUpdater/breakingUpdates/version1To2.tsx
index babfb9db74..864a650138 100644
--- a/Composer/packages/client/src/components/AppUpdater/breakingUpdates/version1To2.tsx
+++ b/Composer/packages/client/src/components/AppUpdater/breakingUpdates/version1To2.tsx
@@ -88,7 +88,7 @@ export const Version1To2Content: React.FC = (props) => {
>
{formatMessage(
- 'Bot Framework Composer 2.0 provides more built-in capabilities so you can build complex bots quickly. Update to Composer 2.0 for advanced bot templates, prebuilt components, and a runtime that is fully extensible through packages.'
+ 'Bot Framework Composer 2.0 provides more built-in capabilities so you can build complex bots quickly. Update to Composer 2.0 for advanced bot templates, prebuilt components, and a runtime that is fully extensible through packages.',
)}
{formatMessage.rich(
'Update cancelled. Auto-update has been turned off for this release. You can update at any time by selecting Help > Check for updates.',
- { b: ({ children }) => {children} }
+ { b: ({ children }) => {children} },
)}
diff --git a/Composer/packages/client/src/components/Auth/AuthCard.tsx b/Composer/packages/client/src/components/Auth/AuthCard.tsx
index 27e948faaa..eb00e6e095 100644
--- a/Composer/packages/client/src/components/Auth/AuthCard.tsx
+++ b/Composer/packages/client/src/components/Auth/AuthCard.tsx
@@ -51,9 +51,8 @@ const styles = {
export const AuthCard: React.FC = () => {
const [authCardVisible, setAuthCardVisible] = useState(false);
- const { refreshLoginStatus, requireUserLogin, logoutUser, setShowAuthDialog, setShowTenantDialog } = useRecoilValue(
- dispatcherState
- );
+ const { refreshLoginStatus, requireUserLogin, logoutUser, setShowAuthDialog, setShowTenantDialog } =
+ useRecoilValue(dispatcherState);
const isAuthenticated = useRecoilValue(isAuthenticatedState);
const currentUser = useRecoilValue(currentUserState);
const showAuthDialog = useRecoilValue(showAuthDialogState);
diff --git a/Composer/packages/client/src/components/Auth/AuthDialog.tsx b/Composer/packages/client/src/components/Auth/AuthDialog.tsx
index ab3fdf42ac..c9073a33e2 100644
--- a/Composer/packages/client/src/components/Auth/AuthDialog.tsx
+++ b/Composer/packages/client/src/components/Auth/AuthDialog.tsx
@@ -76,7 +76,7 @@ export const AuthDialog: React.FC = (props) => {
type: DialogType.close,
title: formatMessage('Provide access tokens'),
subText: formatMessage(
- 'To perform provisioning and publishing actions, Composer requires access to your Azure and MS Graph accounts. Paste access tokens from the az command line tool using the commands highlighted below.'
+ 'To perform provisioning and publishing actions, Composer requires access to your Azure and MS Graph accounts. Paste access tokens from the az command line tool using the commands highlighted below.',
),
styles: authDialogStyles.dialog,
}}
diff --git a/Composer/packages/client/src/components/Auth/TenantDialog.tsx b/Composer/packages/client/src/components/Auth/TenantDialog.tsx
index b99935e139..617206e256 100644
--- a/Composer/packages/client/src/components/Auth/TenantDialog.tsx
+++ b/Composer/packages/client/src/components/Auth/TenantDialog.tsx
@@ -56,7 +56,7 @@ export const TenantDialog: React.FC = (props) => {
}}
dialogType={DialogTypes.Customer}
subText={formatMessage(
- 'The directory you choose will impact subscription, resource group, and region filters that are available when you select or create Azure resources. You can change this later.'
+ 'The directory you choose will impact subscription, resource group, and region filters that are available when you select or create Azure resources. You can change this later.',
)}
title={formatMessage('Select directory')}
onDismiss={props.onDismiss}
diff --git a/Composer/packages/client/src/components/BotConvertDialog.tsx b/Composer/packages/client/src/components/BotConvertDialog.tsx
index 2d822e5a7d..6c8dd8d493 100644
--- a/Composer/packages/client/src/components/BotConvertDialog.tsx
+++ b/Composer/packages/client/src/components/BotConvertDialog.tsx
@@ -17,7 +17,7 @@ export const BotConvertConfirmDialog = (showSubContent: boolean) => {
{formatMessage(
- 'This project was created in an older version of Composer. To open this project in Composer 2.0, we must copy your project and convert it to the latest format. Your original project will not be changed.'
+ 'This project was created in an older version of Composer. To open this project in Composer 2.0, we must copy your project and convert it to the latest format. Your original project will not be changed.',
)}
{formatMessage(
- 'Import content from an existing knowledge base on the QnA maker portal. Your knowledge base will downloaded locally and source knowledge base will remain as-is.'
+ 'Import content from an existing knowledge base on the QnA maker portal. Your knowledge base will downloaded locally and source knowledge base will remain as-is.',
)}
{formatMessage(
- 'Select this option if you want to create a knowledge base from content hosted online such as an FAQ or document link (.csv, .xls or .doc format)'
+ 'Select this option if you want to create a knowledge base from content hosted online such as an FAQ or document link (.csv, .xls or .doc format)',
)}
diff --git a/Composer/packages/client/src/components/QnA/CreateQnAModal.tsx b/Composer/packages/client/src/components/QnA/CreateQnAModal.tsx
index 887145507b..0dca53a68b 100644
--- a/Composer/packages/client/src/components/QnA/CreateQnAModal.tsx
+++ b/Composer/packages/client/src/components/QnA/CreateQnAModal.tsx
@@ -180,8 +180,8 @@ export const CreateQnAModal: React.FC = (props) => {
if (data.length === 0) {
setSubscriptionsErrorMessage(
formatMessage(
- 'Your subscription list is empty, please add your subscription, or login with another account.'
- )
+ 'Your subscription list is empty, please add your subscription, or login with another account.',
+ ),
);
}
})
@@ -235,7 +235,7 @@ export const CreateQnAModal: React.FC = (props) => {
const keylist: KeyRec[] = await fetchKeys(
cognitiveServicesManagementClient,
- accounts.filter((a) => a.kind === serviceKeyType)
+ accounts.filter((a) => a.kind === serviceKeyType),
);
const kbsMap = {};
@@ -437,7 +437,7 @@ export const CreateQnAModal: React.FC = (props) => {
{noKeys && subscriptionId && (
{formatMessage(
- 'No existing QnA Maker resources were found in this subscription. Select a different subscription, or click “Back” to create a new resource or generate a resource request to handoff to your Azure admin.'
+ 'No existing QnA Maker resources were found in this subscription. Select a different subscription, or click “Back” to create a new resource or generate a resource request to handoff to your Azure admin.',
)}
)}
diff --git a/Composer/packages/client/src/components/QnA/ImportQnAFromUrl.tsx b/Composer/packages/client/src/components/QnA/ImportQnAFromUrl.tsx
index 89e9c0801e..c5406c801f 100644
--- a/Composer/packages/client/src/components/QnA/ImportQnAFromUrl.tsx
+++ b/Composer/packages/client/src/components/QnA/ImportQnAFromUrl.tsx
@@ -43,7 +43,7 @@ const title =
{formatMessage('Replace knowledge base fro
const description = (
{formatMessage(
- 'Select this option if you want to replace current knowledge base from content hosted online such as an FAQ or document link (.csv, .xls or .doc format)'
+ 'Select this option if you want to replace current knowledge base from content hosted online such as an FAQ or document link (.csv, .xls or .doc format)',
)}
);
diff --git a/Composer/packages/client/src/components/QnA/PersonaCard.tsx b/Composer/packages/client/src/components/QnA/PersonaCard.tsx
index 14dbee6391..4183124ec7 100644
--- a/Composer/packages/client/src/components/QnA/PersonaCard.tsx
+++ b/Composer/packages/client/src/components/QnA/PersonaCard.tsx
@@ -20,13 +20,13 @@ export const PersonaCard: React.FC = (props) => {
const confirmed = await OpenConfirmModal(
formatMessage('Sign out of Azure'),
formatMessage(
- 'By signing out of Azure, your operation will be canceled and this dialog will close. Do you want to continue?'
+ 'By signing out of Azure, your operation will be canceled and this dialog will close. Do you want to continue?',
),
{
onRenderContent: (subtitle: string) =>
{subtitle}
,
confirmText: formatMessage('Sign out'),
cancelText: formatMessage('Cancel'),
- }
+ },
);
if (confirmed) {
await logoutUser();
diff --git a/Composer/packages/client/src/components/QnA/ReplaceQnAFromModal.tsx b/Composer/packages/client/src/components/QnA/ReplaceQnAFromModal.tsx
index 9e5d23e3fe..63e36dd4f4 100644
--- a/Composer/packages/client/src/components/QnA/ReplaceQnAFromModal.tsx
+++ b/Composer/packages/client/src/components/QnA/ReplaceQnAFromModal.tsx
@@ -145,8 +145,8 @@ export const ReplaceQnAFromModal: React.FC = (props) => {
if (data.length === 0) {
setSubscriptionsErrorMessage(
formatMessage(
- 'Your subscription list is empty, please add your subscription, or login with another account.'
- )
+ 'Your subscription list is empty, please add your subscription, or login with another account.',
+ ),
);
}
})
@@ -199,7 +199,7 @@ export const ReplaceQnAFromModal: React.FC = (props) => {
const accounts = await cognitiveServicesManagementClient.accounts.list();
const keylist: KeyRec[] = await fetchKeys(
cognitiveServicesManagementClient,
- accounts.filter((a) => a.kind === serviceKeyType)
+ accounts.filter((a) => a.kind === serviceKeyType),
);
const kbsMap = {};
@@ -304,7 +304,7 @@ export const ReplaceQnAFromModal: React.FC = (props) => {
{formatMessage(
- 'Select this option when you want to import existing knowledge base from QnA maker portal. '
+ 'Select this option when you want to import existing knowledge base from QnA maker portal. ',
)}
@@ -359,7 +359,7 @@ export const ReplaceQnAFromModal: React.FC = (props) => {
{noKeys && subscriptionId && (
{formatMessage(
- 'No existing QnA Maker resources were found in this subscription. Select a different subscription, or click “Back” to create a new resource or generate a resource request to handoff to your Azure admin.'
+ 'No existing QnA Maker resources were found in this subscription. Select a different subscription, or click “Back” to create a new resource or generate a resource request to handoff to your Azure admin.',
)}
)}
diff --git a/Composer/packages/client/src/components/QnA/constants.ts b/Composer/packages/client/src/components/QnA/constants.ts
index cbbb5bec48..1275a074c9 100644
--- a/Composer/packages/client/src/components/QnA/constants.ts
+++ b/Composer/packages/client/src/components/QnA/constants.ts
@@ -102,16 +102,16 @@ export const validateName = (sources: QnAFile[]): FieldValidator => {
if (name) {
if (!FileNameRegex.test(name)) {
currentError = formatMessage(
- 'A knowledge base name cannot contain spaces or special characters. Use letters, numbers, -, or _.'
+ 'A knowledge base name cannot contain spaces or special characters. Use letters, numbers, -, or _.',
);
}
const duplicatedItemIndex = sources.findIndex(
- (item) => getBaseName(item.id.toLowerCase()) === `${name.toLowerCase()}.source`
+ (item) => getBaseName(item.id.toLowerCase()) === `${name.toLowerCase()}.source`,
);
if (duplicatedItemIndex > -1) {
currentError = formatMessage(
- 'You already have a knowledge base with that name. Choose another name and try again.'
+ 'You already have a knowledge base with that name. Choose another name and try again.',
);
}
}
diff --git a/Composer/packages/client/src/components/QnA/styles.ts b/Composer/packages/client/src/components/QnA/styles.ts
index 774a525b93..1ee77743d8 100644
--- a/Composer/packages/client/src/components/QnA/styles.ts
+++ b/Composer/packages/client/src/components/QnA/styles.ts
@@ -115,13 +115,13 @@ export const subText = css`
export const knowledgeBaseStyle = {
root: {
color: NeutralColors.gray160,
- fontWeight: '600' as '600',
+ fontWeight: '600' as const,
},
};
export const urlStackStyle = {
root: {
- overflowY: 'auto' as 'auto',
+ overflowY: 'auto' as const,
marginBottom: 10,
},
};
diff --git a/Composer/packages/client/src/components/Split/ThinSplitter.tsx b/Composer/packages/client/src/components/Split/ThinSplitter.tsx
index 40eef62c9f..aca804abe3 100644
--- a/Composer/packages/client/src/components/Split/ThinSplitter.tsx
+++ b/Composer/packages/client/src/components/Split/ThinSplitter.tsx
@@ -33,7 +33,7 @@ const Splitter = styled.div(
marginLeft: horizontal ? '0' : getCenteredMargin(splitterSize),
marginTop: horizontal ? getCenteredMargin(splitterSize) : '0',
background: dragging ? 'black' : 'silver',
- })
+ }),
);
/**
diff --git a/Composer/packages/client/src/components/TriggerCreationModal/TriggerCreationModal.tsx b/Composer/packages/client/src/components/TriggerCreationModal/TriggerCreationModal.tsx
index 7adb86d255..4f285333ff 100644
--- a/Composer/packages/client/src/components/TriggerCreationModal/TriggerCreationModal.tsx
+++ b/Composer/packages/client/src/components/TriggerCreationModal/TriggerCreationModal.tsx
@@ -97,7 +97,7 @@ export const TriggerCreationModal: React.FC = (props)
projectId,
dialogId,
localeLuFile,
- setLocaleLuFile
+ setLocaleLuFile,
);
return (
diff --git a/Composer/packages/client/src/components/TriggerCreationModal/TriggerDropdownGroup.tsx b/Composer/packages/client/src/components/TriggerCreationModal/TriggerDropdownGroup.tsx
index 9c43131469..a8d3a717f4 100644
--- a/Composer/packages/client/src/components/TriggerCreationModal/TriggerDropdownGroup.tsx
+++ b/Composer/packages/client/src/components/TriggerCreationModal/TriggerDropdownGroup.tsx
@@ -44,14 +44,14 @@ export const TriggerDropdownGroup: FC = ({
);
},
- [recognizerType]
+ [recognizerType],
);
const triggerOptionTree = useMemo(() => {
return generateTriggerOptionTree(
triggerUISchema,
formatMessage('What is the type of this trigger?'),
- formatMessage('Select a trigger type')
+ formatMessage('Select a trigger type'),
);
}, []);
diff --git a/Composer/packages/client/src/components/TriggerCreationModal/TriggerOptionTree.ts b/Composer/packages/client/src/components/TriggerCreationModal/TriggerOptionTree.ts
index f342206a3b..2a6df068b8 100644
--- a/Composer/packages/client/src/components/TriggerCreationModal/TriggerOptionTree.ts
+++ b/Composer/packages/client/src/components/TriggerCreationModal/TriggerOptionTree.ts
@@ -43,20 +43,20 @@ const getGroupKey = (submenu) => (typeof submenu === 'object' ? submenu.label :
export const generateTriggerOptionTree = (
triggerUIOptions: TriggerUISchema,
rootPrompt: string,
- rootPlaceHolder: string
+ rootPlaceHolder: string,
): TriggerOptionTree => {
const root = new TriggerOptionGroupNode('triggerTypeDropDown', rootPrompt, rootPlaceHolder);
const allOptionEntries = Object.entries(triggerUIOptions).filter(([, option]) => Boolean(option)) as [
string,
- TriggerUIOption
+ TriggerUIOption,
][];
const leafEntries = allOptionEntries.filter(([, options]) => !options.submenu);
const nonLeafEntries = allOptionEntries.filter(([, options]) => options.submenu);
// Build leaf nodes whose depth = 1.
const leafNodeList = leafEntries.map(
- ([$kind, options]) => new TriggerOptionLeafNode(options?.label ?? '', $kind, options?.order)
+ ([$kind, options]) => new TriggerOptionLeafNode(options?.label ?? '', $kind, options?.order),
);
// Insert depth 1 leaf nodes to tree.
@@ -66,17 +66,20 @@ export const generateTriggerOptionTree = (
// Build group nodes.
const groups = nonLeafEntries
.map(([, options]) => options.submenu)
- .reduce((result, submenu) => {
- const name = getGroupKey(submenu);
- if (!result[name]) result[name] = new TriggerOptionGroupNode(name, '', '');
- if (typeof submenu === 'object') {
- const tree: TriggerOptionGroupNode = result[name];
- tree.prompt = submenu.prompt;
- tree.placeholder = submenu.placeholder;
- tree.parent = root;
- }
- return result;
- }, {} as { [key: string]: TriggerOptionGroupNode });
+ .reduce(
+ (result, submenu) => {
+ const name = getGroupKey(submenu);
+ if (!result[name]) result[name] = new TriggerOptionGroupNode(name, '', '');
+ if (typeof submenu === 'object') {
+ const tree: TriggerOptionGroupNode = result[name];
+ tree.prompt = submenu.prompt;
+ tree.placeholder = submenu.placeholder;
+ tree.parent = root;
+ }
+ return result;
+ },
+ {} as { [key: string]: TriggerOptionGroupNode },
+ );
// Insert depth 1 group nodes to tree.
root.children.push(...Object.values(groups));
diff --git a/Composer/packages/client/src/components/TriggerCreationModal/resolveTriggerWidget.tsx b/Composer/packages/client/src/components/TriggerCreationModal/resolveTriggerWidget.tsx
index bf7483b234..48eb02f612 100644
--- a/Composer/packages/client/src/components/TriggerCreationModal/resolveTriggerWidget.tsx
+++ b/Composer/packages/client/src/components/TriggerCreationModal/resolveTriggerWidget.tsx
@@ -26,7 +26,7 @@ export function resolveTriggerWidget(
projectId: string,
dialogId: string,
luFile?: LuFile,
- setLuFile?: (data: LuFile) => void
+ setLuFile?: (data: LuFile) => void,
) {
const isRegEx = isRegExRecognizerType(dialogFile);
const isLUISnQnA = isLUISnQnARecognizerType(dialogFile) || isPVARecognizerType(dialogFile);
@@ -67,7 +67,7 @@ export function resolveTriggerWidget(
Name: PlaceHolderSectionName,
Body: body,
},
- {}
+ {},
);
setLuFile(shadowLuFile);
}
diff --git a/Composer/packages/client/src/components/TriggerCreationModal/validators.ts b/Composer/packages/client/src/components/TriggerCreationModal/validators.ts
index f0d6bbb84f..3468190ff8 100644
--- a/Composer/packages/client/src/components/TriggerCreationModal/validators.ts
+++ b/Composer/packages/client/src/components/TriggerCreationModal/validators.ts
@@ -23,7 +23,7 @@ const validateDupRegExIntent = (
selectedType: string,
intent: string,
isRegEx: boolean,
- regExIntents: [{ intent: string; pattern: string }]
+ regExIntents: [{ intent: string; pattern: string }],
): string | undefined => {
if (selectedType === SDKKinds.OnIntent && isRegEx && regExIntents.find((ri) => ri.intent === intent)) {
return formatMessage(`RegEx {intent} is already defined`, { intent });
@@ -53,7 +53,7 @@ const validateTriggerPhrases = (
selectedType: string,
isRegEx: boolean,
intent: string,
- triggerPhrases: string
+ triggerPhrases: string,
): string | undefined => {
if (selectedType === SDKKinds.OnIntent && !isRegEx && triggerPhrases) {
return getLuDiagnostics(intent, triggerPhrases);
@@ -64,7 +64,7 @@ export const validateForm = (
selectedType: string,
data: TriggerFormData,
isRegEx: boolean,
- regExIntents: [{ intent: string; pattern: string }]
+ regExIntents: [{ intent: string; pattern: string }],
): TriggerFormDataErrors => {
const errors: TriggerFormDataErrors = {};
const { $kind, event: eventName, intent, regEx, triggerPhrases } = data;
diff --git a/Composer/packages/client/src/components/WebChat/WebChatComposer.tsx b/Composer/packages/client/src/components/WebChat/WebChatComposer.tsx
index b23def1405..bface67a95 100644
--- a/Composer/packages/client/src/components/WebChat/WebChatComposer.tsx
+++ b/Composer/packages/client/src/components/WebChat/WebChatComposer.tsx
@@ -21,66 +21,73 @@ export type WebChatComposerProps = {
isDisabled: boolean;
};
-const createCardActionMiddleware = () => (next) => async ({ cardAction, getSignInUrl }) => {
- const { type, value } = cardAction;
-
- switch (type) {
- case 'signin': {
- // eslint-disable-next-line security/detect-non-literal-fs-filename
- const popup = window.open();
- const url = await getSignInUrl();
- if (popup) {
- popup.location.href = url;
+const createCardActionMiddleware =
+ () =>
+ (next) =>
+ async ({ cardAction, getSignInUrl }) => {
+ const { type, value } = cardAction;
+
+ switch (type) {
+ case 'signin': {
+ // eslint-disable-next-line security/detect-non-literal-fs-filename
+ const popup = window.open();
+ const url = await getSignInUrl();
+ if (popup) {
+ popup.location.href = url;
+ }
+ break;
}
- break;
- }
- case 'downloadFile':
- //Fall through
+ case 'downloadFile':
+ //Fall through
- case 'playAudio':
- //Fall through
+ case 'playAudio':
+ //Fall through
- case 'playVideo':
- //Fall through
+ case 'playVideo':
+ //Fall through
- case 'showImage':
- //Fall through
+ case 'showImage':
+ //Fall through
- case 'openUrl':
- // eslint-disable-next-line security/detect-non-literal-fs-filename
- window.open(value, '_blank');
- break;
+ case 'openUrl':
+ // eslint-disable-next-line security/detect-non-literal-fs-filename
+ window.open(value, '_blank');
+ break;
- default:
- return next({ cardAction, getSignInUrl });
- }
-};
+ default:
+ return next({ cardAction, getSignInUrl });
+ }
+ };
+
+const createActivityMiddleware =
+ () =>
+ (next: unknown) =>
+ (...setupArgs) =>
+ (...renderArgs) => {
+ const card = setupArgs[0];
+ switch (card.activity.type) {
+ case ActivityType.Trace:
+ return false;
-const createActivityMiddleware = () => (next: unknown) => (...setupArgs) => (...renderArgs) => {
- const card = setupArgs[0];
- switch (card.activity.type) {
- case ActivityType.Trace:
- return false;
-
- case ActivityType.EndOfConversation:
- return false;
-
- default:
- if (typeof next === 'function') {
- const middlewareResult = next(...setupArgs);
- if (middlewareResult) {
- return (
-
- {middlewareResult(...renderArgs)}
-
- );
+ case ActivityType.EndOfConversation:
+ return false;
+
+ default:
+ if (typeof next === 'function') {
+ const middlewareResult = next(...setupArgs);
+ if (middlewareResult) {
+ return (
+
+ {middlewareResult(...renderArgs)}
+
+ );
+ }
+ return false;
}
return false;
- }
- return false;
- }
-};
+ }
+ };
const areEqual = (prevProps: WebChatComposerProps, nextProps: WebChatComposerProps) => {
const result =
diff --git a/Composer/packages/client/src/components/WebChat/WebChatPanel.tsx b/Composer/packages/client/src/components/WebChat/WebChatPanel.tsx
index bd914198bc..1b650f36c5 100644
--- a/Composer/packages/client/src/components/WebChat/WebChatPanel.tsx
+++ b/Composer/packages/client/src/components/WebChat/WebChatPanel.tsx
@@ -70,10 +70,8 @@ export const WebChatPanel: React.FC = ({
webChatTrafficChannel.current = new WebSocket(`ws://${location.hostname}:${conversationServerPort}/ws/traffic`);
if (webChatTrafficChannel.current) {
webChatTrafficChannel.current.onmessage = (event) => {
- const data:
- | ConversationActivityTraffic
- | ConversationNetworkTrafficItem
- | ConversationNetworkErrorItem = JSON.parse(event.data);
+ const data: ConversationActivityTraffic | ConversationNetworkTrafficItem | ConversationNetworkErrorItem =
+ JSON.parse(event.data);
switch (data.trafficType) {
case 'network': {
@@ -88,7 +86,7 @@ export const WebChatPanel: React.FC = ({
id: uuid(),
timestamp: new Date(a.timestamp || Date.now()).getTime(),
trafficType: data.trafficType,
- }))
+ })),
);
break;
}
@@ -163,7 +161,7 @@ export const WebChatPanel: React.FC = ({
botUrl,
secret,
projectId,
- activeLocale
+ activeLocale,
);
if (mounted) {
setChatData({
@@ -191,7 +189,7 @@ export const WebChatPanel: React.FC = ({
oldChatData,
requireNewUserId,
activeLocale,
- secret
+ secret,
);
TelemetryClient.track('WebChatConversationRestarted', {
@@ -208,9 +206,9 @@ export const WebChatPanel: React.FC = ({
}
},
1000,
- { leading: true }
+ { leading: true },
),
- [secret, activeLocale]
+ [secret, activeLocale],
);
const onSaveTranscriptClick = async (conversationId: string) => {
diff --git a/Composer/packages/client/src/components/WebChat/__tests__/ActivityHighlightWrapper.test.tsx b/Composer/packages/client/src/components/WebChat/__tests__/ActivityHighlightWrapper.test.tsx
index 978c14538d..2be092edbe 100644
--- a/Composer/packages/client/src/components/WebChat/__tests__/ActivityHighlightWrapper.test.tsx
+++ b/Composer/packages/client/src/components/WebChat/__tests__/ActivityHighlightWrapper.test.tsx
@@ -36,7 +36,7 @@ describe('', () => {
trafficType: 'activity',
},
});
- }
+ },
);
getByTestId('composer-wc-activity-selected');
});
@@ -60,7 +60,7 @@ describe('', () => {
trafficType: 'activity',
},
});
- }
+ },
);
getByTestId('composer-wc-activity');
});
diff --git a/Composer/packages/client/src/components/WebChat/hooks/WebChatHooksContainer.tsx b/Composer/packages/client/src/components/WebChat/hooks/WebChatHooksContainer.tsx
index e6a268fb91..b1bf44843a 100644
--- a/Composer/packages/client/src/components/WebChat/hooks/WebChatHooksContainer.tsx
+++ b/Composer/packages/client/src/components/WebChat/hooks/WebChatHooksContainer.tsx
@@ -6,7 +6,7 @@ import React from 'react';
import { useActivityInspectionListener } from './useActivityInspectionListener';
import { useTranscriptFocusListener } from './useTranscriptFocusListener';
-export const WebChatHooksContainer: React.FC<{}> = () => {
+export const WebChatHooksContainer: React.FC = () => {
useActivityInspectionListener();
useTranscriptFocusListener();
diff --git a/Composer/packages/client/src/components/WebChat/hooks/useTranscriptFocusListener.ts b/Composer/packages/client/src/components/WebChat/hooks/useTranscriptFocusListener.ts
index f278e09aae..d916d63d79 100644
--- a/Composer/packages/client/src/components/WebChat/hooks/useTranscriptFocusListener.ts
+++ b/Composer/packages/client/src/components/WebChat/hooks/useTranscriptFocusListener.ts
@@ -45,7 +45,7 @@ export const useTranscriptFocusListener = () => {
setWebChatInspectionData(currentProjectId, { item: trafficItem });
}
},
- [activeDebugPanelTab, currentProjectId, rawWebChatTraffic, setDebugPanelActiveTab, setDebugPanelExpansion]
+ [activeDebugPanelTab, currentProjectId, rawWebChatTraffic, setDebugPanelActiveTab, setDebugPanelExpansion],
);
useObserveTranscriptFocus(onActivityFocused, [onActivityFocused]);
diff --git a/Composer/packages/client/src/components/WebChat/utils/conversationService.ts b/Composer/packages/client/src/components/WebChat/utils/conversationService.ts
index 541695cbd3..1ce1aec82b 100644
--- a/Composer/packages/client/src/components/WebChat/utils/conversationService.ts
+++ b/Composer/packages/client/src/components/WebChat/utils/conversationService.ts
@@ -37,7 +37,7 @@ export class ConversationService {
newConversationId: string,
userId: string,
activeLocale: string,
- secret: BotSecret
+ secret: BotSecret,
) {
const url = `${this.directlineHostUrl}/conversations/${oldConversationId}/updateConversation`;
return axios.put(
@@ -53,7 +53,7 @@ export class ConversationService {
headers: {
'Content-Type': 'application/json',
},
- }
+ },
);
}
@@ -67,7 +67,7 @@ export class ConversationService {
private async fetchDirectLineObject(
conversationId: string,
- directLineOptions: { mode: WebChatMode; endpointId: string; userId: string }
+ directLineOptions: { mode: WebChatMode; endpointId: string; userId: string },
) {
const options = {
conversationId,
@@ -100,7 +100,7 @@ export class ConversationService {
headers: {
'Content-Type': 'application/json',
},
- }
+ },
);
}
@@ -108,7 +108,7 @@ export class ConversationService {
botUrl: string,
secret: BotSecret,
projectId: string,
- activeLocale: string
+ activeLocale: string,
): Promise {
const webChatMode = 'livechat';
const user = this.getUser();
@@ -147,7 +147,7 @@ export class ConversationService {
oldChatData: ChatData,
requireNewUserID: boolean,
activeLocale: string,
- secret: BotSecret
+ secret: BotSecret,
) {
if (oldChatData.directline) {
oldChatData.directline.end();
@@ -165,7 +165,7 @@ export class ConversationService {
conversationId,
user.id,
activeLocale,
- secret
+ secret,
);
const { endpointId } = resp.data;
const directline = await this.fetchDirectLineObject(conversationId, {
diff --git a/Composer/packages/client/src/components/__tests__/BotRuntimeController/BotController.test.tsx b/Composer/packages/client/src/components/__tests__/BotRuntimeController/BotController.test.tsx
index c57881a9ed..ee9c81a647 100644
--- a/Composer/packages/client/src/components/__tests__/BotRuntimeController/BotController.test.tsx
+++ b/Composer/packages/client/src/components/__tests__/BotRuntimeController/BotController.test.tsx
@@ -63,7 +63,7 @@ describe('', () => {
};
const { findAllByText } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
await findAllByText('Restart all bots (2/3 running)');
});
@@ -78,7 +78,7 @@ describe('', () => {
};
const { findByText } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
await findByText('Start all');
});
@@ -93,7 +93,7 @@ describe('', () => {
};
const { findByTestId } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
const button = await findByTestId('button');
@@ -113,7 +113,7 @@ describe('', () => {
};
const { findByTestId } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
const button = await findByTestId('button');
@@ -135,7 +135,7 @@ describe('', () => {
};
const { findByText } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
await findByText('Starting bots.. (1/4 running)');
});
@@ -151,7 +151,7 @@ describe('', () => {
};
const { findByText } = renderWithRecoil(
,
- initRecoilState
+ initRecoilState,
);
await findByText('Stopping bots.. (2/4 running)');
});
diff --git a/Composer/packages/client/src/components/__tests__/BotRuntimeController/useBotOperations.test.tsx b/Composer/packages/client/src/components/__tests__/BotRuntimeController/useBotOperations.test.tsx
index f3a0b5daa7..460e878d2c 100644
--- a/Composer/packages/client/src/components/__tests__/BotRuntimeController/useBotOperations.test.tsx
+++ b/Composer/packages/client/src/components/__tests__/BotRuntimeController/useBotOperations.test.tsx
@@ -76,7 +76,7 @@ describe('useBotOperations', () => {
endpointKey: '',
subscriptionKey: '',
},
- }
+ },
);
});
diff --git a/Composer/packages/client/src/components/__tests__/DisableFeatureToolTip.test.tsx b/Composer/packages/client/src/components/__tests__/DisableFeatureToolTip.test.tsx
index 5a0db8ab66..3336c77ed5 100644
--- a/Composer/packages/client/src/components/__tests__/DisableFeatureToolTip.test.tsx
+++ b/Composer/packages/client/src/components/__tests__/DisableFeatureToolTip.test.tsx
@@ -25,7 +25,7 @@ describe('', () => {
},
},
});
- }
+ },
);
const tooltipElement = container.querySelector('#pva-disable-tooltip0');
expect(tooltipElement).toBeDefined();
@@ -46,7 +46,7 @@ describe('', () => {
},
},
});
- }
+ },
);
const tooltipElement = container.querySelector('#pva-disable-tooltip0');
expect(tooltipElement).toBeNull();
diff --git a/Composer/packages/client/src/constants.tsx b/Composer/packages/client/src/constants.tsx
index 9634860dca..7ae68efeac 100644
--- a/Composer/packages/client/src/constants.tsx
+++ b/Composer/packages/client/src/constants.tsx
@@ -24,12 +24,12 @@ export const UNDO_LIMIT = 10;
export const Tips = {
get PROJECT_NAME() {
return formatMessage(
- `Create a name for the project which will be used to name the application: (projectname-environment-LUfilename)`
+ `Create a name for the project which will be used to name the application: (projectname-environment-LUfilename)`,
);
},
get ENVIRONMENT() {
return formatMessage(
- `When multiple people are working with models you want to be able to work with models independently from each other tied to the source control.`
+ `When multiple people are working with models you want to be able to work with models independently from each other tied to the source control.`,
);
},
get AUTHORING_KEY() {
@@ -46,7 +46,7 @@ export const Tips = {
},
get DEFAULT_LANGUAGE() {
return formatMessage(
- `Configures default language model to use if there is no culture code in the file name (Default: en-us)`
+ `Configures default language model to use if there is no culture code in the file name (Default: en-us)`,
);
},
};
@@ -77,12 +77,12 @@ export const Text = {
},
get LUISDEPLOY() {
return formatMessage(
- `If you already have a LUIS account, provide the information below. If you do not have an account yet, create a (free) account first.`
+ `If you already have a LUIS account, provide the information below. If you do not have an account yet, create a (free) account first.`,
);
},
get QNADEPLOY() {
return formatMessage(
- `If you already have a QNA account, provide the information below. If you do not have an account yet, create a (free) account first.`
+ `If you already have a QNA account, provide the information below. If you do not have an account yet, create a (free) account first.`,
);
},
get LUISDEPLOYSUCCESS() {
@@ -202,7 +202,7 @@ export const DialogCreationCopy = {
return {
title: formatMessage('Choose a bot project for your Azure Bot'),
subText: formatMessage(
- 'Use your Azure Bot resource with a new or existing bot project. You can publish your bot project directly to Azure using the publishing profile created for you.'
+ 'Use your Azure Bot resource with a new or existing bot project. You can publish your bot project directly to Azure using the publishing profile created for you.',
),
};
},
@@ -222,7 +222,7 @@ export const DialogCreationCopy = {
return {
title: formatMessage('Define conversation objective'),
subText: formatMessage(
- `What can the user accomplish through this conversation? For example, BookATable, OrderACoffee etc.`
+ `What can the user accomplish through this conversation? For example, BookATable, OrderACoffee etc.`,
),
};
},
@@ -260,7 +260,7 @@ export const DialogCreationCopy = {
return {
title: formatMessage('Add QnA Maker knowledge base'),
subText: formatMessage(
- 'Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. Learn more about knowledge base sources. Skip this step to add questions and answers manually after creation. The number of sources and file size you can add depends on the QnA service SKU you choose. Learn more about QnA Maker SKUs.'
+ 'Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. Learn more about knowledge base sources. Skip this step to add questions and answers manually after creation. The number of sources and file size you can add depends on the QnA service SKU you choose. Learn more about QnA Maker SKUs.',
),
};
},
@@ -281,7 +281,7 @@ export const DialogDeleting = {
},
get CONTENT() {
return formatMessage(
- `The dialog you have tried to delete is currently used in the below dialog(s). Removing this dialog will cause your Bot to malfunction without additional action.`
+ `The dialog you have tried to delete is currently used in the below dialog(s). Removing this dialog will cause your Bot to malfunction without additional action.`,
);
},
get CONFIRM_CONTENT() {
@@ -294,15 +294,15 @@ export const MultiLanguagesDialog = {
return {
title: formatMessage('Copy content for translation'),
subText: formatMessage(
- `Composer cannot yet translate your bot automatically.\nTo create a translation manually, Composer will create a copy of your bot’s content with the name of the additional language. This content can then be translated without affecting the original bot logic or flow and you can switch between languages to ensure the responses are correctly and appropriately translated.`
+ `Composer cannot yet translate your bot automatically.\nTo create a translation manually, Composer will create a copy of your bot’s content with the name of the additional language. This content can then be translated without affecting the original bot logic or flow and you can switch between languages to ensure the responses are correctly and appropriately translated.`,
),
selectDefaultLangTitle: formatMessage(
- 'This language will be copied and used as the basis (and fallback language) for the translation.'
+ 'This language will be copied and used as the basis (and fallback language) for the translation.',
),
selectionTitle: formatMessage('To which language will you be translating your bot?'),
searchPlaceHolder: formatMessage('Search'),
whenDoneText: formatMessage(
- 'When done, switch to the newly created language and start the (manual) translation process.'
+ 'When done, switch to the newly created language and start the (manual) translation process.',
),
};
},
@@ -310,7 +310,7 @@ export const MultiLanguagesDialog = {
return {
title: formatMessage('Select language to delete'),
subText: formatMessage(
- `When deleting a language, only the content will be removed. The flow and logic of the conversation and dialog will remain functional.`
+ `When deleting a language, only the content will be removed. The flow and logic of the conversation and dialog will remain functional.`,
),
};
},
@@ -321,7 +321,7 @@ export const addSkillDialog = {
return {
title: formatMessage('Connect to a skill'),
subText: formatMessage(
- "To connect to a skill, your bot needs the information captured in the skill’s manifest, and, for secure access, the skill needs to know your bot's App ID. Follow the steps below to proceed."
+ "To connect to a skill, your bot needs the information captured in the skill’s manifest, and, for secure access, the skill needs to know your bot's App ID. Follow the steps below to proceed.",
),
};
},
@@ -343,7 +343,7 @@ export const addSkillDialog = {
{children}
),
- }
+ },
),
};
},
@@ -380,7 +380,7 @@ export const enableOrchestratorDialog = {
},
get subText() {
return formatMessage(
- 'A bot that consists of multiple bots or connects to skills (multi-bot project) needs Orchestrator to detect and route user input to the appropriate bot or skill.'
+ 'A bot that consists of multiple bots or connects to skills (multi-bot project) needs Orchestrator to detect and route user input to the appropriate bot or skill.',
);
},
};
@@ -396,10 +396,10 @@ export const removeSkillDialog = () => {
return {
title: formatMessage('Warning'),
subText: formatMessage(
- 'The skill you tried to remove from the project is currently used in the below bot(s). Removing this skill won’t delete the files, but it will cause your Bot to malfunction without additional action.'
+ 'The skill you tried to remove from the project is currently used in the below bot(s). Removing this skill won’t delete the files, but it will cause your Bot to malfunction without additional action.',
),
subTextNoUse: formatMessage(
- 'You are about to remove the skill from this project. Removing this skill won’t delete the files.'
+ 'You are about to remove the skill from this project. Removing this skill won’t delete the files.',
),
footerText: formatMessage('Do you wish to continue?'),
};
@@ -471,7 +471,7 @@ export const authUrl = `https://login.microsoftonline.com/${authConfig.tenantId}
export const triggerNotSupportedWarning = () =>
formatMessage(
- 'This trigger type is not supported by the RegEx recognizer. To ensure this trigger is fired, change the recognizer type.'
+ 'This trigger type is not supported by the RegEx recognizer. To ensure this trigger is fired, change the recognizer type.',
);
// TODO: replace language options with available languages pertinent to the selected template (issue #5554)
diff --git a/Composer/packages/client/src/hooks/useResizeObserver.ts b/Composer/packages/client/src/hooks/useResizeObserver.ts
index 6357cdebd8..6e4a9bd5cf 100644
--- a/Composer/packages/client/src/hooks/useResizeObserver.ts
+++ b/Composer/packages/client/src/hooks/useResizeObserver.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/ban-ts-ignore */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
@@ -20,7 +20,7 @@ export const useResizeObserver = (
// @ts-ignore
resizeCallback: (entries: ResizeObserverEntry[]) => void,
// @ts-ignore
- options?: ResizeObserverOptions
+ options?: ResizeObserverOptions,
) => {
// @ts-ignore
const resizeObserver = React.useRef(new ResizeObserver(resizeCallback));
diff --git a/Composer/packages/client/src/index.tsx b/Composer/packages/client/src/index.tsx
index 343c5c4114..1faea7ee7f 100644
--- a/Composer/packages/client/src/index.tsx
+++ b/Composer/packages/client/src/index.tsx
@@ -16,7 +16,7 @@ const appHostElm = document.getElementById('root');
const emotionCache = createCache({
key: 'client-cache',
- // @ts-expect-error
+ // @ts-expect-error nonce is defined during initial page rendering
nonce: window.__nonce__,
});
@@ -32,7 +32,7 @@ const renderApp = (AppComponent: typeof App) => {
,
- appHostElm
+ appHostElm,
);
};
@@ -44,6 +44,7 @@ renderApp(App);
*/
if (module.hot) {
module.hot.accept('./App', () => {
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
const NextApp = require<{ App: typeof App }>('./App').App;
renderApp(NextApp);
});
diff --git a/Composer/packages/client/src/pages/about/About.tsx b/Composer/packages/client/src/pages/about/About.tsx
index 9705b73560..f5240780d9 100644
--- a/Composer/packages/client/src/pages/about/About.tsx
+++ b/Composer/packages/client/src/pages/about/About.tsx
@@ -39,7 +39,7 @@ export const About: React.FC = () => {
{children}
),
- }
+ },
)}
THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
{formatMessage(
- 'List of languages that bot will be able to understand (User input) and respond to (Bot responses). To make this bot available in other languages, click ‘Manage languages’ to create a copy of the default language, and translate the content into the new language.'
+ 'List of languages that bot will be able to understand (User input) and respond to (Bot responses). To make this bot available in other languages, click ‘Manage languages’ to create a copy of the default language, and translate the content into the new language.',
)}
> = (props) => {
+export const BotProjectInfo: React.FC<
+ RouteComponentProps<{
+ projectId?: string;
+ isRootBot?: boolean;
+ }>
+> = (props) => {
const { projectId = '', isRootBot = false } = props;
const botProjects = useRecoilValue(localBotsDataSelector);
const botProject = botProjects.find((b) => b.projectId === projectId);
diff --git a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
index 99fe7fe256..0d3a91a98c 100644
--- a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
+++ b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
@@ -62,10 +62,12 @@ enum PivotItemKey {
// -------------------- BotProjectSettingsTabView -------------------- //
-export const BotProjectSettingsTabView: React.FC> = (props) => {
+export const BotProjectSettingsTabView: React.FC<
+ RouteComponentProps<{
+ projectId: string;
+ scrollToSectionId: string;
+ }>
+> = (props) => {
const { projectId = '', scrollToSectionId = '' } = props;
const botProjects = useRecoilValue(localBotsDataSelector);
const botProject = botProjects.find((b) => b.projectId === projectId);
diff --git a/Composer/packages/client/src/pages/botProject/CreatePublishProfileDialog.tsx b/Composer/packages/client/src/pages/botProject/CreatePublishProfileDialog.tsx
index 410c724b36..12de04701f 100644
--- a/Composer/packages/client/src/pages/botProject/CreatePublishProfileDialog.tsx
+++ b/Composer/packages/client/src/pages/botProject/CreatePublishProfileDialog.tsx
@@ -36,7 +36,7 @@ export const CreatePublishProfileDialog: React.FC Promise) => {
const warningText = formatMessage(
- 'Are you sure you want to delete your bot? This action cannot be undone and your bot and all related files in the bot project folder will be permanently deleted. Your Azure resources will remain unchanged.'
+ 'Are you sure you want to delete your bot? This action cannot be undone and your bot and all related files in the bot project folder will be permanently deleted. Your Azure resources will remain unchanged.',
);
const title = formatMessage('Delete Bot');
const settings = {
diff --git a/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx b/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx
index 153197023b..4e1c71fe2f 100644
--- a/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx
+++ b/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx
@@ -66,7 +66,7 @@ export const GetAppInfoFromPublishProfileDialog: React.FC = (props) => {
const dialogTitle = {
title: formatMessage('Retrieve App ID from publishing profile'),
subText: formatMessage(
- 'A publishing profile contains the information necessary to provision and publish your bot, including its App ID.'
+ 'A publishing profile contains the information necessary to provision and publish your bot, including its App ID.',
),
};
diff --git a/Composer/packages/client/src/pages/botProject/PublishProfieWrapperDialog.tsx b/Composer/packages/client/src/pages/botProject/PublishProfieWrapperDialog.tsx
index 6682f0a405..195947da23 100644
--- a/Composer/packages/client/src/pages/botProject/PublishProfieWrapperDialog.tsx
+++ b/Composer/packages/client/src/pages/botProject/PublishProfieWrapperDialog.tsx
@@ -28,7 +28,7 @@ export const PublishProfileWrapperDialog: React.FC(
- null
+ null,
);
useEffect(() => {
diff --git a/Composer/packages/client/src/pages/botProject/PublishTargets.tsx b/Composer/packages/client/src/pages/botProject/PublishTargets.tsx
index e635384026..004cbd884f 100644
--- a/Composer/packages/client/src/pages/botProject/PublishTargets.tsx
+++ b/Composer/packages/client/src/pages/botProject/PublishTargets.tsx
@@ -101,8 +101,8 @@ export const PublishTargets: React.FC = (props) => {
formatMessage('Delete?'),
formatMessage(
'Are you sure you want to remove {targetName}? This will remove only the profile and will not delete provisioned resources.',
- { targetName }
- )
+ { targetName },
+ ),
);
if (confirmed) {
const newPublishTargets = publishTargets.filter((t) => t.name !== targetName);
diff --git a/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx b/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx
index e93f81b957..c3a959e810 100644
--- a/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx
+++ b/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx
@@ -155,7 +155,9 @@ export const RootBotExternalService: React.FC = (pr
setLocalRootLuisKey(value);
} else {
setLuisKeyErrorMsg(
- formatMessage('LUIS key is required with the current recognizer setting to start your bot locally, and publish')
+ formatMessage(
+ 'LUIS key is required with the current recognizer setting to start your bot locally, and publish',
+ ),
);
setLocalRootLuisKey('');
}
@@ -185,8 +187,8 @@ export const RootBotExternalService: React.FC = (pr
if (!localRootLuisKey) {
setLuisKeyErrorMsg(
formatMessage(
- 'LUIS authoring key is required with the current recognizer setting to start your bot locally, and publish'
- )
+ 'LUIS authoring key is required with the current recognizer setting to start your bot locally, and publish',
+ ),
);
} else {
setLuisKeyErrorMsg('');
@@ -252,7 +254,9 @@ export const RootBotExternalService: React.FC = (pr
const handleRootLuisAuthoringKeyOnBlur = () => {
if (!localRootLuisKey) {
setLuisKeyErrorMsg(
- formatMessage('LUIS key is required with the current recognizer setting to start your bot locally, and publish')
+ formatMessage(
+ 'LUIS key is required with the current recognizer setting to start your bot locally, and publish',
+ ),
);
}
setSettings(projectId, {
@@ -325,7 +329,7 @@ export const RootBotExternalService: React.FC = (pr
{children}
),
- }
+ },
)}
),
@@ -437,8 +437,8 @@ export const ABSChannels: React.FC = (props) => {
const result = await OpenConfirmModal(
formatMessage('Enable speech'),
formatMessage(
- 'This cognitive service account is already set as the default for another bot. Do you want to enable this service without setting it as default?'
- )
+ 'This cognitive service account is already set as the default for another bot. Do you want to enable this service without setting it as default?',
+ ),
);
if (result) {
toggleSpeechOn(settings, false);
@@ -588,7 +588,7 @@ export const ABSChannels: React.FC = (props) => {
>
{formatMessage(
- 'Teams requires a few more steps to get your connection up and running. Follow the instructions on our documentation page to learn how.'
+ 'Teams requires a few more steps to get your connection up and running. Follow the instructions on our documentation page to learn how.',
)}
diff --git a/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx b/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx
index 7351a40f9c..853a60df5d 100644
--- a/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx
+++ b/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx
@@ -43,7 +43,7 @@ const AdapterSection = ({ projectId, scrollToSectionId }: Props) => {
{children}
),
- }
+ },
)}
{formatMessage(
- 'You are about to pull project files from the selected publish profiles. The current project will be overwritten by the pulled files, and will be saved as a backup automatically. You will be able to retrieve the backup anytime in the future.'
+ 'You are about to pull project files from the selected publish profiles. The current project will be overwritten by the pulled files, and will be saved as a backup automatically. You will be able to retrieve the backup anytime in the future.',
)}
{formatMessage('Do you want to proceed?')}
diff --git a/Composer/packages/client/src/pages/publish/pullDialog.tsx b/Composer/packages/client/src/pages/publish/pullDialog.tsx
index 61b409e01b..bf892dd195 100644
--- a/Composer/packages/client/src/pages/publish/pullDialog.tsx
+++ b/Composer/packages/client/src/pages/publish/pullDialog.tsx
@@ -43,7 +43,7 @@ export const PullDialog: React.FC = (props) => {
try {
// wait for pull result from server
const res = await axios.post<{ backupLocation: string }>(
- `/api/publish/${projectId}/pull/${selectedTarget.name}`
+ `/api/publish/${projectId}/pull/${selectedTarget.name}`,
);
const { backupLocation } = res.data;
// show notification indicating success and close dialog
diff --git a/Composer/packages/client/src/pages/publish/pullFailedDialog.tsx b/Composer/packages/client/src/pages/publish/pullFailedDialog.tsx
index 444ebec0a3..73cc3dff37 100644
--- a/Composer/packages/client/src/pages/publish/pullFailedDialog.tsx
+++ b/Composer/packages/client/src/pages/publish/pullFailedDialog.tsx
@@ -45,7 +45,7 @@ export const PullFailedDialog: React.FC = (props) => {
{formatMessage.rich(
'There was an unexpected error pulling from publish profile { selectedTargetName }',
- { b: Bold, selectedTargetName }
+ { b: Bold, selectedTargetName },
)}