- Merge release

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx

@@ -5,9 +5,9 @@ import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {Link, useLocation, useNavigate} from "react-router-dom";
 import {DateFormatter} from "../../utils/DateFormatter";
-import {alphaSort} from "../../utils/sorters";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import {pageLimit} from "../../utils/config";
+import {alphaSort, dateSort} from "../../utils/sorters";
+import OwnerNameDisplay, {OwnerNameDisplayFunction,} from "../owner-name-display/owner-name-display.component";
 
 export default function CsiResponseListPaginated({
                                                      refetch,
@@ -16,23 +16,25 @@ export default function CsiResponseListPaginated({
                                                      total,
                                                  }) {
     const search = queryString.parse(useLocation().search);
-    const {responseid, page, sortcolumn, sortorder} = search;
+    const {responseid} = search;
     const history = useNavigate();
+    const {t} = useTranslation();
     const [state, setState] = useState({
         sortedInfo: {},
         filteredInfo: {text: ""},
+        page: "",
     });
 
-    const {t} = useTranslation();
+
     const columns = [
         {
             title: t("jobs.fields.ro_number"),
             dataIndex: "ro_number",
             key: "ro_number",
-            width: "8%",
-            sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
-            sortOrder: sortcolumn === "ro_number" && sortorder,
 
+            sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
+            sortOrder:
+                state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
             render: (text, record) => (
                 <Link to={"/manage/jobs/" + record.job.id}>
                     {record.job.ro_number || t("general.labels.na")}
@@ -41,15 +43,15 @@ export default function CsiResponseListPaginated({
         },
         {
             title: t("jobs.fields.owner"),
-            dataIndex: "owner",
-            key: "owner",
-            ellipsis: true,
-            sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
-            width: "25%",
-            sortOrder: sortcolumn === "owner" && sortorder,
+            dataIndex: "owner_name",
+            key: "owner_name",
+            sorter: (a, b) => alphaSort(OwnerNameDisplayFunction(a.job),
+                OwnerNameDisplayFunction(b.job)
+            ),
+            sortOrder: state.sortedInfo.columnKey === "owner_name" && state.sortedInfo.order,
             render: (text, record) => {
-                return record.job.owner ? (
-                    <Link to={"/manage/owners/" + record.job.owner.id}>
+                return record.job.ownerid ? (
+                    <Link to={"/manage/owners/" + record.job.ownerid}>
                         <OwnerNameDisplay ownerObject={record.job}/>
                     </Link>
                 ) : (
@@ -64,9 +66,8 @@ export default function CsiResponseListPaginated({
             dataIndex: "completedon",
             key: "completedon",
             ellipsis: true,
-            sorter: (a, b) => a.completedon - b.completedon,
-            width: "25%",
-            sortOrder: sortcolumn === "completedon" && sortorder,
+            sorter: (a, b) => dateSort(a.completedon, b.completedon),
+            sortOrder: state.sortedInfo.columnKey === "completedon" && state.sortedInfo.order,
             render: (text, record) => {
                 return record.completedon ? (
                     <DateFormatter>{record.completedon}</DateFormatter>
@@ -76,11 +77,12 @@ export default function CsiResponseListPaginated({
     ];
 
     const handleTableChange = (pagination, filters, sorter) => {
-        setState({...state, filteredInfo: filters, sortedInfo: sorter});
-        search.page = pagination.current;
-        search.sortcolumn = sorter.columnKey;
-        search.sortorder = sorter.order;
-        history({search: queryString.stringify(search)});
+        setState({
+            ...state,
+            filteredInfo: filters,
+            sortedInfo: sorter,
+            page: pagination.current,
+        });
     };
 
     const handleOnRowClick = (record) => {
@@ -108,7 +110,7 @@ export default function CsiResponseListPaginated({
                 pagination={{
                     position: "top",
                     pageSize: pageLimit,
-                    current: parseInt(page || 1),
+                    current: parseInt(state.page || 1),
                     total: total,
                 }}
                 columns={columns}
@@ -121,13 +123,7 @@ export default function CsiResponseListPaginated({
                     },
                     selectedRowKeys: [responseid],
                     type: "radio",
-                }}
-                onRow={(record, rowIndex) => {
-                    return {
-                        onClick: (event) => {
-                            handleOnRowClick(record);
-                        }, // click row
-                    };
+
                 }}
             />
         </Card>