From 6e5fcbfdbdc75897cb2c246129f29cb4cfcc4992 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Wed, 3 May 2023 16:30:48 -0700 Subject: [PATCH] IO-2267 Remove Sort for Linked Table fields --- .../payment-list-paginated.component.jsx | 8 +-- .../src/pages/bills/bills.page.component.jsx | 56 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx index a502a52b9..0a202545e 100644 --- a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx +++ b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx @@ -54,8 +54,8 @@ export function PaymentsListPaginated({ title: t("jobs.fields.ro_number"), dataIndex: "ro_number", key: "ro_number", - sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number), - sortOrder: sortcolumn === "ro_number" && sortorder, + // sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number), + // sortOrder: sortcolumn === "ro_number" && sortorder, render: (text, record) => { return record.job ? ( @@ -78,8 +78,8 @@ export function PaymentsListPaginated({ dataIndex: "owner", key: "owner", ellipsis: true, - sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln), - sortOrder: sortcolumn === "owner" && sortorder, + // sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln), + // sortOrder: sortcolumn === "owner" && sortorder, render: (text, record) => { return record.job?.owner ? ( diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx index 8647a6ded..d95558a32 100644 --- a/client/src/pages/bills/bills.page.component.jsx +++ b/client/src/pages/bills/bills.page.component.jsx @@ -45,20 +45,20 @@ export function BillsListPage({ title: t("bills.fields.vendorname"), dataIndex: "vendorname", key: "vendorname", - sortObject: (direction) => { - return { - vendor: { - name: direction - ? direction === "descend" - ? "desc" - : "asc" - : "desc", - }, - }; - }, - sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name), - sortOrder: - state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order, + // sortObject: (direction) => { + // return { + // vendor: { + // name: direction + // ? direction === "descend" + // ? "desc" + // : "asc" + // : "desc", + // }, + // }; + // }, + // sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name), + // sortOrder: + // state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order, render: (text, record) => {record.vendor.name}, }, { @@ -74,20 +74,20 @@ export function BillsListPage({ title: t("jobs.fields.ro_number"), dataIndex: "ro_number", key: "ro_number", - sortObject: (direction) => { - return { - job: { - ro_number: direction - ? direction === "descend" - ? "desc" - : "asc" - : "desc", - }, - }; - }, - sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number), - sortOrder: - state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order, + // sortObject: (direction) => { + // return { + // job: { + // ro_number: direction + // ? direction === "descend" + // ? "desc" + // : "asc" + // : "desc", + // }, + // }; + // }, + // sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number), + // sortOrder: + // state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order, render: (text, record) => record.job && (