mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fixed evaluated filters

Browse Source
This commit is contained in:
Jan Prochazka 2022-03-31 15:15:15 +02:00
parent 25380ee0a8
commit 5aac142e4c
12 changed files with 90 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/api/src/utility/JsonLinesDatastore.js
View File

@ -163,6 +163,7 @@ class JsonLinesDatastore {
const res = [];
await lock.acquire('reader', async () => {
await this._ensureReader(offset, filter);
// console.log(JSON.stringify(this.currentFilter, undefined, 2));
for (let i = 0; i < limit; i += 1) {
const line = await this._readLine(true);
if (line == null) break;

3
packages/datalib/src/GridDisplay.ts
View File

@ -652,7 +652,8 @@ export abstract class GridDisplay {
for (const name in filters) {
const column = this.isDynamicStructure ? null : this.columns.find(x => x.columnName == name);
if (!this.isDynamicStructure && !column) continue;
const filterType = this.isDynamicStructure ? this.filterTypeOverride ?? 'mongo' : getFilterType(column.dataType);
const filterType =
this.filterTypeOverride ?? (this.isDynamicStructure ? 'mongo' : getFilterType(column.dataType));
try {
const condition = parseFilter(filters[name], filterType);
const replaced = _.cloneDeepWith(condition, (expr: Expression) => {

2
packages/datalib/src/JslGridDisplay.ts
View File

@ -21,7 +21,7 @@ export class JslGridDisplay extends GridDisplay {
this.filterable = true;
this.supportsReload = supportsReload;
this.isDynamicStructure = isDynamicStructure;
if (isDynamicStructure) this.filterTypeOverride = 'string';
this.filterTypeOverride = 'eval';
if (structure?.columns) {
this.columns = _.uniqBy(

52
packages/filterparser/src/parseFilter.ts
View File

@ -254,10 +254,10 @@ const createParser = (filterType: FilterType) => {
eq: r => word('=').then(r.value).map(binaryCondition('=')),
ne: r => word('!=').then(r.value).map(binaryCondition('<>')),
ne2: r => word('<>').then(r.value).map(binaryCondition('<>')),
lt: r => word('<').then(r.value).map(binaryCondition('<')),
gt: r => word('>').then(r.value).map(binaryCondition('>')),
le: r => word('<=').then(r.value).map(binaryCondition('<=')),
ge: r => word('>=').then(r.value).map(binaryCondition('>=')),
lt: r => word('<').then(r.value).map(binaryCondition('<')),
gt: r => word('>').then(r.value).map(binaryCondition('>')),
startsWith: r => word('^').then(r.value).map(likeCondition('like', '#VALUE#%')),
endsWith: r => word('$').then(r.value).map(likeCondition('like', '%#VALUE#')),
contains: r => word('+').then(r.value).map(likeCondition('like', '%#VALUE#%')),
@ -271,24 +271,30 @@ const createParser = (filterType: FilterType) => {
};
const allowedValues = []; // 'string1', 'string2', 'number', 'noQuotedString'];
if (filterType == 'string') allowedValues.push('string1', 'string2', 'noQuotedString');
if (filterType == 'number') allowedValues.push('string1Num', 'string2Num', 'number');
if (filterType == 'string' || filterType == 'eval') {
allowedValues.push('string1', 'string2', 'noQuotedString');
}
if (filterType == 'number') {
allowedValues.push('string1Num', 'string2Num', 'number');
}
const allowedElements = ['null', 'notNull', 'eq', 'ne', 'ne2'];
if (filterType == 'number' || filterType == 'datetime') allowedElements.push('lt', 'gt', 'le', 'ge');
if (filterType == 'string')
allowedElements.push(
'empty',
'notEmpty',
'startsWith',
'endsWith',
'contains',
'startsWithNot',
'endsWithNot',
'containsNot'
);
if (filterType == 'logical') allowedElements.push('true', 'false', 'trueNum', 'falseNum');
if (filterType == 'datetime')
if (filterType == 'number' || filterType == 'datetime' || filterType == 'eval') {
allowedElements.push('le', 'ge', 'lt', 'gt');
}
if (filterType == 'string') {
allowedElements.push('empty', 'notEmpty');
}
if (filterType == 'eval' || filterType == 'string') {
allowedElements.push('startsWith', 'endsWith', 'contains', 'startsWithNot', 'endsWithNot', 'containsNot');
}
if (filterType == 'logical') {
allowedElements.push('true', 'false', 'trueNum', 'falseNum');
}
if (filterType == 'eval') {
allowedElements.push('true', 'false');
}
if (filterType == 'datetime') {
allowedElements.push(
'yearMonthDaySecond',
'yearMonthDayMinute',
@ -308,10 +314,13 @@ const createParser = (filterType: FilterType) => {
'thisYear',
'nextYear'
);
}
// must be last
if (filterType == 'string') allowedElements.push('valueTestStr');
else allowedElements.push('valueTestEq');
if (filterType == 'string' || filterType == 'eval') {
allowedElements.push('valueTestStr');
} else {
allowedElements.push('valueTestEq');
}
return P.createLanguage(langDef);
};
@ -321,6 +330,7 @@ const parsers = {
string: createParser('string'),
datetime: createParser('datetime'),
logical: createParser('logical'),
eval: createParser('eval'),
mongo: mongoParser,
};

2
packages/filterparser/src/types.ts
View File

@ -1,3 +1,3 @@
// import types from 'dbgate-types';
export type FilterType = 'number' | 'string' | 'datetime' | 'logical' | 'mongo';
export type FilterType = 'number' | 'string' | 'datetime' | 'logical' | 'eval' | 'mongo';

27
packages/web/src/datagrid/DataFilterControl.svelte
View File

@ -161,6 +161,33 @@
{ onClick: () => setFilter('TRUE'), text: 'Is True' },
{ onClick: () => setFilter('FALSE'), text: 'Is False' },
];
case 'eval':
return [
{ onClick: () => setFilter(''), text: 'Clear Filter' },
{ onClick: () => filterMultipleValues(), text: 'Filter multiple values' },
{ onClick: () => openFilterWindow('='), text: 'Equals...' },
{ onClick: () => openFilterWindow('<>'), text: 'Does Not Equal...' },
{ onClick: () => setFilter('NULL'), text: 'Is Null' },
{ onClick: () => setFilter('NOT NULL'), text: 'Is Not Null' },
{ divider: true },
{ onClick: () => openFilterWindow('>'), text: 'Greater Than...' },
{ onClick: () => openFilterWindow('>='), text: 'Greater Than Or Equal To...' },
{ onClick: () => openFilterWindow('<'), text: 'Less Than...' },
{ onClick: () => openFilterWindow('<='), text: 'Less Than Or Equal To...' },
{ divider: true },
{ onClick: () => openFilterWindow('+'), text: 'Contains...' },
{ onClick: () => openFilterWindow('~'), text: 'Does Not Contain...' },
{ onClick: () => openFilterWindow('^'), text: 'Begins With...' },
{ onClick: () => openFilterWindow('!^'), text: 'Does Not Begin With...' },
{ onClick: () => openFilterWindow('$'), text: 'Ends With...' },
{ onClick: () => openFilterWindow('!$'), text: 'Does Not End With...' },
];
}
// return [

5
packages/web/src/datagrid/DataGrid.svelte
View File

@ -80,6 +80,7 @@
export let display;
export let changeSetState;
export let dispatchChangeSet;
export let useEvalFilters = false;
export let isDetailView = false;
export let showReferences = false;
@ -181,7 +182,7 @@
height={'30%'}
skip={!isDynamicStructure || !display?.filterable}
>
<JsonViewFilters {...$$props} {managerSize} {isDynamicStructure} />
<JsonViewFilters {...$$props} {managerSize} {isDynamicStructure} {useEvalFilters} />
</WidgetColumnBarItem>
<WidgetColumnBarItem
@ -191,7 +192,7 @@
skip={!display?.filterable || isDynamicStructure || display.filterCount == 0 || isFormView}
collapsed={isDetailView}
>
<JsonViewFilters {...$$props} {managerSize} {isDynamicStructure} />
<JsonViewFilters {...$$props} {managerSize} {isDynamicStructure} {useEvalFilters} />
</WidgetColumnBarItem>
<WidgetColumnBarItem

3
packages/web/src/datagrid/DataGridCore.svelte
View File

@ -335,6 +335,7 @@
export let multipleGridsOnTab = false;
export let tabControlHiddenTab = false;
export let onCustomGridRefresh;
export let useEvalFilters = false;
// export let generalAllowSave = false;
export const activator = createActivator('DataGridCore', false);
@ -1548,7 +1549,7 @@
{conid}
{database}
driver={display?.driver}
filterType={col.filterType || getFilterType(col.dataType)}
filterType={useEvalFilters ? 'eval' : col.filterType || getFilterType(col.dataType)}
filter={display.getFilter(col.uniqueName)}
setFilter={value => display.setFilter(col.uniqueName, value)}
showResizeSplitter

1
packages/web/src/datagrid/JslDataGrid.svelte
View File

@ -58,5 +58,6 @@
gridCoreComponent={JslDataGridCore}
bind:loadedRows
isDynamicStructure={$info?.__isDynamicStructure}
useEvalFilters
/>
{/key}

6
packages/web/src/jsonview/JsonViewFilterColumn.svelte
View File

@ -10,8 +10,10 @@
export let display;
export let filters;
export let isDynamicStructure;
export let useEvalFilters;
function computeFilterType(isDynamicStructure, display, uniqueName) {
function computeFilterType(isDynamicStructure, display, uniqueName, useEvalFilters) {
if (useEvalFilters) return 'eval';
if (isDynamicStructure) return 'mongo';
const col = display.findColumn(uniqueName);
if (col) {
@ -35,7 +37,7 @@
</InlineButton>
</div>
<DataFilterControl
filterType={computeFilterType(isDynamicStructure, display, uniqueName)}
filterType={computeFilterType(isDynamicStructure, display, uniqueName, useEvalFilters)}
filter={filters[uniqueName]}
setFilter={value => display.setFilter(uniqueName, value)}
/>

3
packages/web/src/jsonview/JsonViewFilters.svelte
View File

@ -7,6 +7,7 @@
export let managerSize;
export let display;
export let isDynamicStructure;
export let useEvalFilters;
$: filters = display?.config?.filters;
@ -15,6 +16,6 @@
<ManagerInnerContainer width={managerSize}>
{#each allFilterNames as uniqueName}
<JsonViewFilterColumn {uniqueName} {display} {filters} {isDynamicStructure} />
<JsonViewFilterColumn {uniqueName} {display} {filters} {isDynamicStructure} {useEvalFilters} />
{/each}
</ManagerInnerContainer>

15
packages/web/src/modals/SetFilterModal_Select.svelte
View File

@ -54,6 +54,21 @@
{ value: '$', label: 'ends with' },
{ value: '!$', label: 'does not end with' },
];
case 'eval':
return [
{ value: '=', label: 'eqals' },
{ value: '<>', label: 'does not equal' },
{ value: '<', label: 'is smaller' },
{ value: '>', label: 'is greater' },
{ value: '<=', label: 'is smaller or equal' },
{ value: '>=', label: 'is greater or equal' },
{ value: '+', label: 'contains' },
{ value: '~', label: 'does not contain' },
{ value: '^', label: 'begins with' },
{ value: '!^', label: 'does not begin with' },
{ value: '$', label: 'ends with' },
{ value: '!$', label: 'does not end with' },
];
}
}
</script>