ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-13 17:22:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix duplicate required indicator (#22976)

Browse Source
This commit is contained in:
Alan Ren
2023-05-04 21:53:42 -07:00
committed by GitHub
parent b37df9b6ad
commit 70e756b82d
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/workbench/browser/modal/dialogHelper.ts
View File

@@ -9,8 +9,7 @@ import { append, $ } from 'vs/base/browser/dom';
import * as types from 'vs/base/common/types';
import * as azdata from 'azdata';
import { wrapStringWithNewLine } from 'sql/workbench/common/sqlWorkbenchUtils';
export const requiredIndicatorSpan = 'span.required-indicator';
import { RequiredIndicatorClassName } from 'sql/base/browser/ui/label/label';
export function appendRow(container: HTMLElement, label: string, labelClass: string, cellContainerClass: string, rowContainerClass?: string | Array<string>, showRequiredIndicator: boolean = false, title?: string, titleMaxWidth?: number): HTMLElement {
let rowContainer = append(container, $('tr'));
@@ -31,7 +30,7 @@ export function appendRow(container: HTMLElement, label: string, labelClass: str
append(labelContainer, $('div')).innerText = label;
if (showRequiredIndicator) {
appendRequiredIndicator(labelContainer);
labelContainer.classList.add(RequiredIndicatorClassName);
}
let inputCellContainer = append(rowContainer, $(`td.${cellContainerClass}`));
@@ -81,14 +80,6 @@ export function getCategoryName(categories: azdata.CategoryValue[], categoryDisp
return categoryName;
}
export function appendRequiredIndicator(labelContainer: HTMLElement): HTMLElement {
const indicator = append(labelContainer, $(requiredIndicatorSpan));
indicator.innerText = '*';
indicator.style.color = 'red';
indicator.style.marginLeft = '5px';
return indicator;
}
export function getOptionContainerByName(parentContainer: HTMLElement, optionName: string): HTMLElement | undefined {
for (let i = 0; i < parentContainer.childElementCount; i++) {
if (parentContainer.children.item(i).classList.contains(`option-${optionName}`)) {

5
src/sql/workbench/browser/modal/optionsDialog.ts
View File

@@ -32,6 +32,7 @@ import { GroupHeaderBackground } from 'sql/platform/theme/common/colorRegistry';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
import { AdsWidget } from 'sql/base/browser/ui/adsWidget';
import { Actions } from 'sql/platform/connection/common/constants';
import { RequiredIndicatorClassName } from 'sql/base/browser/ui/label/label';
export interface IOptionsDialogOptions extends IModalOptions {
cancelLabel?: string;
@@ -246,7 +247,7 @@ export class OptionsDialog extends Modal {
let element = DialogHelper.getOptionContainerByName(container, optionAction.optionName) as HTMLElement;
// Append required indicator when not present.
if (element && element.childElementCount === 1) {
DialogHelper.appendRequiredIndicator(element);
element.classList.add(RequiredIndicatorClassName);
}
}
// Force selection event if option value is available.
@@ -274,7 +275,7 @@ export class OptionsDialog extends Modal {
let element = DialogHelper.getOptionContainerByName(container, optionAction.optionName) as HTMLElement;
// Append required indicator when not present.
if (element && element.childElementCount === 1) {
DialogHelper.appendRequiredIndicator(element);
element.classList.add(RequiredIndicatorClassName);
}
}
} else {

3
src/sql/workbench/services/connection/browser/connectionWidget.ts
View File

@@ -43,6 +43,7 @@ import { AdsWidget } from 'sql/base/browser/ui/adsWidget';
import { createCSSRule } from 'vs/base/browser/dom';
import { AuthLibrary, getAuthLibrary } from 'sql/workbench/services/accountManagement/utils';
import { adjustForMssqlAppName } from 'sql/platform/connection/common/utils';
import { RequiredIndicatorClassName } from 'sql/base/browser/ui/label/label';
const ConnectionStringText = localize('connectionWidget.connectionString', "Connection string");
@@ -362,7 +363,7 @@ export class ConnectionWidget extends lifecycle.Disposable {
if (optionAction.required) {
let element = DialogHelper.getOptionContainerByName(this._tableContainer, optionAction.optionName);
if (element) {
DialogHelper.appendRequiredIndicator(element);
element.classList.add(RequiredIndicatorClassName);
}
}
} else {