upgrade ajv and rjsf

bcgov · Dec 5, 2023 · 842c419 · 842c419
1 parent 8408136
commit 842c419
Show file tree

Hide file tree

Showing 6 changed files with 147 additions and 48 deletions.
diff --git a/appv2/package-lock.json b/appv2/package-lock.json
diff --git a/appv2/package.json b/appv2/package.json
@@ -37,10 +37,10 @@
     "@mui/x-data-grid": "^5.17.18",
     "@react-leaflet/core": "^2.1.0",
     "@reduxjs/toolkit": "^1.9.5",
-    "@rjsf/core": "^5.0.0-beta.15",
-    "@rjsf/mui": "^5.0.0-beta.15",
-    "@rjsf/utils": "^5.0.0-beta.15",
-    "@rjsf/validator-ajv6": "^5.0.0-beta.15",
+    "@rjsf/core": "^5.15.0",
+    "@rjsf/mui": "^5.15.0",
+    "@rjsf/utils": "^5.15.0",
+    "@rjsf/validator-ajv8": "^5.15.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/user-event": "^8.1.3",
     "@tmcw/togeojson": "^4.4.1",

diff --git a/appv2/src/UI/Overlay/Admin/email-setup/EmailSettings.tsx b/appv2/src/UI/Overlay/Admin/email-setup/EmailSettings.tsx
@@ -1,5 +1,5 @@
 import { RJSFSchema, UiSchema } from '@rjsf/utils';
-import validator from '@rjsf/validator-ajv6';
+import validator from '@rjsf/validator-ajv8';
 import React, { useEffect } from 'react';
 import { Form } from '@rjsf/mui';
 import {

diff --git a/appv2/src/UI/Overlay/Admin/email-setup/EmailTemplates.tsx b/appv2/src/UI/Overlay/Admin/email-setup/EmailTemplates.tsx
@@ -1,7 +1,7 @@
 import { Card, CardContent, Grid } from '@mui/material';
 import { Form } from '@rjsf/mui';
 import { RJSFSchema, UiSchema } from '@rjsf/utils';
-import validator from '@rjsf/validator-ajv6';
+import validator from '@rjsf/validator-ajv8';
 import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { EMAIL_TEMPLATES_RETRIEVE_REQUEST, EMAIL_TEMPLATES_SET_ACTIVE, EMAIL_TEMPLATES_UPDATE } from 'state/actions';

diff --git a/appv2/src/UI/Overlay/Records/Activity/form/FormContainer.tsx b/appv2/src/UI/Overlay/Records/Activity/form/FormContainer.tsx
@@ -32,7 +32,7 @@ import { selectActivity } from 'state/reducers/activity';
 import { useDispatch } from 'react-redux';
 import { ACTIVITY_CHEM_TREATMENT_DETAILS_FORM_ON_CHANGE_REQUEST, ACTIVITY_ON_FORM_CHANGE_REQUEST } from 'state/actions';
 import { selectUserSettings } from 'state/reducers/userSettings';
-import validator from '@rjsf/validator-ajv6';
+import validator from '@rjsf/validator-ajv8';
 import 'UI/Overlay/Records/Activity/form/aditionalFormStyles.css'
 import { getCustomErrorTransformer } from 'rjsf/business-rules/customErrorTransformer';
 import _ from 'lodash';
@@ -76,7 +76,7 @@ const FormContainer: React.FC<IFormContainerProps> = (props) => {
   const dispatch = useDispatch();
   console.log('rendering')
 
-  const debouncedFormChange = 
+  const debouncedFormChange =
     _.debounce((event, ref, lastField, callbackFun) => {
     //(event, ref, lastField, callbackFun) => {
       dispatch({
@@ -313,7 +313,6 @@ const FormContainer: React.FC<IFormContainerProps> = (props) => {
                   debouncedFormChange(event, formRef, focusedFieldArgs, (updatedFormData) => {
                     //setformData(updatedFormData);
                   });
-                  console.log('AFTER DEBOUNCE')
                 }}
                 onError={(error) => {
                   if (!props.onFormSubmitError) {

diff --git a/database/src/migrations/fix.sql b/database/src/migrations/fix.sql