From d073cd595b1c46feca13e2fe2e42d2ac43b7dd12 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Fri, 21 Aug 2020 13:08:49 -0700 Subject: [PATCH] Disable connectivity mode selection (#11911) * Disable connectivity mode selection until Direct mode is fully completed * add azdata change --- extensions/arc/package.json | 1 + extensions/resource-deployment/src/ui/modelViewUtils.ts | 2 +- .../src/ui/radioGroupLoadingComponentBuilder.ts | 5 +++-- src/sql/azdata.d.ts | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extensions/arc/package.json b/extensions/arc/package.json index 5796257ee9..c0bae41ca1 100644 --- a/extensions/arc/package.json +++ b/extensions/arc/package.json @@ -306,6 +306,7 @@ "defaultValue": "Indirect", "optionsType": "radio" }, + "enabled": false, "required": true, "variableName": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CONNECTIVITY_MODE" } diff --git a/extensions/resource-deployment/src/ui/modelViewUtils.ts b/extensions/resource-deployment/src/ui/modelViewUtils.ts index e2c186138b..67a1fc0b29 100644 --- a/extensions/resource-deployment/src/ui/modelViewUtils.ts +++ b/extensions/resource-deployment/src/ui/modelViewUtils.ts @@ -746,7 +746,7 @@ async function createRadioOptions(context: FieldContext, getRadioButtonInfo?: (( context.fieldInfo.fieldAlignItems = 'flex-start'; // by default align the items to the top. } const label = createLabel(context.view, { text: context.fieldInfo.label, description: context.fieldInfo.description, required: context.fieldInfo.required, width: context.fieldInfo.labelWidth, cssStyles: context.fieldInfo.labelCSSStyles }); - const radioGroupLoadingComponentBuilder = new RadioGroupLoadingComponentBuilder(context.view, context.onNewDisposableCreated); + const radioGroupLoadingComponentBuilder = new RadioGroupLoadingComponentBuilder(context.view, context.onNewDisposableCreated, context.fieldInfo); context.fieldInfo.labelPosition = LabelPosition.Left; context.onNewInputComponentCreated(context.fieldInfo.variableName!, { component: radioGroupLoadingComponentBuilder }); addLabelInputPairToContainer(context.view, context.components, label, radioGroupLoadingComponentBuilder.component(), context.fieldInfo); diff --git a/extensions/resource-deployment/src/ui/radioGroupLoadingComponentBuilder.ts b/extensions/resource-deployment/src/ui/radioGroupLoadingComponentBuilder.ts index ac601cd634..9133a04fda 100644 --- a/extensions/resource-deployment/src/ui/radioGroupLoadingComponentBuilder.ts +++ b/extensions/resource-deployment/src/ui/radioGroupLoadingComponentBuilder.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as azdata from 'azdata'; import * as vscode from 'vscode'; -import { OptionsInfo } from '../interfaces'; +import { OptionsInfo, FieldInfo } from '../interfaces'; import { getErrorMessage } from '../utils'; export class RadioGroupLoadingComponentBuilder implements azdata.ComponentBuilder { @@ -12,7 +12,7 @@ export class RadioGroupLoadingComponentBuilder implements azdata.ComponentBuilde private _optionsLoadingBuilder: azdata.LoadingComponentBuilder; private _onValueChangedEmitter: vscode.EventEmitter = new vscode.EventEmitter(); private _currentRadioOption!: azdata.RadioButtonComponent; - constructor(private _view: azdata.ModelView, private _onNewDisposableCreated: (disposable: vscode.Disposable) => void) { + constructor(private _view: azdata.ModelView, private _onNewDisposableCreated: (disposable: vscode.Disposable) => void, private _fieldInfo: FieldInfo) { this._optionsDivContainer = this._view!.modelBuilder.divContainer().withProperties({ clickable: false }).component(); this._optionsLoadingBuilder = this._view!.modelBuilder.loadingComponent().withItem(this._optionsDivContainer); } @@ -47,6 +47,7 @@ export class RadioGroupLoadingComponentBuilder implements azdata.ComponentBuilde label: option.displayName, checked: option.displayName === defaultValue, name: option.name, + enabled: this._fieldInfo.enabled }).component(); if (radioOption.checked) { this._currentRadioOption = radioOption; diff --git a/src/sql/azdata.d.ts b/src/sql/azdata.d.ts index 95eb9f1388..b1e850b445 100644 --- a/src/sql/azdata.d.ts +++ b/src/sql/azdata.d.ts @@ -3255,7 +3255,7 @@ declare module 'azdata' { editableCategory = 'editableCategory' } - export interface RadioButtonProperties { + export interface RadioButtonProperties extends ComponentProperties { name?: string; label?: string; value?: string;