Merge branch 'development' into Sanjeev-fix-create-new-event-button

Author: sanjeev29

.husky/pre-commit

@@ -1,4 +1,12 @@
 #!/bin/sh
+# Load nvm if available
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+# Use Node 20 if available (or install if needed)
+if [ -f .nvmrc ]; then
+  nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
+fi
+
 . "$(dirname "$0")/_/husky.sh"
 
 echo ""

.husky/pre-push

@@ -1,4 +1,12 @@
 #!/bin/sh
+# Load nvm if available
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+# Use Node 20 if available (or install if needed)
+if [ -f .nvmrc ]; then
+  nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
+fi
+
 . "$(dirname "$0")/_/husky.sh"
 
 echo "🧪 Running tests before push..."

git

@@ -210,4 +210,4 @@
   "optionalDependencies": {
     "@rollup/rollup-darwin-arm64": "^4.54.0"
   }
-}
+}

package.json

@@ -116,4 +116,4 @@ describe('authActions', () => {
 
     expect(setHeaderData(data)).toEqual(expectedAction); // Assert the action
   });
-});
+});

src/actions/__tests__/authActions.js.test.js

@@ -115,7 +115,7 @@ export const getHeaderData = userId => {
   };
 };
 
-export const logoutUser = () => dispatch => {
+export const logoutUser = () => (dispatch) => {
   // Clear any active force-logout timer before logging out
   dispatch(stopForceLogout());
   localStorage.removeItem(tokenKey);
@@ -135,18 +135,18 @@ export const startForceLogout = (delayMs = 20000) => (dispatch, getState) => {
   const timerId = setTimeout(async () => {
     try {
       const { userProfile } = getState();
-      
+
       if (userProfile && userProfile._id) {
         const { firstName: name, lastName, personalLinks, adminLinks, _id } = userProfile;
-        
+
         await axios.put(ENDPOINTS.USER_PROFILE(_id), {
           firstName: name,
           lastName,
           personalLinks,
           adminLinks,
           isAcknowledged: true,
         });
-        
+
         // eslint-disable-next-line no-console
         console.log('Permission changes acknowledged during force logout');
       }

src/actions/authActions.js

@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useRef } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import axios from 'axios';
 import { ENDPOINTS } from '~/utils/URL';

src/components/Auth/PermissionWatcher.jsx

@@ -66,11 +66,17 @@ export function BMDashboard() {
           }
         });
 
-        // Handle containers
+        // Handle containers - only target containers within BMDashboard, not ProjectDetails
         const containers = bmContainer.querySelectorAll(
-          '.container, .projects-list, .project-summary, .log-bar, .log-bar-dark',
+          '.container, .projects-list, .project-summary',
         );
         containers.forEach(container => {
+          // Skip if it's inside ProjectDetails (has project-details class in parent)
+          const isInProjectDetails = container.closest('.project-details, .project-details-dark');
+          if (isInProjectDetails) {
+            return; // Don't override ProjectDetails styles
+          }
+
           if (darkMode) {
             container.style.setProperty('background-color', '#1b2a41', 'important');
             container.style.setProperty('color', '#ffffff', 'important');
@@ -80,11 +86,17 @@ export function BMDashboard() {
           }
         });
 
-        // Handle LogBar headings specifically
+        // Handle LogBar headings specifically - only within BMDashboard, not ProjectDetails
         const logBarHeadings = bmContainer.querySelectorAll(
           '.log-bar h2, .log-bar-dark h2, .log-bar__section h2',
         );
         logBarHeadings.forEach(heading => {
+          // Skip if it's inside ProjectDetails (has project-details class in parent)
+          const isInProjectDetails = heading.closest('.project-details, .project-details-dark');
+          if (isInProjectDetails) {
+            return; // Don't override ProjectDetails LogBar styles
+          }
+
           if (darkMode) {
             heading.style.setProperty('color', '#ffffff', 'important');
             heading.style.setProperty('text-shadow', '0 1px 2px rgba(0, 0, 0, 0.5)', 'important');

src/components/BMDashboard/BMDashboard.jsx

@@ -1,10 +1,11 @@
 import { useState, useEffect } from 'react';
+import { useDispatch } from 'react-redux';
 import { Form, FormGroup, FormFeedback, Label, Input, Button } from 'reactstrap';
 import Joi from 'joi-browser';
 import { toast } from 'react-toastify';
 import { useHistory } from 'react-router-dom';
 
-import { addEquipmentType } from '~/actions/bmdashboard/equipmentActions';
+import { addEquipmentType, fetchAllEquipments } from '~/actions/bmdashboard/equipmentActions';
 
 const FuelTypes = {
   dies: 'Diesel',
@@ -25,6 +26,7 @@ const schema = Joi.object({
 
 export default function AddTypeForm() {
   const history = useHistory();
+  const dispatch = useDispatch();
   const [name, setName] = useState('');
   const [desc, setDesc] = useState('');
   const [fuel, setFuel] = useState(FuelTypes.dies);
@@ -62,6 +64,8 @@ export default function AddTypeForm() {
     const response = await addEquipmentType({ name, desc, fuel });
     if (response.status === 201) {
       toast.success('Success: new equipment type added.');
+      // Refresh the equipment list to show the newly added item
+      dispatch(fetchAllEquipments());
       setIsRedirected(true);
     } else if (response.status === 409) {
       toast.error(`Error: that type already exists.`);

src/components/BMDashboard/Equipment/Add/AddTypeForm.jsx

@@ -106,7 +106,7 @@ export default function IssueDashboard() {
       </div>
       <Row className="mb-3">
         <Col>
-          <h4 className="fw-semibold">Issue Dashboard</h4>
+          <h4 className={`fw-semibold ${darkMode ? 'text-light' : ''}`}>Issue Dashboard</h4>
         </Col>
       </Row>
 
@@ -135,13 +135,13 @@ export default function IssueDashboard() {
 
               return (
                 <tr key={issue._id}>
-                  <td className="fw-medium">{issue.name}</td>
-                  <td>{openSince}</td>
+                  <td className={`fw-medium ${darkMode ? 'text-light' : ''}`}>{issue.name}</td>
+                  <td className={darkMode ? 'text-light' : ''}>{openSince}</td>
                   <td>
                     <span className={`${styles.badge} ${styles.bgInfo} text-dark`}>{category}</span>
                   </td>
-                  <td>{assignedTo}</td>
-                  <td>{cost}</td>
+                  <td className={darkMode ? 'text-light' : ''}>{assignedTo}</td>
+                  <td className={darkMode ? 'text-light' : ''}>{cost}</td>
                   <td className={`${styles.textEnd} position-relative`}>
                     <div className={`issue-dashboard-dropdown  ${darkMode ? 'bg-oxide-blue' : ''}`}>
                       <button
@@ -155,7 +155,9 @@ export default function IssueDashboard() {
 
                       {menuOpen === issue._id && (
                         <div
-                          className={`issue-dashboard-dropdown-menu show action-menu${
+                          className={`issue-dashboard-dropdown-menu show ${styles.actionMenu} ${
+                            darkMode ? styles.actionMenuDark : ''
+                          } ${
                             currentItems.indexOf(issue) === currentItems.length - 1
                               ? ' last-row-menu'
                               : ''
@@ -204,7 +206,10 @@ export default function IssueDashboard() {
 
             {issues.length === 0 && (
               <tr>
-                <td colSpan="6" className="text-center py-4 text-muted">
+                <td
+                  colSpan="6"
+                  className={`text-center py-4 ${darkMode ? 'text-light' : 'text-muted'}`}
+                >
                   No issues found. Create one to get started.
                 </td>
               </tr>
@@ -215,10 +220,10 @@ export default function IssueDashboard() {
 
       <div
         className={`card-footer d-flex justify-content-between align-items-center ${
-          darkMode ? 'bg-dark text-light' : 'bg-light text-muted'
+          darkMode ? 'bg-space-cadet text-light' : 'bg-light text-muted'
         }`}
       >
-        <div className="small">
+        <div className={`small ${darkMode ? 'text-light' : ''}`}>
           Showing {currentItems.length} of {issues.length} issues
         </div>
         <nav aria-label="Issue pagination">