fix: Added copy from profile button and dialog #7465
+181
−16
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT License. | ||
|
|
||
| /** @jsx jsx */ | ||
| import React, { Fragment, useState, useEffect } from 'react'; | ||
| import { jsx } from '@emotion/core'; | ||
| import { useRecoilValue } from 'recoil'; | ||
| import { PublishTarget } from '@bfc/shared'; | ||
| import formatMessage from 'format-message'; | ||
| import { DefaultButton, PrimaryButton } from 'office-ui-fabric-react/lib/Button'; | ||
| import Dialog, { DialogFooter } from 'office-ui-fabric-react/lib/Dialog'; | ||
| import { Dropdown, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown'; | ||
|
|
||
| import { settingsState } from '../../recoilModel/atoms/botState'; | ||
|
|
||
| type AppInfo = { | ||
| appId: string; | ||
| appPassword?: string; | ||
| }; | ||
|
|
||
| type Props = { | ||
| projectId: string; | ||
| hidden?: boolean; | ||
|
There was a problem hiding this comment. What is it? Do you mean should hidden be required? There was a problem hiding this comment. the dialog is rendered conditionally, controlling hidden from outside almost never happens, so it's not needed. |
||
| onOK: (info: AppInfo) => void; | ||
| onCancel: () => void; | ||
| }; | ||
|
|
||
| export const GetAppInfoFromPublishProfileDialog: React.FC<Props> = (props) => { | ||
| const { projectId, hidden, onOK: onAdd, onCancel } = props; | ||
| const { publishTargets } = useRecoilValue(settingsState(projectId)); | ||
| const [publishTargetOptions, setPublishTargetOptions] = useState<IDropdownOption[]>([]); | ||
GeoffCoxMSFT marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const [publishTargetsErrorMessage, setPublishTargetsErrorMessage] = useState<string | undefined>(); | ||
| const [selectedKey, setSelectedKey] = useState<string | number | undefined>(); | ||
|
|
||
| const dialogTitle = { | ||
| title: formatMessage('Add from publishing profile'), | ||
| subText: formatMessage('Select the publishing profile you’d like to add a Microsoft App ID and Password from.'), | ||
| }; | ||
|
|
||
| const getAppInfo = (profile: PublishTarget) => { | ||
| if (profile) { | ||
| const config = JSON.parse(profile.configuration); | ||
GeoffCoxMSFT marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const appId = config?.settings?.MicrosoftAppId; | ||
| const appPassword = config?.settings?.MicrosoftAppPassword; | ||
|
|
||
| if (appId) { | ||
GeoffCoxMSFT marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return { appId, appPassword }; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| useEffect(() => { | ||
| // reset the ui back to no selection | ||
| setPublishTargetOptions([]); | ||
|
|
||
| // generate options | ||
| const options: IDropdownOption[] = | ||
| publishTargets | ||
| ?.map((p) => { | ||
| return { key: p.name, text: p.name, data: getAppInfo(p) }; | ||
| }) | ||
| .filter((p) => p.data !== undefined) || []; | ||
|
|
||
| setPublishTargetOptions(options); | ||
| }, [publishTargets, projectId]); | ||
GeoffCoxMSFT marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| useEffect(() => { | ||
| if (publishTargetOptions.length === 0) { | ||
GeoffCoxMSFT marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| setPublishTargetsErrorMessage('No profiles were found containing a Microsoft App ID.'); | ||
| } else { | ||
| setPublishTargetsErrorMessage(undefined); | ||
| } | ||
| }, [publishTargetOptions]); | ||
|
|
||
| const handleAdd = () => { | ||
| const opt = publishTargetOptions?.find((p) => p.key === selectedKey); | ||
| if (opt) { | ||
| onAdd(opt.data); | ||
| } | ||
| }; | ||
|
|
||
| return ( | ||
| <Fragment> | ||
| <Dialog | ||
| dialogContentProps={{ | ||
| title: dialogTitle.title, | ||
| subText: dialogTitle.subText, | ||
| }} | ||
| hidden={hidden} | ||
| minWidth={500} | ||
| modalProps={{ | ||
| isBlocking: true, | ||
| }} | ||
| onDismiss={onCancel} | ||
| > | ||
| <div css={{ height: '100px' }}> | ||
| <Dropdown | ||
| errorMessage={publishTargetsErrorMessage} | ||
| options={publishTargetOptions} | ||
| placeholder={formatMessage('Select publishing profile')} | ||
| selectedKey={selectedKey} | ||
| styles={{ | ||
| root: { marginBottom: 10 }, | ||
| dropdown: { width: 450 }, | ||
| }} | ||
| onChange={(_, opt) => { | ||
| setSelectedKey(opt?.key); | ||
| }} | ||
| /> | ||
| </div> | ||
| <DialogFooter> | ||
| <PrimaryButton | ||
| disabled={!!publishTargetsErrorMessage || !selectedKey} | ||
| text={formatMessage('Add App ID and Password')} | ||
| onClick={handleAdd} | ||
| /> | ||
| <DefaultButton text={formatMessage('Cancel')} onClick={onCancel} /> | ||
| </DialogFooter> | ||
| </Dialog> | ||
| </Fragment> | ||
GeoffCoxMSFT marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ); | ||
| }; | ||
|
|
||
| //onChange={onSelectProfile} | ||
GeoffCoxMSFT marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| //onRenderOption={renderDropdownOption} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use backtick ``
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For line continuation or for string templating? (formatMessage.rich can take a regular string). I moved it to be a single line.