- Merge release and adjust due to version differences

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

client/src/utils/RenderTemplate.js

@@ -9,7 +9,8 @@ import {store} from "../redux/store";
 import client from "../utils/GraphQLClient";
 import cleanAxios from "./CleanAxios";
 import {TemplateList} from "./TemplateConstants";
-import {applyFilters, applySorters, parseQuery, printQuery, wrapFiltersInAnd} from "./graphQLmodifier";
+import {generateTemplate} from "./graphQLmodifier";
+
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 
 jsreport.serverUrl = server;
@@ -74,7 +75,10 @@ export default async function RenderTemplate(
             headerpath: `/${bodyshop.imexshopid}/header.html`,
             footerpath: `/${bodyshop.imexshopid}/footer.html`,
             bodyshop: bodyshop,
+            filters: templateObject?.filters,
+            sorters: templateObject?.sorters,
             offset: bodyshop.timezone, //dayjs().utcOffset(),
+            defaultSorters: templateObject?.defaultSorters,
         },
     };
 
@@ -402,9 +406,12 @@ const fetchContextData = async (templateObject, jsrAuth) => {
     // console.log('Unmodified Query');
     // console.dir(templateQueryToExecute);
 
+    const hasFilters = templateObject?.filters?.length > 0;
+    const hasSorters = templateObject?.sorters?.length > 0;
+    const hasDefaultSorters = templateObject?.defaultSorters?.length > 0;
 
     // We have no template filters or sorters, so we can just execute the query and return the data
-    if ((!templateObject?.filters && !templateObject?.filters?.length && !templateObject?.sorters && !templateObject?.sorters?.length)) {
+    if (!hasFilters && !hasSorters && !hasDefaultSorters) {
         let contextData = {};
     if (templateQueryToExecute) {
         const {data} = await client.query({
@@ -416,36 +423,11 @@ const fetchContextData = async (templateObject, jsrAuth) => {
         return {contextData, useShopSpecificTemplate};
     }
 
-    // Parse the query and apply the filters and sorters
-    const ast = parseQuery(templateQueryToExecute);
-
-    let filterFields = [];
-
-    if (templateObject?.filters && templateObject?.filters?.length) {
-        applyFilters(ast, templateObject.filters, filterFields);
-        wrapFiltersInAnd(ast, filterFields);
-    }
-
-    if (templateObject?.sorters && templateObject?.sorters?.length) {
-        applySorters(ast, templateObject.sorters);
-    }
-
-    const finalQuery = printQuery(ast);
-
-    // commented out for future revision debugging
-    // console.log('Modified Query');
-    // console.log(finalQuery);
-
-    let contextData = {};
-    if (templateQueryToExecute) {
-        const {data} = await client.query({
-            query: gql(finalQuery),
-            variables: {...templateObject.variables},
-        });
-        contextData = data;
-    }
-
-    return {contextData, useShopSpecificTemplate};
+    return await generateTemplate(
+        templateQueryToExecute,
+        templateObject,
+        useShopSpecificTemplate
+    );
 };
 
 //export const displayTemplateInWindow = (html) => {