[CHORE] Re-export redux-form references (#3388)

* re-export redux-form references

* stupid diff

* update package.json files

* testing on MS

* see if change to MS dockerfile was unnecessary in pipeline

* whoops other missing comma

.nvmrc

@@ -1 +1 @@
-v20.11.0
+v20.16.0

bin/validate.sh

@@ -8,7 +8,7 @@ OS=${1}
 # Global config
 # These values are checked for in validation
 LIC_PLATE="4c2ba9"
-DESIRED_NODE_VER="v20.11.0"
+DESIRED_NODE_VER="v20.16.0"
 DESIRED_YARN_VER="3.2.4"
 DESIRED_DC_VER="v2"
 SERVICES_PATH="./services"

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "description": "Mines Digital Services Packages",
   "engines": {
-    "node": "=20.11.0"
+    "node": "=20.16.0"
   },
   "workspaces": {
     "packages": [

services/common/package.json

@@ -86,4 +86,4 @@
   "jest-junit": {
     "output": "./coverage/tests-report.xml"
   }
-}
+}

services/common/src/components/documents/ReplaceDocumentModal.tsx

@@ -1,5 +1,5 @@
 import React, { FC, useState } from "react";
-import { Field } from "redux-form";
+import { Field } from "@mds/common/components/forms/form";
 import { useDispatch } from "react-redux";
 import { Alert, Col, notification, Row, Typography } from "antd";
 import { MineDocument } from "@mds/common/models/documents/document";

services/common/src/components/documents/spatial/AddSpatialDocumentsModal.tsx

@@ -2,7 +2,7 @@ import React, { FC, useState } from "react";
 import { Link } from "react-router-dom";
 import { useDispatch, useSelector } from "react-redux";
 import FormWrapper from "../../forms/FormWrapper";
-import { change, Field, getFormValues, reset, touch } from "redux-form";
+import { change, Field, getFormValues, reset, touch } from "@mds/common/components/forms/form";
 import RenderFileUpload from "../../forms/RenderFileUpload";
 import { spatialDocumentBundle } from "@mds/common/redux/utils/Validate";
 import { Alert, Button, Row, Steps, Typography } from "antd";

services/common/src/components/forms/BaseInput.tsx

@@ -1,7 +1,7 @@
 import { EMPTY_FIELD } from "@mds/common/constants/strings";
 import { Form, Typography } from "antd";
 import React, { FC, ReactNode } from "react";
-import { WrappedFieldProps, WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form";
+import { WrappedFieldProps, WrappedFieldMetaProps, WrappedFieldInputProps } from "@mds/common/components/forms/form";
 
 /**
  BaseInput:

services/common/src/components/forms/FormWrapper.tsx

@@ -2,7 +2,7 @@ import React, { FC, useEffect } from "react";
 import { Form } from "antd";
 import { compose } from "@reduxjs/toolkit";
 import { connect, useDispatch, useSelector } from "react-redux";
-import { reduxForm, submit, getFormSubmitErrors, InjectedFormProps, ConfigProps } from "redux-form";
+import { reduxForm, submit, getFormSubmitErrors, InjectedFormProps, ConfigProps } from "@mds/common/components/forms/form";
 
 export interface IFormContext {
   isEditMode: boolean;

services/common/src/components/forms/RenderAutoComplete.spec.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { render, screen, fireEvent } from "@testing-library/react";
-import { Field } from "redux-form";
+import { Field } from "@mds/common/components/forms/form";
 import FormWrapper from "./FormWrapper";
 import RenderAutoComplete from "./RenderAutoComplete";
 import { ReduxWrapper } from "@mds/common/tests/utils/ReduxWrapper";

services/common/src/components/forms/RenderCancelButton.tsx

@@ -1,6 +1,6 @@
 import React, { FC, ReactNode, useContext } from "react";
 import { useSelector, useDispatch } from "react-redux";
-import { isDirty } from "redux-form";
+import { isDirty } from "@mds/common/components/forms/form";
 import { FormContext } from "./FormWrapper";
 import { closeModal } from "@mds/common/redux/actions/modalActions";
 import { Modal, ModalFuncProps } from "antd";

services/common/src/components/forms/RenderDateTimeTz.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { Form, DatePicker, Select } from "antd";
 import { useSelector, connect } from "react-redux";
-import { Field, getFormValues, change } from "redux-form";
+import { Field, getFormValues, change } from "@mds/common/components/forms/form";
 import moment from "moment-timezone";
 import { compose, bindActionCreators } from "redux";
 import {

services/common/src/components/forms/RenderResetButton.spec.tsx

@@ -3,7 +3,7 @@ import { render, fireEvent } from "@testing-library/react";
 import RenderResetButton from "./RenderResetButton";
 import { ReduxWrapper } from "@mds/common/tests/utils/ReduxWrapper";
 import FormWrapper from "./FormWrapper";
-import * as reduxForm from "redux-form";
+import * as reduxForm from "@mds/common/components/forms/form";
 
 const initialState = {
     form: {

services/common/src/components/forms/RenderResetButton.tsx

@@ -1,6 +1,6 @@
 import React, { FC, ReactNode, useContext } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { isDirty, isSubmitting, reset } from "redux-form";
+import { isDirty, isSubmitting, reset } from "@mds/common/components/forms/form";
 import { FormContext } from "./FormWrapper";
 import { Button } from "antd";
 import { ButtonProps } from "antd/lib/button/button";

services/common/src/components/forms/RenderSubmitButton.tsx

@@ -1,6 +1,6 @@
 import React, { FC, ReactNode, useContext } from "react";
 import { useSelector } from "react-redux";
-import { isDirty, isSubmitting } from "redux-form";
+import { isDirty, isSubmitting } from "@mds/common/components/forms/form";
 import { FormContext } from "./FormWrapper";
 import { Button } from "antd";
 import { ButtonProps } from "antd/lib/button/button";

services/common/src/components/forms/SteppedForm.tsx

@@ -1,6 +1,6 @@
 import React, { FC, ReactElement, useEffect, useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
-import { getFormSyncErrors, getFormValues, submit } from "redux-form";
+import { getFormSyncErrors, getFormValues, submit } from "@mds/common/components/forms/form";
 import { Button, Col, Menu, Popconfirm, Row, StepProps } from "antd";
 import LeftOutlined from "@ant-design/icons/LeftOutlined";
 import RightOutlined from "@ant-design/icons/RightOutlined";

services/common/src/components/forms/form.tsx

@@ -0,0 +1,32 @@
+export {
+    arrayPush,
+    arrayRemove,
+    change,
+    ChangeAction,
+    ConfigProps,
+    destroy,
+    Field,
+    Fields,
+    FieldArray,
+    FieldArrayFieldsProps,
+    FormAction,
+    FormSection,
+    formValueSelector,
+    getFormSubmitErrors,
+    getFormSyncErrors,
+    getFormValues,
+    hasSubmitFailed,
+    initialize,
+    InjectedFormProps,
+    isDirty,
+    isPristine,
+    isSubmitting,
+    reducer,
+    reduxForm,
+    reset,
+    submit,
+    touch,
+    WrappedFieldInputProps,
+    WrappedFieldMetaProps,
+    WrappedFieldProps
+} from "redux-form";

services/common/src/components/help/HelpGuide.tsx

@@ -2,7 +2,7 @@ import { Alert, Button, Col, Drawer, Row, Typography } from "antd";
 import React, { FC, useEffect, useState } from "react";
 import { Route, Switch, useParams } from "react-router-dom";
 import { useSelector, useDispatch } from "react-redux";
-import { isDirty, submit } from "redux-form";
+import { isDirty, submit } from "@mds/common/components/forms/form";
 import {
   getSystemFlag,
   isAuthenticated,

services/common/src/components/help/HelpGuideForm.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from "react";
-import { Field } from "redux-form";
+import { Field } from "@mds/common/components/forms/form";
 import RenderRichTextEditor from "../forms/RenderRichTextEditor";
 import { FORM } from "@mds/common/constants/forms";
 import FormWrapper from "../forms/FormWrapper";

services/common/src/components/projectSummary/Agent.tsx

@@ -1,6 +1,6 @@
 import React, { FC, useEffect, useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
-import { Field, change, getFormValues } from "redux-form";
+import { Field, change, getFormValues } from "@mds/common/components/forms/form";
 import { Col, Row, Typography, Alert } from "antd";
 import RenderField from "@mds/common/components/forms/RenderField";
 import RenderRadioButtons from "@mds/common/components/forms/RenderRadioButtons";

services/common/src/components/projectSummary/Applicant.tsx

@@ -1,7 +1,7 @@
 import { Col, Row, Typography } from "antd";
 import React, { FC, useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { Field, getFormValues, change } from "redux-form";
+import { Field, getFormValues, change } from "@mds/common/components/forms/form";
 import {
   email,
   maxLength,

services/common/src/components/projectSummary/ApplicationSummary.tsx

@@ -1,5 +1,5 @@
 import React, { FC, useContext, useEffect, useState } from "react";
-import { getFormValues } from "redux-form";
+import { getFormValues } from "@mds/common/components/forms/form";
 import { useSelector } from "react-redux";
 import { ColumnsType } from "antd/es/table";
 import { Button, Alert, Typography, Col, Row } from "antd";

services/common/src/components/projectSummary/AuthorizationSupportDocumentUpload.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from "react";
-import { Field } from "redux-form";
+import { Field } from "@mds/common/components/forms/form";
 import { DOCUMENT, EXCEL, IMAGE, SPATIAL } from "@mds/common/constants/fileTypes";
 import { PROJECT_SUMMARY_DOCUMENTS } from "@mds/common/constants/API";
 import RenderFileUpload from "@mds/common/components/forms/RenderFileUpload";

services/common/src/components/projectSummary/AuthorizationsInvolved.tsx

@@ -9,7 +9,7 @@ import {
   FieldArray,
   FormSection,
   getFormValues,
-} from "redux-form";
+} from "@mds/common/components/forms/form";
 import { Alert, Button, Checkbox, Col, Row, Tooltip, Typography } from "antd";
 import InfoCircleOutlined from "@ant-design/icons/InfoCircleOutlined";
 import PlusCircleFilled from "@ant-design/icons/PlusCircleFilled";

services/common/src/components/projectSummary/BasicInformation.tsx

@@ -1,6 +1,6 @@
 import React, { FC } from "react";
 import { Typography } from "antd";
-import { Field } from "redux-form";
+import { Field } from "@mds/common/components/forms/form";
 import { maxLength, required } from "@mds/common/redux/utils/Validate";
 import RenderField from "@mds/common/components/forms/RenderField";
 import RenderAutoSizeField from "@mds/common/components/forms/RenderAutoSizeField";

services/common/src/components/projectSummary/Declaration.tsx

@@ -1,7 +1,7 @@
 import React, { FC } from "react";
 import { Collapse, Row, Typography } from "antd";
 import { useSelector } from "react-redux";
-import { Field, getFormValues } from "redux-form";
+import { Field, getFormValues } from "@mds/common/components/forms/form";
 import { getAmsAuthorizationTypes } from "@mds/common/redux/selectors/projectSelectors";
 import { required } from "@mds/common/redux/utils/Validate";
 import RenderCheckbox from "../forms/RenderCheckbox";

services/common/src/components/projectSummary/DocumentUpload.tsx

@@ -1,5 +1,5 @@
 import React, { FC, useContext, useEffect } from "react";
-import { change, Field, getFormValues } from "redux-form";
+import { change, Field, getFormValues } from "@mds/common/components/forms/form";
 import { useSelector, useDispatch } from "react-redux";
 import { Button, Typography } from "antd";
 import { CSV, DOCUMENT, EXCEL, IMAGE, OTHER_SPATIAL, XML } from "@mds/common/constants/fileTypes";

services/common/src/components/projectSummary/FacilityOperator.tsx

@@ -1,7 +1,7 @@
 import React, { FC } from "react";
 import { useSelector } from "react-redux";
 import { Col, Row, Typography } from "antd";
-import { Field, getFormValues } from "redux-form";
+import { Field, getFormValues } from "@mds/common/components/forms/form";
 import {
   email,
   maxLength,

services/common/src/components/projectSummary/LegalLandOwnerInformation.spec.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { render, fireEvent } from "@testing-library/react";
 import { Provider } from "react-redux";
 import configureStore from "redux-mock-store";
-import { reducer as formReducer } from "redux-form";
+import { reducer as formReducer } from "@mds/common/components/forms/form";
 import { LegalLandOwnerInformation } from "@mds/common/components/projectSummary/LegalLandOwnerInformation";
 import * as MOCK from "@mds/common/tests/mocks/dataMocks";
 import FormWrapper from "../forms/FormWrapper";

services/common/src/components/projectSummary/LegalLandOwnerInformation.tsx

@@ -1,7 +1,7 @@
 import React, { FC, useEffect, useState } from "react";
 import { Col, Row, Typography } from "antd";
 import { useSelector } from "react-redux";
-import { Field, getFormValues, getFormSyncErrors } from "redux-form";
+import { Field, getFormValues, getFormSyncErrors } from "@mds/common/components/forms/form";
 import RenderRadioButtons from "@mds/common/components/forms/RenderRadioButtons";
 import {
   email,

services/common/src/components/projectSummary/PaymentContact.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import { Col, Row, Typography } from "antd";
 import { useSelector, useDispatch } from "react-redux";
-import { Field, getFormValues, change } from "redux-form";
+import { Field, getFormValues, change } from "@mds/common/components/forms/form";
 
 import RenderField from "@mds/common/components/forms/RenderField";
 import { getDropdownProvinceOptions } from "@mds/common/redux/selectors/staticContentSelectors";

services/common/src/components/projectSummary/ProjectContacts.tsx

@@ -5,7 +5,7 @@ import { Typography, Button, Row, Col, Popconfirm } from "antd";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faTrashAlt } from "@fortawesome/pro-light-svg-icons";
 import PlusOutlined from "@ant-design/icons/PlusOutlined";
-import { Field, FieldArray, arrayPush, getFormValues, change } from "redux-form";
+import { Field, FieldArray, arrayPush, getFormValues, change } from "@mds/common/components/forms/form";
 import {
   maxLength,
   phoneNumber,

services/common/src/components/projectSummary/ProjectDates.tsx

@@ -1,6 +1,6 @@
 import React, { FC } from "react";
 import { useSelector } from "react-redux";
-import { Field, getFormValues } from "redux-form";
+import { Field, getFormValues } from "@mds/common/components/forms/form";
 import { Col, Row, Typography } from "antd";
 import {
   dateNotBeforeOther,

services/common/src/components/projectSummary/ProjectLinks.tsx

@@ -1,6 +1,6 @@
 import React, { FC, useContext, useEffect, useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
-import { Field, change } from "redux-form";
+import { Field, change } from "@mds/common/components/forms/form";
 import { Button, Col, Row, Typography } from "antd";
 import ProjectLinksTable from "@mds/common/components/projectSummary/ProjectLinksTable";
 import { ILinkedProject, IProject } from "@mds/common/interfaces";

services/common/src/components/projectSummary/ProjectManagement.tsx

@@ -1,6 +1,6 @@
 import React, { FC, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { Field, getFormValues } from "redux-form";
+import { Field, getFormValues } from "@mds/common/components/forms/form";
 import { Alert, Col, Row, Typography } from "antd";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faLock } from "@fortawesome/pro-regular-svg-icons";

services/common/src/components/projectSummary/ProjectSummaryFileUpload.tsx

@@ -1,5 +1,5 @@
 import React, { FC, useEffect, useState, ReactNode } from "react";
-import { Field, WrappedFieldProps } from "redux-form";
+import { Field, WrappedFieldProps } from "@mds/common/components/forms/form";
 import { useSelector } from "react-redux";
 import { NEW_VERSION_DOCUMENTS, PROJECT_SUMMARY_DOCUMENTS } from "@mds/common/constants/API";
 import RenderFileUpload from "@mds/common/components/forms/RenderFileUpload";

services/common/src/components/projectSummary/ProjectSummaryForm.tsx

@@ -1,6 +1,6 @@
 import React, { FC } from "react";
 import { useSelector } from "react-redux";
-import { getFormValues } from "redux-form";
+import { getFormValues } from "@mds/common/components/forms/form";
 import { FORM } from "@mds/common/constants/forms";
 import DocumentUpload from "@mds/common/components/projectSummary/DocumentUpload";
 import ProjectContacts from "@mds/common/components/projectSummary/ProjectContacts";

services/common/src/components/reports/ReportDefinitionFieldSelect.tsx

@@ -1,7 +1,7 @@
 import { formatComplianceCodeReportName } from "@mds/common/redux/utils/helpers";
 import React, { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
-import { Field } from "redux-form";
+import { Field } from "@mds/common/components/forms/form";
 
 import { getMineReportDefinitionOptions } from "@mds/common/redux/selectors/staticContentSelectors";
 

services/common/src/components/reports/ReportDetailsForm.tsx

@@ -1,7 +1,7 @@
 import { Alert, Button, Col, Row, Typography } from "antd";
 import React, { FC, ReactNode, useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { arrayPush, change, Field, FieldArray, getFormValues } from "redux-form";
+import { arrayPush, change, Field, FieldArray, getFormValues } from "@mds/common/components/forms/form";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faTrashAlt } from "@fortawesome/pro-light-svg-icons";
 

services/common/src/components/reports/ReportFileUpload.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from "react";
-import { Field } from "redux-form";
+import { Field } from "@mds/common/components/forms/form";
 import { DOCUMENT, EXCEL, IMAGE, SPATIAL } from "@mds/common/constants/fileTypes";
 import { MINE_REPORT_DOCUMENT } from "@mds/common/constants/API";
 import RenderFileUpload from "../forms/RenderFileUpload";

services/common/src/components/reports/ReportGetStarted.tsx

@@ -1,6 +1,6 @@
 import { Alert, Button, Col, Row, Typography } from "antd";
 import React, { FC, ReactNode, useEffect, useState } from "react";
-import { Field, getFormValues, change } from "redux-form";
+import { Field, getFormValues, change } from "@mds/common/components/forms/form";
 import ArrowRightOutlined from "@ant-design/icons/ArrowRightOutlined";
 import { useSelector, useDispatch } from "react-redux";
 import { IMine, IMineReportDefinition, IMineReportSubmission } from "@mds/common/interfaces";

services/common/src/components/reports/ReportSteps.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import { Button, Col, Row, Steps, Typography } from "antd";
 import { Link, useHistory, useParams } from "react-router-dom";
 import { useDispatch, useSelector } from "react-redux";
-import { reset } from "redux-form";
+import { reset } from "@mds/common/components/forms/form";
 import { IMine, IMineReportSubmission } from "@mds/common/interfaces";
 import ArrowLeftOutlined from "@ant-design/icons/ArrowLeftOutlined";
 import { getMineById } from "@mds/common/redux/selectors/mineSelectors";

services/common/src/components/tailings/BasicInformation.tsx

@@ -10,7 +10,7 @@ import {
   requiredList,
 } from "@mds/common/redux/utils/Validate";
 
-import { Field } from "redux-form";
+import { Field } from "@mds/common/components/forms/form";
 import { connect } from "react-redux";
 import { formatDateTime } from "@mds/common/redux/utils/helpers";
 import { getPermits } from "@mds/common/redux/selectors/permitSelectors";

services/common/src/redux/reducers/rootReducerShared.ts

@@ -1,6 +1,6 @@
 import { createReducer } from "@mds/common/redux/utils/helpers";
 import networkReducer from "@mds/common/redux/reducers/networkReducer";
-import { reducer as formReducer } from "redux-form";
+import { reducer as formReducer } from "@mds/common/components/forms/form";
 import { loadingBarReducer } from "react-redux-loading-bar";
 import { NetworkReducerTypes } from "@mds/common/constants/networkReducerTypes";
 import {

services/common/src/redux/rootState.ts

@@ -4,7 +4,7 @@ import { loadingBarReducer } from "react-redux-loading-bar";
 
 import type { TypedUseSelectorHook } from 'react-redux'
 import { useDispatch, useSelector, useStore } from 'react-redux'
-import type { FormAction } from 'redux-form';
+import type { FormAction } from "@mds/common/components/forms/form";
 
 export const getStore = (preloadedState = {}) =>
   configureStore({

services/common/src/redux/utils/helpers.ts

@@ -7,7 +7,7 @@ import {
 import { get, isEmpty, isNil, sortBy } from "lodash";
 import { createNumberMask } from "redux-form-input-masks";
 import moment from "moment-timezone";
-import { reset } from "redux-form";
+import { reset } from "@mds/common/components/forms/form";
 import {
   IComplianceArticle,
   IMineReportDefinition,