fix columns conflict (#466)

netobserv · Feb 2, 2024 · a34b76c · a34b76c
1 parent e67dc95
commit a34b76c
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/web/src/components/modals/export-modal.tsx b/web/src/components/modals/export-modal.tsx
@@ -124,15 +124,17 @@ export const ExportModal: React.FC<ExportModalProps> = ({
   }, [isExportAll, selectedColumns]);
 
   React.useEffect(() => {
-    // reload selected columns when config is loaded
-    setSelectedColumns(
-      getLocalStorage(LOCAL_STORAGE_EXPORT_COLS_KEY, columns, {
-        id: 'id',
-        criteria: 'isSelected'
-      })
-    );
+    // reload selected columns when config is loaded and popup closed
+    if (!isModalOpen) {
+      setSelectedColumns(
+        getLocalStorage(LOCAL_STORAGE_EXPORT_COLS_KEY, _.cloneDeep(columns), {
+          id: 'id',
+          criteria: 'isSelected'
+        })
+      );
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [columns]);
+  }, [isModalOpen, columns]);
 
   return (
     <Modal