- Merge release and adjust due to version differences

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

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -16,9 +16,11 @@ import EmployeeSearchSelect from "../employee-search-select/employee-search-sele
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import "./report-center-modal.styles.scss";
 import ReportCenterModalFiltersSortersComponent from "./report-center-modal-filters-sorters-component";
+import {selectBodyshop} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
     reportCenterModal: selectReportCenter,
+    bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
     //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -28,7 +30,7 @@ export default connect(
     mapDispatchToProps
 )(ReportCenterModalComponent);
 
-export function ReportCenterModalComponent({reportCenterModal}) {
+export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
     const [form] = Form.useForm();
     const [search, setSearch] = useState("");
 
@@ -64,7 +66,7 @@ export function ReportCenterModalComponent({reportCenterModal}) {
         const end = values.dates ? values.dates[1] : null;
         const {id} = values;
 
-        await GenerateDocument(
+        const templateConfig =
             {
                 name: values.key,
                 variables: {
@@ -81,7 +83,14 @@ export function ReportCenterModalComponent({reportCenterModal}) {
                 },
                 filters: values.filters,
                 sorters: values.sorters,
-            },
+            };
+
+        if (_.isString(values.defaultSorters) && !_.isEmpty(values.defaultSorters)) {
+            templateConfig.defaultSorters = JSON.parse(values.defaultSorters);
+        }
+
+        await GenerateDocument(
+            templateConfig,
             {
                 to: values.to,
                 subject: Templates[values.key]?.subject,
@@ -119,6 +128,7 @@ export function ReportCenterModalComponent({reportCenterModal}) {
                     onChange={(e) => setSearch(e.target.value)}
                     value={search}
                 />
+                <Form.Item name="defaultSorters" hidden/>
                 <Form.Item
                     name="key"
                     label={t("reportcenter.labels.key")}
@@ -183,7 +193,7 @@ export function ReportCenterModalComponent({reportCenterModal}) {
                         );
                     }}
                 </Form.Item>
-                <ReportCenterModalFiltersSortersComponent form={form}/>
+                <ReportCenterModalFiltersSortersComponent form={form} bodyshop={bodyshop}/>
                 <Form.Item style={{margin: 0, padding: 0}} dependencies={["key"]}>
                     {() => {
                         const key = form.getFieldValue("key");