From 74a62a46d3792b11947c59876b60694cc1d609b5 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Thu, 29 Jul 2021 13:24:14 -0700 Subject: [PATCH] IO-1280 Sorting on Available jobs. --- .../jobs-available-table.component.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/src/components/jobs-available-table/jobs-available-table.component.jsx b/client/src/components/jobs-available-table/jobs-available-table.component.jsx index d5b341d00..508eddc6f 100644 --- a/client/src/components/jobs-available-table/jobs-available-table.component.jsx +++ b/client/src/components/jobs-available-table/jobs-available-table.component.jsx @@ -57,7 +57,7 @@ export function JobsAvailableComponent({ title: t("jobs.fields.cieca_id"), dataIndex: "cieca_id", key: "cieca_id", - sorter: (a, b) => alphaSort(a, b), + sorter: (a, b) => alphaSort(a.cieca_id, b.cieca_id), sortOrder: state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order, }, @@ -68,9 +68,10 @@ export function JobsAvailableComponent({ //width: "8%", // onFilter: (value, record) => record.ro_number.includes(value), // filteredValue: state.filteredInfo.text || null, - sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number), + sorter: (a, b) => + alphaSort(a.job && a.job.ro_number, b.job && b.job.ro_number), sortOrder: - state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order, + state.sortedInfo.columnKey === "job_id" && state.sortedInfo.order, render: (text, record) => record.job ? ( @@ -87,7 +88,7 @@ export function JobsAvailableComponent({ dataIndex: "ownr_name", key: "ownr_name", ellipsis: true, - sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln), + sorter: (a, b) => alphaSort(a.ownr_name, b.ownr_name), sortOrder: state.sortedInfo.columnKey === "ownr_name" && state.sortedInfo.order, },