From 7d4f12e45d59f6520bf821808812129134014851 Mon Sep 17 00:00:00 2001 From: basseche Date: Wed, 27 Nov 2024 14:26:12 +0100 Subject: [PATCH 1/4] change commons-ui version --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a8b72d31..8fea05d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@gridsuite/commons-ui": "0.72.0", + "@gridsuite/commons-ui": "0.72.1", "@hookform/resolvers": "^3.3.4", "@mui/icons-material": "^5.15.14", "@mui/lab": "5.0.0-alpha.169", @@ -3015,9 +3015,9 @@ } }, "node_modules/@gridsuite/commons-ui": { - "version": "0.72.0", - "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.72.0.tgz", - "integrity": "sha512-N8nb4TqmWqo6DrwNIf3radX2YZ7qh117jHMF6VDagiAZ42uWk8jW2ReWm/Eb6el7tIE13LzKTm6h6d5HpT2d4g==", + "version": "0.72.1", + "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.72.1.tgz", + "integrity": "sha512-H3wbD/RBIvtvkX6QN3YcJXrsdSr6QIa5kyIlpsu6PlK7SrfUYSAaF1u0EsyKRtc/htNG5OlwD/0EOgcvML8KNw==", "dependencies": { "@react-querybuilder/dnd": "^7.2.0", "@react-querybuilder/material": "^7.2.0", diff --git a/package.json b/package.json index c2b971f2..4b9b6df3 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@gridsuite/commons-ui": "0.72.0", + "@gridsuite/commons-ui": "0.72.1", "@hookform/resolvers": "^3.3.4", "@mui/icons-material": "^5.15.14", "@mui/lab": "5.0.0-alpha.169", From a05142aa9eec937397e614a4dfdcd9ddcc0002e0 Mon Sep 17 00:00:00 2001 From: Tristan Chuine Date: Wed, 27 Nov 2024 16:45:20 +0100 Subject: [PATCH 2/4] Fix `getCriteriaBasedSchema` and `getCriteriaBasedFormData` usage --- .../dialogs/contingency-list/contingency-list-utils.ts | 4 ++-- .../creation/contingency-list-creation-dialog.tsx | 2 +- .../creation/contingency-list-creation-form.tsx | 2 +- .../edition/criteria-based/criteria-based-edition-dialog.tsx | 2 +- .../edition/criteria-based/criteria-based-edition-form.tsx | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/dialogs/contingency-list/contingency-list-utils.ts b/src/components/dialogs/contingency-list/contingency-list-utils.ts index f9e52c24..4163399a 100644 --- a/src/components/dialogs/contingency-list/contingency-list-utils.ts +++ b/src/components/dialogs/contingency-list/contingency-list-utils.ts @@ -77,14 +77,14 @@ export const getContingencyListEmptyFormData = (name = '') => ({ [FieldConstants.CONTINGENCY_LIST_TYPE]: ContingencyListType.CRITERIA_BASED.id, [FieldConstants.SCRIPT]: '', [FieldConstants.EQUIPMENT_TYPE]: null, - ...getCriteriaBasedFormData({}, {}), + ...getCriteriaBasedFormData(), }); export const getCriteriaBasedFormDataFromFetchedElement = (response: any, name: string) => ({ [FieldConstants.NAME]: name, [FieldConstants.CONTINGENCY_LIST_TYPE]: ContingencyListType.CRITERIA_BASED.id, [FieldConstants.EQUIPMENT_TYPE]: response.equipmentType, - ...getCriteriaBasedFormData(response, {}), + ...getCriteriaBasedFormData(response), }); export const getExplicitNamingFormDataFromFetchedElement = (response: any) => { diff --git a/src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.tsx b/src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.tsx index 186c9c82..4a262e84 100644 --- a/src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.tsx +++ b/src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.tsx @@ -40,7 +40,7 @@ const schema = yup.object().shape({ otherwise: (schemaOtherwise) => schemaOtherwise.nullable(), }), ...getExplicitNamingSchema(), - ...getCriteriaBasedSchema({}), + ...getCriteriaBasedSchema(), }); const emptyFormData = getContingencyListEmptyFormData(); diff --git a/src/components/dialogs/contingency-list/creation/contingency-list-creation-form.tsx b/src/components/dialogs/contingency-list/creation/contingency-list-creation-form.tsx index f93908c6..817f873d 100644 --- a/src/components/dialogs/contingency-list/creation/contingency-list-creation-form.tsx +++ b/src/components/dialogs/contingency-list/creation/contingency-list-creation-form.tsx @@ -49,7 +49,7 @@ export default function ContingencyListCreationForm() { /> ); - const emptyValues = getCriteriaBasedFormData({}, {}); + const emptyValues = getCriteriaBasedFormData(); return ( <> diff --git a/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx b/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx index eeeb8e79..e857ac82 100644 --- a/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx +++ b/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx @@ -32,7 +32,7 @@ import { PARAM_LANGUAGE } from '../../../../../utils/config-params'; const schema = yup.object().shape({ [FieldConstants.NAME]: yup.string().trim().required('nameEmpty'), [FieldConstants.EQUIPMENT_TYPE]: yup.string().required(), - ...getCriteriaBasedSchema(null), + ...getCriteriaBasedSchema(), }); const emptyFormData = (name?: string) => getContingencyListEmptyFormData(name); diff --git a/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-form.tsx b/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-form.tsx index eceade41..8a93d639 100644 --- a/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-form.tsx +++ b/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-form.tsx @@ -20,7 +20,7 @@ import { AppState } from '../../../../../redux/types'; import { SUPPORTED_CONTINGENCY_LIST_EQUIPMENTS } from '../../contingency-list-utils'; export default function CriteriaBasedEditionForm() { - const emptyValues = getCriteriaBasedFormData({}, {}); + const emptyValues = getCriteriaBasedFormData(); const activeDirectory = useSelector((state: AppState) => state.activeDirectory); return ( <> From bfbd42eccaa8d9b46998ee383d801f513578ba22 Mon Sep 17 00:00:00 2001 From: Tristan Chuine Date: Wed, 27 Nov 2024 18:11:00 +0100 Subject: [PATCH 3/4] Fixing error with commons-ui --- package-lock.json | 7 ++++--- package.json | 2 +- .../contingency-list/contingency-list-utils.ts | 18 +----------------- .../contingency-list-creation-dialog.tsx | 1 + .../criteria-based-edition-dialog.tsx | 6 ++---- src/utils/rest-api.ts | 6 +++--- 6 files changed, 12 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fea05d9..a693fc85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@gridsuite/commons-ui": "0.72.1", + "@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.72.1.tgz", "@hookform/resolvers": "^3.3.4", "@mui/icons-material": "^5.15.14", "@mui/lab": "5.0.0-alpha.169", @@ -3016,8 +3016,9 @@ }, "node_modules/@gridsuite/commons-ui": { "version": "0.72.1", - "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.72.1.tgz", - "integrity": "sha512-H3wbD/RBIvtvkX6QN3YcJXrsdSr6QIa5kyIlpsu6PlK7SrfUYSAaF1u0EsyKRtc/htNG5OlwD/0EOgcvML8KNw==", + "resolved": "file:../commons-ui/gridsuite-commons-ui-0.72.1.tgz", + "integrity": "sha512-vMTa/Vnzz2/OffzvNcYZ1DjbmUMrKpNJFPvJ+BUPL8FrYOOa/0FbNueUwNKZY2Na5OhAVYvMix32LTmh290N9A==", + "license": "MPL-2.0", "dependencies": { "@react-querybuilder/dnd": "^7.2.0", "@react-querybuilder/material": "^7.2.0", diff --git a/package.json b/package.json index 4b9b6df3..a3bab604 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@gridsuite/commons-ui": "0.72.1", + "@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.72.1.tgz", "@hookform/resolvers": "^3.3.4", "@mui/icons-material": "^5.15.14", "@mui/lab": "5.0.0-alpha.169", diff --git a/src/components/dialogs/contingency-list/contingency-list-utils.ts b/src/components/dialogs/contingency-list/contingency-list-utils.ts index 4163399a..0be0e4aa 100644 --- a/src/components/dialogs/contingency-list/contingency-list-utils.ts +++ b/src/components/dialogs/contingency-list/contingency-list-utils.ts @@ -8,6 +8,7 @@ import { v4 as uuid4 } from 'uuid'; import { CONTINGENCY_LIST_EQUIPMENTS, + type CriteriaBasedData, EquipmentType, FieldConstants, getCriteriaBasedFormData, @@ -27,23 +28,6 @@ export interface IdentifierList { identifierList: Identifier[]; } -export interface RangeInputData { - [FieldConstants.OPERATION_TYPE]: string; - [FieldConstants.VALUE_1]: number | null; - [FieldConstants.VALUE_2]: number | null; -} - -export interface CriteriaBasedData { - [FieldConstants.COUNTRIES]?: string[]; - [FieldConstants.COUNTRIES_1]?: string[]; - [FieldConstants.COUNTRIES_2]?: string[]; - [FieldConstants.NOMINAL_VOLTAGE]?: RangeInputData | null; - [FieldConstants.NOMINAL_VOLTAGE_1]?: RangeInputData | null; - [FieldConstants.NOMINAL_VOLTAGE_2]?: RangeInputData | null; - [FieldConstants.NOMINAL_VOLTAGE_3]?: RangeInputData | null; - [key: string]: any; -} - export type ContingencyListFormData = { [FieldConstants.NAME]: string; [FieldConstants.DESCRIPTION]?: string; diff --git a/src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.tsx b/src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.tsx index 4a262e84..1fe98043 100644 --- a/src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.tsx +++ b/src/components/dialogs/contingency-list/creation/contingency-list-creation-dialog.tsx @@ -104,6 +104,7 @@ export default function ContingencyListCreationDialog({ onClose={closeAndClear} onSave={onSubmit} formSchema={schema} + // @ts-expect-error TODO: formSchema is of type ContingencyListFormDataWithRequiredCriteria but formMethods of type ContingencyListFormData formMethods={methods} titleId={titleId} removeOptional diff --git a/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx b/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx index e857ac82..276c3210 100644 --- a/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx +++ b/src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx @@ -35,8 +35,6 @@ const schema = yup.object().shape({ ...getCriteriaBasedSchema(), }); -const emptyFormData = (name?: string) => getContingencyListEmptyFormData(name); - export interface CriteriaBasedEditionDialogProps { contingencyListId: string; contingencyListType: string; @@ -62,7 +60,7 @@ export default function CriteriaBasedEditionDialog({ const selectionForCopy = useSelector((state: AppState) => state.selectionForCopy); const dispatch = useDispatch(); const methods = useForm({ - defaultValues: emptyFormData(name), + defaultValues: getContingencyListEmptyFormData(name), resolver: yupResolver(schema), }); @@ -93,7 +91,7 @@ export default function CriteriaBasedEditionDialog({ }, [contingencyListId, contingencyListType, name, reset, snackError]); const closeAndClear = () => { - reset(emptyFormData()); + reset(getContingencyListEmptyFormData()); onClose(); }; diff --git a/src/utils/rest-api.ts b/src/utils/rest-api.ts index bbda491f..ec4237cb 100644 --- a/src/utils/rest-api.ts +++ b/src/utils/rest-api.ts @@ -9,12 +9,13 @@ import ReconnectingWebSocket from 'reconnecting-websocket'; import { backendFetch, backendFetchJson, + type CriteriaBasedData, ElementType, fetchEnv, FieldConstants, getRequestParamFromList, - GsLang, - GsTheme, + type GsLang, + type GsTheme, } from '@gridsuite/commons-ui'; import { LiteralUnion } from 'type-fest'; import { IncomingHttpHeaders } from 'node:http'; @@ -25,7 +26,6 @@ import { store } from '../redux/store'; import { ContingencyListType } from './elementType'; import { CONTINGENCY_ENDPOINTS } from './constants-endpoints'; import { AppState } from '../redux/types'; -import { CriteriaBasedData } from '../components/dialogs/contingency-list/contingency-list-utils'; import { PrepareContingencyListForBackend } from '../components/dialogs/contingency-list-helper'; import { UsersIdentities } from './user-identities.type'; From 410542b3a93974049a319a8e8f18f6c64eef26cf Mon Sep 17 00:00:00 2001 From: basseche Date: Thu, 28 Nov 2024 12:54:51 +0100 Subject: [PATCH 4/4] change version commons-ui --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index a693fc85..f5eb7697 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.72.1.tgz", + "@gridsuite/commons-ui": "0.72.2", "@hookform/resolvers": "^3.3.4", "@mui/icons-material": "^5.15.14", "@mui/lab": "5.0.0-alpha.169", @@ -3015,10 +3015,9 @@ } }, "node_modules/@gridsuite/commons-ui": { - "version": "0.72.1", - "resolved": "file:../commons-ui/gridsuite-commons-ui-0.72.1.tgz", - "integrity": "sha512-vMTa/Vnzz2/OffzvNcYZ1DjbmUMrKpNJFPvJ+BUPL8FrYOOa/0FbNueUwNKZY2Na5OhAVYvMix32LTmh290N9A==", - "license": "MPL-2.0", + "version": "0.72.2", + "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.72.2.tgz", + "integrity": "sha512-G4uygY0fxmiRawsXHKosjbNpmRfyGM1sK5/GJe0APmn7wa16d25x9jLrzfSzp1KjL4u0llIGuBYDnssABC4rVw==", "dependencies": { "@react-querybuilder/dnd": "^7.2.0", "@react-querybuilder/material": "^7.2.0", diff --git a/package.json b/package.json index a3bab604..8ff6144f 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.72.1.tgz", + "@gridsuite/commons-ui": "0.72.2", "@hookform/resolvers": "^3.3.4", "@mui/icons-material": "^5.15.14", "@mui/lab": "5.0.0-alpha.169",