types:fix type

Signed-off-by: capyq <quentin.capy@rte-france.com>
gridsuite · Oct 17, 2024 · e6e7fea · e6e7fea
1 parent 3ee4bc9
commit e6e7fea
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 38 deletions.
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
@@ -16,7 +16,7 @@ import {
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
 import { createContingencyList } from '../../../../utils/rest-api';
-import { FunctionComponent, SyntheticEvent } from 'react';
+import { FunctionComponent } from 'react';
 import ContingencyListCreationForm from './contingency-list-creation-form';
 import {
     ContingencyListFormData,
@@ -47,7 +47,7 @@ const schema = yup.object().shape({
 const emptyFormData = getContingencyListEmptyFormData();
 
 interface ContingencyListCreationDialogProps {
-    onClose: (event?: SyntheticEvent) => void;
+    onClose: () => void;
     open: boolean;
     titleId: string;
 }
@@ -75,9 +75,9 @@ const ContingencyListCreationDialog: FunctionComponent<ContingencyListCreationDi
     const nameError = errors[FieldConstants.NAME];
     const isValidating = errors.root?.isValidating;
 
-    const closeAndClear = (event?: SyntheticEvent) => {
+    const closeAndClear = () => {
         reset(emptyFormData);
-        onClose(event);
+        onClose();
     };
 
     const onSubmit = (data: ContingencyListFormDataWithRequiredCriteria) => {

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
@@ -16,7 +16,7 @@ import {
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
 
-import { FunctionComponent, SyntheticEvent, useEffect, useState } from 'react';
+import { FunctionComponent, useEffect, useState } from 'react';
 import {
     CriteriaBasedData,
     getContingencyListEmptyFormData,
@@ -48,7 +48,7 @@ interface CriteriaBasedEditionDialogProps {
     contingencyListId: string;
     contingencyListType: string;
     open: boolean;
-    onClose: (event?: SyntheticEvent) => void;
+    onClose: () => void;
     titleId: string;
     name: string;
     broadcastChannel: BroadcastChannel;
@@ -98,9 +98,9 @@ const CriteriaBasedEditionDialog: FunctionComponent<CriteriaBasedEditionDialogPr
             .finally(() => setIsFetching(false));
     }, [contingencyListId, contingencyListType, name, reset, snackError]);
 
-    const closeAndClear = (event?: SyntheticEvent) => {
+    const closeAndClear = () => {
         reset(emptyFormData());
-        onClose(event);
+        onClose();
     };
 
     const editContingencyList = (contingencyListId: string, contingencyList: CriteriaBasedEditionFormData) => {

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
@@ -15,7 +15,7 @@ import {
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
 
-import { FunctionComponent, SyntheticEvent, useEffect, useState } from 'react';
+import { FunctionComponent, useEffect, useState } from 'react';
 import {
     getContingencyListEmptyFormData,
     getExplicitNamingFormDataFromFetchedElement,
@@ -49,7 +49,7 @@ interface ExplicitNamingEditionDialogProps {
     contingencyListId: string;
     contingencyListType: string;
     open: boolean;
-    onClose: (event?: SyntheticEvent) => void;
+    onClose: () => void;
     titleId: string;
     name: string;
     broadcastChannel: BroadcastChannel;
@@ -98,9 +98,9 @@ const ExplicitNamingEditionDialog: FunctionComponent<ExplicitNamingEditionDialog
             .finally(() => setIsFetching(false));
     }, [contingencyListId, contingencyListType, name, reset, snackError]);
 
-    const closeAndClear = (event?: SyntheticEvent) => {
+    const closeAndClear = () => {
         reset(emptyFormData());
-        onClose(event);
+        onClose();
     };
 
     const editContingencyList = (contingencyListId: string, contingencyList: ExplicitNamingEditionFormData) => {

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
@@ -15,7 +15,7 @@ import {
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
 
-import React, { FunctionComponent, SyntheticEvent, useEffect, useState } from 'react';
+import { FunctionComponent, useEffect, useState } from 'react';
 import { getContingencyListEmptyFormData, getScriptFormDataFromFetchedElement } from '../../contingency-list-utils';
 import { getContingencyList, saveScriptContingencyList } from 'utils/rest-api';
 import ScriptEditionForm from './script-edition-form';
@@ -41,7 +41,7 @@ interface ScriptEditionDialogProps {
     contingencyListId: string;
     contingencyListType: string;
     open: boolean;
-    onClose: (event?: React.SyntheticEvent) => void;
+    onClose: () => void;
     titleId: string;
     name: string;
     broadcastChannel: BroadcastChannel;
@@ -92,9 +92,9 @@ const ScriptEditionDialog: FunctionComponent<ScriptEditionDialogProps> = ({
             .finally(() => setIsFetching(false));
     }, [contingencyListId, contingencyListType, name, reset, snackError]);
 
-    const closeAndClear = (event?: SyntheticEvent) => {
+    const closeAndClear = () => {
         reset(emptyFormData());
-        onClose(event);
+        onClose();
     };
 
     const editContingencyList = (contingencyListId: string, contingencyList: ScriptEditionFormData) => {

diff --git a/src/components/dialogs/copy-to-script-dialog.tsx b/src/components/dialogs/copy-to-script-dialog.tsx
@@ -25,7 +25,7 @@ const emptyFormData = {
 interface CopyToScriptDialogProps {
     id: string;
     open: boolean;
-    onClose: (...args: any[]) => void;
+    onClose: () => void;
     onValidate: (...args: any[]) => void;
     currentName: string;
     title: string;
@@ -82,10 +82,6 @@ const CopyToScriptDialog: React.FunctionComponent<CopyToScriptDialogProps> = ({
         onValidate(id, data[FieldConstants.NAME]);
     };
 
-    const handleClose = () => {
-        onClose();
-    };
-
     const handleGenerateNameError = useCallback(() => {
         return handleError(
             intl.formatMessage(
@@ -117,7 +113,7 @@ const CopyToScriptDialog: React.FunctionComponent<CopyToScriptDialogProps> = ({
     return (
         <CustomMuiDialog
             open={open}
-            onClose={handleClose}
+            onClose={onClose}
             onSave={onSubmit}
             formSchema={schema}
             formMethods={methods}

diff --git a/src/components/dialogs/create-case-dialog/create-case-dialog.tsx b/src/components/dialogs/create-case-dialog/create-case-dialog.tsx
@@ -42,7 +42,7 @@ interface IFormData {
 }
 
 interface CreateCaseDialogProps {
-    onClose: (e?: unknown, nextSelectedDirectoryId?: string | null) => void;
+    onClose: () => void;
     open: boolean;
 }
 

diff --git a/src/components/dialogs/create-directory-dialog.tsx b/src/components/dialogs/create-directory-dialog.tsx
@@ -20,7 +20,7 @@ import { FunctionComponent } from 'react';
 
 interface CreateDirectoryDialogProps {
     open: boolean;
-    onClose: (e?: unknown, nextSelectedDirectoryId?: string | null) => void;
+    onClose: () => void;
     onClick: (newName: string) => void;
     title: string;
     parentDirectory?: string;

diff --git a/src/components/dialogs/create-study-dialog/create-study-dialog.tsx b/src/components/dialogs/create-study-dialog/create-study-dialog.tsx
@@ -64,7 +64,7 @@ function formatCaseImportParameters(params: Parameter[]): Parameter[] {
 
 interface CreateStudyDialogProps {
     open: boolean;
-    onClose: (e?: unknown, nextSelectedDirectoryId?: string | null) => void;
+    onClose: () => void;
     providedExistingCase?: ElementAttributes;
 }
 

diff --git a/src/components/dialogs/delete-dialog.tsx b/src/components/dialogs/delete-dialog.tsx
@@ -18,7 +18,7 @@ import { CancelButton, ElementAttributes, OverflowableText } from '@gridsuite/co
 
 interface DeleteDialogProps {
     open: boolean;
-    onClose: (e?: unknown, nextSelectedDirectoryId?: string | null) => void;
+    onClose: () => void;
     onClick: () => void;
     items: ElementAttributes[];
     multipleDeleteFormatMessageId: string;

diff --git a/src/components/dialogs/rename-dialog.tsx b/src/components/dialogs/rename-dialog.tsx
@@ -20,7 +20,7 @@ import { AppState } from 'redux/reducer';
 
 interface RenameDialogProps {
     open: boolean;
-    onClose: (e?: unknown, nextSelectedDirectoryId?: string | null) => void;
+    onClose: () => void;
     onClick: (newName: string) => void;
     title: string;
     message: string;

diff --git a/src/components/menus/directory-tree-contextual-menu.tsx b/src/components/menus/directory-tree-contextual-menu.tsx
@@ -46,7 +46,7 @@ import { AppState } from 'redux/reducer';
 interface DirectoryTreeContextualMenuProps {
     directory: ElementAttributes | null;
     open: boolean;
-    onClose: (e: unknown, nextSelectedDirectoryId?: string | null) => void;
+    onClose: (nextSelectedDirectoryId?: string | null) => void;
     openDialog: string;
     setOpenDialog: (dialogId: string) => void;
     restrictMenuItems: boolean;
@@ -72,8 +72,8 @@ const DirectoryTreeContextualMenu: React.FC<DirectoryTreeContextualMenuProps> =
     };
 
     const handleCloseDialog = useCallback(
-        (e: unknown, nextSelectedDirectoryId: string | null = null) => {
-            onClose(e, nextSelectedDirectoryId);
+        (nextSelectedDirectoryId: string | null = null) => {
+            onClose(nextSelectedDirectoryId);
             setOpenDialog(DialogsId.NONE);
             setHideMenu(false);
             setDeleteError('');
@@ -83,7 +83,7 @@ const DirectoryTreeContextualMenu: React.FC<DirectoryTreeContextualMenuProps> =
 
     const [renameCB, renameState] = useDeferredFetch(
         renameElement,
-        () => handleCloseDialog(null, null),
+        () => handleCloseDialog(),
         (HTTPStatusCode: number) => {
             if (HTTPStatusCode === 403) {
                 return intl.formatMessage({ id: 'renameDirectoryError' });
@@ -94,12 +94,12 @@ const DirectoryTreeContextualMenu: React.FC<DirectoryTreeContextualMenuProps> =
     );
 
     const [insertDirectoryCB, insertDirectoryState] = useDeferredFetch(insertDirectory, (response: ElementAttributes) =>
-        handleCloseDialog(null, response?.elementUuid)
+        handleCloseDialog(response?.elementUuid)
     );
 
     const [insertRootDirectoryCB, insertRootDirectoryState] = useDeferredFetch(
         insertRootDirectory,
-        (response: ElementAttributes) => handleCloseDialog(null, response?.elementUuid)
+        (response: ElementAttributes) => handleCloseDialog(response?.elementUuid)
     );
 
     const selectionForCopy = useSelector((state: AppState) => state.selectionForCopy);
@@ -128,7 +128,7 @@ const DirectoryTreeContextualMenu: React.FC<DirectoryTreeContextualMenuProps> =
     function pasteElement(directoryUuid: string, selectionForCopy: any) {
         if (!selectionForCopy.sourceItemUuid) {
             handleError(intl.formatMessage({ id: 'elementPasteFailed404' }));
-            handleCloseDialog(null);
+            handleCloseDialog();
         } else {
             console.info('Pasting element %s into directory %s', selectionForCopy.nameItem, directoryUuid);
 
@@ -183,7 +183,7 @@ const DirectoryTreeContextualMenu: React.FC<DirectoryTreeContextualMenuProps> =
                     );
             }
 
-            handleCloseDialog(null);
+            handleCloseDialog();
         }
     }
 
@@ -192,7 +192,7 @@ const DirectoryTreeContextualMenu: React.FC<DirectoryTreeContextualMenuProps> =
         (elementsUuid: string) => {
             setDeleteError('');
             deleteElement(elementsUuid)
-                .then(() => handleCloseDialog(null, directory?.parentUuid))
+                .then(() => handleCloseDialog(directory?.parentUuid))
                 .catch((error: any) => {
                     //show the error message and don't close the dialog
                     setDeleteError(error.message);
@@ -377,7 +377,7 @@ const DirectoryTreeContextualMenu: React.FC<DirectoryTreeContextualMenuProps> =
                 return (
                     <FilterCreationDialog
                         open={true}
-                        onClose={handleCloseDialog}
+                        onClose={() => handleCloseDialog()}
                         activeDirectory={activeDirectory}
                         elementExists={elementExists}
                         language={languageLocal}
@@ -392,7 +392,12 @@ const DirectoryTreeContextualMenu: React.FC<DirectoryTreeContextualMenuProps> =
     return (
         <>
             {open && (
-                <CommonContextualMenu {...others} menuItems={buildMenu()} open={open && !hideMenu} onClose={onClose} />
+                <CommonContextualMenu
+                    {...others}
+                    menuItems={buildMenu()}
+                    open={open && !hideMenu}
+                    onClose={() => onClose()}
+                />
             )}
             {renderDialog()}
         </>