Merge branch 'fix/export-modal-issues'

gisce/webclient#827
gisce · Feb 1, 2024 · 20dce1d · 20dce1d
2 parents ca90ffe + dd08284
commit 20dce1d
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 36 deletions.
diff --git a/src/components/other/ExportModal/ExportModal.stories.tsx b/src/components/other/ExportModal/ExportModal.stories.tsx
@@ -298,39 +298,44 @@ export const Default: ComponentStory<typeof ExportModal> = () => {
           ];
         }}
         onGetPredefinedExports={async () => {
+          console.log("onGetPredefinedExports");
           await new Promise((resolve) => setTimeout(resolve, 1000));
-          return [
-            {
-              id: 3,
-              name: "Exportación de prueba 3",
-              fields: [
-                {
-                  key: "active/contador",
-                },
-                {
-                  key: "parent1/parent2/test",
-                },
-              ],
-            },
-            {
-              id: 1,
-              name: "Exportación de prueba",
-              fields: [
-                {
-                  key: "active",
-                },
-              ],
-            },
-            {
-              id: 2,
-              name: "Exportación de prueba 2",
-              fields: [
-                {
-                  key: "city",
-                },
-              ],
-            },
-          ];
+          console.log("onGetPredefinedExports 2");
+          return {
+            predefinedExports: [
+              {
+                id: 3,
+                name: "Exportación de prueba 3",
+                fields: [
+                  {
+                    key: "active/contador",
+                  },
+                  {
+                    key: "parent1/parent2/test",
+                  },
+                ],
+              },
+              {
+                id: 1,
+                name: "Exportación de prueba",
+                fields: [
+                  {
+                    key: "active",
+                  },
+                ],
+              },
+              {
+                id: 2,
+                name: "Exportación de prueba 2",
+                fields: [
+                  {
+                    key: "city",
+                  },
+                ],
+              },
+            ],
+            keysWithChilds: [],
+          };
         }}
         onSavePredefinedExport={async (options: PredefinedExport) => {
           await new Promise((resolve) => setTimeout(resolve, 3000));

diff --git a/src/components/other/ExportModal/ExportModal.tsx b/src/components/other/ExportModal/ExportModal.tsx
@@ -131,9 +131,8 @@ export const ExportModalWithContext = (props: ExportModalProps) => {
   const onGetPredefinedExportsCallback = useCallback(async () => {
     const { predefinedExports, keysWithChilds } =
       await onGetPredefinedExports();
-
     if (keysWithChilds.length > 0) {
-      let updatedTree: ExportField[] = [];
+      let updatedTree;
 
       for (const entry of keysWithChilds) {
         const { key, childs } = entry;
@@ -143,7 +142,7 @@ export const ExportModalWithContext = (props: ExportModalProps) => {
           updatedTree = updateTreeData(updatedTree, key, childs);
         }
       }
-      setDataSource(updatedTree);
+      setDataSource(updatedTree as ExportField[]);
     }
 
     return predefinedExports as PredefinedExportMandatoryId[];

diff --git a/src/context/LocaleContext.tsx b/src/context/LocaleContext.tsx
@@ -71,7 +71,7 @@ export const useLocale = (propLocale?: Locale): LocaleContextType => {
   }
 
   if (!context) {
-    console.error(
+    console.warn(
       "useLocale must be used within a LocaleContextProvider - assuming default locale value",
     );
     return {