From 9cc0d6175e59c497292ad8077f0a37619442097e Mon Sep 17 00:00:00 2001
From: Dave Richer <dave@imexsystems.ca>
Date: Thu, 15 Feb 2024 21:01:43 -0500
Subject: [PATCH] - Progress commit

Signed-off-by: Dave Richer <dave@imexsystems.ca>
---
 ...center-modal-filters-sorters-component.jsx | 24 ++++++++++++++-----
 client/src/utils/graphQLmodifier.js           | 17 +++++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/client/src/components/report-center-modal/report-center-modal-filters-sorters-component.jsx b/client/src/components/report-center-modal/report-center-modal-filters-sorters-component.jsx
index 62efefac0..4e3d0aa5d 100644
--- a/client/src/components/report-center-modal/report-center-modal-filters-sorters-component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal-filters-sorters-component.jsx
@@ -5,8 +5,20 @@ import {DeleteFilled} from "@ant-design/icons";
 import {useTranslation} from "react-i18next";
 import {getOperatorsByType} from "../../utils/graphQLmodifier";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
+import {setModalContext} from "../../redux/modals/modals.actions";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectBodyshop, selectCurrentUser} from "../../redux/user/user.selectors";
 
-export default function ReportCenterModalFiltersSortersComponent({form}) {
+const mapDispatchToProps = (dispatch) => ({});
+const mapStateToProps = createStructuredSelector({
+    bodyshop: selectBodyshop,
+    currentUser: selectCurrentUser
+});
+
+export  function ReportCenterModalFiltersSortersComponent({form, bodyshop, currentUser}) {
+    console.dir(bodyshop, {depth: null})
+    console.dir(currentUser, {depth: null})
     return (
         <Form.Item style={{margin: 0, padding: 0}} dependencies={["key"]}>
             {() => {
@@ -17,6 +29,9 @@ export default function ReportCenterModalFiltersSortersComponent({form}) {
     );
 }
 
+export default connect(mapStateToProps, mapDispatchToProps)(ReportCenterModalFiltersSortersComponent);
+
+
 function RenderFilters({templateId, form}) {
     const [state, setState] = useState(null);
     const [visible, setVisible] = useState(false);
@@ -210,7 +225,7 @@ function RenderFilters({templateId, form}) {
                                                                         state.sorters
                                                                             ? state.sorters.map((f) => ({
                                                                                 value: f.name,
-                                                                                label: t(f.translation),
+                                                                                label: f?.translation ? (t(f.translation) === f.translation ? f.label : t(f.translation)) : f.label,
                                                                             }))
                                                                             : []
                                                                     }
@@ -230,10 +245,7 @@ function RenderFilters({templateId, form}) {
                                                                 ]}
                                                             >
                                                                 <Select
-                                                                    options={[
-                                                                        {value: "desc", label: "Descending"},
-                                                                        {value: "asc", label: "Ascending"},
-                                                                    ]}
+                                                                    options={getOperatorsByType()}
                                                                 />
                                                             </Form.Item>
                                                         </Col>
diff --git a/client/src/utils/graphQLmodifier.js b/client/src/utils/graphQLmodifier.js
index 5716753ad..c9a93542e 100644
--- a/client/src/utils/graphQLmodifier.js
+++ b/client/src/utils/graphQLmodifier.js
@@ -16,7 +16,24 @@ const NUMBER_OPERATORS = [
     {value: "_gte", label: "greater than or equal"},
     {value: "_lte", label: "less than or equal"}
 ];
+const ORDER_BY_OPERATORS = [
+    {value: "asc", label: "ascending"},
+    {value: "desc", label: "descending"}
+];
 
+/**
+ * Get the available operators for filtering
+ * @returns {[{label: string, value: string},{label: string, value: string}]}
+ */
+export function getOrderByOperators() {
+    return ORDER_BY_OPERATORS;
+}
+
+/**
+ * Get the available operators for filtering
+ * @param type
+ * @returns {[{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},null]}
+ */
 export function getOperatorsByType(type = 'string') {
     const operators = {
         string: STRING_OPERATORS,