Adapt code from modifications in commons-ui to remove a maximum occur…

…rences of 'any' type (#601) * Adapt code from modifications in commons-ui to remove 'any' type ... Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
gridsuite · Jan 27, 2025 · 310570b · 310570b
1 parent c0cbc61
commit 310570b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 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.79.0",
+        "@gridsuite/commons-ui": "0.80.0",
         "@hookform/resolvers": "^3.3.4",
         "@mui/icons-material": "^5.15.14",
         "@mui/lab": "5.0.0-alpha.169",

diff --git a/src/components/menus/content-contextual-menu.tsx b/src/components/menus/content-contextual-menu.tsx
@@ -192,7 +192,6 @@ export default function ContentContextualMenu(props: Readonly<ContentContextualM
                         activeElement.description,
                         activeElement.elementUuid,
                         selectedDirectory?.elementUuid,
-                        // @ts-expect-error TODO: seems to be an object but we await a string???
                         activeElement.specificMetadata.type
                     );
                     break;
@@ -222,7 +221,6 @@ export default function ContentContextualMenu(props: Readonly<ContentContextualM
                         activeElement.elementUuid,
                         undefined,
                         activeElement.type,
-                        // @ts-expect-error TODO: seems to be an object but we await a string???
                         activeElement.specificMetadata.type
                     ).catch((error) => handleDuplicateError(error.message));
                     break;
@@ -314,6 +312,7 @@ export default function ContentContextualMenu(props: Readonly<ContentContextualM
     );
 
     const [renameCB, renameState] = useDeferredFetch(
+        // @ts-expect-error refacto typing of useDefferedFetch
         renameElement,
         (elementUuid: string, renamedElement: any[]) => {
             // if copied element is renamed
@@ -717,7 +716,6 @@ export default function ContentContextualMenu(props: Readonly<ContentContextualM
                         onClose={handleCloseDialog}
                         sourceFilterForExplicitNamingConversion={{
                             id: activeElement.elementUuid,
-                            // @ts-expect-error TODO: seems to be an object but we await a string???
                             equipmentType: activeElement.specificMetadata.equipmentType,
                         }}
                         activeDirectory={activeDirectory}

diff --git a/src/components/menus/directory-tree-contextual-menu.tsx b/src/components/menus/directory-tree-contextual-menu.tsx
@@ -91,6 +91,7 @@ export default function DirectoryTreeContextualMenu(props: Readonly<DirectoryTre
     );
 
     const [renameCB, renameState] = useDeferredFetch(
+        // @ts-expect-error refacto typing of useDefferedFetch
         renameElement,
         handleCloseDialog,
         (HTTPStatusCode: number) => {

diff --git a/src/components/tree.test.ts b/src/components/tree.test.ts
@@ -20,7 +20,10 @@ const otherProperties = {
     lastModifiedBy: 'user1',
     children: [],
     parentUuid: null,
-    specificMetadata: {},
+    specificMetadata: {
+        type: '',
+        equipmentType: '',
+    },
 };
 
 test('boot1', () => {

diff --git a/src/components/utils/directory-content-utils.ts b/src/components/utils/directory-content-utils.ts
@@ -22,7 +22,6 @@ export const formatMetadata = (
     childrenMetadata: Record<UUID, ElementAttributes>
 ): ElementAttributes => ({
     ...data,
-    // @ts-expect-error TODO: "Type `object` is not assignable to type `string`"
     subtype: childrenMetadata[data.elementUuid]?.specificMetadata.type,
     hasMetadata: !!childrenMetadata[data.elementUuid],
 });

diff --git a/src/components/utils/downloadUtils.ts b/src/components/utils/downloadUtils.ts
@@ -35,7 +35,7 @@ const triggerDownload = ({ blob, filename }: DownloadData): void => {
 const downloadStrategies: { [key in ElementType]?: (element: ElementAttributes) => Promise<DownloadData> } = {
     [ElementType.CASE]: async (element: ElementAttributes) => {
         const result = await downloadCase(element.elementUuid);
-        const filename = result.headers.get('caseName');
+        const filename = result.headers.get('caseName') ?? element.elementName;
         return { blob: await result.blob(), filename };
     },
     [ElementType.SPREADSHEET_CONFIG]: async (element: ElementAttributes) => {
@@ -113,7 +113,10 @@ export function useDownloadUtils() {
                     abortController2
                 );
 
-                let downloadFileName = result.headers.get('Content-Disposition').split('filename=')[1];
+                let downloadFileName =
+                    result.headers.get('Content-Disposition')?.split('filename=')[1] ??
+                    fileName ??
+                    caseElement.elementName;
                 // We remove quotes
                 downloadFileName = downloadFileName.substring(1, downloadFileName.length - 1);
 

diff --git a/src/components/utils/renderers/type-cell-renderer.tsx b/src/components/utils/renderers/type-cell-renderer.tsx
@@ -68,7 +68,7 @@ export function TypeCellRenderer({ data, childrenMetadata }: Readonly<TypeCellRe
                         data?.type,
                         specificMetadata?.type?.toString(),
                         data?.type === ElementType.SPREADSHEET_CONFIG
-                            ? toTitleCase(specificMetadata.sheetType?.toString()) ?? null
+                            ? toTitleCase(specificMetadata.sheetType ?? 'no-type') ?? null
                             : specificMetadata.format?.toString() ?? null,
                         intl
                     )}