diff --git a/projects/erp-hierarchical-grid/src/components/ErpHGrid/ErpHGrid.tsx b/projects/erp-hierarchical-grid/src/components/ErpHGrid/ErpHGrid.tsx index 0dbf22e..d5413ea 100644 --- a/projects/erp-hierarchical-grid/src/components/ErpHGrid/ErpHGrid.tsx +++ b/projects/erp-hierarchical-grid/src/components/ErpHGrid/ErpHGrid.tsx @@ -23,7 +23,7 @@ import { erpDataService } from "../../services/ErpDataService"; import { BadgeVariant } from "../../models/BadgeVariant"; import { OrderStatus } from "../../models/OrderStatus"; import { DataPoint } from "../../models/DataPoint"; -import { FullAddressFilteringOperand } from "../../CustomFilteringOperand"; +import { FullAddressFilteringOperand } from "../../services/custom-operations/CustomFilteringOperand"; import BILL_PAID from "../../assets/icons/bill_paid.svg"; import CHECK from "../../assets/icons/check.svg"; import DELIVERY from "../../assets/icons/delivery.svg"; @@ -130,7 +130,7 @@ const ErpHGrid = () => { const rating: number = ctx.cell.value; return ( <> - + ); }; @@ -459,7 +459,7 @@ const ErpHGrid = () => { field="orderInformation" header="Address" dataType="string" - sortable={true} + sortable={false} resizable={true} visibleWhenCollapsed={false} formatter={formatAddress} @@ -471,7 +471,7 @@ const ErpHGrid = () => { field="orderInformation" header="Address" dataType="string" - sortable={true} + sortable={false} resizable={true} visibleWhenCollapsed={true} formatter={formatFullAddress} diff --git a/projects/erp-hierarchical-grid/src/CustomFilteringOperand.ts b/projects/erp-hierarchical-grid/src/services/custom-operations/CustomFilteringOperand.ts similarity index 97% rename from projects/erp-hierarchical-grid/src/CustomFilteringOperand.ts rename to projects/erp-hierarchical-grid/src/services/custom-operations/CustomFilteringOperand.ts index 33e716a..5f2b9ad 100644 --- a/projects/erp-hierarchical-grid/src/CustomFilteringOperand.ts +++ b/projects/erp-hierarchical-grid/src/services/custom-operations/CustomFilteringOperand.ts @@ -1,4 +1,4 @@ -import { IgrStringFilteringOperand } from "igniteui-react-grids/grids"; +import { IgrStringFilteringOperand, IFilteringStrategy } from "igniteui-react-grids/grids"; export class FullAddressFilteringOperand extends IgrStringFilteringOperand { public constructor(isAddressShort: boolean = false) {