Merge branch 'development' into add-dynamic-legend-color-differentiation-percent-tools-returned-late

# Conflicts:
#	src/components/BMDashboard/RentalChart/ReturnedLateChart.module.css

Author: uhakruthi1

.husky/pre-commit

@@ -1,19 +1,20 @@
 #!/bin/sh
 # Load nvm if available
-# Try to load nvm (non-blocking)
 export NVM_DIR="$HOME/.nvm"
-
-if [ -s "$NVM_DIR/nvm.sh" ]; then
-  . "$NVM_DIR/nvm.sh"
-  nvm use >/dev/null 2>&1
-  echo "Using Node via nvm"
-else
-  echo "nvm not available, using system Node"
+[ -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
 
 echo ""
 echo "🛡️  Husky pre-commit hook triggered"
 
+if git rev-parse -q --verify MERGE_HEAD >/dev/null 2>&1; then
+  echo "ℹ️  Merge commit detected. Skipping lint-staged auto-fix on the merged file set."
+  exit 0
+fi
+
 # Block plain .css files (except .module.css and index.css)
 for file in $(git diff --cached --name-only --diff-filter=ACM | grep '\.css$'); do
   case "$file" in
@@ -44,4 +45,4 @@ if git diff --cached --name-only | grep -qE '\.(js|jsx|ts|tsx|css)$'; then
   fi
 else
   echo "ℹ️  No JS/TS/CSS files to lint. Skipping lint-staged."
-fi
+fi

.husky/pre-push

@@ -9,18 +9,45 @@ fi
 
 . "$(dirname "$0")/_/husky.sh"
 
-echo "🧪 Running tests before push..."
-npm run test -- --bail=1
-test_status=$?
+changed_files=$(git diff --name-only @{upstream}...HEAD 2>/dev/null)
 
-echo "🧹 Running lint before push..."
-npm run lint
-lint_status=$?
+if [ -z "$changed_files" ]; then
+  echo "ℹ️  No outgoing changes to validate. Skipping pre-push checks."
+  exit 0
+fi
+
+if ! printf '%s\n' "$changed_files" | grep -qvE '^\.husky/'; then
+  echo "ℹ️  Only Husky hook changes detected. Skipping full test and lint checks."
+  exit 0
+fi
+
+js_files=$(printf '%s\n' "$changed_files" | grep -E '\.(js|jsx|ts|tsx)$' || true)
+style_files=$(printf '%s\n' "$changed_files" | grep -E '\.(css|scss|sass)$' || true)
+
+test_status=0
+lint_status=0
+style_status=0
+
+if [ -n "$js_files" ]; then
+  echo "🧪 Running related tests before push..."
+  yarn vitest related --run $js_files
+  test_status=$?
+
+  echo "🧹 Running ESLint on changed files before push..."
+  yarn eslint $js_files
+  lint_status=$?
+fi
+
+if [ -n "$style_files" ]; then
+  echo "🎨 Running Stylelint on changed files before push..."
+  yarn stylelint $style_files
+  style_status=$?
+fi
 
 # Block push if either fails
-if [ $test_status -ne 0 ] || [ $lint_status -ne 0 ]; then
-  echo "❌ Push blocked: Lint or test failed."
+if [ $test_status -ne 0 ] || [ $lint_status -ne 0 ] || [ $style_status -ne 0 ]; then
+  echo "❌ Push blocked: changed-file validation failed."
   exit 1
 fi
 
-echo "✅ All checks passed. Proceeding with push..."
+echo "✅ All checks passed. Proceeding with push..."

jest.config.js

@@ -20,6 +20,8 @@ module.exports = {
     'react-leaflet': '<rootDir>/src/_tests_/__mocks__/react-leaflet.js',
     'marker-cluster-group': '<rootDir>/src/_tests_/__mocks__/react-leaflet-cluster.js',
     '\\.(css|less|scss|sass)$': 'identity-obj-proxy', // <-- Added to mock CSS/SCSS files
+    // Fix for Node.js built-in modules in Node 20
+    '^node:(.*)$': '$1',
   },
 
   // The paths to modules that run some code to configure or set up the testing environment before each test