admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-2267 Remove Sort for Linked Table fields

Browse Source
This commit is contained in:
Allan Carr
2023-05-03 16:30:48 -07:00
parent 759a8ac58c
commit 6e5fcbfdbd
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
View File

@@ -54,8 +54,8 @@ export function PaymentsListPaginated({
title: t("jobs.fields.ro_number"), title: t("jobs.fields.ro_number"),
dataIndex: "ro_number", dataIndex: "ro_number",
key: "ro_number", key: "ro_number",
sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number), // sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
sortOrder: sortcolumn === "ro_number" && sortorder, // sortOrder: sortcolumn === "ro_number" && sortorder,
render: (text, record) => { render: (text, record) => {
return record.job ? ( return record.job ? (
<Link to={"/manage/jobs/" + record.job.id}> <Link to={"/manage/jobs/" + record.job.id}>
@@ -78,8 +78,8 @@ export function PaymentsListPaginated({
dataIndex: "owner", dataIndex: "owner",
key: "owner", key: "owner",
ellipsis: true, ellipsis: true,
sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln), // sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
sortOrder: sortcolumn === "owner" && sortorder, // sortOrder: sortcolumn === "owner" && sortorder,
render: (text, record) => { render: (text, record) => {
return record.job?.owner ? ( return record.job?.owner ? (
<Link to={"/manage/owners/" + record.job?.owner?.id}> <Link to={"/manage/owners/" + record.job?.owner?.id}>

56
client/src/pages/bills/bills.page.component.jsx
View File

@@ -45,20 +45,20 @@ export function BillsListPage({
title: t("bills.fields.vendorname"), title: t("bills.fields.vendorname"),
dataIndex: "vendorname", dataIndex: "vendorname",
key: "vendorname", key: "vendorname",
sortObject: (direction) => { // sortObject: (direction) => {
return { // return {
vendor: { // vendor: {
name: direction // name: direction
? direction === "descend" // ? direction === "descend"
? "desc" // ? "desc"
: "asc" // : "asc"
: "desc", // : "desc",
}, // },
}; // };
}, // },
sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name), // sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name),
sortOrder: // sortOrder:
state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order, // state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
render: (text, record) => <span>{record.vendor.name}</span>, render: (text, record) => <span>{record.vendor.name}</span>,
}, },
{ {
@@ -74,20 +74,20 @@ export function BillsListPage({
title: t("jobs.fields.ro_number"), title: t("jobs.fields.ro_number"),
dataIndex: "ro_number", dataIndex: "ro_number",
key: "ro_number", key: "ro_number",
sortObject: (direction) => { // sortObject: (direction) => {
return { // return {
job: { // job: {
ro_number: direction // ro_number: direction
? direction === "descend" // ? direction === "descend"
? "desc" // ? "desc"
: "asc" // : "asc"
: "desc", // : "desc",
}, // },
}; // };
}, // },
sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number), // sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
sortOrder: // sortOrder:
state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order, // state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
render: (text, record) => render: (text, record) =>
record.job && ( record.job && (
<Link to={`/manage/jobs/${record.job.id}`}> <Link to={`/manage/jobs/${record.job.id}`}>