diff --git a/Composer/packages/client/src/pages/botProject/AppIdAndPassword.tsx b/Composer/packages/client/src/pages/botProject/AppIdAndPassword.tsx index 8bb9aa0c2d..106ad79948 100644 --- a/Composer/packages/client/src/pages/botProject/AppIdAndPassword.tsx +++ b/Composer/packages/client/src/pages/botProject/AppIdAndPassword.tsx @@ -12,12 +12,14 @@ import formatMessage from 'format-message'; import { FontSizes } from 'office-ui-fabric-react/lib/Styling'; import { SharedColors } from '@uifabric/fluent-theme'; import { Link } from 'office-ui-fabric-react/lib/Link'; +import { PrimaryButton } from 'office-ui-fabric-react/lib/Button'; import { dispatcherState, settingsState } from '../../recoilModel'; import { mergePropertiesManagedByRootBot } from '../../recoilModel/dispatchers/utils/project'; import { rootBotProjectIdSelector } from '../../recoilModel/selectors/project'; import { inputFieldStyles, subtext, title } from './styles'; +import { GetAppInfoFromPublishProfileDialog } from './GetAppInfoFromPublishProfileDialog'; // -------------------- Styles -------------------- // const labelContainer = css` @@ -75,6 +77,8 @@ export const AppIdAndPassword: React.FC = (props) => { const rootBotProjectId = useRecoilValue(rootBotProjectIdSelector) || ''; const settings = useRecoilValue(settingsState(projectId)); const mergedSettings = mergePropertiesManagedByRootBot(projectId, rootBotProjectId, settings); + const [showImportDialog, setShowImportDialog] = useState(false); + useEffect(() => { setLocalMicrosoftAppId(MicrosoftAppId ?? ''); setLocalMicrosoftAppPassword(MicrosoftAppPassword ?? ''); @@ -102,12 +106,22 @@ export const AppIdAndPassword: React.FC = (props) => { }); }, [projectId, mergedSettings, localMicrosoftAppId]); + const handleAddFromProfile = (appId: string, appPassword: string) => { + setLocalMicrosoftAppId(appId); + setLocalMicrosoftAppPassword(appPassword); + setSettings(projectId, { + ...mergedSettings, + MicrosoftAppId: appId, + MicrosoftAppPassword: appPassword, + }); + }; + return (
{formatMessage('Microsoft App ID')}
{formatMessage.rich( - 'A Microsoft App ID is required for your local Azure resources. If you’ve created an App ID already, you can add here. If not, your App ID and secret will be created when you provision resources for this bot. Learn more.', + 'A Microsoft App ID is required for your local Azure resources. If you’ve created an App ID already, you can add here. If not, your App ID and Password will be created when you provision resources for this bot. To add and App ID and Password from a publishing profile you’ve created, click the button below. Learn more.', { a: ({ children }) => ( @@ -140,7 +154,27 @@ export const AppIdAndPassword: React.FC = (props) => { onChange={handleAppPasswordOnChange} onRenderLabel={onRenderLabel} /> + { + setShowImportDialog(true); + }} + />
+ {showImportDialog && ( + ); }; diff --git a/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx b/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx new file mode 100644 index 0000000000..f718e435fb --- /dev/null +++ b/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx @@ -0,0 +1,116 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT License. + +/** @jsx jsx */ +import React, { useState, useMemo } 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; + onOK: (info: AppInfo) => void; + onCancel: () => void; +}; + +const getAppInfo = (profile: PublishTarget) => { + if (profile) { + try { + const config = JSON.parse(profile.configuration); + const appId = config?.settings?.MicrosoftAppId; + const appPassword = config?.settings?.MicrosoftAppPassword; + + if (appId) { + return { appId, appPassword }; + } + } catch (err) { + console.log(err); + } + } +}; + +export const GetAppInfoFromPublishProfileDialog: React.FC = (props) => { + const { projectId, hidden, onOK: onAdd, onCancel } = props; + const { publishTargets } = useRecoilValue(settingsState(projectId)); + const [selectedKey, setSelectedKey] = useState(); + + const publishTargetOptions = useMemo(() => { + const options: IDropdownOption[] = + publishTargets + ?.map((p) => { + return { key: p.name, text: p.name, data: getAppInfo(p) }; + }) + .filter((p) => p.data !== undefined) || []; + return options; + }, [publishTargets]); + + const publishTargetsErrorMessage = useMemo(() => { + if (publishTargetOptions.length === 0) { + return formatMessage('No profiles were found containing a Microsoft App ID.'); + } + return undefined; + }, [publishTargetOptions]); + + 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 handleAdd = () => { + const opt = publishTargetOptions?.find((p) => p.key === selectedKey); + if (opt) { + onAdd(opt.data); + } + }; + + return ( + + ); +}; diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json index 0a740db784..a523a8d646 100644 --- a/Composer/packages/server/src/locales/en-US.json +++ b/Composer/packages/server/src/locales/en-US.json @@ -35,8 +35,8 @@ "a_language_understanding_intelligent_service_luis__348b281": { "message": "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_microsoft_app_id_is_required_for_your_local_azur_454cfd41": { - "message": "A Microsoft App ID is required for your local Azure resources. If you’ve created an App ID already, you can add here. If not, your App ID and secret will be created when you provision resources for this bot. Learn more." + "a_microsoft_app_id_is_required_for_your_local_azur_eb7844c2": { + "message": "A Microsoft App ID is required for your local Azure resources. If you’ve created an App ID already, you can add here. If not, your App ID and Password will be created when you provision resources for this bot. To add and App ID and Password from a publishing profile you’ve created, click the button below. Learn more." }, "a_minimap_gives_an_overview_of_your_source_code_fo_9a897f4f": { "message": "A minimap gives an overview of your source code for quick navigation and code understanding." @@ -143,6 +143,9 @@ "add_8523c19b": { "message": "Add" }, + "add_a_bot_58522e81": { + "message": "Add a bot" + }, "add_a_dialog_e378aa3a": { "message": "Add a dialog" }, @@ -179,6 +182,9 @@ "add_alternative_phrasing_17e0304c": { "message": "+ Add alternative phrasing" }, + "add_app_id_and_password_164e0fdb": { + "message": "Add App ID and Password" + }, "add_connections_d720a32e": { "message": "Add connections" }, @@ -191,6 +197,9 @@ "add_entity_5f769994": { "message": "Add entity" }, + "add_from_publishing_profile_a672094f": { + "message": "Add from publishing profile" + }, "add_microsoft_app_ids_of_bots_that_can_access_this_7d41742c": { "message": "Add Microsoft App Ids of bots that can access this skill. You can skip this step and add this information later from the project settings tab." }, @@ -758,9 +767,6 @@ "congratulations_your_model_is_successfully_publish_52ebc297": { "message": "Congratulations! Your model is successfully published." }, - "connect_a_remote_skill_10cf0724": { - "message": "Connect a remote skill" - }, "connect_to_a_skill_53c9dff0": { "message": "Connect to a skill" }, @@ -776,8 +782,8 @@ "connect_your_bot_to_microsoft_teams_and_webchat_or_90a228b8": { "message": "Connect your bot to Microsoft Teams and WebChat, or enable DirectLine Speech." }, - "connect_your_bot_to_teams_external_channels_or_ena_8b4fc9f0": { - "message": "Connect your bot to Teams, external channels, or enable speech. Learn more" + "connect_your_bot_to_teams_external_channels_or_ena_687b7580": { + "message": "Connect your bot to Teams, external channels, or enable speech." }, "connecting_to_b_source_b_to_import_bot_content_106cf675": { "message": "Connecting to { source } to import bot content..." @@ -869,9 +875,6 @@ "create_a_new_service_resource_23d59c2f": { "message": "Create a new { service } resource" }, - "create_a_new_skill_e961ff28": { - "message": "Create a new skill" - }, "create_a_publish_profile_to_continue_1e2fa5a0": { "message": "Create a publish profile to continue" }, @@ -1433,6 +1436,9 @@ "error_afac7133": { "message": "Error:" }, + "error_attempting_to_parse_skill_manifest_there_cou_dee89499": { + "message": "Error attempting to parse Skill manifest. There could be an error in it''s format." + }, "error_checking_node_version_98bfbf4c": { "message": "Error checking node version" }, @@ -1616,8 +1622,8 @@ "find_tutorials_step_by_step_guides_discover_what_y_8f3e3863": { "message": "Find tutorials, step-by-step guides. Discover what you can build with Composer." }, - "finish_setting_up_your_environment_and_provisionig_11cdecda": { - "message": "Finish setting up your environment and provisionig resources so that you can publish your bot." + "finish_setting_up_your_environment_and_provisionin_e2fc3625": { + "message": "Finish setting up your environment and provisioning resources so that you can publish your bot." }, "firstselector_a3daca5d": { "message": "FirstSelector" @@ -2513,6 +2519,9 @@ "no_prebuilt_entities_found_a1015451": { "message": "no prebuilt entities found" }, + "no_profiles_were_found_containing_a_microsoft_app__e63012d": { + "message": "No profiles were found containing a Microsoft App ID." + }, "no_properties_found_6f777f6e": { "message": "No properties found" }, @@ -2621,9 +2630,6 @@ "one_or_more_options_that_are_passed_to_the_dialog__cbcf5d72": { "message": "One or more options that are passed to the dialog that is called." }, - "open_an_existing_skill_fbd87273": { - "message": "Open an existing skill" - }, "open_e0beb7b9": { "message": "Open" }, @@ -3302,6 +3308,9 @@ "select_the_language_that_bot_will_be_able_to_under_1f2bcb96": { "message": "Select the language that bot will be able to understand (User input) and respond to (Bot responses).\n To make this bot available in other languages, click “Add’ to create a copy of the default language, and translate the content into the new language." }, + "select_the_publishing_profile_you_d_like_to_add_a__ffff34ac": { + "message": "Select the publishing profile you’d like to add a Microsoft App ID and Password from." + }, "select_which_dialogs_are_included_in_the_skill_man_281ef8c9": { "message": "Select which dialogs are included in the skill manifest" }, @@ -4136,6 +4145,9 @@ "which_bot_do_you_want_to_open_974bb1e5": { "message": "Which bot do you want to open?" }, + "which_bot_would_you_like_to_add_to_your_project_e31270db": { + "message": "Which bot would you like to add to your project" + }, "which_bots_are_allowed_to_use_this_skill_b908339e": { "message": "Which bots are allowed to use this skill?" }, @@ -4196,6 +4208,9 @@ "you_re_ready_to_go_18ee8dac": { "message": "You’re ready to go!" }, + "your_bot_is_configured_with_only_a_luis_authoring__179ab81c": { + "message": "Your bot is configured with only a LUIS authoring key, which has a limit of 1,000 calls per month. If your bot hits this limit, publish it to Azure using a publishing profile to continue testing.Learn more" + }, "your_bot_is_using_luis_and_qna_for_natural_languag_53830684": { "message": "Your bot is using LUIS and QNA for natural language understanding." },