Merged in release/2023-12-01 (pull request #1087)

Release/2023 12 01

Approved-by: Allan Carr

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

@@ -34,10 +34,8 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-
       sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number),
       sortOrder: sortcolumn === "ro_number" && sortorder,
-
       render: (text, record) => (
         <Link to={"/manage/jobs/" + record.id}>
           {record.ro_number || t("general.labels.na")}

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

@@ -44,9 +44,9 @@ export function JobsList({bodyshop,}) {
                 {
                     [sortcolumn || "ro_number"]:
                         sortorder && sortorder !== "false"
-                            ? sortorder === "descend"
+                            ? (sortorder === "descend"
                                 ? "desc"
-                                : "asc"
+                                : "asc")
                             : "desc",
                 },
             ],

client/src/graphql/jobs.queries.js

@@ -12,7 +12,7 @@ export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
       offset: $offset
       limit: $limit
       where: { status: { _in: $statuses }, converted: { _eq: $isConverted } }
-      order_by: { created_at: desc }
+      order_by: $order
     ) {
       iouparent
       ownr_fn

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

@@ -40,9 +40,9 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
           {
             [sortcolumn || "ro_number"]:
               sortorder && sortorder !== "false"
-                ? sortorder === "descend"
+                ? (sortorder === "descend"
                   ? "desc"
-                  : "asc"
+                  : "asc")
                 : "desc",
           },
         ],