Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Simplify

Edward Cuiac0b095f7f10
diff --git a/client/src/components/SiteSettings/ImportManager.tsx b/client/src/components/SiteSettings/ImportManager.tsx
index 0160322e7..ff85af510 100644
--- a/client/src/components/SiteSettings/ImportManager.tsx
+++ b/client/src/components/SiteSettings/ImportManager.tsx
@@ -1,9 +1,6 @@
"use client";
import { useMemo, useState, useRef, useEffect } from "react";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { z } from "zod";
import { DateTime } from "luxon";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
@@ -37,23 +34,18 @@ const CONFIRM_THRESHOLD = 100 * 1024 * 1024;
const ALLOWED_FILE_TYPES = ["text/csv"];
const ALLOWED_EXTENSIONS = [".csv"];
-const importFormSchema = z.object({
- file: z
- .custom<FileList>()
- .refine(files => files.length === 1, "Please select a file")
- .refine(files => {
- const file = files[0];
- if (!file) return false;
- const extension = "." + file.name.split(".").pop()?.toLowerCase();
- return ALLOWED_EXTENSIONS.includes(extension) || ALLOWED_FILE_TYPES.includes(file.type);
- }, "Only CSV files are accepted")
- .refine(files => {
- const file = files[0];
- return file && file.name.length <= 255;
- }, "Filename is too long"),
-});
-
-type ImportFormData = z.infer<typeof importFormSchema>;
+function validateFile(file: File | null): string {
+ if (!file) {
+ return "Please select a file";
+ }
+
+ const extension = "." + file.name.split(".").pop()?.toLowerCase();
+ if (!ALLOWED_EXTENSIONS.includes(extension) && !ALLOWED_FILE_TYPES.includes(file.type)) {
+ return "Only CSV files are accepted";
+ }
+
+ return "";
+}
function formatFileSize(bytes: number): string {
const sizeInMB = bytes / 1024 / 1024;
@@ -68,52 +60,43 @@ function formatFileSize(bytes: number): string {
export function ImportManager({ siteId, disabled }: ImportManagerProps) {
const [showConfirmDialog, setShowConfirmDialog] = useState(false);
- const [pendingImportData, setPendingImportData] = useState<ImportFormData | null>(null);
+ const [pendingFile, setPendingFile] = useState<File | null>(null);
const [deleteImportId, setDeleteImportId] = useState<string | null>(null);
const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+ const [selectedFile, setSelectedFile] = useState<File | null>(null);
+ const [fileError, setFileError] = useState<string>("");
+ const fileInputRef = useRef<HTMLInputElement>(null);
const workerManagerRef = useRef<CSVWorkerManager | null>(null);
const { data, isLoading, error } = useGetSiteImports(siteId);
const createImportMutation = useCreateSiteImport(siteId);
const deleteMutation = useDeleteSiteImport(siteId);
- const {
- register,
- handleSubmit,
- watch,
- reset,
- formState: { errors, isValid },
- } = useForm<ImportFormData>({
- resolver: zodResolver(importFormSchema),
- mode: "onChange",
- defaultValues: {
- file: Object.assign(new DataTransfer().files, {}),
- },
- });
-
- const fileList = watch("file");
- const selectedFile = fileList?.[0];
-
useEffect(() => {
return () => {
workerManagerRef.current?.terminate();
};
}, []);
- const onSubmit = (data: ImportFormData) => {
- const file = data.file[0];
- if (!file) return;
+ const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+ const file = e.target.files?.[0] || null;
+ setSelectedFile(file);
+ setFileError(validateFile(file));
+ };
+
+ const onSubmit = (e: React.FormEvent) => {
+ e.preventDefault();
+ if (!selectedFile || fileError) return;
- if (file.size > CONFIRM_THRESHOLD) {
- setPendingImportData(data);
+ if (selectedFile.size > CONFIRM_THRESHOLD) {
+ setPendingFile(selectedFile);
setShowConfirmDialog(true);
} else {
- executeImport(data);
+ executeImport(selectedFile);
}
};
- const executeImport = (data: ImportFormData) => {
- const file = data.file[0];
+ const executeImport = (file: File) => {
if (!file) return;
createImportMutation.mutate(undefined, {
@@ -130,7 +113,11 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {
allowedDateRange.latestAllowedDate
);
- reset();
+ setSelectedFile(null);
+ setFileError("");
+ if (fileInputRef.current) {
+ fileInputRef.current.value = "";
+ }
},
onError: error => {
console.error("Failed to create import:", error);
@@ -211,7 +198,8 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {
const hasActiveImport =
IS_CLOUD && sortedImports.some(imp => imp.status === "pending" || imp.status === "processing");
- const isImportDisabled = !isValid || createImportMutation.isPending || disabled || hasActiveImport;
+ const isImportDisabled =
+ !selectedFile || !!fileError || createImportMutation.isPending || disabled || hasActiveImport;
return (
<div className="space-y-6">
@@ -235,7 +223,7 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {
</Alert>
)}
- <form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
+ <form onSubmit={onSubmit} className="space-y-4">
{/* File Upload */}
<div className="space-y-2">
<Label htmlFor="file" className="flex items-center gap-2">
@@ -243,10 +231,12 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {
CSV File
</Label>
<Input
+ ref={fileInputRef}
+ id="file"
type="file"
accept=".csv"
multiple={false}
- {...register("file")}
+ onChange={handleFileChange}
disabled={disabled || createImportMutation.isPending || hasActiveImport}
/>
{selectedFile && (
@@ -254,7 +244,7 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {
Selected: {selectedFile.name} ({formatFileSize(selectedFile.size)})
</p>
)}
- {errors.file && <p className="text-sm text-red-600">{errors.file.message as string}</p>}
+ {fileError && <p className="text-sm text-red-600">{fileError}</p>}
</div>
{/* Import Button */}
@@ -430,7 +420,7 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>Cancel</AlertDialogCancel>
- <AlertDialogAction onClick={() => pendingImportData && executeImport(pendingImportData)}>
+ <AlertDialogAction onClick={() => pendingFile && executeImport(pendingFile)}>
Yes, Import File
</AlertDialogAction>
</AlertDialogFooter>
diff --git a/client/src/lib/import/csv-worker-manager.ts b/client/src/lib/import/csv-worker-manager.ts
index 4bb700557..b932a48c3 100644
--- a/client/src/lib/import/csv-worker-manager.ts
+++ b/client/src/lib/import/csv-worker-manager.ts
@@ -2,8 +2,6 @@ import Papa from "papaparse";
import { DateTime } from "luxon";
import type { UmamiEvent } from "./types";
-type CompleteCallback = (success: boolean, message: string) => void;
-
const BATCH_SIZE = 5000;
const umamiHeaders = [
@@ -47,7 +45,6 @@ const umamiHeaders = [
export class CSVWorkerManager {
private aborted = false;
- private onComplete: CompleteCallback | null = null;
private uploadInProgress = false;
private parsingComplete = false;
private quotaExceeded = false;
@@ -58,10 +55,6 @@ export class CSVWorkerManager {
private earliestAllowedDate: DateTime | null = null;
private latestAllowedDate: DateTime | null = null;
- constructor(onComplete?: CompleteCallback) {
- this.onComplete = onComplete || null;
- }
-
startImport(
file: File,
siteId: number,
@@ -71,13 +64,7 @@ export class CSVWorkerManager {
): void {
this.siteId = siteId;
this.importId = importId;
- this.parsingComplete = false;
- this.uploadInProgress = false;
- this.currentBatch = [];
- this.aborted = false;
- this.quotaExceeded = false;
- // Set up date range filter
this.earliestAllowedDate = DateTime.fromFormat(earliestAllowedDate, "yyyy-MM-dd", { zone: "utc" }).startOf("day");
this.latestAllowedDate = DateTime.fromFormat(latestAllowedDate, "yyyy-MM-dd", { zone: "utc" }).endOf("day");
@@ -91,15 +78,10 @@ export class CSVWorkerManager {
return;
}
- // Start parsing with PapaParse worker
Papa.parse<UmamiEvent>(file, {
worker: true,
header: true,
skipEmptyLines: "greedy",
- delimiter: "",
- transformHeader: (header, index) => {
- return umamiHeaders[index] || header;
- },
step: results => {
if (this.aborted || this.quotaExceeded) return;
@@ -204,9 +186,8 @@ export class CSVWorkerManager {
}
private handleError(message: string): void {
- if (this.onComplete) {
- this.onComplete(false, message);
- }
+ console.error("CSV Import Error:", message);
+ this.terminate();
}
private async uploadBatch(events: UmamiEvent[], isLastBatch: boolean): Promise<void> {
@@ -246,16 +227,12 @@ export class CSVWorkerManager {
if (data.quotaExceeded) {
this.quotaExceeded = true;
this.aborted = true; // Stop parsing
- if (this.onComplete) {
- this.onComplete(true, data.message || "Import completed with quota limits");
- }
+ console.log("Import completed with quota limits:", data.message);
return;
}
} catch (error) {
// Critical failure - network error, server error, etc.
- if (this.onComplete) {
- this.onComplete(false, `Upload failed: ${error instanceof Error ? error.message : "Unknown error"}`);
- }
+ console.error("Upload failed:", error instanceof Error ? error.message : "Unknown error");
this.terminate();
return;
} finally {
@@ -268,9 +245,7 @@ export class CSVWorkerManager {
private checkCompletion(): void {
if (this.parsingComplete && !this.uploadInProgress && !this.quotaExceeded) {
- if (this.onComplete) {
- this.onComplete(true, "Import completed successfully");
- }
+ console.log("Import completed successfully");
}
}