diff --git a/Composer/packages/client/__tests__/components/CreationFlowV2/index.test.tsx b/Composer/packages/client/__tests__/components/CreationFlowV2/index.test.tsx index 284fec7a3b..1a02ad414d 100644 --- a/Composer/packages/client/__tests__/components/CreationFlowV2/index.test.tsx +++ b/Composer/packages/client/__tests__/components/CreationFlowV2/index.test.tsx @@ -86,7 +86,7 @@ describe('', () => { ); navigate('create/dotnet/%40microsoft%2Fgenerator-bot-empty'); - const node = await findByText('OK'); + const node = await findByText('Create'); act(() => { fireEvent.click(node); diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/AdapterSettings.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/AdapterSettings.test.tsx index 7d5d49ccd2..0a8a518ebd 100644 --- a/Composer/packages/client/__tests__/pages/botProjectsSettings/AdapterSettings.test.tsx +++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/AdapterSettings.test.tsx @@ -80,17 +80,6 @@ describe('ExternalAdapterSettings', () => { setSettingsMock.mockClear(); }); - it('renders a link to the package manager', () => { - const { getByText } = renderWithRecoilAndCustomDispatchers( - , - initRecoilState - ); - - const link = getByText(/from package manager/); - - expect(link.attributes.getNamedItem('href')?.value).toContain('plugin/package-manager/package-manager'); - }); - it('brings up the modal', () => { const { getByTestId, getByText, queryByTestId } = renderWithRecoilAndCustomDispatchers( , diff --git a/Composer/packages/client/src/components/BotRuntimeController/publishDialog.tsx b/Composer/packages/client/src/components/BotRuntimeController/publishDialog.tsx index 6f8f7fadd9..6519ad3274 100644 --- a/Composer/packages/client/src/components/BotRuntimeController/publishDialog.tsx +++ b/Composer/packages/client/src/components/BotRuntimeController/publishDialog.tsx @@ -175,7 +175,7 @@ export const PublishDialog: React.FC = (props) => {
{Text.LUISDEPLOY} - {formatMessage('Learn more.')} + {formatMessage('Learn more')} ); @@ -187,7 +187,7 @@ export const PublishDialog: React.FC = (props) => {
{Text.QNADEPLOY} - {formatMessage('Learn more.')} + {formatMessage('Learn more')} ); diff --git a/Composer/packages/client/src/components/CreationFlow/FileSelector.tsx b/Composer/packages/client/src/components/CreationFlow/FileSelector.tsx index bc819a38ca..9c797e80aa 100644 --- a/Composer/packages/client/src/components/CreationFlow/FileSelector.tsx +++ b/Composer/packages/client/src/components/CreationFlow/FileSelector.tsx @@ -527,17 +527,20 @@ export const FileSelector: React.FC = (props) => { label={formatMessage('Location')} options={breadcrumbItems} selectedKey={currentPath} + styles={{ root: { width: '420px' } }} onChange={updatePath} onPendingValueChanged={updatePathPending} /> - - {operationMode.write && ( - - + {operationMode.write && ( + {formatMessage('Create new folder')} - - )} + )} +
diff --git a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx index d15f9381e8..f0ed5373bc 100644 --- a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx +++ b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx @@ -44,10 +44,9 @@ const textFieldlabel = { }; const name = { - subComponentStyles: textFieldlabel, -}; - -const description = { + root: { + width: '420px', + }, subComponentStyles: textFieldlabel, }; @@ -367,36 +366,26 @@ const DefineConversationV2: React.FC = (props) => { onChange={(_e, val) => updateField('name', val)} /> - - updateField('description', val)} - /> - - - {!isImported && ( - + {!isImported && ( updateField('runtimeType', option?.key.toString())} /> - - )} + )} + {locationSelectContent} diff --git a/Composer/packages/client/src/components/GetStarted/GetStartedTask.tsx b/Composer/packages/client/src/components/GetStarted/GetStartedTask.tsx index 4fff7e6dd7..159d1703a0 100644 --- a/Composer/packages/client/src/components/GetStarted/GetStartedTask.tsx +++ b/Composer/packages/client/src/components/GetStarted/GetStartedTask.tsx @@ -17,14 +17,14 @@ type TaskProps = { }; const getStartedStepStyle = (disabled?: boolean) => css` - margin-bottom: 15px; + margin-bottom: 10px; pointer-events: ${disabled ? 'none' : 'auto'}; opacity: ${disabled ? 0.4 : 1}; `; const stepDescriptionStyle = css` margin-left: 36px; - font-size: 12px; + font-size: 14px; color: ${NeutralColors.gray120}; margin-top: -4px; `; diff --git a/Composer/packages/client/src/components/GetStarted/styles.ts b/Composer/packages/client/src/components/GetStarted/styles.ts index 60fee93bca..d3dff79a99 100644 --- a/Composer/packages/client/src/components/GetStarted/styles.ts +++ b/Composer/packages/client/src/components/GetStarted/styles.ts @@ -7,14 +7,14 @@ import { FontWeights } from 'office-ui-fabric-react/lib/Styling'; export const h3Style = css` font-size: ${FontSizes.size14}; margin-top: 24px; - font-weight: ${FontWeights.regular}; + font-weight: ${FontWeights.semibold}; margin-bottom: 4px; `; export const topH3Style = css` font-size: ${FontSizes.size14}; margin-top: 12px; - font-weight: ${FontWeights.regular}; + font-weight: ${FontWeights.semibold}; margin-bottom: 4px; `; diff --git a/Composer/packages/client/src/components/Header.tsx b/Composer/packages/client/src/components/Header.tsx index f1acb5d540..6af2b2a406 100644 --- a/Composer/packages/client/src/components/Header.tsx +++ b/Composer/packages/client/src/components/Header.tsx @@ -224,6 +224,12 @@ export const Header = () => { } }, [isWebChatPanelVisible]); + useEffect(() => { + if (!hideBotController && showGetStarted) { + setShowGetStarted(false); + } + }, [hideBotController]); + const showUpdateAvailableIcon = status === AppUpdaterStatus.UPDATE_AVAILABLE && !showing; const languageListOptions = useMemo(() => { diff --git a/Composer/packages/client/src/pages/botProject/AllowedCallers.tsx b/Composer/packages/client/src/pages/botProject/AllowedCallers.tsx index 93609f1893..a11d56e010 100644 --- a/Composer/packages/client/src/pages/botProject/AllowedCallers.tsx +++ b/Composer/packages/client/src/pages/botProject/AllowedCallers.tsx @@ -147,7 +147,7 @@ export const AllowedCallers: React.FC = ({ projectId }) => {
{formatMessage('Allowed Callers')}
{formatMessage.rich( - 'Skills can be “called” by external bots. Allow other bots to call your skill by adding their App IDs to the list below. Learn more.', + 'Skills can be “called” by external bots. Allow other bots to call your skill by adding their App IDs to the list below. Learn more', { a: ({ children }) => ( = (props) => {
{formatMessage('Microsoft App ID')}
{formatMessage.rich( - 'An App ID is used for communication between your bot and skills, services, websites or applications. Use an existing App ID or automatically generate an App ID when creating a publishing profile for this bot. Learn more.', + 'An App ID is used for communication between your bot and skills, services, websites or applications. Use an existing App ID or automatically generate an App ID when creating a publishing profile for this bot. Learn more', { a: ({ children }) => ( diff --git a/Composer/packages/client/src/pages/botProject/BotLanguage.tsx b/Composer/packages/client/src/pages/botProject/BotLanguage.tsx index 06f69f38be..e8cf7d53fa 100644 --- a/Composer/packages/client/src/pages/botProject/BotLanguage.tsx +++ b/Composer/packages/client/src/pages/botProject/BotLanguage.tsx @@ -18,7 +18,7 @@ import { AddLanguageModal } from '../../components/MultiLanguage'; import { mergePropertiesManagedByRootBot } from '../../recoilModel/dispatchers/utils/project'; import { rootBotProjectIdSelector } from '../../recoilModel/selectors/project'; -import { subtitle } from './styles'; +import { headerText } from './styles'; // -------------------- Styles -------------------- // const botLanguageContainerStyle = css` @@ -152,7 +152,7 @@ export const BotLanguage: React.FC = (props) => { return (
-
+
{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.' )} diff --git a/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx b/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx index b349b0c9b3..3caf932e0e 100644 --- a/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx +++ b/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx @@ -26,6 +26,7 @@ const valueStyle = css` const headerStyle = css` font-size: 20px; font-weight: 600; + margin-top: 25px; `; const rootTextStyle = css` @@ -61,12 +62,12 @@ export const BotProjectInfo: React.FC - {formatMessage('View readme')} + {formatMessage('View Readme')}