Merge branch 'development' into fix/align-search-filters-events-sections - resolve conflicts

Author: Namitha7070

.github/workflows/deploy.yml

@@ -62,4 +62,4 @@ jobs:
           domain: ${{ vars.SURGE_DOMAIN }}
           project: './build'
           login: ${{ secrets.SURGE_LOGIN }}
-          token: ${{ secrets.SURGE_TOKEN }}
+          token: ${{ secrets.SURGE_TOKEN }}

.github/workflows/pull_request_test.yml

@@ -55,4 +55,4 @@ jobs:
     - name: Run Unit Tests for Changed Files Only
       run: yarn run test:changed
     - name: Run Lint
-      run: yarn run lint
+      run: yarn run lint

.gitignore

@@ -2,7 +2,6 @@
 
 # dependencies
 /node_modules
-package-lock.json
 # testing
 /coverage
 *.code-snippets

.husky-disabled/pre-commit

@@ -7,11 +7,14 @@ if [ -f .nvmrc ]; then
   nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
 fi
 
-. "$(dirname "$0")/_/husky.sh"
-
 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
@@ -42,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-commit

@@ -3,24 +3,55 @@
 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
+if command -v nvm >/dev/null 2>&1 && [ -f .nvmrc ]; then
   nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
 fi
 
-. "$(dirname "$0")/_/husky.sh"
+if git rev-parse --abbrev-ref @{upstream} >/dev/null 2>&1; then
+  changed_files=$(git diff --name-only @{upstream}...HEAD)
+else
+  echo "ℹ️  No upstream branch set. Skipping pre-push checks."
+  exit 0
+fi
+
+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)
 
-echo "🧪 Running tests before push..."
-npm run test -- --bail=1
-test_status=$?
+test_status=0
+lint_status=0
+style_status=0
+
+if [ -n "$js_files" ]; then
+  echo "🧪 Running related tests before push..."
+  npx vitest related --run $js_files
+  test_status=$?
+
+  echo "🧹 Running ESLint on changed files before push..."
+  npx eslint $js_files
+  lint_status=$?
+fi
+
+if [ -n "$style_files" ]; then
+  echo "🎨 Running Stylelint on changed files before push..."
+  npx stylelint $style_files
+  style_status=$?
+fi
 
-echo "🧹 Running lint before push..."
-npm run lint
-lint_status=$?
 
 # 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..."

.husky/pre-push

@@ -0,0 +1,2 @@
+# Avoid stale persisted package tarballs in CI/Netlify.
+cache-folder "/tmp/hgn-yarn-cache"

.yarnrc

@@ -0,0 +1,70 @@
+const fs = require('fs');
+
+const files = [
+  'src/components/Announcements/SocialMediaComposer.module.css',
+  'src/components/ApplicationAnalytics/jobAnalytics.module.css',
+  'src/components/BMDashboard/AddMaterial/AddMaterial.module.css',
+  'src/components/BMDashboard/Equipment/Update/UpdateEquipment.module.css',
+  'src/components/BMDashboard/Issues/issueChart.module.css',
+  'src/components/BMDashboard/Issues/issueCharts.module.css',
+  'src/components/BMDashboard/ItemList/ItemListView.module.css',
+  'src/components/BMDashboard/Lesson/LessonForm.module.css',
+  'src/components/BMDashboard/LessonList/LessonCard.module.css',
+  'src/components/BMDashboard/Projects/ProjectDetails/ProjectDetails.module.css',
+  'src/components/BMDashboard/UtilizationChart/UtilizationChart.module.css',
+  'src/components/BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.module.css',
+  'src/components/BMDashboard/WeeklyProjectSummary/IssueBreakdownChart.module.css',
+  'src/components/Collaboration/Collaboration.module.css',
+  'src/components/CommunityPortal/Activities/ActivityAttendance.module.css',
+  'src/components/CommunityPortal/Activities/activityId/ActivityComments.module.css',
+  'src/components/EductionPortal/EvaluationResults/EvaluationResults.module.css',
+  'src/components/EductionPortal/EvaluationResults/OverallPerformance.module.css',
+  'src/components/EductionPortal/EvaluationResults/TeacherFeedback.module.css',
+  'src/components/EductionPortal/StudentTasks/StudentTasks.module.css',
+  'src/components/EductionPortal/StudentTasks/TaskDetails.module.css',
+  'src/components/ExperienceDonutChart/ExperienceDonutChart.module.css',
+  'src/components/Header/Header.module.css',
+  'src/components/HGNForm/TopCommunityMembers/TopCommunityMembers.module.css',
+  'src/components/HGNPRDashboard/ReviewersStackedBarChart/ReviewersStackedBarChart.module.css',
+  'src/components/HGNSkillsDashboard/SkillsProfilePage/styles/ProfileDetails.module.css',
+  'src/components/LandingPage/HelpModal.module.css',
+  'src/components/LBDashboard/SentimentBreakdownDonutChart/SentimentBreakdownDonutChart.module.css',
+  'src/components/MaterialSummary/MaterialSummary.module.css',
+  'src/components/Projects/projects.module.css',
+];
+
+function resolveKeepHead(content) {
+  const lines = content.split('\n');
+  const result = [];
+  let state = 'normal';
+  for (const line of lines) {
+    if (line.startsWith('<<<<<<< ')) {
+      state = 'head';
+    } else if (line === '=======' && state === 'head') {
+      state = 'other';
+    } else if (line.startsWith('>>>>>>> ') && state === 'other') {
+      state = 'normal';
+    } else if (state !== 'other') {
+      result.push(line);
+    }
+  }
+  return result.join('\n');
+}
+
+let count = 0;
+for (const f of files) {
+  if (!fs.existsSync(f)) {
+    console.log('NOT FOUND: ' + f);
+    continue;
+  }
+  const content = fs.readFileSync(f, 'utf8');
+  if (!content.includes('<<<<<<<')) {
+    console.log('No conflict: ' + f);
+    continue;
+  }
+  const resolved = resolveKeepHead(content);
+  fs.writeFileSync(f, resolved, 'utf8');
+  console.log('Fixed: ' + f);
+  count++;
+}
+console.log('Total: ' + count);

fix-conflicts.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

jest.config.js

@@ -1,5 +1,9 @@
 {
   "compilerOptions": {
-    "baseUrl": "src"
-  }
+    "baseUrl": "src",
+    "paths": {
+      "~/*": ["./*"]
+    }
+  },
+  "include": ["src"]
 }