IO-1180 Resolved sorting issues on All Jobs Page.

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -9,7 +9,6 @@ import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -32,7 +31,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       dataIndex: "ro_number",
       key: "ro_number",
       width: "8%",
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number),
       sortOrder: sortcolumn === "ro_number" && sortorder,
 
       render: (text, record) => (
@@ -44,12 +43,12 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
 
     {
       title: t("jobs.fields.owner"),
-      dataIndex: "owner",
+      dataIndex: "ownr_ln",
-      key: "owner",
+      key: "ownr_ln",
       ellipsis: true,
-      // sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
       width: "25%",
-      // sortOrder: sortcolumn === "owner" && sortorder,
+      //sortOrder: sortcolumn === "ownr_ln" && sortorder,
       render: (text, record) => {
         return record.owner ? (
           <Link to={"/manage/owners/" + record.owner.id}>
@@ -80,7 +79,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       key: "status",
       width: "10%",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.status, b.status),
+      sorter: true, // (a, b) => alphaSort(a.status, b.status),
       sortOrder: sortcolumn === "status" && sortorder,
       render: (text, record) => {
         return record.status || t("general.labels.na");
@@ -117,7 +116,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       key: "plate_no",
       width: "8%",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
+      sorter: true, //(a, b) => alphaSort(a.plate_no, b.plate_no),
       sortOrder: sortcolumn === "plate_no" && sortorder,
       render: (text, record) => {
         return record.plate_no ? record.plate_no : "";
@@ -129,7 +128,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       key: "clm_no",
       width: "12%",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+      sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder: sortcolumn === "clm_no" && sortorder,
       render: (text, record) => {
         return record.clm_no ? (
@@ -150,7 +149,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       dataIndex: "clm_total",
       key: "clm_total",
       width: "10%",
-      sorter: (a, b) => a.clm_total - b.clm_total,
+      sorter: true, //(a, b) => a.clm_total - b.clm_total,
       sortOrder: sortcolumn === "clm_total" && sortorder,
       render: (text, record) => {
         return record.clm_total ? (
@@ -173,7 +172,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
 
   const handleTableChange = (pagination, filters, sorter) => {
     search.page = pagination.current;
-    search.sortcolumn = sorter.columnKey;
+    search.sortcolumn = sorter.column && sorter.column.key;
     search.sortorder = sorter.order;
     if (filters.status) {
       search.statusFilters = JSON.stringify(_.flattenDeep(filters.status));

client/src/pages/jobs-all/jobs-all.container.jsx

@@ -35,13 +35,14 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
         offset: page ? (page - 1) * 25 : 0,
         limit: 25,
         ...(statusFilters ? { statusList: JSON.parse(statusFilters) } : {}),
-        order:  [
+        order: [
           {
-            [sortcolumn || "created_at"]: sortorder
+            [sortcolumn || "created_at"]:
-              ? sortorder === "descend"
+              sortorder && sortorder !== "false"
-                ? "desc"
+                ? sortorder === "descend"
-                : "asc"
+                  ? "desc"
-              : "desc",
+                  : "asc"
+                : "desc",
           },
         ],
       },

client/src/utils/TemplateConstants.js

@@ -710,7 +710,7 @@ export const TemplateList = (type, context) => {
             ),
             description: "",
             subject: i18n.t(
-              "reportcenter.templates.hours_sold_summary_open_ins_cƒo"
+              "reportcenter.templates.hours_sold_summary_open_ins_co"
             ),
             key: "hours_sold_summary_open_ins_co",
             //idtype: "vendor",