Skip to content

Commit 0140385

Browse files
deduplicate yup
1 parent e35b633 commit 0140385

File tree

11 files changed

+20
-43
lines changed

11 files changed

+20
-43
lines changed

src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import {
1212
getCriteriaBasedSchema,
1313
PARAM_LANGUAGE,
1414
useSnackMessage,
15+
yup,
1516
} from '@gridsuite/commons-ui';
1617
import { useForm } from 'react-hook-form';
17-
import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
18+
import { yupResolver } from '@hookform/resolvers/yup';
1819
import ContingencyListCreationForm from './contingency-list-creation-form';
1920
import { getContingencyListEmptyFormData, getFormContent } from '../contingency-list-utils';
20-
import yup from '../../../utils/yup-config';
2121
import { getExplicitNamingSchema } from '../explicit-naming/explicit-naming-form';
2222
import { ContingencyListType } from '../../../../utils/elementType';
2323
import { useParameterState } from '../../parameters-dialog';

src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import {
1111
getCriteriaBasedSchema,
1212
PARAM_LANGUAGE,
1313
useSnackMessage,
14+
yup,
1415
} from '@gridsuite/commons-ui';
1516
import { useForm } from 'react-hook-form';
16-
import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
17+
import { yupResolver } from '@hookform/resolvers/yup';
1718
import { useEffect, useState } from 'react';
1819
import {
1920
getContingencyListEmptyFormData,
2021
getCriteriaBasedFormDataFromFetchedElement,
2122
} from '../../contingency-list-utils';
22-
import yup from 'components/utils/yup-config';
2323
import CriteriaBasedEditionForm from './criteria-based-edition-form';
2424
import { useDispatch, useSelector } from 'react-redux';
2525
import { noSelectionForCopy } from 'utils/constants';

src/components/dialogs/contingency-list/edition/explicit-naming/explicit-naming-edition-dialog.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import { CustomMuiDialog, FieldConstants, useSnackMessage } from '@gridsuite/commons-ui';
8+
import { CustomMuiDialog, FieldConstants, useSnackMessage, yup } from '@gridsuite/commons-ui';
99
import { useForm } from 'react-hook-form';
10-
import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
10+
import { yupResolver } from '@hookform/resolvers/yup';
1111
import { useEffect, useState } from 'react';
1212
import {
1313
getContingencyListEmptyFormData,
1414
getExplicitNamingFormDataFromFetchedElement,
1515
} from '../../contingency-list-utils';
16-
import yup from 'components/utils/yup-config';
1716
import { getExplicitNamingEditSchema } from '../../explicit-naming/explicit-naming-form';
1817
import ExplicitNamingEditionForm from './explicit-naming-edition-form';
1918
import { prepareContingencyListForBackend } from 'components/dialogs/contingency-list-helper';

src/components/dialogs/contingency-list/edition/script/script-edition-dialog.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import { CustomMuiDialog, FieldConstants, useSnackMessage } from '@gridsuite/commons-ui';
8+
import { CustomMuiDialog, FieldConstants, useSnackMessage, yup } from '@gridsuite/commons-ui';
99
import { useForm } from 'react-hook-form';
10-
import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
10+
import { yupResolver } from '@hookform/resolvers/yup';
1111
import { useEffect, useState } from 'react';
1212
import { getContingencyListEmptyFormData, getScriptFormDataFromFetchedElement } from '../../contingency-list-utils';
13-
import yup from 'components/utils/yup-config';
1413
import ScriptEditionForm from './script-edition-form';
1514
import { useDispatch, useSelector } from 'react-redux';
1615
import { noSelectionForCopy } from 'utils/constants';

src/components/dialogs/contingency-list/explicit-naming/explicit-naming-form.jsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@
77

88
import { useIntl } from 'react-intl';
99
import React, { useCallback, useMemo } from 'react';
10-
import yup from '../../../utils/yup-config';
1110
import { makeDefaultRowData } from '../contingency-list-utils';
1211
import ChipsArrayEditor from '../../../utils/rhf-inputs/ag-grid-table-rhf/cell-editors/chips-array-editor';
1312
import { ContingencyListType } from 'utils/elementType';
1413
import { v4 as uuid4 } from 'uuid';
15-
import { FieldConstants, gridItem, CustomAgGridTable, ROW_DRAGGING_SELECTION_COLUMN_DEF } from '@gridsuite/commons-ui';
14+
import {
15+
CustomAgGridTable,
16+
FieldConstants,
17+
gridItem,
18+
ROW_DRAGGING_SELECTION_COLUMN_DEF,
19+
yup,
20+
} from '@gridsuite/commons-ui';
1621

1722
export const getExplicitNamingSchema = (id) => {
1823
return {

src/components/dialogs/copy-to-script-dialog.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
*/
77
import { FunctionComponent, useCallback, useEffect, useState } from 'react';
88
import { useIntl } from 'react-intl';
9-
import yup from 'components/utils/yup-config';
109
import { useForm } from 'react-hook-form';
1110
import { yupResolver } from '@hookform/resolvers/yup';
1211
import { CircularProgress, Grid } from '@mui/material';
13-
import { CustomMuiDialog, ElementType, FieldConstants, UniqueNameInput } from '@gridsuite/commons-ui';
12+
import { CustomMuiDialog, ElementType, FieldConstants, UniqueNameInput, yup } from '@gridsuite/commons-ui';
1413
import { useSelector } from 'react-redux';
1514
import { UUID } from 'crypto';
1615
import { AppState } from '../../redux/reducer';

src/components/dialogs/create-case-dialog/create-case-dialog-utils.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import yup from '../../utils/yup-config';
9-
import { FieldConstants } from '@gridsuite/commons-ui';
8+
import { FieldConstants, yup } from '@gridsuite/commons-ui';
109

1110
export const getCreateCaseDialogFormValidationDefaultValues = () => ({
1211
[FieldConstants.CASE_NAME]: '',

src/components/dialogs/create-case-dialog/create-case-dialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { Grid } from '@mui/material';
1212
import { addUploadingElement, removeUploadingElement } from '../../../redux/actions';
1313
import UploadNewCase from '../commons/upload-new-case';
1414
import { useForm } from 'react-hook-form';
15-
import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
15+
import { yupResolver } from '@hookform/resolvers/yup';
1616
import {
1717
createCaseDialogFormValidationSchema,
1818
getCreateCaseDialogFormValidationDefaultValues,

src/components/dialogs/create-study-dialog/create-study-dialog-utils.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import yup from '../../utils/yup-config';
9-
import { FieldConstants } from '@gridsuite/commons-ui';
8+
import { FieldConstants, yup } from '@gridsuite/commons-ui';
109

1110
export const getCreateStudyDialogFormDefaultValues = ({
1211
directory = '',

src/components/dialogs/create-study-dialog/create-study-dialog.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
createStudyDialogFormValidationSchema,
3030
getCreateStudyDialogFormDefaultValues,
3131
} from './create-study-dialog-utils';
32-
import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
32+
import { yupResolver } from '@hookform/resolvers/yup';
3333
import PrefilledNameInput from '../commons/prefilled-name-input';
3434
import { handleMaxElementsExceededError } from '../../utils/rest-errors';
3535
import { caseSrv, exploreSrv, networkConversionSrv } from '../../../services';

src/components/utils/yup-config.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)