From 64f2643fc415d1d915543dcd3691f02fd67caf6c Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 10:28:42 -0400 Subject: [PATCH 01/37] Remove bot settings tool bar buttons --- .../pages/botProject/BotProjectSettings.tsx | 61 ------------------- 1 file changed, 61 deletions(-) diff --git a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx index 5782b34626..ad05d6c788 100644 --- a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx +++ b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx @@ -12,7 +12,6 @@ import { Toggle } from 'office-ui-fabric-react/lib/Toggle'; import { DialogSetting } from '@bfc/shared'; import { defaultToolbarButtonStyles } from '@bfc/ui-shared'; -import TelemetryClient from '../../telemetry/TelemetryClient'; import { LoadingSpinner } from '../../components/LoadingSpinner'; import { INavTreeItem } from '../../components/NavTree'; import { Page } from '../../components/Page'; @@ -21,7 +20,6 @@ import { settingsState, userSettingsState } from '../../recoilModel/atoms'; import { localBotsDataSelector, rootBotProjectIdSelector } from '../../recoilModel/selectors/project'; import { createBotSettingUrl, navigateTo } from '../../utils/navigation'; import { mergePropertiesManagedByRootBot } from '../../recoilModel/dispatchers/utils/project'; -import { usePVACheck } from '../../hooks/usePVACheck'; import { openDeleteBotModal } from './DeleteBotButton'; import { BotProjectSettingsTabView } from './BotProjectsSettingsTabView'; @@ -54,7 +52,6 @@ const BotProjectSettings: React.FC b.projectId === currentProjectId); const { deleteBot } = useRecoilValue(dispatcherState); - const isPVABot = usePVACheck(currentProjectId); const settings = useRecoilValue(settingsState(currentProjectId)); const mergedSettings = mergePropertiesManagedByRootBot(currentProjectId, rootBotProjectId, settings); @@ -63,66 +60,8 @@ const BotProjectSettings: React.FC { - TelemetryClient.track('GettingStartedLinkClicked', { method: 'button', url: link }); - navigateTo(link); - }; - const toolbarItems = useMemo(() => { - const linkToPackageManager = `/bot/${rootBotProjectId}/plugin/package-manager/package-manager`; - const linkToConnections = `/bot/${rootBotProjectId}/botProjectsSettings/#connections`; - const linkToLGEditor = `/bot/${rootBotProjectId}/language-generation`; - const linkToLUEditor = `/bot/${rootBotProjectId}/language-understanding`; - return [ - ...(!isPVABot - ? [ - { - text: formatMessage('Add a package'), - type: 'action', - buttonProps: { - iconProps: { iconName: 'Package' }, - onClick: () => buttonClick(linkToPackageManager), - styles: defaultToolbarButtonStyles, - }, - align: 'left', - }, - ] - : []), - { - text: formatMessage('Edit LG'), - type: 'action', - buttonProps: { - iconProps: { iconName: 'Robot' }, - onClick: () => buttonClick(linkToLGEditor), - styles: defaultToolbarButtonStyles, - }, - align: 'left', - }, - { - text: formatMessage('Edit LU'), - type: 'action', - buttonProps: { - iconProps: { iconName: 'People' }, - onClick: () => buttonClick(linkToLUEditor), - styles: defaultToolbarButtonStyles, - }, - align: 'left', - }, - ...(!isPVABot - ? [ - { - text: formatMessage('Manage connections'), - type: 'action', - buttonProps: { - iconProps: { iconName: 'PlugConnected' }, - onClick: () => buttonClick(linkToConnections), - styles: defaultToolbarButtonStyles, - }, - align: 'left', - }, - ] - : []), { text: formatMessage('Delete bot'), type: 'action', From 709a795ef6dca880976852d7d90b369a43ecdc9c Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 10:31:28 -0400 Subject: [PATCH 02/37] Change settings header string and remove subtext --- .../client/src/pages/botProject/BotProjectSettings.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx index ad05d6c788..876fcbe555 100644 --- a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx +++ b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx @@ -100,12 +100,6 @@ const BotProjectSettings: React.FC { - return formatMessage( - 'This Page contains detailed information about your bot. For security reasons, they are hidden by default. To test your bot or publish to Azure, you may need to provide these settings.' - ); - }; - const saveChangeResult = (result: DialogSetting) => { setSettings(currentProjectId, result); }; @@ -132,9 +126,8 @@ const BotProjectSettings: React.FC }>
From 0eb3d43284ccb2e2a988bc4a6e311bf623a86dda Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 10:33:21 -0400 Subject: [PATCH 03/37] Fix capitalization in settings tabs --- Composer/cypress/integration/LuisDeploy.spec.ts | 2 +- .../pages/botProject/BotProjectsSettingsTabView.tsx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Composer/cypress/integration/LuisDeploy.spec.ts b/Composer/cypress/integration/LuisDeploy.spec.ts index 1c867ae39c..66810a36cc 100644 --- a/Composer/cypress/integration/LuisDeploy.spec.ts +++ b/Composer/cypress/integration/LuisDeploy.spec.ts @@ -14,7 +14,7 @@ context('Luis Deploy', () => { it('can deploy luis success', () => { cy.visitPage('Project settings'); - cy.findByText('Development Resources').click(); + cy.findByText('Development resources').click(); cy.findAllByTestId('rootLUISAuthoringKey').type('12345678', { delay: 200 }); cy.findAllByTestId('rootLUISRegion').click(); cy.findByText('westus').click(); diff --git a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx index 862208fcd8..6e4b6065f4 100644 --- a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx +++ b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx @@ -101,17 +101,17 @@ export const BotProjectSettingsTabView: React.FC { if (isPVABot) { return ( - {formatMessage('Development Resources')} + {formatMessage('Development resources')} ); } else { - return {formatMessage('Development Resources')}; + return {formatMessage('Development resources')}; } }} > @@ -145,11 +145,11 @@ export const BotProjectSettingsTabView: React.FC - {formatMessage('Skill Configuration')} + {formatMessage('Skill configuration')} ); } else { - return {formatMessage('Skill Configuration')}; + return {formatMessage('Skill configuration')}; } }} > From 7b084418b75b3e7b5b501734f268b4dad10f6306 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 10:43:07 -0400 Subject: [PATCH 04/37] More space between pivot menu and content--should be consistent on each tab --- .../packages/client/src/pages/botProject/BotLanguage.tsx | 4 ++-- .../client/src/pages/botProject/BotProjectInfo.tsx | 1 + .../src/pages/botProject/adapters/AdapterSection.tsx | 4 ++-- Composer/packages/client/src/pages/botProject/styles.ts | 8 +++++++- 4 files changed, 12 insertions(+), 5 deletions(-) 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 2540714699..77087371ae 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` diff --git a/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx b/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx index 4002f7fabf..41b0050e44 100644 --- a/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx +++ b/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx @@ -8,7 +8,7 @@ import { Stack } from 'office-ui-fabric-react/lib/Stack'; import { Link } from 'office-ui-fabric-react/lib/Link'; import { Link as RouterLink } from '@reach/router'; -import { title, subtitle, subtext } from '../styles'; +import { title, subtitle, subtext, headerText } from '../styles'; import ExternalAdapterSettings from './ExternalAdapterSettings'; import ABSChannels from './ABSChannels'; @@ -28,7 +28,7 @@ const AdapterSection = ({ projectId, scrollToSectionId }: Props) => { return (
-
+
{formatMessage.rich( 'Expand the reach of your bot by adding connections. Connections are added per bot (typically to the root bot, if your project contains multiple bots), as well as per publishing profile. Select a publishing profile to add and enable connections. Learn more.', { diff --git a/Composer/packages/client/src/pages/botProject/styles.ts b/Composer/packages/client/src/pages/botProject/styles.ts index 7b755b4cc6..d46fb27092 100644 --- a/Composer/packages/client/src/pages/botProject/styles.ts +++ b/Composer/packages/client/src/pages/botProject/styles.ts @@ -8,7 +8,7 @@ import { FontSizes, FontWeights, mergeStyleSets } from 'office-ui-fabric-react/l export const title = css` font-size: ${FontSizes.large}; font-weight: ${FontWeights.semibold}; - margin-top: 20px; + margin-top: 25px; margin-bottom: 5px; `; @@ -24,6 +24,12 @@ export const subtitle = css` padding: 12px 0; `; +export const headerText = css` + color: ${NeutralColors.gray130}; + font-size: ${FontSizes.medium}; + margin-top: 25px; +`; + export const sectionHeader = css` font-weight: ${FontWeights.semibold}; font-size: ${FontSizes.medium}; From 78ca964f373423b47f20a62cf73f8a0ac53b1e2c Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 10:54:40 -0400 Subject: [PATCH 05/37] - Align content with pivot menu on left side - Max width of inputs and text 580x in all tabs --- .../botProject/BotProjectsSettingsTabView.tsx | 27 +++++++++++++------ .../client/src/pages/botProject/styles.ts | 7 ++++- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx index 6e4b6065f4..4c082337e9 100644 --- a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx +++ b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx @@ -24,6 +24,7 @@ import { RuntimeSettings } from './RuntimeSettings'; import AdapterSection from './adapters/AdapterSection'; import { SkillHostEndPoint } from './SkillHostEndPoint'; import { AllowedCallers } from './AllowedCallers'; +import { tabContentContainer } from './styles'; // -------------------- Styles -------------------- // @@ -95,8 +96,10 @@ export const BotProjectSettingsTabView: React.FC - - +
+ + +
- - +
+ + +
{isRootBot && ( - +
+ +
)} - {isRootBot && } - +
+ {isRootBot && } + +
- +
+ +
diff --git a/Composer/packages/client/src/pages/botProject/styles.ts b/Composer/packages/client/src/pages/botProject/styles.ts index d46fb27092..0ff09e393a 100644 --- a/Composer/packages/client/src/pages/botProject/styles.ts +++ b/Composer/packages/client/src/pages/botProject/styles.ts @@ -12,6 +12,11 @@ export const title = css` margin-bottom: 5px; `; +export const tabContentContainer = css` + margin-left: 7px; + max-width: 580px; +`; + export const subtext = css` color: ${NeutralColors.gray130}; font-size: ${FontSizes.medium}; @@ -151,7 +156,7 @@ export const actionButton = { }, }; -export const inputFieldStyles = mergeStyleSets({ root: { marginTop: 10, width: '75%' } }, customError); +export const inputFieldStyles = mergeStyleSets({ root: { marginTop: 10 } }, customError); export const teamsCallOutStyles = mergeStyleSets({ callout: { From 37e8b0913c908eb4b95b92474d338b90301444bc Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 10:57:17 -0400 Subject: [PATCH 06/37] In all tables, headers should be semi-bold rather than bold --- Composer/packages/client/src/pages/botProject/styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/pages/botProject/styles.ts b/Composer/packages/client/src/pages/botProject/styles.ts index 0ff09e393a..d6b8aef9a6 100644 --- a/Composer/packages/client/src/pages/botProject/styles.ts +++ b/Composer/packages/client/src/pages/botProject/styles.ts @@ -70,7 +70,7 @@ export const tableRowItem = (width?: string) => css` export const tableColumnHeader = (width?: string) => css` font-size: ${FontSizes.medium}; - font-weight: ${FontWeights.bold}; + font-weight: ${FontWeights.semibold}; padding-top: 10px; padding-left: 10px; text-overflow: ellipsis; From d663a606a2a2be31fa4a8354adb372d42aa9d27b Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:00:17 -0400 Subject: [PATCH 07/37] nix tool tip on start command --- .../src/pages/botProject/runtime-settings/RuntimeSettings.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/Composer/packages/client/src/pages/botProject/runtime-settings/RuntimeSettings.tsx b/Composer/packages/client/src/pages/botProject/runtime-settings/RuntimeSettings.tsx index 965e37bae6..355128d12d 100644 --- a/Composer/packages/client/src/pages/botProject/runtime-settings/RuntimeSettings.tsx +++ b/Composer/packages/client/src/pages/botProject/runtime-settings/RuntimeSettings.tsx @@ -275,7 +275,6 @@ export const RuntimeSettings: React.FC handleRuntimeSettingOnBlur('command')} onChange={handleRuntimeSettingOnChange('command')} - onRenderLabel={onRenderLabel} />
{needsUpdate && ( From ea47fd735cc8a02a43738e3bee2e62dec3f7a3fe Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:00:36 -0400 Subject: [PATCH 08/37] "Readme" instead of "Read Me" --- .../packages/client/src/pages/botProject/BotProjectInfo.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx b/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx index 77087371ae..92547cef6d 100644 --- a/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx +++ b/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx @@ -56,7 +56,7 @@ export const BotProjectInfo: React.FC{location}
-
{formatMessage('Read Me')}
+
{formatMessage('Readme')}
{readme && ( - {formatMessage('View project readme')} + {formatMessage('View project Readme')} Date: Tue, 4 May 2021 11:02:24 -0400 Subject: [PATCH 09/37] Ensure padding at bottom of page --- Composer/packages/client/src/pages/botProject/styles.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Composer/packages/client/src/pages/botProject/styles.ts b/Composer/packages/client/src/pages/botProject/styles.ts index d6b8aef9a6..f2e28c2413 100644 --- a/Composer/packages/client/src/pages/botProject/styles.ts +++ b/Composer/packages/client/src/pages/botProject/styles.ts @@ -13,8 +13,9 @@ export const title = css` `; export const tabContentContainer = css` - margin-left: 7px; + margin-left: 10px; max-width: 580px; + padding-bottom: 10px; `; export const subtext = css` From ea482a494fe8a555a6cc651669636db99ff52e65 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:09:16 -0400 Subject: [PATCH 10/37] Tighten up horizontal spacing between columns in tables --- Composer/packages/client/src/pages/botProject/styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/pages/botProject/styles.ts b/Composer/packages/client/src/pages/botProject/styles.ts index f2e28c2413..25682db516 100644 --- a/Composer/packages/client/src/pages/botProject/styles.ts +++ b/Composer/packages/client/src/pages/botProject/styles.ts @@ -145,7 +145,7 @@ export const unknownIconStyle = (required: boolean) => { }; export const columnSizes = ['300px', '150px', '150px']; -export const extendedColumnSizes = ['300px', '150px', '300px']; +export const extendedColumnSizes = ['200px', '200px', '250px']; export const actionButton = { root: { From 05fb16db4425de3f011110ec01102f93809a6075 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:15:28 -0400 Subject: [PATCH 11/37] Replacing routerLink with Link for consistent styling --- .../src/pages/botProject/adapters/AdapterSection.tsx | 10 ++++++---- .../botProject/adapters/ExternalAdapterSettings.tsx | 11 ++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx b/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx index 41b0050e44..71d0571250 100644 --- a/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx +++ b/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx @@ -6,9 +6,9 @@ import { useEffect, useRef } from 'react'; import formatMessage from 'format-message'; import { Stack } from 'office-ui-fabric-react/lib/Stack'; import { Link } from 'office-ui-fabric-react/lib/Link'; -import { Link as RouterLink } from '@reach/router'; import { title, subtitle, subtext, headerText } from '../styles'; +import { navigateTo } from '../../../utils/navigation'; import ExternalAdapterSettings from './ExternalAdapterSettings'; import ABSChannels from './ABSChannels'; @@ -54,12 +54,14 @@ const AdapterSection = ({ projectId, scrollToSectionId }: Props) => { 'Find and install more external services to your bot project in package manager. For further guidance, see documentation for adding external connections.', { a: ({ children }) => ( - { + navigateTo(`/bot/${projectId}/plugin/package-manager/package-manager`); + }} > {children} - + ), a2: ({ children }) => ( {
{formatMessage.rich('Add from package manager', { a: ({ children }) => ( - + { + navigateTo(`/bot/${projectId}/plugin/package-manager/package-manager`); + }} + > {children} - + ), })}
From 082c52d9f7b24c2ad008533be9764dcdc3256819 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:17:15 -0400 Subject: [PATCH 12/37] Lower-case M in "Open manifest" --- .../client/src/pages/botProject/adapters/ABSChannels.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx b/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx index 6a8c47d1ca..86b760588d 100644 --- a/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx +++ b/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx @@ -516,7 +516,7 @@ export const ABSChannels: React.FC = (props) => { setShowTeamsManifestModal(true); }} > - {formatMessage('Open Manifest')} + {formatMessage('Open manifest')} )} From 95752e35fd2755094daeb4c78413f1c629863b07 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:24:56 -0400 Subject: [PATCH 13/37] - Action item sub-text too small - Tighten space between action items more (between bottom of sub-text and title of next item) --- .../client/src/components/GetStarted/GetStartedTask.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; `; From be68e428340a4e1fe2ccd879631204c6778baf22 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:27:01 -0400 Subject: [PATCH 14/37] Sub-titles should be semi-bold --- Composer/packages/client/src/components/GetStarted/styles.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; `; From a81dc0241698ee49cc912df46522d6f480481fdd Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:31:12 -0400 Subject: [PATCH 15/37] =?UTF-8?q?=20-=20Align=20table=20with=20=E2=80=9CPu?= =?UTF-8?q?blish=E2=80=9D=20(move=20to=20the=20right)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Composer/packages/client/src/pages/publish/styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/pages/publish/styles.ts b/Composer/packages/client/src/pages/publish/styles.ts index 401baf0e9c..6c1f09dd6b 100644 --- a/Composer/packages/client/src/pages/publish/styles.ts +++ b/Composer/packages/client/src/pages/publish/styles.ts @@ -35,7 +35,7 @@ export const HeaderText = css` `; export const ContentStyle = css` - margin-left: 2px; + margin-left: 12px; display: flex; height: 100%; border-top: 1px solid #dddddd; From 4536650dafef3d9e021374a66a636576abeaff37 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:32:45 -0400 Subject: [PATCH 16/37] - "Publishing profile"--lowercase on profile --- Composer/packages/client/src/pages/publish/Publish.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/pages/publish/Publish.tsx b/Composer/packages/client/src/pages/publish/Publish.tsx index f8ccb27994..d245db2162 100644 --- a/Composer/packages/client/src/pages/publish/Publish.tsx +++ b/Composer/packages/client/src/pages/publish/Publish.tsx @@ -498,7 +498,7 @@ const Publish: React.FC
- + {botProjectData && botProjectData.length > 1 && ( From f2e5bf34068f775cc49766a416e2cc49c6ee610f Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:35:46 -0400 Subject: [PATCH 17/37] - Super long add button (#7491) --- Composer/packages/client/src/pages/botProject/styles.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/Composer/packages/client/src/pages/botProject/styles.ts b/Composer/packages/client/src/pages/botProject/styles.ts index 25682db516..77c743d65a 100644 --- a/Composer/packages/client/src/pages/botProject/styles.ts +++ b/Composer/packages/client/src/pages/botProject/styles.ts @@ -154,6 +154,7 @@ export const actionButton = { color: SharedColors.cyanBlue10, paddingLeft: 0, marginLeft: 5, + width: '75px', }, }; From 6736984eaa2cdb2bcdc51dacfadab77ed0436ba9 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:41:00 -0400 Subject: [PATCH 18/37] Table needs line under header --- Composer/packages/client/src/pages/botProject/PublishTargets.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/Composer/packages/client/src/pages/botProject/PublishTargets.tsx b/Composer/packages/client/src/pages/botProject/PublishTargets.tsx index f043684034..f6ebcb1f4d 100644 --- a/Composer/packages/client/src/pages/botProject/PublishTargets.tsx +++ b/Composer/packages/client/src/pages/botProject/PublishTargets.tsx @@ -31,6 +31,7 @@ const publishTargetsHeader = css` display: flex; flex-direction: row; height: 42px; + border-bottom: 1px solid rgb(243, 242, 241); `; const editPublishProfile = { From f132d6388646509f65afb195ed94c6ca02ccdccc Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 11:46:58 -0400 Subject: [PATCH 19/37] Edit and delete buttons are too small, too high --- .../packages/client/src/pages/botProject/PublishTargets.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Composer/packages/client/src/pages/botProject/PublishTargets.tsx b/Composer/packages/client/src/pages/botProject/PublishTargets.tsx index f6ebcb1f4d..c5aeaca42c 100644 --- a/Composer/packages/client/src/pages/botProject/PublishTargets.tsx +++ b/Composer/packages/client/src/pages/botProject/PublishTargets.tsx @@ -36,11 +36,9 @@ const publishTargetsHeader = css` const editPublishProfile = { root: { - fontSize: 12, + fontSize: 14, fontWeight: FontWeights.regular, color: SharedColors.cyanBlue10, - paddingLeft: 0, - paddingBottom: 5, }, }; From 36bd0aa77a53d98ff626a4c268c04a85226a934d Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 13:40:20 -0400 Subject: [PATCH 20/37] Align Target column content with header (move content right) --- Composer/packages/client/src/pages/botProject/styles.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/Composer/packages/client/src/pages/botProject/styles.ts b/Composer/packages/client/src/pages/botProject/styles.ts index 77c743d65a..71092bd58e 100644 --- a/Composer/packages/client/src/pages/botProject/styles.ts +++ b/Composer/packages/client/src/pages/botProject/styles.ts @@ -56,7 +56,6 @@ export const tableRow = css` flex-direction: row; align-items: center; height: 42px; - width: 750px; `; export const tableRowItem = (width?: string) => css` From 0748c030698be6c3b0487d212619e10d85c6974b Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 13:46:29 -0400 Subject: [PATCH 21/37] Tighten spacing between edit and delete buttons --- .../client/src/pages/botProject/PublishTargets.tsx | 13 ++++++++++--- .../packages/client/src/pages/botProject/styles.ts | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Composer/packages/client/src/pages/botProject/PublishTargets.tsx b/Composer/packages/client/src/pages/botProject/PublishTargets.tsx index c5aeaca42c..3ab5a98e97 100644 --- a/Composer/packages/client/src/pages/botProject/PublishTargets.tsx +++ b/Composer/packages/client/src/pages/botProject/PublishTargets.tsx @@ -17,7 +17,14 @@ import { AuthDialog } from '../../components/Auth/AuthDialog'; import { isShowAuthDialog } from '../../utils/auth'; import { PublishProfileDialog } from './create-publish-profile/PublishProfileDialog'; -import { tableRow, tableRowItem, tableColumnHeader, columnSizes, actionButton } from './styles'; +import { + tableRow, + tableRowItem, + tableColumnHeader, + columnSizes, + actionButton, + publishProfileButtonColumnSize, +} from './styles'; // -------------------- Styles -------------------- // @@ -119,7 +126,7 @@ export const PublishTargets: React.FC = (props) => {
{p.type}
-
+
= (props) => { {formatMessage('Edit')}
-
+
{ export const columnSizes = ['300px', '150px', '150px']; export const extendedColumnSizes = ['200px', '200px', '250px']; +export const publishProfileButtonColumnSize = '100px'; export const actionButton = { root: { From 977bbeb8d0231449e7bfee578281c1d76e1f87f1 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 13:52:55 -0400 Subject: [PATCH 22/37] "Learn more" move to top sentence after "...Microsoft Azure is required." and lowercase m --- .../azurePublish/src/components/ChooseProvisionAction.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/azurePublish/src/components/ChooseProvisionAction.tsx b/extensions/azurePublish/src/components/ChooseProvisionAction.tsx index 940f131d38..a4614ec9fb 100644 --- a/extensions/azurePublish/src/components/ChooseProvisionAction.tsx +++ b/extensions/azurePublish/src/components/ChooseProvisionAction.tsx @@ -85,7 +85,10 @@ const CreateActionContent = () => { {formatMessage('Microsoft Azure')} - {formatMessage(' is required.')} + {formatMessage(' is required. ')} + + {formatMessage('Learn more')} +
@@ -115,9 +118,6 @@ const CreateActionContent = () => {
- - {formatMessage('Learn More')} - ); }; From 26dcdeca7e9d2808f14c0c841f2f8717f9757334 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 15:00:19 -0400 Subject: [PATCH 23/37] - Lowercase m --- extensions/azurePublish/src/components/azureProvisionDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/azurePublish/src/components/azureProvisionDialog.tsx b/extensions/azurePublish/src/components/azureProvisionDialog.tsx index 87609e4353..01f2b43433 100644 --- a/extensions/azurePublish/src/components/azureProvisionDialog.tsx +++ b/extensions/azurePublish/src/components/azureProvisionDialog.tsx @@ -965,7 +965,7 @@ export const AzureProvisionDialog: React.FC = () => { href="https://docs.microsoft.com/en-us/azure/cognitive-services/luis/luis-reference-regions" target="_blank" > - {formatMessage('Learn More')} + {formatMessage('Learn more')} Date: Tue, 4 May 2021 15:31:46 -0400 Subject: [PATCH 24/37] =?UTF-8?q?=20-=20Do=20we=20need=20description=20fie?= =?UTF-8?q?ld=3F=20Can=20we=20remove=20it=3F=20=20-=20If=20so,=20maybe=20r?= =?UTF-8?q?untime=20type=20on=20right=3F=20=20-=20Inputs=20same=20width=20?= =?UTF-8?q?(370px=3F)=20=20-=20=E2=80=9CCreate=20new=20folder=E2=80=9D=20u?= =?UTF-8?q?nder=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CreationFlow/FileSelector.tsx | 15 ++++++----- .../CreationFlow/v2/DefineConversation.tsx | 25 ++++++------------- 2 files changed, 16 insertions(+), 24 deletions(-) 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..a50a24ae29 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,29 +366,19 @@ const DefineConversationV2: React.FC = (props) => { onChange={(_e, val) => updateField('name', val)} /> - - updateField('description', val)} - /> - - - {!isImported && ( - + {!isImported && ( updateField('runtimeType', option?.key.toString())} /> - - )} + )} + {locationSelectContent} From e2586c24c2c3458235a972c4022e3a9574f23175 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 16:10:28 -0400 Subject: [PATCH 25/37] Design iteration changes with Em --- .../src/components/BotRuntimeController/publishDialog.tsx | 4 ++-- .../packages/client/src/pages/botProject/AllowedCallers.tsx | 2 +- .../packages/client/src/pages/botProject/AppIdAndPassword.tsx | 2 +- .../client/src/pages/botProject/BotProjectSettings.tsx | 2 +- .../client/src/pages/botProject/RootBotExternalService.tsx | 2 +- .../client/src/pages/botProject/SkillBotExternalService.tsx | 4 ++-- .../client/src/pages/botProject/adapters/AdapterSection.tsx | 2 +- Composer/packages/client/src/pages/botProject/styles.ts | 4 ++-- .../src/pages/setting/app-settings/FeatureFlagCheckBox.tsx | 2 +- .../client/src/pages/setting/dialog-settings/constants.ts | 2 +- Composer/packages/client/src/utils/runtimeErrors.ts | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) 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/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. An App ID is created when you provision resources for your bot. If you’ve created an App ID already, you can use that ID instead. Learn more.', + 'An App ID is used for communication between your bot and skills, services, websites or applications. An App ID is created when you provision resources for your bot. If you’ve created an App ID already, you can use that ID instead. Learn more', { a: ({ children }) => ( diff --git a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx index 876fcbe555..f27d338e28 100644 --- a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx +++ b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx @@ -126,7 +126,7 @@ const BotProjectSettings: React.FC }> diff --git a/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx b/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx index 50f06d7447..2651261e72 100644 --- a/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx +++ b/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx @@ -339,7 +339,7 @@ export const RootBotExternalService: React.FC = (pr
{formatMessage('Language Understanding')}
{formatMessage.rich( - 'Language Understanding Intelligent Service (LUIS) is a machine learning-driven recognition service that enables advanced conversational capabilities. If you already have LUIS keys you’d like to use, you can paste them below. To fetch existing keys from Azure or create new keys, you can click “Get LUIS keys”. Learn more.', + 'Language Understanding Intelligent Service (LUIS) is a machine learning-driven recognition service that enables advanced conversational capabilities. If you already have LUIS keys you’d like to use, you can paste them below. To fetch existing keys from Azure or create new keys, you can click “Get LUIS keys”. Learn more', { a: ({ children }) => ( diff --git a/Composer/packages/client/src/pages/botProject/SkillBotExternalService.tsx b/Composer/packages/client/src/pages/botProject/SkillBotExternalService.tsx index d55f08a576..f46d3776a1 100644 --- a/Composer/packages/client/src/pages/botProject/SkillBotExternalService.tsx +++ b/Composer/packages/client/src/pages/botProject/SkillBotExternalService.tsx @@ -142,7 +142,7 @@ export const SkillBotExternalService: React.FC = (
{formatMessage('Language Understanding')}
{formatMessage.rich( - 'Language Understanding Intelligent Service (LUIS) is a machine learning-driven recognition service that enables advanced conversational capabilities. If you already have LUIS keys you’d like to use, you can paste them below. To fetch existing keys from Azure or create new keys, you can click “Get LUIS keys”. Learn more.', + 'Language Understanding Intelligent Service (LUIS) is a machine learning-driven recognition service that enables advanced conversational capabilities. If you already have LUIS keys you’d like to use, you can paste them below. To fetch existing keys from Azure or create new keys, you can click “Get LUIS keys”. Learn more', { a: ({ children }) => ( @@ -200,7 +200,7 @@ export const SkillBotExternalService: React.FC = (
{formatMessage('QnA Maker')}
{formatMessage.rich( - 'Integrate with QnA Maker to provide bot content from easy-to-manage knowledge bases. If you already have a QnA key you’d like to use, you can paste it below. To fetch an existing key from Azure or create a new key, you can click “Get QnA key”. Learn more.', + 'Integrate with QnA Maker to provide bot content from easy-to-manage knowledge bases. If you already have a QnA key you’d like to use, you can paste it below. To fetch an existing key from Azure or create a new key, you can click “Get QnA key”. Learn more', { a: ({ children }) => ( diff --git a/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx b/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx index 71d0571250..214aa58e16 100644 --- a/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx +++ b/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx @@ -30,7 +30,7 @@ const AdapterSection = ({ projectId, scrollToSectionId }: Props) => {
{formatMessage.rich( - 'Expand the reach of your bot by adding connections. Connections are added per bot (typically to the root bot, if your project contains multiple bots), as well as per publishing profile. Select a publishing profile to add and enable connections. Learn more.', + 'Expand the reach of your bot by adding connections. Connections are added per bot (typically to the root bot, if your project contains multiple bots), as well as per publishing profile. Select a publishing profile to add and enable connections. Learn more', { a: ({ children }) => ( diff --git a/Composer/packages/client/src/pages/botProject/styles.ts b/Composer/packages/client/src/pages/botProject/styles.ts index 79f7c2edf1..6c8d8a3b6a 100644 --- a/Composer/packages/client/src/pages/botProject/styles.ts +++ b/Composer/packages/client/src/pages/botProject/styles.ts @@ -144,7 +144,7 @@ export const unknownIconStyle = (required: boolean) => { }; export const columnSizes = ['300px', '150px', '150px']; -export const extendedColumnSizes = ['200px', '200px', '250px']; +export const extendedColumnSizes = ['220px', '80px', '250px']; export const publishProfileButtonColumnSize = '100px'; export const actionButton = { @@ -154,7 +154,7 @@ export const actionButton = { color: SharedColors.cyanBlue10, paddingLeft: 0, marginLeft: 5, - width: '75px', + width: '120px', }, }; diff --git a/Composer/packages/client/src/pages/setting/app-settings/FeatureFlagCheckBox.tsx b/Composer/packages/client/src/pages/setting/app-settings/FeatureFlagCheckBox.tsx index 856d5226c6..e988b609b1 100644 --- a/Composer/packages/client/src/pages/setting/app-settings/FeatureFlagCheckBox.tsx +++ b/Composer/packages/client/src/pages/setting/app-settings/FeatureFlagCheckBox.tsx @@ -32,7 +32,7 @@ const renderLabel = (featureName: string, description: string, documentationLink {description} {documentationLink && ( - {formatMessage('Learn more.')} + {formatMessage('Learn more')} )} diff --git a/Composer/packages/client/src/pages/setting/dialog-settings/constants.ts b/Composer/packages/client/src/pages/setting/dialog-settings/constants.ts index 869fc94987..e83cabcd41 100644 --- a/Composer/packages/client/src/pages/setting/dialog-settings/constants.ts +++ b/Composer/packages/client/src/pages/setting/dialog-settings/constants.ts @@ -18,6 +18,6 @@ export const BotSettings = { languageBotLanauge: formatMessage('Bot language (active)'), languageDefaultLanauge: formatMessage('Default language'), languageAddLanauge: formatMessage('Create copy to translate bot content'), - learnMore: formatMessage('Learn more.'), + learnMore: formatMessage('Learn more'), settingsTitle: formatMessage('Bot settings'), }; diff --git a/Composer/packages/client/src/utils/runtimeErrors.ts b/Composer/packages/client/src/utils/runtimeErrors.ts index 32e34d7fa0..7d458bea33 100644 --- a/Composer/packages/client/src/utils/runtimeErrors.ts +++ b/Composer/packages/client/src/utils/runtimeErrors.ts @@ -6,7 +6,7 @@ import formatMessage from 'format-message'; export const missingDotnetVersionError = { message: formatMessage('To run this bot, Composer needs .NET Core SDK.'), linkAfterMessage: { - text: formatMessage('Learn more.'), + text: formatMessage('Learn more'), url: 'https://aka.ms/install-composer', }, link: { @@ -18,7 +18,7 @@ export const missingDotnetVersionError = { export const missingFunctionsError = { message: formatMessage('To run this bot, Composer needs Azure Functions Core Tools.'), linkAfterMessage: { - text: formatMessage('Learn more.'), + text: formatMessage('Learn more'), url: 'https://docs.microsoft.com/en-us/azure/azure-functions/functions-run-local#install-the-azure-functions-core-tools', }, From 39c4b30e6479f860cc520df2cc80d2300bd6f512 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 16:28:50 -0400 Subject: [PATCH 26/37] add line under bot settings header --- .../packages/client/src/pages/botProject/BotProjectSettings.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx index f27d338e28..879c87b3f1 100644 --- a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx +++ b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx @@ -33,6 +33,7 @@ const header = css` flex-shrink: 0; justify-content: space-between; label: PageHeader; + border-bottom: 1px solid silver; `; const container = css` From 3b0e764b6a595db157535a97b23943778428fe73 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 16:51:21 -0400 Subject: [PATCH 27/37] Almost there" bubb is the wrong component, should be the blue one --- .../src/pages/botProject/adapters/ABSChannels.tsx | 15 +++++---------- .../client/src/pages/botProject/styles.ts | 1 + 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx b/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx index 86b760588d..ab7cb3f3da 100644 --- a/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx +++ b/Composer/packages/client/src/pages/botProject/adapters/ABSChannels.tsx @@ -16,8 +16,8 @@ import { TokenCredentials } from '@azure/ms-rest-js'; import { Spinner } from 'office-ui-fabric-react/lib/Spinner'; import { Stack } from 'office-ui-fabric-react/lib/Stack'; import { OpenConfirmModal } from '@bfc/ui-shared'; -import { Callout } from 'office-ui-fabric-react/lib/Callout'; import { Text } from 'office-ui-fabric-react/lib/Text'; +import { TeachingBubble } from 'office-ui-fabric-react/lib/TeachingBubble'; import TelemetryClient from '../../../telemetry/TelemetryClient'; import { LoadingSpinner } from '../../../components/LoadingSpinner'; @@ -550,19 +550,14 @@ export const ABSChannels: React.FC = (props) => { onToggleVisibility={setShowSpeechModal} /> {showTeamsCallOut && ( - { setShowTeamsCallOut(false); }} > - - {formatMessage('Almost there!')} - {formatMessage( 'Teams requires a few more steps to get your connection up and running. Follow the instructions on our documentation page to learn how.' @@ -571,7 +566,7 @@ export const ABSChannels: React.FC = (props) => { {formatMessage('See instructions')} - + )}
Date: Tue, 4 May 2021 16:57:44 -0400 Subject: [PATCH 28/37] urther Tighten spacing between edit and delete buttons in publish view --- Composer/packages/client/src/pages/botProject/styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/pages/botProject/styles.ts b/Composer/packages/client/src/pages/botProject/styles.ts index 414e8afb07..9060983fbf 100644 --- a/Composer/packages/client/src/pages/botProject/styles.ts +++ b/Composer/packages/client/src/pages/botProject/styles.ts @@ -145,7 +145,7 @@ export const unknownIconStyle = (required: boolean) => { export const columnSizes = ['300px', '150px', '150px']; export const extendedColumnSizes = ['220px', '80px', '250px']; -export const publishProfileButtonColumnSize = '100px'; +export const publishProfileButtonColumnSize = '50px'; export const actionButton = { root: { From 5ec00c2bc27a9288f7cdec3b6d05cc1b2e5eb272 Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 17:13:18 -0400 Subject: [PATCH 29/37] =?UTF-8?q?=20DefineConversation:=20Button=20should?= =?UTF-8?q?=20say=20=E2=80=9CCreate=E2=80=9D=20instead=20of=20OK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CreationFlow/v2/DefineConversation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx index a50a24ae29..f0ed5373bc 100644 --- a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx +++ b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx @@ -385,7 +385,7 @@ const DefineConversationV2: React.FC = (props) => { From 466ed4095202215f52f449059837541a4d42697e Mon Sep 17 00:00:00 2001 From: Patrick Volum Date: Tue, 4 May 2021 17:30:46 -0400 Subject: [PATCH 30/37] Move json switch to right side and make text smaller size --- .../pages/botProject/BotProjectSettings.tsx | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx index 879c87b3f1..c869cccf84 100644 --- a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx +++ b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx @@ -29,8 +29,6 @@ import { BotProjectSettingsTabView } from './BotProjectsSettingsTabView'; const header = css` padding: 5px 20px; display: flex; - flex-direction: column; - flex-shrink: 0; justify-content: space-between; label: PageHeader; border-bottom: 1px solid silver; @@ -105,6 +103,22 @@ const BotProjectSettings: React.FC { + return ( + { + setAdvancedSettingsEnabled(!isAdvancedSettingsEnabled); + }} + /> + ); + }; + const handleChange = (result: any) => { // prevent result was undefined, it will cause error if (result && typeof result === 'object') { @@ -129,19 +143,10 @@ const BotProjectSettings: React.FC }>
- { - setAdvancedSettingsEnabled(!isAdvancedSettingsEnabled); - }} - /> {isAdvancedSettingsEnabled ? ( Date: Tue, 4 May 2021 18:00:55 -0400 Subject: [PATCH 31/37] Fix existing resource terminology in service provision modal --- .../components/ManageService/ManageService.tsx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Composer/packages/client/src/components/ManageService/ManageService.tsx b/Composer/packages/client/src/components/ManageService/ManageService.tsx index bac5e6f1d5..5512890ee3 100644 --- a/Composer/packages/client/src/components/ManageService/ManageService.tsx +++ b/Composer/packages/client/src/components/ManageService/ManageService.tsx @@ -695,6 +695,17 @@ export const ManageService = (props: ManageServiceProps) => { ); }; + const getModalTitle = (): string => { + let title = formatMessage('Select {service} keys', { service: props.serviceName }); + if (currentPage === 2) { + title = + nextAction === 'create' + ? formatMessage('Create new {service} resource', { service: props.serviceName }) + : formatMessage('Choose existing {service} resource', { service: props.serviceName }); + } + return title; + }; + return ( {showAuthDialog && ( @@ -725,16 +736,13 @@ export const ManageService = (props: ManageServiceProps) => {