mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-18 05:40:31 +00:00
- feat: Update react-query package to V 2.1.1.
- feat: Favicon setup. - feat: Fix accounts inactivate/activate 1 account. - feat: Seed accounts, expenses and manual journals resource fields. - feat: Validate make journal receivable/payable without contact. - feat: Validate make journal contact without receivable or payable. - feat: More components abstractions. - feat: Use reselect.js to memorize components properties. - fix: Journal type of manual journal. - fix: Sidebar style optimization. - fix: Data-table check-box style optimization. - fix: Data-table spinner style dimensions. - fix: Submit journal with contact_id and contact_type.
This commit is contained in:
@@ -1,10 +1,7 @@
|
||||
import DynamicFilterRoleAbstructor from '@/lib/DynamicFilter/DynamicFilterRoleAbstructor';
|
||||
import {
|
||||
getRoleFieldColumn,
|
||||
} from '@/lib/ViewRolesBuilder';
|
||||
import { getRoleFieldColumn } from '@/lib/ViewRolesBuilder';
|
||||
|
||||
export default class DynamicFilterSortBy extends DynamicFilterRoleAbstructor {
|
||||
|
||||
constructor(sortByFieldKey, sortDirection) {
|
||||
super();
|
||||
|
||||
@@ -18,13 +15,17 @@ export default class DynamicFilterSortBy extends DynamicFilterRoleAbstructor {
|
||||
/**
|
||||
* Builds database query of sort by column on the given direction.
|
||||
*/
|
||||
buildQuery() {
|
||||
buildQuery() {
|
||||
const { columnKey = null, value = null } = this.filterRoles;
|
||||
|
||||
return (builder) => {
|
||||
const fieldRelation = getRoleFieldColumn(this.tableName, columnKey);
|
||||
const comparatorColumn =
|
||||
fieldRelation.relationColumn ||
|
||||
`${this.tableName}.${fieldRelation.column}`;
|
||||
|
||||
if (columnKey) {
|
||||
builder.orderBy(`${this.tableName}.${fieldRelation.column}`, value.toLowerCase());
|
||||
builder.orderBy(`${comparatorColumn}`, value.toLowerCase());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -88,8 +88,6 @@ export function getRoleFieldColumn(tableName, columnKey) {
|
||||
return (tableFields[columnKey]) ? tableFields[columnKey] : null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Builds roles queries.
|
||||
* @param {String} tableName -
|
||||
|
||||
Reference in New Issue
Block a user