Merge branch 'development' into nikhil-update-equipment-tool

Author: nikhilgiri0226

.babelrc

@@ -1,3 +1,7 @@
 {
-  "presets": ["react-app"]
+  "presets": ["react-app"],
+  "plugins": [
+    "@babel/plugin-proposal-optional-chaining",
+    "@babel/plugin-proposal-nullish-coalescing-operator"
+  ]
 }

.eslintignore

@@ -6,25 +6,20 @@ src/actions/**
 src/App.css
 src/config.json
 
-src/index.js
-src/reducers/**
-src/styles.js
 src/__tests__/**
 
 /public/
 /build/
 /node_modules/
-src/components/App.jsx
-src/components/AutoReload/**
 src/components/Badge/**
 src/components/common/**
 src/components/Projects/**
 src/components/SummaryManagement/**
 src/components/TaskEditSuggestions/**
 src/components/TeamMemberTasks/**
-src/components/Teams/**
+src/components/Timelog/**
 src/components/UserManagement/**
 src/components/UserProfile/**
-src/components/Announcements/**
 src/components/EmailSubscribeForm/**
-src/components/Dashboard/**
+src/components/Dashboard/**
+src/components/Teams/TeamMembersPopup.jsx

.github/workflows/pull_request_test.yml

@@ -3,7 +3,6 @@ name: Pull Request Unit Test
 on:
   pull_request:
     branches:
-      - main
       - development
 jobs:
   test:
@@ -17,4 +16,6 @@ jobs:
     - name: Install Dependencies
       run: npm ci
     - name: Run Unit Tests
-      run: npm test
+      run: npm test
+    - name: Run Lint
+      run: npm run lint

.prettierignore

@@ -4,27 +4,23 @@ src/actions/**
 src/App.css
 src/config.json
 
-src/index.js
 src/languages/**
-src/reducers/**
 src/registerServiceWorker.js
 src/routes.js
 src/setupTests.js
 src/store.js
-src/styles.js
+src/utils/**
 src/__tests__/**
 
 
-src/components/App.jsx
-src/components/AutoReload/**
+src/components/Header/**
 src/components/Inventory/**
 src/components/Memberships/**
 src/components/Projects/**
 src/components/Reports/**
 src/components/SummaryManagement/**
 src/components/TaskEditSuggestions/**
 src/components/TeamMemberTasks/**
-src/components/Teams/**
+src/components/Timelog/**
 src/components/UserManagement/**
 src/components/UserProfile/**
-src/components/Announcements/**

.vscode/settings.json

@@ -2,7 +2,7 @@
   // other settings
   // formatting using eslint
   // let editor format using prettier for all other files
-  "editor.formatOnSave": true,
+  "editor.formatOnSave": false,
   // disable editor formatting, so eslint can handle it
   "[javascript]": {
     "editor.formatOnSave": true
@@ -20,4 +20,4 @@
     "**/.settings": true,
     "**/.factorypath": true
   }
-}
+}

package-lock.json

@@ -16,21 +16,20 @@
     "axios": "^0.21.2",
     "axios-mock-adapter": "^1.22.0",
     "bootstrap": "^4.5.3",
-    "chart.js": "^4.4.7",
+    "chart.js": "^3.9.1",
     "chartjs-plugin-datalabels": "^2.2.0",
     "classnames": "^2.2.6",
     "d3": "^7.8.5",
     "date-fns": "^2.14.0",
     "diff": "^5.0.0",
-    "dompurify": "^3.1.3",
+    "dompurify": "^3.1.7",
     "font-awesome": "^4.7.0",
     "fs-extra": "^11.2.0",
     "history": "^4.10.1",
     "html-react-parser": "^1.4.14",
     "html-to-pdfmake": "^2.0.6",
     "joi": "^14.0.6",
     "jwt-decode": "^2.2.0",
-    "leaflet": "^1.9.4",
     "lodash": "^4.17.21",
     "lz-string": "^1.5.0",
     "moment": "^2.29.2",
@@ -50,8 +49,10 @@
     "react-html-parser": "^2.0.2",
     "react-icons": "^4.3.1",
     "react-input-range": "^1.3.0",
-    "react-leaflet": "^4.2.1",
-    "react-leaflet-cluster": "^2.1.0",
+    "react-leaflet": ">=3.1.0 <3.2.0",
+    "@react-leaflet/core": ">=1.0.0 <1.1.0",
+    "leaflet": "1.7.1",
+    "react-leaflet-cluster": "^1.0.4",
     "react-multi-select-component": "^4.0.2",
     "react-phone-input-2": "^2.14.0",
     "react-redux": "^7.2.0",
@@ -81,7 +82,7 @@
     "prestart": "npm run test",
     "postinstall": "node ./postinstall.js",
     "start": "react-scripts start",
-    "build": "npm run postinstall && react-scripts build",
+    "build": "npm run postinstall && set CI=false && react-scripts build",
     "test": "cross-env CI=true react-scripts test --env=jest-environment-jsdom-sixteen",
     "test:watch": " react-scripts test --env=jest-environment-jsdom-sixteen",
     "test:coverage": "cross-env CI=true react-scripts test --env=jest-environment-jsdom-sixteen --coverage",
@@ -94,16 +95,17 @@
   "browserslist": [
     ">0.2%",
     "not dead",
-    "not ie <= 11",
     "not op_mini all"
   ],
   "devDependencies": {
     "@babel/helper-validator-identifier": "^7.12.11",
+    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@jest/globals": "^29.7.0",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^10.4.9",
     "@testing-library/user-event": "^12.0.14",
+    "@types/dompurify": "^3.0.5",
     "@types/react-router-dom": "^5.3.3",
     "babel-eslint": "^10.1.0",
     "cross-env": "^5.2.1",
@@ -124,6 +126,7 @@
     "node-fetch": "^3.1.1",
     "node-sass": "^8.0.0",
     "prettier": "^1.19.1",
+    "react-error-overlay": "^6.0.9",
     "redux-mock-store": "^1.5.4",
     "sinon": "^7.3.2",
     "surge": "^0.21.6"