Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed content of signed in view of Cosmos DB service dialog. #2150

Merged
merged 1 commit into from
May 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Added
- [client] Added a log panel entry at the start of a conversation that displays the bot endpoint in PR [2149](https://github.com/microsoft/BotFramework-Emulator/pull/2149)

## Fixed
- [client] Added missing content to signed in view of Cosmos DB service dialog and fixed product page link in PR [2150](https://github.com/microsoft/BotFramework-Emulator/pull/2150)

## v4.9.0 - 2020 - 05 - 11
## Added
- [main] Exposed `id` field on response object returned from `/v3/conversations` endpoint in PR [2129](https://github.com/microsoft/BotFramework-Emulator/pull/2129)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ describe('The ServiceExplorerSagas', () => {
);
});

it(' should open a QnA maker external link', () => {
it('should open a QnA maker external link', () => {
const payload = {
azureAuthWorkflowComponents: {
loginFailedDialog: AzureLoginFailedDialogContainer,
Expand All @@ -494,6 +494,34 @@ describe('The ServiceExplorerSagas', () => {
)
);
});

it('should open a Cosmos DB external link', () => {
const payload = {
azureAuthWorkflowComponents: {
loginFailedDialog: AzureLoginFailedDialogContainer,
loginSuccessDialog: AzureLoginSuccessDialogContainer,
promptDialog: ConnectServicePromptDialogContainer,
},
getStartedDialog: GetStartedWithCSDialogContainer,
editorComponent: ConnectedServiceEditorContainer,
pickerComponent: ConnectedServicePickerContainer,
serviceType: ServiceTypes.CosmosDB,
};

action = launchExternalLink(payload as any);
sagaIt = ServicesExplorerSagas.launchExternalLink;

const it = sagaIt(action);
const result = it.next().value;

expect(result).toEqual(
call(
[commandService, commandService.remoteCall],
SharedConstants.Commands.Electron.OpenExternal,
'https://azure.microsoft.com/services/cosmos-db/'
)
);
});
});

describe(' openAddConnectedServiceContextMenu', () => {
Expand Down
8 changes: 8 additions & 0 deletions packages/app/client/src/state/sagas/servicesExplorerSagas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,14 @@ export class ServicesExplorerSagas {
);
break;

case ServiceTypes.CosmosDB:
yield call(
[ServicesExplorerSagas.commandService, ServicesExplorerSagas.commandService.remoteCall],
SharedConstants.Commands.Electron.OpenExternal,
'https://azure.microsoft.com/services/cosmos-db/'
);
break;

default:
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,15 @@ const titleMap = {
[ServiceTypes.Dispatch]: 'Connect to a Dispatch model',
[ServiceTypes.QnA]: 'Create a QnA Maker knowledge base',
[ServiceTypes.BlobStorage]: 'Create a Blob Storage Container',
[ServiceTypes.CosmosDB]: 'Connect to a Cosmos DB account',
};

const buttonTextMap = {
[ServiceTypes.Luis]: 'LUIS',
[ServiceTypes.Dispatch]: 'Dispatch',
[ServiceTypes.QnA]: 'QnA Maker',
[ServiceTypes.BlobStorage]: 'Blob Storage',
[ServiceTypes.CosmosDB]: 'Cosmos DB',
};

export class GetStartedWithCSDialog extends Component<GetStartedWithCSDialogProps, {}> {
Expand Down