- clear stage

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";
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 
 jsreport.serverUrl = server;
@@ -292,7 +292,7 @@ export const GenerateDocument = async (
             })
         );
     } else if (sendType === "x") {
-        console.log("excel");
+
         await RenderTemplate(template, bodyshop, false, true);
     } else if (sendType === "text") {
         await RenderTemplate(template, bodyshop, false, false, true);
@@ -306,6 +306,58 @@ export const GenerateDocuments = async (templates) => {
     await RenderTemplates(templates, bodyshop);
 };
 
+export const fetchFilterData = async ({name}) => {
+    try {
+        const bodyshop = store.getState().user.bodyshop;
+        const jsrAuth = (await axios.post("/utils/jsr")).data;
+        jsreport.headers["FirebaseAuthorization"] =
+            "Bearer " + (await auth.currentUser.getIdToken());
+
+        const folders = await cleanAxios.get(`${server}/odata/folders`, {
+            headers: {Authorization: jsrAuth},
+        });
+        const shopSpecificFolder = folders.data.value.find(
+            (f) => f.name === bodyshop.imexshopid
+        );
+
+        const jsReportFilters = await cleanAxios.get(
+            `${server}/odata/assets?$filter=name eq '${name}.filters'`,
+            {headers: {Authorization: jsrAuth}}
+        );
+        console.log("🚀 ~ fetchFilterData ~ jsReportFilters:", jsReportFilters);
+
+        let parsedFilterData;
+        let useShopSpecificTemplate = false;
+        // let shopSpecificTemplate;
+
+        if (shopSpecificFolder) {
+            let shopSpecificTemplate = jsReportFilters.data.value.find(
+                (f) => f?.folder?.shortid === shopSpecificFolder.shortid
+            );
+            if (shopSpecificTemplate) {
+                useShopSpecificTemplate = true;
+                parsedFilterData = atob(shopSpecificTemplate.content);
+            }
+        }
+
+        if (!parsedFilterData) {
+            const generalTemplate = jsReportFilters.data.value.find((f) => !f.folder);
+            useShopSpecificTemplate = false;
+            if (generalTemplate) parsedFilterData = atob(generalTemplate.content);
+        }
+        const data = JSON.parse(parsedFilterData);
+        return {
+            data,
+            useShopSpecificTemplate,
+            success: true,
+        }
+    } catch {
+        return {
+            success: false,
+        }
+    }
+};
+
 const fetchContextData = async (templateObject, jsrAuth) => {
     const bodyshop = store.getState().user.bodyshop;
 
@@ -344,7 +396,16 @@ const fetchContextData = async (templateObject, jsrAuth) => {
         templateQueryToExecute = atob(generalTemplate.content);
     }
 
-    let contextData = {};
+    // Commented out for future revision debugging
+    // console.log('Template Object');
+    // console.dir(templateObject);
+    // console.log('Unmodified Query');
+    // console.dir(templateQueryToExecute);
+
+
+    // 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)) {
+        let contextData = {};
     if (templateQueryToExecute) {
         const {data} = await client.query({
             query: gql(templateQueryToExecute),
@@ -352,6 +413,37 @@ const fetchContextData = async (templateObject, jsrAuth) => {
         });
         contextData = data;
     }
+        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};
 };
@@ -406,4 +498,4 @@ function extend(o1, o2, o3) {
         }
     }
     return result;
-}
+}