- big progress commit

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

client/src/utils/RenderTemplate.js

@@ -9,7 +9,7 @@ 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;
 
@@ -278,7 +278,9 @@ export const GenerateDocument = async (
     sendType,
     jobid
 ) => {
+
   const bodyshop = store.getState().user.bodyshop;
+
   if (sendType === "e") {
     store.dispatch(
         setEmailOptions({
@@ -404,7 +406,7 @@ const fetchContextData = async (templateObject, jsrAuth) => {
 
 
   // 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 (!(templateObject?.filters?.length || templateObject?.sorters?.length)) {
     let contextData = {};
     if (templateQueryToExecute) {
       const {data} = await client.query({
@@ -417,36 +419,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) => {