ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reverted changes to Radio buttons default value (#20100)

Browse Source 
* Reverted resourcedeploy changes

* Replaced the !

Co-authored-by: Candice Ye <canye@microsoft.com>
This commit is contained in:
Candice Ye
2022-07-19 21:04:39 -07:00
committed by GitHub
parent 3d2f729586
commit 5e88338423
3 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/arc/package.json
View File

@@ -186,7 +186,7 @@
"displayName": "%arc.data.controller.direct.display.name%" "displayName": "%arc.data.controller.direct.display.name%"
} }
], ],
"defaultValue": "indirect", "defaultValue": "%arc.data.controller.indirect.display.name%",
"optionsType": "radio" "optionsType": "radio"
} }
}, },
@@ -1149,10 +1149,7 @@
"displayName": "%arc.sql.service.tier.general.purpose%" "displayName": "%arc.sql.service.tier.general.purpose%"
} }
], ],
"defaultValue": { "defaultValue": "%arc.sql.service.tier.business.critical%",
"name": "BusinessCritical",
"displayName": "%arc.sql.service.tier.business.critical%"
},
"optionsType": "radio" "optionsType": "radio"
} }
}, },
@@ -1184,10 +1181,7 @@
"displayName": "%arc.sql.three.replicas%" "displayName": "%arc.sql.three.replicas%"
} }
], ],
"defaultValue": { "defaultValue": "%arc.sql.three.replicas%",
"name": "3",
"displayName": "%arc.sql.three.replicas%"
},
"optionsType": "radio" "optionsType": "radio"
}, },
"dynamicOptions": { "dynamicOptions": {
@@ -1201,10 +1195,7 @@
"displayName": "%arc.sql.one.replica%" "displayName": "%arc.sql.one.replica%"
} }
], ],
"defaultValue": { "defaultValue": "%arc.sql.one.replica%"
"name": "1",
"displayName": "%arc.sql.one.replica%"
}
} }
] ]
}, },

2
extensions/resource-deployment/src/interfaces.ts
View File

@@ -285,7 +285,7 @@ export interface IOptionsSource {
export interface OptionsInfo { export interface OptionsInfo {
values?: string[] | azdata.CategoryValue[], values?: string[] | azdata.CategoryValue[],
source?: IOptionsSource, source?: IOptionsSource,
defaultValue: string | ResourceTypeOptionValue, defaultValue: string,
optionsType?: OptionsType optionsType?: OptionsType
} }

9
extensions/resource-deployment/src/ui/radioGroupLoadingComponentBuilder.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import * as azdata from 'azdata'; import * as azdata from 'azdata';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import { OptionsInfo, FieldInfo, instanceOfDynamicEnablementInfo, ResourceTypeOptionValue } from '../interfaces'; import { OptionsInfo, FieldInfo, instanceOfDynamicEnablementInfo } from '../interfaces';
import { getErrorMessage } from '../common/utils'; import { getErrorMessage } from '../common/utils';
export class RadioGroupLoadingComponentBuilder implements azdata.ComponentBuilder<azdata.LoadingComponent, azdata.LoadingComponentProperties> { export class RadioGroupLoadingComponentBuilder implements azdata.ComponentBuilder<azdata.LoadingComponent, azdata.LoadingComponentProperties> {
@@ -45,12 +45,7 @@ export class RadioGroupLoadingComponentBuilder implements azdata.ComponentBuilde
} }
let options: (string[] | azdata.CategoryValue[]) = optionsInfo.values!; let options: (string[] | azdata.CategoryValue[]) = optionsInfo.values!;
let defaultValue: string | ResourceTypeOptionValue = optionsInfo.defaultValue!; let defaultValue: string = optionsInfo.defaultValue!;
if (typeof optionsInfo.defaultValue === 'string') {
defaultValue = optionsInfo.defaultValue;
} else {
defaultValue = optionsInfo.defaultValue.displayName;
}
options.forEach((op: string | azdata.CategoryValue) => { options.forEach((op: string | azdata.CategoryValue) => {
const option: azdata.CategoryValue = (typeof op === 'string') const option: azdata.CategoryValue = (typeof op === 'string')
? { name: op, displayName: op } ? { name: op, displayName: op }