remove elementUuid (same as id)

gridsuite · Jan 8, 2025 · 550debf · 550debf
1 parent 529089a
commit 550debf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 27 deletions.
diff --git a/src/components/filter/expert/ExpertFilterEditionDialog.tsx b/src/components/filter/expert/ExpertFilterEditionDialog.tsx
@@ -42,7 +42,6 @@ export function ExpertFilterEditionDialog({
     elementExists,
     language,
     description,
-    elementUuid,
 }: Readonly<FilterProps>) {
     const { snackError } = useSnackMessage();
     const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
@@ -69,6 +68,7 @@ export function ExpertFilterEditionDialog({
                     setDataFetchStatus(FetchStatus.FETCH_SUCCESS);
                     reset({
                         [FieldConstants.NAME]: name,
+                        [FieldConstants.DESCRIPTION]: description,
                         [FieldConstants.FILTER_TYPE]: FilterType.EXPERT.id,
                         [FieldConstants.EQUIPMENT_TYPE]: response[FieldConstants.EQUIPMENT_TYPE],
                         [EXPERT_FILTER_QUERY]: importExpertRules(response[EXPERT_FILTER_QUERY]),
@@ -82,7 +82,7 @@ export function ExpertFilterEditionDialog({
                     });
                 });
         }
-    }, [id, name, open, reset, snackError, getFilterById]);
+    }, [id, name, open, reset, snackError, getFilterById, description]);
 
     const onSubmit = useCallback(
         (filterForm: { [prop: string]: any }) => {
@@ -99,23 +99,14 @@ export function ExpertFilterEditionDialog({
                     snackError({
                         messageTxt: error,
                     });
-                },
-                elementUuid
+                }
             );
             if (itemSelectionForCopy.sourceItemUuid === id) {
                 setItemSelectionForCopy(NO_ITEM_SELECTION_FOR_COPY);
                 broadcastChannel.postMessage({ NO_SELECTION_FOR_COPY: NO_ITEM_SELECTION_FOR_COPY });
             }
         },
-        [
-            broadcastChannel,
-            id,
-            onClose,
-            itemSelectionForCopy.sourceItemUuid,
-            snackError,
-            setItemSelectionForCopy,
-            elementUuid,
-        ]
+        [broadcastChannel, id, onClose, itemSelectionForCopy.sourceItemUuid, snackError, setItemSelectionForCopy]
     );
 
     const isDataReady = dataFetchStatus === FetchStatus.FETCH_SUCCESS;

diff --git a/src/components/filter/explicitNaming/ExplicitNamingFilterEditionDialog.tsx b/src/components/filter/explicitNaming/ExplicitNamingFilterEditionDialog.tsx
@@ -46,7 +46,6 @@ export function ExplicitNamingFilterEditionDialog({
     elementExists,
     language,
     description,
-    elementUuid,
 }: Readonly<FilterProps>) {
     const { snackError } = useSnackMessage();
     const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
@@ -72,6 +71,7 @@ export function ExplicitNamingFilterEditionDialog({
                     setDataFetchStatus(FetchStatus.FETCH_SUCCESS);
                     reset({
                         [FieldConstants.NAME]: name,
+                        [FieldConstants.DESCRIPTION]: description,
                         [FieldConstants.FILTER_TYPE]: FilterType.EXPLICIT_NAMING.id,
                         [FieldConstants.EQUIPMENT_TYPE]: response[FieldConstants.EQUIPMENT_TYPE],
                         [FILTER_EQUIPMENTS_ATTRIBUTES]: response[FILTER_EQUIPMENTS_ATTRIBUTES].map((row: any) => ({
@@ -88,7 +88,7 @@ export function ExplicitNamingFilterEditionDialog({
                     });
                 });
         }
-    }, [id, name, open, reset, snackError, getFilterById]);
+    }, [id, name, open, reset, snackError, getFilterById, description]);
 
     const onSubmit = useCallback<SubmitHandler<FormSchemaType>>(
         (filterForm) => {
@@ -104,15 +104,14 @@ export function ExplicitNamingFilterEditionDialog({
                         messageTxt: error,
                     });
                 },
-                onClose,
-                elementUuid
+                onClose
             );
             if (itemSelectionForCopy.sourceItemUuid === id) {
                 setItemSelectionForCopy(NO_ITEM_SELECTION_FOR_COPY);
                 broadcastChannel.postMessage({ NO_SELECTION_FOR_COPY: NO_ITEM_SELECTION_FOR_COPY });
             }
         },
-        [broadcastChannel, id, itemSelectionForCopy, onClose, snackError, setItemSelectionForCopy, elementUuid]
+        [broadcastChannel, id, itemSelectionForCopy, onClose, snackError, setItemSelectionForCopy]
     );
 
     const isDataReady = dataFetchStatus === FetchStatus.FETCH_SUCCESS;

diff --git a/src/components/filter/filter.type.ts b/src/components/filter/filter.type.ts
@@ -30,7 +30,6 @@ export interface FilterProps {
     itemSelectionForCopy: ItemSelectionForCopy;
     setItemSelectionForCopy: (selection: ItemSelectionForCopy) => void;
     getFilterById: (id: string) => Promise<{ [prop: string]: any }>;
-    elementUuid: UUID;
     activeDirectory?: UUID;
     elementExists?: ElementExistsType;
     language?: string;

diff --git a/src/components/filter/utils/filterApi.ts b/src/components/filter/utils/filterApi.ts
@@ -21,7 +21,6 @@ export const saveExplicitNamingFilter = (
     id: string | null,
     setCreateFilterErr: (value?: string) => void,
     handleClose: () => void,
-    elementUuid?: UUID,
     activeDirectory?: UUID,
     token?: string
 ) => {
@@ -56,7 +55,7 @@ export const saveExplicitNamingFilter = (
             .catch((error) => {
                 setCreateFilterErr(error.message);
             });
-    } else if (elementUuid) {
+    } else {
         saveFilter(
             {
                 id,
@@ -65,7 +64,6 @@ export const saveExplicitNamingFilter = (
                 filterEquipmentsAttributes: cleanedTableValues,
             },
             name,
-            elementUuid,
             description,
             token
         )
@@ -87,7 +85,6 @@ export const saveExpertFilter = (
     activeDirectory: any,
     onClose: () => void,
     onError: (message: string) => void,
-    elementUuid?: UUID,
     token?: string
 ) => {
     if (isFilterCreation) {
@@ -108,7 +105,7 @@ export const saveExpertFilter = (
             .catch((error: any) => {
                 onError(error.message);
             });
-    } else if (elementUuid) {
+    } else {
         saveFilter(
             {
                 id,
@@ -117,7 +114,6 @@ export const saveExpertFilter = (
                 rules: exportExpertRules(query),
             },
             name,
-            elementUuid,
             description,
             token
         )

diff --git a/src/services/explore.ts b/src/services/explore.ts
@@ -35,10 +35,9 @@ export function createFilter(
     );
 }
 
-export function saveFilter(filter: any, name: string, elementUuid: UUID, description: string, token?: string) {
+export function saveFilter(filter: any, name: string, description: string, token?: string) {
     const urlSearchParams = new URLSearchParams();
     urlSearchParams.append('name', name);
-    urlSearchParams.append('elementUuid', elementUuid);
     urlSearchParams.append('description', description);
     return backendFetch(
         `${PREFIX_EXPLORE_SERVER_QUERIES}/v1/explore/filters/${filter.id}?${urlSearchParams.toString()}`,