Merge branch 'main' into feat_optim_users-identity_cache

gridsuite · Jan 2, 2025 · cea9317 · cea9317
2 parents e9efc3a + 8fbaf47
commit cea9317
Show file tree

Hide file tree

Showing 13 changed files with 490 additions and 439 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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.75.0",
+        "@gridsuite/commons-ui": "0.76.2",
         "@hookform/resolvers": "^3.3.4",
         "@mui/icons-material": "^5.15.14",
         "@mui/lab": "5.0.0-alpha.169",

diff --git a/src/components/dialogs/commons/prefilled-name-input.tsx b/src/components/dialogs/commons/prefilled-name-input.tsx
@@ -9,7 +9,7 @@ import { useEffect, useState } from 'react';
 import { useFormContext } from 'react-hook-form';
 import { ElementType, FieldConstants, UniqueNameInput } from '@gridsuite/commons-ui';
 import { useSelector } from 'react-redux';
-import { elementExists } from '../../../utils/rest-api';
+import { elementExists, getBaseName } from '../../../utils/rest-api';
 import { AppState } from '../../../redux/types';
 
 export interface PrefilledNameInputProps {
@@ -45,9 +45,15 @@ export default function PrefilledNameInput({ label, name, elementType }: Readonl
 
             if (caseName) {
                 clearErrors(name);
-                setValue(name, caseName?.substring(0, caseName.indexOf('.')), {
-                    shouldDirty: true,
-                });
+                getBaseName(caseName)
+                    .then((response) => {
+                        setValue(name, response, {
+                            shouldDirty: true,
+                        });
+                    })
+                    .catch((error) => {
+                        console.error('Error fetching base name:', error);
+                    });
             }
         }
     }, [caseFile, modifiedByUser, apiCallErrorMessage, caseFileErrorMessage, setValue, clearErrors, name]);

diff --git a/...ponents/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx b/...ponents/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-dialog.tsx
@@ -57,7 +57,7 @@ export default function CriteriaBasedEditionDialog({
     const [languageLocal] = useParameterState(PARAM_LANGUAGE);
     const [isFetching, setIsFetching] = useState(!!contingencyListId);
     const { snackError } = useSnackMessage();
-    const selectionForCopy = useSelector((state: AppState) => state.itemSelectionForCopy);
+    const itemSelectionForCopy = useSelector((state: AppState) => state.itemSelectionForCopy);
     const dispatch = useDispatch();
     const methods = useForm<CriteriaBasedEditionFormData>({
         defaultValues: getContingencyListEmptyFormData(name),
@@ -98,7 +98,7 @@ export default function CriteriaBasedEditionDialog({
     const onSubmit = (contingencyList: CriteriaBasedEditionFormData) => {
         saveCriteriaBasedContingencyList(contingencyListId, contingencyList)
             .then(() => {
-                if (selectionForCopy.sourceItemUuid === contingencyListId) {
+                if (itemSelectionForCopy.sourceItemUuid === contingencyListId) {
                     dispatch(setItemSelectionForCopy(NO_ITEM_SELECTION_FOR_COPY));
                     broadcastChannel.postMessage({ NO_ITEM_SELECTION_FOR_COPY });
                 }

diff --git a/...nents/dialogs/contingency-list/edition/explicit-naming/explicit-naming-edition-dialog.tsx b/...nents/dialogs/contingency-list/edition/explicit-naming/explicit-naming-edition-dialog.tsx
@@ -65,7 +65,7 @@ export default function ExplicitNamingEditionDialog({
 }: Readonly<ExplicitNamingEditionDialogProps>) {
     const [isFetching, setIsFetching] = useState(!!contingencyListId);
     const { snackError } = useSnackMessage();
-    const selectionForCopy = useSelector((state: AppState) => state.itemSelectionForCopy);
+    const itemSelectionForCopy = useSelector((state: AppState) => state.itemSelectionForCopy);
     const dispatch = useDispatch();
     const methods = useForm({
         defaultValues: emptyFormData(name),
@@ -110,7 +110,7 @@ export default function ExplicitNamingEditionDialog({
     const onSubmit = (contingencyList: ExplicitNamingEditionFormData) => {
         editContingencyList(contingencyListId, contingencyList)
             .then(() => {
-                if (selectionForCopy.sourceItemUuid === contingencyListId) {
+                if (itemSelectionForCopy.sourceItemUuid === contingencyListId) {
                     dispatch(setItemSelectionForCopy(NO_ITEM_SELECTION_FOR_COPY));
                     broadcastChannel.postMessage({ NO_ITEM_SELECTION_FOR_COPY });
                 }

diff --git a/src/components/dialogs/contingency-list/edition/script/script-edition-dialog.tsx b/src/components/dialogs/contingency-list/edition/script/script-edition-dialog.tsx
@@ -57,7 +57,7 @@ export default function ScriptEditionDialog({
 }: Readonly<ScriptEditionDialogProps>) {
     const [isFetching, setIsFetching] = useState(!!contingencyListId);
     const { snackError } = useSnackMessage();
-    const selectionForCopy = useSelector((state: AppState) => state.itemSelectionForCopy);
+    const itemSelectionForCopy = useSelector((state: AppState) => state.itemSelectionForCopy);
     const dispatch = useDispatch();
 
     const methods = useForm({
@@ -106,7 +106,7 @@ export default function ScriptEditionDialog({
     const onSubmit = (contingencyList: ScriptEditionFormData) => {
         editContingencyList(contingencyListId, contingencyList)
             .then(() => {
-                if (selectionForCopy.sourceItemUuid === contingencyListId) {
+                if (itemSelectionForCopy.sourceItemUuid === contingencyListId) {
                     dispatch(setItemSelectionForCopy(NO_ITEM_SELECTION_FOR_COPY));
                     broadcastChannel.postMessage({ NO_ITEM_SELECTION_FOR_COPY });
                 }

diff --git a/...nts/dialogs/network-modification/composite-modification/composite-modification-dialog.tsx b/...nts/dialogs/network-modification/composite-modification/composite-modification-dialog.tsx
@@ -62,7 +62,7 @@ export default function CompositeModificationDialog({
     const [languageLocal] = useParameterState(PARAM_LANGUAGE);
     const [isFetching, setIsFetching] = useState(!!compositeModificationId);
     const { snackError } = useSnackMessage();
-    const selectionForCopy = useSelector((state: AppState) => state.itemSelectionForCopy);
+    const itemSelectionForCopy = useSelector((state: AppState) => state.itemSelectionForCopy);
     const [modifications, setModifications] = useState<NetworkModificationMetadata[]>([]);
     const dispatch = useDispatch();
 
@@ -129,7 +129,7 @@ export default function CompositeModificationDialog({
     const onSubmit = (formData: FormData) => {
         saveCompositeModification(compositeModificationId, formData[FieldConstants.NAME])
             .then(() => {
-                if (selectionForCopy.sourceItemUuid === compositeModificationId) {
+                if (itemSelectionForCopy.sourceItemUuid === compositeModificationId) {
                     dispatch(setItemSelectionForCopy(NO_ITEM_SELECTION_FOR_COPY));
                     broadcastChannel.postMessage({ NO_ITEM_SELECTION_FOR_COPY });
                 }