remove SQL Login from CMS and add error messages (#5873)

This commit is contained in:
Aditya Bist
2019-06-04 12:52:46 -07:00
committed by GitHub
parent 4ad226570a
commit 6197279e83
8 changed files with 34 additions and 66 deletions

View File

@@ -86,17 +86,9 @@
"defaultValue": null,
"objectType": null,
"categoryValues": [
{
"displayName": "%cms.connectionOptions.authType.categoryValues.sqlLogin%",
"name": "SqlLogin"
},
{
"displayName": "%cms.connectionOptions.authType.categoryValues.integrated%",
"name": "Integrated"
},
{
"displayName": "%cms.connectionOptions.authType.categoryValues.azureMFA%",
"name": "AzureMFA"
}
],
"isRequired": true,

View File

@@ -78,7 +78,7 @@ export class CmsResourceTreeNode extends CmsResourceTreeNodeBase {
}
}, (error) => {
let errorText = localize('cms.errors.expandCmsFail', 'The Central Management Server {0} could not be found or is offline', this.name);
this.appContext.apiWrapper.showErrorMessage(errorText);
this.appContext.apiWrapper.showErrorMessage(error ? error : errorText);
return [];
});
} catch {

View File

@@ -143,9 +143,7 @@ export class CmsUtils {
providerName: undefined,
saveProfile: undefined,
id: undefined,
options: {
authTypeChanged: true
}
options: {}
};
return this.openConnectionDialog([cmsProvider], initialProfile, { saveConnection: false }).then(async (connection) => {
if (connection && connection.options) {