Merge pull request #151 from afadil/develop

small fixes
afadil · Oct 27, 2024 · 785a6a2 · 785a6a2
2 parents 6326ee2 + 1d9f008
commit 785a6a2
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 36 deletions.
diff --git a/src/pages/activity/import/hooks/useCsvParser.ts b/src/pages/activity/import/hooks/useCsvParser.ts
@@ -1,6 +1,6 @@
 import { useState, useCallback } from 'react';
 import Papa from 'papaparse';
-import { ImportFormat } from '@/lib/types';
+import { ImportFormat, ImportMappingData } from '@/lib/types';
 import { validateCsvStructure, initializeColumnMapping } from '../utils/csvValidation';
 
 export function useCsvParser() {
@@ -21,44 +21,55 @@ export function useCsvParser() {
     setValidationErrors({});
   };
 
-  const parseCsvFile = useCallback((file: File, form: any) => {
-    resetFileStates();
-    setSelectedFile(file);
+  const parseCsvFile = useCallback(
+    (
+      file: File,
+      mapping: ImportMappingData,
+      onUpdateMapping?: (updates: Partial<ImportMappingData>) => void,
+    ) => {
+      resetFileStates();
+      setSelectedFile(file);
 
-    Papa.parse(file, {
-      complete: (results: Papa.ParseResult<string[]>) => {
-        if (results.data && results.data.length > 0) {
-          setCsvData(results.data);
-          const headerRow = results.data[0].map((header) => header.trim());
-          setHeaders(headerRow);
+      Papa.parse<string[]>(file, {
+        complete: (results) => {
+          if (results.data && results.data.length > 0) {
+            setCsvData(results.data);
+            const headerRow = results.data[0].map((header) => header.trim());
+            setHeaders(headerRow);
 
-          const isValid = validateCsvStructure(headerRow);
+            const isValid = validateCsvStructure(headerRow);
 
-          if (!isValid) {
-            setIsValidCsv(false);
-            setError(
-              "Oops! The CSV file structure doesn't look quite right. Please make sure your file starts with a header row containing multiple column names.",
-            );
+            if (!isValid) {
+              setIsValidCsv(false);
+              setError(
+                "Oops! The CSV file structure doesn't look quite right. Please make sure your file starts with a header row containing multiple column names.",
+              );
+            } else {
+              const initialMapping = initializeColumnMapping(headerRow);
+              if (onUpdateMapping) {
+                onUpdateMapping({
+                  fieldMappings: {
+                    ...mapping.fieldMappings,
+                    ...initialMapping,
+                  },
+                });
+              }
+            }
           } else {
-            const initialMapping = initializeColumnMapping(headerRow);
-            form.setValue('mapping.columns', {
-              ...form.getValues('mapping.columns'),
-              ...initialMapping,
-            } as Record<ImportFormat, string>);
+            setIsValidCsv(false);
+            setError('The CSV file appears to be empty.');
           }
-        } else {
+          setIsLoading(false);
+        },
+        error: (error: any) => {
           setIsValidCsv(false);
-          setError('The CSV file appears to be empty.');
-        }
-        setIsLoading(false);
-      },
-      error: (error: any) => {
-        setIsValidCsv(false);
-        setError(`Error parsing CSV: ${error.message}`);
-        setIsLoading(false);
-      },
-    });
-  }, []);
+          setError(`Error parsing CSV: ${error.message}`);
+          setIsLoading(false);
+        },
+      });
+    },
+    [],
+  );
 
   return {
     csvData,

diff --git a/src/pages/activity/import/import-form.tsx b/src/pages/activity/import/import-form.tsx
@@ -92,10 +92,10 @@ export function ActivityImportForm({
     (acceptedFiles: File[]) => {
       const file = acceptedFiles[0];
       resetFileStates();
-      parseCsvFile(file, mapping);
+      parseCsvFile(file, mapping, updateMapping);
       setAccordionValue('');
     },
-    [parseCsvFile, mapping, resetFileStates],
+    [parseCsvFile, mapping, resetFileStates, updateMapping],
   );
 
   const { saveAndCheckImportMutation } = useActivityImportMutations({

diff --git a/src/pages/activity/import/utils/csvValidation.ts b/src/pages/activity/import/utils/csvValidation.ts
@@ -199,5 +199,5 @@ export function isCashActivity(activityType: ActivityType): boolean {
 }
 
 export function validateTickerSymbol(symbol: string): boolean {
-  return tickerRegex.test(symbol);
+  return tickerRegex.test(symbol.trim());
 }