- Merge release

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

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -88,6 +88,7 @@ function BillEnterModalContainer({
             location,
             outstanding_returns,
             inventory,
+            federal_tax_exempt,
             ...remainingValues
         } = values;
 

client/src/components/csi-response-form/csi-response-form.container.jsx

@@ -5,6 +5,7 @@ import React, {useEffect} from "react";
 import {useTranslation} from "react-i18next";
 import {useLocation} from "react-router-dom";
 import {QUERY_CSI_RESPONSE_BY_PK} from "../../graphql/csi.queries";
+import {DateFormatter} from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 import ConfigFormComponents from "../config-form-components/config-form-components.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
@@ -44,7 +45,13 @@ export default function CsiResponseFormContainer() {
                     readOnly
                     componentList={data.csi_by_pk.csiquestion.config}
                 />
-            </Form>
+                {data.csi_by_pk.validuntil ? (
+                    <>
+                        {t("csi.fields.validuntil")}
+                        {": "}
+                        <DateFormatter>{data.csi_by_pk.validuntil}</DateFormatter>
+                    </>
+                ) : null}</Form>
         </Card>
     );
 }

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>

client/src/components/shop-csi-config-form/shop-csi-config-form.component.jsx

@@ -1,5 +1,5 @@
-import React from "react";
 import {Form} from "antd";
+import React from "react";
 import ConfigFormComponents from "../config-form-components/config-form-components.component";
 
 export default function ShopCsiConfigForm({selectedCsi}) {
@@ -10,7 +10,7 @@ export default function ShopCsiConfigForm({selectedCsi}) {
 
     return (
         <div>
-            The Config Form {readOnly}
+            {readOnly}
             {selectedCsi && (
                 <Form form={form} onFinish={handleFinish}>
                     <ConfigFormComponents

client/src/components/shop-csi-config/shop-csi-config.component.jsx

@@ -1,7 +1,8 @@
 import {CheckCircleFilled} from "@ant-design/icons";
+import {useQuery} from "@apollo/client";
 import {Button, Col, List, Row} from "antd";
 import React, {useState} from "react";
-import {useQuery} from "@apollo/client";
+
 import {useTranslation} from "react-i18next";
 import {GET_ALL_QUESTION_SETS} from "../../graphql/csi.queries";
 import {DateFormatter} from "../../utils/DateFormatter";
@@ -21,7 +22,7 @@ export default function ShopCsiConfig() {
     if (error) return <AlertComponent message={error.message} type="error"/>;
     return (
         <div>
-            The Config Form
+
             <Row>
                 <Col span={3}>
                     <List
@@ -42,7 +43,8 @@ export default function ShopCsiConfig() {
                         )}
                     />
                 </Col>
-                <Col span={21}>
+                <Col span={1}/>
+                <Col span={20}>
                     <ShopCsiConfigForm selectedCsi={selectedCsi}/>
                 </Col>
             </Row>