From 2252091b5317624d33dddd880662590013abf70c Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Wed, 29 Nov 2023 16:09:20 -0500 Subject: [PATCH 1/2] Fix order issue on all jobs --- .../jobs-list-paginated/jobs-list-paginated.component.jsx | 2 -- client/src/graphql/jobs.queries.js | 2 +- client/src/pages/jobs-all/jobs-all.container.jsx | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx index f1455d2a7..b5048d0ef 100644 --- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx +++ b/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) => ( {record.ro_number || t("general.labels.na")} diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index a583b7808..b18673de6 100644 --- a/client/src/graphql/jobs.queries.js +++ b/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 diff --git a/client/src/pages/jobs-all/jobs-all.container.jsx b/client/src/pages/jobs-all/jobs-all.container.jsx index a678ecab9..dd78369a0 100644 --- a/client/src/pages/jobs-all/jobs-all.container.jsx +++ b/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", }, ], From 0d70545b98fdf4ab5b1c023a8ebce4e8f463e54d Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Wed, 29 Nov 2023 16:10:30 -0500 Subject: [PATCH 2/2] Fix order issue on all jobs --- client/src/components/jobs-list/jobs-list.component.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx index f025f1401..885b53634 100644 --- a/client/src/components/jobs-list/jobs-list.component.jsx +++ b/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", }, ],