IO-3121 Adjust Footer

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/production-board-kanban/production-board-kanban-card.component.jsx

@@ -21,7 +21,7 @@ import dayjs from "../../utils/day";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
-import { SiMicrosoftteams } from "react-icons/si";
+import { PiMicrosoftTeamsLogo } from "react-icons/pi";
 
 const cardColor = (ssbuckets, totalHrs) => {
   const bucket = ssbuckets.find((bucket) => bucket.gte <= totalHrs && (!bucket.lt || bucket.lt > totalHrs));
@@ -424,7 +424,7 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe
               noIcon={true}
               linkText={
                 <div className="share-to-teams-badge">
-                  <SiMicrosoftteams />
+                  <PiMicrosoftTeamsLogo />
                 </div>
               }
               urlOverride={`${window.location.origin}/manage/jobs/${card.id}`}

client/src/components/share-to-teams/share-to-teams.component.jsx

@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import { Button } from "antd";
 import { useLocation } from "react-router-dom";
-import { SiMicrosoftteams } from "react-icons/si";
+import { PiMicrosoftTeamsLogo } from "react-icons/pi";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -90,7 +90,7 @@ const ShareToTeamsComponent = ({
         color: "#FFFFFF",
         ...buttonStyle
       }}
-      icon={<SiMicrosoftteams style={{ color: "#FFFFFF", ...buttonIconStyle }} />}
+      icon={<PiMicrosoftTeamsLogo style={{ color: "#FFFFFF", ...buttonIconStyle }} />}
       onClick={handleShare}
       title={linkText === null ? t("general.actions.sharetoteams") : linkText}
     />

client/src/utils/RenderTemplate.js

@@ -9,7 +9,6 @@ import client from "../utils/GraphQLClient";
 import cleanAxios from "./CleanAxios";
 import { TemplateList } from "./TemplateConstants";
 import { generateTemplate } from "./graphQLmodifier";
-import InstanceRenderManager from "./instanceRenderMgr";
 
 const server = import.meta.env.VITE_APP_REPORTS_SERVER_URL;
 
@@ -39,7 +38,7 @@ export default async function RenderTemplate(
   jsreport.headers["Authorization"] = jsrAuth;
 
   //Query assets that match the template name. Must be in format <<templateName>>.query
-  let { contextData, useShopSpecificTemplate } = await fetchContextData(templateObject, jsrAuth);
+  let { contextData, useShopSpecificTemplate, shopSpecificFolder } = await fetchContextData(templateObject, jsrAuth);
 
   const { ignoreCustomMargins } = Templates[templateObject.name];
 
@@ -74,14 +73,8 @@ export default async function RenderTemplate(
       ...contextData,
       ...templateObject.variables,
       ...templateObject.context,
-      headerpath: `/${InstanceRenderManager({
-        imex: bodyshop.imexshopid,
-        rome: bodyshop.imexshopid
-      })}/header.html`,
-      footerpath: `/${InstanceRenderManager({
-        imex: bodyshop.imexshopid,
-        rome: bodyshop.imexshopid
-      })}/footer.html`,
+      headerpath: shopSpecificFolder ? `/${bodyshop.imexshopid}/header.html` : `/GENERIC/header.html`,
+      footerpath: shopSpecificFolder ? `/${bodyshop.imexshopid}/footer.html` : `/GENERIC/footer.html`,
       bodyshop: bodyshop,
       filters: templateObject?.filters,
       sorters: templateObject?.sorters,
@@ -149,11 +142,12 @@ export async function RenderTemplates(templateObjects, bodyshop, renderAsHtml =
   templateObjects.forEach((template) => {
     proms.push(
       (async () => {
-        let { contextData, useShopSpecificTemplate } = await fetchContextData(template, jsrAuth);
+        let { contextData, useShopSpecificTemplate, shopSpecificFolder } = await fetchContextData(template, jsrAuth);
         unsortedTemplatesAndData.push({
           templateObject: template,
           contextData,
-          useShopSpecificTemplate
+          useShopSpecificTemplate,
+          shopSpecificFolder
         });
       })()
     );
@@ -248,8 +242,8 @@ export async function RenderTemplates(templateObjects, bodyshop, renderAsHtml =
 
       // ...rootTemplate.templateObject.variables,
       // ...rootTemplate.templateObject.context,
-      headerpath: `/${bodyshop.imexshopid}/header.html`,
-      footerpath: `/${bodyshop.imexshopid}/footer.html`,
+      headerpath: rootTemplate.shopSpecificFolder ? `/${bodyshop.imexshopid}/header.html` : `/GENERIC/header.html`,
+      footerpath: rootTemplate.shopSpecificFolder ? `/${bodyshop.imexshopid}/footer.html` : `/GENERIC/footer.html`,
       bodyshop: bodyshop,
       offset: bodyshop.timezone
     }
@@ -397,10 +391,10 @@ const fetchContextData = async (templateObject, jsrAuth) => {
       });
       contextData = data;
     }
-    return { contextData, useShopSpecificTemplate };
+    return { contextData, useShopSpecificTemplate, shopSpecificFolder };
   }
 
-  return await generateTemplate(templateQueryToExecute, templateObject, useShopSpecificTemplate);
+  return await generateTemplate(templateQueryToExecute, templateObject, useShopSpecificTemplate, shopSpecificFolder);
 };
 
 //export const displayTemplateInWindow = (html) => {

client/src/utils/graphQLmodifier.js

@@ -1,6 +1,6 @@
+import { gql } from "@apollo/client";
 import { Kind, parse, print, visit } from "graphql";
 import client from "./GraphQLClient";
-import { gql } from "@apollo/client";
 
 /* eslint-disable no-loop-func */
 
@@ -114,9 +114,10 @@ export function printQuery(query) {
  * @param templateQueryToExecute
  * @param templateObject
  * @param useShopSpecificTemplate
- * @returns {Promise<{contextData: {}, useShopSpecificTemplate}>}
+ * @param shopSpecificTemplate
+ * @returns {Promise<{contextData: {}, useShopSpecificTemplate, shopSpecificTemplate}>}
  */
-export async function generateTemplate(templateQueryToExecute, templateObject, useShopSpecificTemplate) {
+export async function generateTemplate(templateQueryToExecute, templateObject, useShopSpecificTemplate, shopSpecificFolder) {
   // Advanced Filtering and Sorting modifications start here
 
   // Parse the query and apply the filters and sorters
@@ -147,7 +148,7 @@ export async function generateTemplate(templateQueryToExecute, templateObject, u
     contextData = data;
   }
 
-  return { contextData, useShopSpecificTemplate };
+  return { contextData, useShopSpecificTemplate, shopSpecificFolder };
 }
 
 /**