Frontend Release to Main [4.71]

index.html

@@ -37,6 +37,8 @@
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
     <script type="module" src="/src/index.jsx"></script>
-    <a class="top" href="#">Back to Top ↑</a>
+    <a class="back-to-top" href="#" aria-label="Back to top">
+      ↑
+    </a>
   </body>
 </html>

package.json

@@ -29,7 +29,7 @@
     "@react-leaflet/core": "^2.1.0",
     "@reduxjs/toolkit": "^2.4.0",
     "@sentry/browser": "^9.15.0",
-    "@tanstack/react-query": "^5.85.3",
+    "@tanstack/react-query": "^5.90.16",
     "@tinymce/miniature": "^6.0.0",
     "@tinymce/tinymce-react": "^6.1.0",
     "ajv": "^8.0.0",
@@ -54,7 +54,7 @@
     "date-fns": "^2.14.0",
     "date-fns-tz": "^2.0.1",
     "dayjs": "^1.11.13",
-    "diff": "^5.0.0",
+    "diff": "^8.0.3",
     "dompurify": "^3.2.5",
     "elliptic": "^6.6.1",
     "font-awesome": "^4.7.0",
@@ -65,7 +65,7 @@
     "html2canvas": "^1.4.1",
     "jest": "^30.2.0",
     "jquery": "^3.7.1",
-    "jspdf": "^3.0.3",
+    "jspdf": "^4.0.0",
     "jwt-decode": "^2.2.0",
     "leaflet": "^1.9.4",
     "leaflet.heat": "^0.2.0",
@@ -206,4 +206,4 @@
     ],
     "**/*.{css,scss,sass}": "stylelint"
   }
-}
+}

public/index.css

@@ -325,11 +325,33 @@ body.bm-dashboard-dark .page-item.active .page-link {
 }
 
 /* Fix the position of the header at the top */
-.top {
-    position: fixed;
-    right: 10px;
-    bottom: 10px;
-  }
+.back-to-top {
+  position: fixed;
+  bottom: 24px;
+  right: 24px;
+
+  width: 48px;
+  height: 48px;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  background-color: #2A1B3D;
+  color: #ffffff;
+
+  border-radius: 50%;
+  font-size: 22px;
+  text-decoration: none;
+
+  box-shadow: 0 6px 16px rgba(0, 0, 0, 0.25);
+  z-index: 1000;
+}
+
+.back-to-top:hover {
+  transform: translateY(-4px);
+  opacity: 0.9;
+}
 
   /* Allow the page content to scroll horizontally */
   .container-fluid {
@@ -339,4 +361,9 @@ body.bm-dashboard-dark .page-item.active .page-link {
   /* Hide the horizontal scrollbar */
   .container-fluid::-webkit-scrollbar {
     display: none;
-  }
+  }
+
+  .tab-content {
+  background-color: transparent;
+  border: none;
+}

src/actions/authActions.js

@@ -2,7 +2,7 @@ import jwtDecode from 'jwt-decode';
 import axios from 'axios';
 import httpService from '../services/httpService';
 import config from '../config.json';
-import { ENDPOINTS } from '~/utils/URL';
+import { ENDPOINTS } from '../utils/URL';
 import { GET_ERRORS } from '../constants/errors';
 import {
   SET_CURRENT_USER,

src/actions/bmdashboard/projectActions.js

@@ -30,3 +30,11 @@ export const fetchBMProjects = () => {
       });
   };
 };
+
+export const getProjectGlobalDistribution = async (payload) => {
+  const url = ENDPOINTS.PROJECT_GLOBAL_DISTRIBUTION
+
+  const res = await axios.get(url, {params: payload});
+
+  return res.data
+  };

src/actions/index.js

@@ -142,6 +142,7 @@ export function getProjectById(projectId) {
   };
 }
 
