ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

handle special values in the table filter (#18872)

Browse Source 
* handle special values in the table filter

* pr comments
This commit is contained in:
Alan Ren
2022-03-31 11:17:55 -07:00
committed by GitHub
parent fe0cff07d6
commit b6083b6447
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts
View File

@@ -258,12 +258,23 @@ export class HeaderFilter<T extends Slick.SlickData> {
} }
} }
// Sort the list to make it easier to find a string
filterItems.sort();
// Promote undefined (NULL) to be always at the top of the list
const nullValueIndex = filterItems.indexOf(undefined);
if (nullValueIndex !== -1) {
filterItems.splice(nullValueIndex, 1);
filterItems.unshift(undefined);
}
this.listData = []; this.listData = [];
for (let i = 0; i < filterItems.length; i++) { for (let i = 0; i < filterItems.length; i++) {
const filtered = workingFilters.some(x => x === filterItems[i]); const filtered = workingFilters.some(x => x === filterItems[i]);
// work item to remove the 'Error:' string check: https://github.com/microsoft/azuredatastudio/issues/15206 // work item to remove the 'Error:' string check: https://github.com/microsoft/azuredatastudio/issues/15206
if (filterItems[i] && filterItems[i].indexOf('Error:') < 0) { const filterItem = filterItems[i];
this.listData.push(new TableFilterListElement(filterItems[i], filtered)); if (!filterItem || filterItem.indexOf('Error:') < 0) {
this.listData.push(new TableFilterListElement(filterItem, filtered));
} }
} }
@@ -543,8 +554,18 @@ class TableFilterListElement {
constructor(val: string, checked: boolean) { constructor(val: string, checked: boolean) {
this.value = val; this.value = val;
this._checked = checked; this._checked = checked;
// Handle the values that are visually hard to differentiate.
if (val === undefined) {
this.displayText = localize('tableFilter.nullDisplayText', "(NULL)");
} else if (val === '') {
this.displayText = localize('tableFilter.blankStringDisplayText', "(Blanks)");
} else {
this.displayText = val;
}
} }
public displayText: string;
public value: string; public value: string;
public onCheckStateChanged = this._onCheckStateChanged.event; public onCheckStateChanged = this._onCheckStateChanged.event;
@@ -605,9 +626,11 @@ class TableFilterListRenderer implements IListRenderer<TableFilterListElement, T
templateData.checkbox.checked = e; templateData.checkbox.checked = e;
})); }));
templateData.checkbox.checked = element.checked; templateData.checkbox.checked = element.checked;
templateData.checkbox.setAttribute('aria-label', element.value); templateData.checkbox.setAttribute('aria-label', element.displayText);
templateData.text.innerText = element.value; templateData.text.innerText = element.displayText;
templateData.label.title = element.value; templateData.label.title = element.displayText;
// Use italic to match the style that NULL value is displayed in the grid.
templateData.label.style.fontStyle = element.displayText === element.value ? 'normal' : 'italic';
} }
disposeElement?(element: TableFilterListElement, index: number, templateData: TableFilterListItemTemplate, height: number): void { disposeElement?(element: TableFilterListElement, index: number, templateData: TableFilterListItemTemplate, height: number): void {

9
src/sql/workbench/contrib/query/browser/gridPanel.ts
View File

@@ -491,7 +491,14 @@ export abstract class GridTableBase<T> extends Disposable implements IView {
(offset, count) => { return this.loadData(offset, count); }, (offset, count) => { return this.loadData(offset, count); },
undefined, undefined,
undefined, undefined,
(data: ICellValue) => { return data.isNull ? undefined : data?.displayValue; }, (data: ICellValue) => {
if (!data || data.isNull) {
return undefined;
}
// If the string only contains whitespaces, it will be treated as empty string to make the filtering easier.
// Note: this is the display string and does not impact the export/copy features.
return data.displayValue.trim() === '' ? '' : data.displayValue;
},
{ {
inMemoryDataProcessing: this.options.inMemoryDataProcessing, inMemoryDataProcessing: this.options.inMemoryDataProcessing,
inMemoryDataCountThreshold: this.options.inMemoryDataCountThreshold inMemoryDataCountThreshold: this.options.inMemoryDataCountThreshold