Merge pull request #781 from Lunatic-Labs/npm-audit-fixes

resolving npm audit issues

FrontEndReact/package.json

@@ -9,39 +9,41 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-private-property-in-object": "",
-    "@babel/preset-react": "^7.23.3",
-    "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.11.0",
-    "@fontsource/roboto": "^5.0.8",
-    "@mui/icons-material": "^5.14.12",
-    "@mui/material": "^5.14.12",
-    "@mui/x-date-pickers": "^6.18.3",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/user-event": "^13.5.0",
-    "bootstrap": "^5.2.3",
-    "date-fns": "^2.30.0",
-    "date-fns-tz": "^2.0.1",
-    "dayjs": "^1.11.10",
-    "dotenv": "^16.3.1",
-    "dotenv-expand": "^10.0.0",
+    "@babel/preset-react": "^7.25.9",
+    "@emotion/react": "^11.13.5",
+    "@emotion/styled": "^11.13.5",
+    "@fontsource/roboto": "^5.1.0",
+    "@mui/icons-material": "^5.15.6",
+    "@mui/material": "^5.15.6",
+    "@mui/system": "^5.15.14",
+    "@mui/x-date-pickers": "^6.19.2",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/user-event": "^14.5.2",
+    "bootstrap": "^5.3.3",
+    "date-fns": "^3.2.0",
+    "date-fns-tz": "^3.2.0",
+    "dayjs": "^1.11.13",
+    "dotenv": "^16.4.5",
+    "dotenv-expand": "^12.0.1",
     "eventsource-client": "^1.1.3",
     "jest-dom": "^4.0.0",
     "mui-datatables": "^4.3.0",
-    "mui-one-time-password-input": "^2.0.1",
-    "react": "^18.2.0",
+    "mui-one-time-password-input": "^3.0.1",
+    "react": "^18.3.1",
     "react-beautiful-dnd": "^13.1.1",
-    "react-cookie": "^6.1.1",
-    "react-datepicker": "^4.12.0",
-    "react-dom": "^18.2.0",
-    "react-router-dom": "^6.10.0",
+    "react-cookie": "^7.2.2",
+    "react-datepicker": "^7.5.0",
+    "react-dom": "^18.3.1",
+    "react-router-dom": "^6.28.0",
+    "react-script": "^2.0.5",
     "react-scripts": "^5.0.1",
-    "react-select": "^5.7.3",
+    "react-select": "^5.8.3",
     "react-validation": "^3.0.7",
     "recharts": "",
     "ts-node": "^10.9.2",
-    "universal-cookie": "^6.1.1",
-    "validator": "^13.9.0",
-    "web-vitals": "^2.1.4"
+    "universal-cookie": "^7.2.2",
+    "validator": "^13.12.0",
+    "web-vitals": "^4.2.4"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -68,10 +70,14 @@
     ]
   },
   "devDependencies": {
-    "@babel/preset-typescript": "^7.23.3",
-    "@testing-library/react": "^14.1.2",
+    "@babel/preset-typescript": "^7.26.0",
+    "@testing-library/react": "^16.0.1",
     "jest": "^29.7.0",
-    "react-test-renderer": "^18.2.0",
+    "react-test-renderer": "^18.3.1",
     "resize-observer-polyfill": "1.5.1"
+  },
+  "overrides": {
+    "nth-check": "^2.0.1",
+    "postcss": "^8.4.31"
   }
 }

FrontEndReact/src/View/Admin/Add/AddTask/AdminAddAssessmentTask.js

@@ -7,7 +7,7 @@ import { genericResourceGET, genericResourcePOST, genericResourcePUT, getDueDate
 import { Box, Button, FormControl, Typography, IconButton, TextField, Tooltip, FormControlLabel, Checkbox, MenuItem, Select, InputLabel, Radio, RadioGroup, FormLabel, FormGroup } from '@mui/material';
 import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker';
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
-import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';
 import ImageModal from "../AddCustomRubric/CustomRubricModal.js";
 import RubricDescriptionsImage from "../../../../../src/RubricDetailedOverview.png";
 import FormHelperText from '@mui/material/FormHelperText';

FrontEndReact/src/utility.js

@@ -1,6 +1,6 @@
 import { apiUrl } from './App.js'; 
 import Cookies from 'universal-cookie';
-import { zonedTimeToUtc, format } from "date-fns-tz";
+import { fromZonedTime, format } from "date-fns-tz";
 import * as eventsource from "eventsource-client";
 
 export async function genericResourceGET(fetchURL, resource, component, options = {}) {    
@@ -243,7 +243,7 @@ export function formatDueDate(dueDate, timeZone) {
 
     const timeZoneId = timeZoneMap[timeZone];
 
-    const zonedDueDate = zonedTimeToUtc(dueDate, timeZoneId);
+    const zonedDueDate = fromZonedTime(dueDate, timeZoneId);
 
     const formattedDueDate = format(zonedDueDate, "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", { timeZone: timeZoneId });