Merge branch 'master-beta' into master-AIO

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}/>
             ),