Merge release / update

client/src/pages/dms/dms.container.jsx

@@ -31,8 +31,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
     setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
     setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
-    insertAuditTrail: ({ jobid, operation }) =>
-        dispatch(insertAuditTrail({ jobid, operation })),
+    insertAuditTrail: ({ jobid, operation, type }) =>
+        dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
@@ -118,7 +118,7 @@ export function DmsContainer({
             insertAuditTrail({
                 jobid: payload,
                 operation: AuditTrailMapping.jobexported(),
-            });
+            type: "jobexported",});
             history("/manage/accounting/receivables");
         });
 

client/src/pages/export-logs/export-logs.page.component.jsx

@@ -12,7 +12,8 @@ import AlertComponent from "../../components/alert/alert.component";
 import {QUERY_EXPORT_LOG_PAGINATED} from "../../graphql/accounting.queries";
 import {selectBodyshop} from "../../redux/user/user.selectors";
 import {DateTimeFormatter} from "../../utils/DateFormatter";
-import {pageLimit} from "../../utils/config";
+import { pageLimit } from "../../utils/config";
+import { alphaSort, dateSort } from "./../../utils/sorters";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -34,11 +35,42 @@ export function ExportLogsPageComponent({bodyshop}) {
                 limit: pageLimit,
                 order: [
                     {
-                        [sortcolumn || "created_at"]: sortorder
+                        ...(sortcolumn === "ro_number"
+              ? {
+                  job: {
+                    [sortcolumn|| "created_at"]: sortorder
                             ? sortorder === "descend"
                                 ? "desc"
                                 : "asc"
-                            : "desc",
+                            : "desc",},
+                }
+              : sortcolumn === "invoice_number"
+              ? {
+                  bill: {
+                    [sortcolumn || "created_at"]: sortorder
+                      ? sortorder === "descend"
+                        ? "desc"
+                        : "asc"
+                      : "desc",
+                  },
+                }
+              : sortcolumn === "paymentnum"
+              ? {
+                  payment: {
+                    [sortcolumn || "created_at"]: sortorder
+                      ? sortorder === "descend"
+                        ? "desc"
+                        : "asc"
+                      : "desc",
+                  },
+                }
+              : {
+                  [sortcolumn || "created_at"]: sortorder
+                    ? sortorder === "descend"
+                      ? "desc"
+                      : "asc"
+                    : "desc",
+                }),
                     },
                 ],
             },
@@ -68,7 +100,8 @@ export function ExportLogsPageComponent({bodyshop}) {
             title: t("general.labels.created_at"),
             dataIndex: "created_at",
             key: "created_at",
-            render: (text, record) => (
+            sorter: (a, b) => dateSort(a.created_at, b.created_at),
+      sortOrder: sortcolumn === "created_at" && sortorder,render: (text, record) => (
                 <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
             ),
         },
@@ -81,7 +114,8 @@ export function ExportLogsPageComponent({bodyshop}) {
             title: t("jobs.fields.ro_number"),
             dataIndex: "ro_number",
             key: "ro_number",
-
+sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder: sortcolumn === "ro_number" && sortorder,
             render: (text, record) =>
                 record.job && (
                     <Link to={`/manage/jobs/${record.job.id}`}>
@@ -93,7 +127,8 @@ export function ExportLogsPageComponent({bodyshop}) {
             title: t("bills.fields.invoice_number"),
             dataIndex: "invoice_number",
             key: "invoice_number",
-            render: (text, record) =>
+            sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
+      sortOrder: sortcolumn === "invoice_number" && sortorder,render: (text, record) =>
                 record.bill && (
                     <Link to={"/manage/bills?billid=" + (record.bill && record.bill.id)}>
                         {record.bill && record.bill.invoice_number}
@@ -103,7 +138,8 @@ export function ExportLogsPageComponent({bodyshop}) {
         {
             title: t("payments.fields.paymentnum"),
             dataIndex: "paymentnum",
-            key: "paymentnum",
+            key: "paymentnum",sorter: (a, b) => alphaSort(a.paymentnum, b.paymentnum),
+      sortOrder: sortcolumn === "paymentnum" && sortorder,
             render: (text, record) =>
                 record.payment && (
                     <Link
@@ -119,7 +155,13 @@ export function ExportLogsPageComponent({bodyshop}) {
         {
             title: t("general.labels.successful"),
             dataIndex: "successful",
-            key: "successful",
+            key: "successful",sorter: (a, b) => Number(a.successful) - Number(b.successful),
+      sortOrder: sortcolumn === "successful" && sortorder,
+      filters: [
+        { text: "True", value: true },
+        { text: "False", value: false },
+      ],
+      onFilter: (value, record) => record.successful === value,
             render: (text, record) => (
                 <Checkbox disabled checked={record.successful}/>
             ),

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -48,11 +48,11 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 
-export function JobsCloseComponent({job, bodyshop, jobRO, insertAuditTrail,}) {
+export function JobsCloseComponent({job, bodyshop, jobRO, insertAuditTrail}) {
     const {t} = useTranslation();
     const [form] = Form.useForm();
     const client = useApolloClient();
@@ -118,7 +118,7 @@ export function JobsCloseComponent({job, bodyshop, jobRO, insertAuditTrail,}) {
             insertAuditTrail({
                 jobid: job.id,
                 operation: AuditTrailMapping.jobinvoiced(),
-            });
+            type: "jobinvoiced",});
             // history.push(`/manage/jobs/${job.id}`);
         } else {
             setLoading(false);

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -23,6 +23,7 @@ import {createStructuredSelector} from "reselect";
 import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
 import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
 import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
+import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
 import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
 import JobReconciliationModal from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
 import JobSyncButton from "../../components/job-sync-button/job-sync-button.component";
@@ -49,7 +50,6 @@ import {selectBodyshop} from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import {DateTimeFormat} from "./../../utils/DateFormatter";
-import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -58,8 +58,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
     setPrintCenterContext: (context) =>
         dispatch(setModalContext({context: context, modal: "printCenter"})),
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 
 export function JobsDetailPage({
@@ -172,7 +172,7 @@ export function JobsDetailPage({
                             ? DateTimeFormat(changedAuditFields[key])
                             : changedAuditFields[key]
                     ),
-                });
+                type: "jobfieldchange",});
             });
 
             await refetch();
@@ -304,7 +304,7 @@ export function JobsDetailPage({
                         {
                             key: 'lifecycle',
                             icon: <BarsOutlined/>,
-                            label: t('menus.jobsdetail.lifecycle'),
+                            label: t("menus.jobsdetail.lifecycle"),
                             children: <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses}/>,
                         },
                         {