opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core-sdk): CB-1568 simplify code

Browse Source
This commit is contained in:
Naumov Alexey
2022-02-15 22:09:35 +03:00
parent 6752765c90
commit 4bcf6a28b1
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
+2 -7
View File
@@ -387,13 +387,8 @@ export class DataGridContextMenuFilterService {
const { model, resultIndex, key } = context.data;
const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
const data = model.source.getAction(resultIndex, ResultSetDataAction);
const columnPosition = data.getColumn(key.column)?.position;
if (columnPosition === undefined) {
return true;
}
const currentConstraint = constraints.get(columnPosition);
const resultColumn = data.getColumn(key.column);
const currentConstraint = resultColumn ? constraints.get(resultColumn.position) : undefined;
return !currentConstraint || !isFilterConstraint(currentConstraint);
},
webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuOrderService.ts
+6 -18
View File
@@ -78,13 +78,9 @@ export class DataGridContextMenuOrderService {
const { model, resultIndex, key } = context.data;
const data = model.source.getAction(resultIndex, ResultSetDataAction);
const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
const columnPosition = data.getColumn(key.column)?.position;
const resultColumn = data.getColumn(key.column);
if (columnPosition === undefined) {
return false;
}
return constraints.getOrder(columnPosition) === EOrder.asc;
return !!resultColumn && constraints.getOrder(resultColumn.position) === EOrder.asc;
},
}
);
@@ -105,13 +101,9 @@ export class DataGridContextMenuOrderService {
const { model, resultIndex, key } = context.data;
const data = model.source.getAction(resultIndex, ResultSetDataAction);
const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
const columnPosition = data.getColumn(key.column)?.position;
const resultColumn = data.getColumn(key.column);
if (columnPosition === undefined) {
return false;
}
return constraints.getOrder(columnPosition) === EOrder.desc;
return !!resultColumn && constraints.getOrder(resultColumn.position) === EOrder.desc;
},
}
);
@@ -132,13 +124,9 @@ export class DataGridContextMenuOrderService {
const { model, resultIndex, key } = context.data;
const data = model.source.getAction(resultIndex, ResultSetDataAction);
const constraints = model.source.getAction(resultIndex, ResultSetConstraintAction);
const columnPosition = data.getColumn(key.column)?.position;
const resultColumn = data.getColumn(key.column);
if (columnPosition === undefined) {
return false;
}
return constraints.getOrder(columnPosition) === null;
return !!resultColumn && constraints.getOrder(resultColumn.position) === null;
},
}
);