+
 export function getProjectsByUser(userId) {
   const request = httpService.get(`${APIEndpoint}/projects/user/${userId}`);
 

src/actions/weeklySummariesFilterAction.js

@@ -0,0 +1,118 @@
+import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
+import { ENDPOINTS } from '~/utils/URL';
+import axios from 'axios';
+import { normalizeFilter } from "~/utils/weeklySummariesFilterHelper";
+
+export const weeklySummariesFiltersApi = createApi({
+  reducerPath: "weeklySummariesFiltersApi",
+  baseQuery: fetchBaseQuery({
+    prepareHeaders: (headers) => {
+      const token = axios.defaults.headers.common.Authorization;
+      if (token) headers.set("Authorization", token);
+      return headers;
+    },
+  }),
+  tagTypes: ["WeeklySummariesFilters"],   // <-- Add tag type
+  endpoints: (builder) => ({
+
+    // ---------------------------------------
+    // GET Filter List
+    // ---------------------------------------
+    getWeeklySummariesFilters: builder.query({
+      query: () => ENDPOINTS.WEEKLY_SUMMARIES_FILTERS,
+      transformResponse: (response) => {
+        const filterList = response;
+        const updatedFilterChoices = [];
+
+        filterList.forEach(filter => {
+          updatedFilterChoices.push(normalizeFilter(filter));
+        });
+
+        return updatedFilterChoices;
+      },
+      providesTags: ["WeeklySummariesFilters"],  // <-- Cache tag
+    }),
+
+    // ---------------------------------------
+    // CREATE New Filter
+    // ---------------------------------------
+    createWeeklySummariesFilter: builder.mutation({
+      query: ({data}) => ({
+        url: ENDPOINTS.WEEKLY_SUMMARIES_FILTERS,
+        method: "POST",
+        body: data,
+      }),
+      invalidatesTags: ["WeeklySummariesFilters"],  // <-- Refresh cache
+    }),
+
+    // ---------------------------------------
+    // UPDATE Existing Filter
+    // ---------------------------------------
+    updateWeeklySummariesFilter: builder.mutation({
+      query: ({ id, data }) => ({
+        url:  ENDPOINTS.WEEKLY_SUMMARIES_FILTER_BY_ID(id),
+        method: "PATCH",
+        body: data,
+      }),
+      invalidatesTags: ["WeeklySummariesFilters"],  // <-- Refresh cache
+    }),
+
+     // ---------------------------------------
+    // REPLACE Existing Filter
+    // ---------------------------------------
+    replaceWeeklySummariesFilter: builder.mutation({
+      query: ({ id, data }) => ({
+        url:  ENDPOINTS.WEEKLY_SUMMARIES_FILTER_BY_ID(id),
+        method: "PUT",
+        body: data,
+      }),
+      invalidatesTags: ["WeeklySummariesFilters"],  // <-- Refresh cache
+    }),
+
+    // ---------------------------------------
+    // DELETE Existing Filter
+    // ---------------------------------------
+    deleteWeeklySummariesFilter: builder.mutation({
+      query: ({ id }) => ({
+        url:  ENDPOINTS.WEEKLY_SUMMARIES_FILTER_BY_ID(id),
+        method: "DELETE",
+      }),
+      invalidatesTags: ["WeeklySummariesFilters"],  // <-- Refresh cache
+    }),
+
+    // ---------------------------------------
+    // UPDATE Existing Filter with Replaced Team codes
+    // ---------------------------------------
+    updateFiltersWithReplacedTeamCodes: builder.mutation({
+      query: ({oldTeamCodes, newTeamCode}) => ({
+        url: ENDPOINTS.WEEKLY_SUMMARIES_FILTER_REPLACE_CODES,
+        method: "POST",
+        body: { oldTeamCodes, newTeamCode },
+      }),
+      invalidatesTags: ["WeeklySummariesFilters"],  // <-- Refresh cache
+    }),
+
+    // ---------------------------------------
+    // UPDATE Existing Filter with Individual Codes changes
+    // ---------------------------------------
+    updateFiltersWithIndividualCodesChange: builder.mutation({
+      query: ({oldTeamCode, newTeamCode, userId}) => ({
+        url: ENDPOINTS.WEEKLY_SUMMARIES_FILTER_REPLACE_INDIVIDUAL_CODES,
+        method: "POST",
+        body: { oldTeamCode, newTeamCode, userId },
+      }),
+      invalidatesTags: ["WeeklySummariesFilters"],  // <-- Refresh cache
+    }),
+
+  }),
+});
+
+export const {
+  useGetWeeklySummariesFiltersQuery,
+  useCreateWeeklySummariesFilterMutation,
+  useUpdateWeeklySummariesFilterMutation,
+  useReplaceWeeklySummariesFilterMutation,
+  useDeleteWeeklySummariesFilterMutation,
+  useUpdateFiltersWithReplacedTeamCodesMutation,
+  useUpdateFiltersWithIndividualCodesChangeMutation,
+} = weeklySummariesFiltersApi;

src/components/App.jsx

@@ -107,6 +107,8 @@ function UpdateDocumentTitle() {
     { pattern: /^\/Logout$/, title: 'Logout' },
     { pattern: /^\/forcePasswordUpdate\/[^/]+$/, title: 'Force Password Update' },
     { pattern: /^\/$/, title: `Dashboard - ${fullName}` },
+    { pattern: /^\/kitchenandinventory\/login$/, title: 'Kitchen and Inventory Login' },
+    { pattern: /^\/kitchenandinventory$/, title: 'Kitchen and Inventory Dashboard' },
     { pattern: /.*/, title: 'HGN APP' }, // Default case
     {
       pattern: /^\/communityportal\/activity\/activityid\/feedback$/,

src/components/AutoUpdate/AutoUpdate.jsx

@@ -17,48 +17,63 @@ function AutoUpdate() {
     headers: noCacheHeaders,
   };
 
-  // Create the hash request with proper URL handling for test environment
-  const hashRequest = (() => {
-    try {
-      return new Request('/hash.txt');
-    } catch (error) {
-      // In test environment, use a fallback URL
-      return new Request('http://localhost/hash.txt');
+  const resolveHashUrl = () => {
+    const isTestEnv =
+      (typeof import.meta !== 'undefined' && import.meta.env?.MODE === 'test') ||
+      (typeof process !== 'undefined' && process.env?.NODE_ENV === 'test');
+
+    if (isTestEnv || typeof window === 'undefined' || !window.location) {
+      return null;
     }
-  })();
+    return new URL('/hash.txt', window.location.origin).toString();
+  };
 
   useEffect(() => {
-    fetch(hashRequest, requestParams)
-      .then(response => {
-        response.text().then(text => {
+    const hashUrl = resolveHashUrl();
+    if (!hashUrl || typeof fetch === 'undefined') {
+      return undefined;
+    }
+
+    let isMounted = true;
+    fetch(hashUrl, requestParams)
+      .then(response => response.text())
+      .then(text => {
+        if (isMounted) {
           setHash(text);
-        });
+        }
       })
       .catch(err => {
         console.error(err); // eslint-disable-line no-console
       });
+
+    return () => {
+      isMounted = false;
+    };
   }, []);
 
   useEffect(() => {
-    if (hash !== undefined) {
-      const interval = setInterval(() => {
-        fetch(hashRequest, requestParams)
-          .then(response => {
-            response.text().then(text => {
-              if (text !== hash) {
-                setUpdated(true);
-              }
-            });
-          })
-          .catch(err => {
-            console.error(err); // eslint-disable-line no-console
-          });
-      }, 5 * MINUTE);
-      return () => clearInterval(interval);
+    if (hash === undefined) {
+      return undefined;
+    }
+
+    const hashUrl = resolveHashUrl();
+    if (!hashUrl || typeof fetch === 'undefined') {
+      return undefined;
     }
 
-    // No cleanup needed if the hash is undefined.
-    return () => {};
+    const interval = setInterval(() => {
+      fetch(hashUrl, requestParams)
+        .then(response => response.text())
+        .then(text => {
+          if (text !== hash) {
+            setUpdated(true);
+          }
+        })
+        .catch(err => {
+          console.error(err); // eslint-disable-line no-console
+        });
+    }, 5 * MINUTE);
+    return () => clearInterval(interval);
   }, [hash]);
 
   if (!updated) return null;

src/components/BMDashboard/BMDashboard.jsx

@@ -5,7 +5,7 @@ import { fetchBMProjects } from '../../actions/bmdashboard/projectActions';
 import ProjectsList from './Projects/ProjectsList';
 import ProjectSelectForm from './Projects/ProjectSelectForm';
 import BMError from './shared/BMError';
-import './BMDashboard.module.css';
+import styles from './BMDashboard.module.css';
 
 export function BMDashboard() {
   const [isError, setIsError] = useState(false);
@@ -170,18 +170,13 @@ export function BMDashboard() {
 
   return (
     <Container
-      className={`justify-content-center align-items-center bm-dashboard-container ${
-        darkMode ? 'bm-dashboard-dark' : 'bm-dashboard-light'
+      fluid
+      className={`justify-content-center align-items-center ${
+        darkMode ? styles.darkBmDashboardMain : ''
       }`}
     >
-      <header
-        className={`bm-dashboard__header ${
-          darkMode ? 'bm-dashboard__header-dark' : 'bm-dashboard__header-light'
-        }`}
-      >
-        <h1 className={darkMode ? 'text-light' : 'text-dark'}>
-          Building and Inventory Management Dashboard
-        </h1>
+      <header className={`${darkMode ? styles.darkBmDashboardHeader : styles.bmDashboardHeader}`}>
+        <h1>Building and Inventory Management Dashboard</h1>
       </header>
       <main
         className={`bm-dashboard-main ${