Skip to content

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

Simplify

Edward Cuibceac03ebd76
diff --git a/client/src/lib/import/csv-worker-manager.ts b/client/src/lib/import/csv-worker-manager.ts
index 8ad47b171..5f0b9b800 100644
--- a/client/src/lib/import/csv-worker-manager.ts
+++ b/client/src/lib/import/csv-worker-manager.ts
@@ -1,5 +1,6 @@
import Papa from "papaparse";
import { DateTime } from "luxon";
+import { authedFetch } from "@/api/utils";
import type { UmamiEvent } from "./types";
export class CSVWorkerManager {
@@ -119,7 +120,6 @@ export class CSVWorkerManager {
created_at: rawEvent.created_at,
};
-
if (!umamiEvent.created_at) {
return null;
}
@@ -143,25 +143,17 @@ export class CSVWorkerManager {
}
try {
- const response = await fetch(`/api/batch-import-events/${this.siteId}/${this.importId}`, {
+ const data = await authedFetch<{
+ quotaExceeded?: boolean;
+ message?: string;
+ }>(`/api/batch-import-events/${this.siteId}/${this.importId}`, undefined, {
method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- credentials: "include",
- body: JSON.stringify({
+ data: {
events,
isLastBatch,
- }),
+ },
});
- if (!response.ok) {
- const errorData = await response.json().catch(() => ({ error: "Unknown error" }));
- throw new Error(errorData.error || `HTTP ${response.status}`);
- }
-
- const data = await response.json();
-
if (data.quotaExceeded) {
this.quotaExceeded = true;
this.aborted = true;
diff --git a/server/src/api/sites/batchImportEvents.ts b/server/src/api/sites/batchImportEvents.ts
index c44d65a66..c0b86acce 100644
--- a/server/src/api/sites/batchImportEvents.ts
+++ b/server/src/api/sites/batchImportEvents.ts
@@ -122,8 +122,6 @@ export async function batchImportEvents(request: FastifyRequest<BatchImportReque
}
return reply.send({
- success: true,
- importedCount: 0,
quotaExceeded: true,
message: quotaMessage,
});
@@ -136,11 +134,7 @@ export async function batchImportEvents(request: FastifyRequest<BatchImportReque
await updateImportStatus(importId, "completed", "No valid events found in the final batch");
}
- return reply.send({
- success: true,
- importedCount: 0,
- message: "No valid events in batch",
- });
+ return reply.send({});
}
await clickhouse.insert({
@@ -159,19 +153,13 @@ export async function batchImportEvents(request: FastifyRequest<BatchImportReque
await updateImportStatus(importId, "completed", finalMessage);
}
- return reply.send({
- success: true,
- importedCount: transformedEvents.length,
- message: `Imported ${transformedEvents.length} events${skippedDueToQuota > 0 ? ` (${skippedDueToQuota} skipped due to quota)` : ""}`,
- });
+ return reply.send({});
} catch (insertError) {
const errorMessage = insertError instanceof Error ? insertError.message : "Unknown error";
await updateImportStatus(importId, "failed", `Failed to insert events: ${errorMessage}`);
return reply.status(500).send({
- success: false,
- error: "Failed to insert events",
- message: errorMessage,
+ error: `Failed to insert events: ${errorMessage}`,
});
}
} catch (error) {