merged dev to local

Author: Juhitha-Reddy

.github/workflows/deploy.yml

@@ -23,14 +23,14 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'yarn'
+          cache: 'npm'
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: npm ci
       # We don't run tests here since we assume it's already done during PR process.
       # - name: Update Browser List
       #   run: npx browserslist@latest --update-db
       - name: Build React App
-        run: yarn run build && cp build/index.html build/200.html 
+        run: npm run build && cp build/index.html build/200.html 
         env:
           NODE_ENV: ${{ github.ref_name == 'main' && 'production' || 'development' }}
           REACT_APP_APIENDPOINT: ${{ vars.REACT_APP_API_ENDPOINT }}

.github/workflows/pull_request_test.yml

@@ -46,13 +46,15 @@ jobs:
     - uses: actions/checkout@v4
       with:
           fetch-depth: 0
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 20
-        cache: 'yarn'
-    - name: Install Dependencies
-      run: yarn install --frozen-lockfile
-    - name: Run Unit Tests for Changed Files Only
-      run: yarn run test:changed
-    - name: Run Lint
-      run: yarn run lint
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20
+        cache: 'yarn'
+    - name: Enable Corepack
+      run: corepack enable
+    - name: Install Dependencies
+      run: yarn install --frozen-lockfile
+    - name: Run Unit Tests for Changed Files Only
+      run: yarn test:changed
+    - name: Run Lint
+      run: yarn lint

.github/workflows/test.yml

@@ -12,14 +12,17 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Set up Node.js & cache Yarn
+      - name: Set up Node.js & cache npm
         uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: yarn
 
+      - name: Enable Corepack
+        run: corepack enable
+
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
 
       - name: Run tests
         run: yarn test

.husky/pre-commit

@@ -10,6 +10,11 @@ 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
@@ -40,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

@@ -3,24 +3,52 @@
 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"
 
-echo "🧪 Running tests before push..."
-npm run test -- --bail=1
-test_status=$?
+changed_files=$(git diff --name-only @{upstream}...HEAD 2>/dev/null)
+
+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..."
+  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..."

.yarnrc

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

fix-conflicts.js

@@ -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);

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

jsconfig.json

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

package.json

@@ -64,8 +64,11 @@
     "html-to-pdfmake": "^2.0.6",
     "html2canvas": "^1.4.1",
     "jest": "^30.2.0",
+    "joi": "^18.1.2",
+    "joi-browser": "^13.4.0",
     "jquery": "^3.7.1",
     "jspdf": "^4.2.1",
+    "jspdf-autotable": "^5.0.7",
     "jwt-decode": "^2.2.0",
     "leaflet": "^1.9.4",
     "leaflet.heat": "^0.2.0",
@@ -79,6 +82,7 @@
     "object-hash": "^3.0.0",
     "path-browserify": "^1.0.1",
     "pdfmake": "^0.2.20",
+    "plotly.js": "^3.3.1",
     "popper.js": "^1.16.1",
     "prop-types": "^15.7.2",
     "rc-slider": "^11.1.8",
@@ -96,11 +100,13 @@
     "react-leaflet": "4.2.1",
     "react-multi-select-component": "^4.0.2",
     "react-phone-input-2": "^2.14.0",
+    "react-plotly.js": "^2.6.0",
     "react-redux": "^7.2.0",
     "react-router": "^5.3.4",
     "react-router-dom": "^5.2.0",
     "react-router-hash-link": "^2.3.1",
     "react-select": "^5.10.2",
+    "react-simple-maps": "^3.0.0",
     "react-spinners": "^0.15.0",
     "react-sticky": "^6.0.3",
     "react-table": "^7.8.0",
@@ -125,6 +131,7 @@
     "tinymce": "^7.2.0",
     "util": "^0.12.5",
     "uuid": "^9.0.1",
+    "validator": "^13.15.26",
     "webpack": "^5.104.1"
   },
   "resolutions": {
@@ -217,4 +224,3 @@
     "@rollup/rollup-darwin-arm64": "^4.54.0"
   }
 }
-