🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Platform
Edward Cui97c1f2f3b5fe
diff --git a/client/src/api/admin/import.ts b/client/src/api/admin/import.tsindex 6ee076647..670538135 100644--- a/client/src/api/admin/import.ts+++ b/client/src/api/admin/import.ts@@ -4,7 +4,7 @@ import { APIResponse } from "@/api/types";interface GetSiteImportsResponse {importId: string;- platform: "umami" | null;+ platform: "umami";importedEvents: number;skippedEvents: number;invalidEvents: number;@@ -42,9 +42,10 @@ export function useCreateSiteImport(site: number) {const queryClient = useQueryClient();return useMutation({- mutationFn: async () => {+ mutationFn: async (data: { platform: "umami" }) => {return await authedFetch<APIResponse<CreateSiteImportResponse>>(`/create-site-import/${site}`, undefined, {method: "POST",+ data,});},onSuccess: async () => {diff --git a/client/src/components/SiteSettings/ImportManager.tsx b/client/src/components/SiteSettings/ImportManager.tsxindex 8a6423e4d..457c06384 100644--- a/client/src/components/SiteSettings/ImportManager.tsx+++ b/client/src/components/SiteSettings/ImportManager.tsx@@ -5,6 +5,7 @@ import { DateTime } from "luxon";import { Button } from "@/components/ui/button";import { Input } from "@/components/ui/input";import { Label } from "@/components/ui/label";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";import {AlertDialog,@@ -64,6 +65,7 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {const [deleteImportId, setDeleteImportId] = useState<string | null>(null);const [showDeleteDialog, setShowDeleteDialog] = useState(false);const [selectedFile, setSelectedFile] = useState<File | null>(null);+ const [selectedPlatform, setSelectedPlatform] = useState<"umami">("umami");const [fileError, setFileError] = useState<string>("");const fileInputRef = useRef<HTMLInputElement>(null);const workerManagerRef = useRef<CsvParser | null>(null);@@ -99,30 +101,34 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {const executeImport = (file: File) => {if (!file) return;- createImportMutation.mutate(undefined, {- onSuccess: response => {- const { importId, allowedDateRange } = response.data;-- workerManagerRef.current = new CsvParser();-- workerManagerRef.current.startImport(- file,- siteId,- importId,- allowedDateRange.earliestAllowedDate,- allowedDateRange.latestAllowedDate- );-- setSelectedFile(null);- setFileError("");- if (fileInputRef.current) {- fileInputRef.current.value = "";- }- },- onError: error => {- console.error("Failed to create import:", error);- },- });+ createImportMutation.mutate(+ { platform: selectedPlatform },+ {+ onSuccess: response => {+ const { importId, allowedDateRange } = response.data;++ workerManagerRef.current = new CsvParser();++ workerManagerRef.current.startImport(+ file,+ siteId,+ importId,+ selectedPlatform,+ allowedDateRange.earliestAllowedDate,+ allowedDateRange.latestAllowedDate+ );++ setSelectedFile(null);+ setFileError("");+ if (fileInputRef.current) {+ fileInputRef.current.value = "";+ }+ },+ onError: error => {+ console.error("Failed to create import:", error);+ },+ }+ );setShowConfirmDialog(false);};@@ -204,6 +210,20 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {)}<form onSubmit={onSubmit} className="space-y-4">+ {/* Platform Selection */}+ <div className="space-y-2">+ <Label htmlFor="platform">Platform</Label>+ <Select value={selectedPlatform} onValueChange={(value: "umami") => setSelectedPlatform(value)}>+ <SelectTrigger id="platform" disabled={disabled || createImportMutation.isPending || hasActiveImport}>+ <SelectValue placeholder="Select platform" />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="umami">Umami</SelectItem>+ </SelectContent>+ </Select>+ <p className="text-sm text-muted-foreground">Select the analytics platform you're importing data from</p>+ </div>+{/* File Upload */}<div className="space-y-2"><Label htmlFor="file" className="flex items-center gap-2">@@ -337,7 +357,7 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {<TableCell className="font-medium">{startedAt}</TableCell><TableCell><Badge variant="outline" className="capitalize">- {imp.platform || "N/A"}+ {imp.platform}</Badge></TableCell><TableCell>diff --git a/client/src/lib/import/csvParser.ts b/client/src/lib/import/csvParser.tsindex 548c8a122..d1117b985 100644--- a/client/src/lib/import/csvParser.ts+++ b/client/src/lib/import/csvParser.ts@@ -36,6 +36,7 @@ export class CsvParser {private aborted = false;private siteId: number = 0;private importId: string = "";+ private platform: "umami" = "umami";private earliestAllowedDate: DateTime | null = null;private latestAllowedDate: DateTime | null = null;@@ -56,12 +57,14 @@ export class CsvParser {file: File,siteId: number,importId: string,+ platform: "umami",earliestAllowedDate: string,latestAllowedDate: string,onProgress?: (progress: ImportProgress) => void): void {this.siteId = siteId;this.importId = importId;+ this.platform = platform;this.onProgress = onProgress;this.earliestAllowedDate = DateTime.fromFormat(earliestAllowedDate, "yyyy-MM-dd", { zone: "utc" }).startOf("day");diff --git a/server/src/api/sites/batchImportEvents.ts b/server/src/api/sites/batchImportEvents.tsindex 9659a112e..ceae2ac1e 100644--- a/server/src/api/sites/batchImportEvents.ts+++ b/server/src/api/sites/batchImportEvents.ts@@ -6,7 +6,7 @@ import { updateImportProgress, completeImport, getImportById } from "../../serviimport { UmamiImportMapper } from "../../services/import/mappings/umami.js";import { importQuotaManager } from "../../services/import/importQuotaManager.js";import { db } from "../../db/postgres/postgres.js";-import { sites, importStatus } from "../../db/postgres/schema.js";+import { sites } from "../../db/postgres/schema.js";import { eq } from "drizzle-orm";const batchImportRequestSchema = z@@ -62,19 +62,8 @@ export async function batchImportEvents(request: FastifyRequest<BatchImportRequereturn reply.status(400).send({ error: "Import already completed" });}- // Auto-detect platform if not set (first batch)- let detectedPlatform = importRecord.platform;- if (!detectedPlatform) {- const firstEvent = events[0];-- if (UmamiImportMapper.umamiEventKeyOnlySchema.safeParse(firstEvent).success) {- detectedPlatform = "umami";- } else {- return reply.status(400).send({ error: "Unable to detect platform from event structure" });- }-- await db.update(importStatus).set({ platform: detectedPlatform }).where(eq(importStatus.importId, importId));- }+ // Platform is set during import creation+ const platform = importRecord.platform;const [siteRecord] = await db.select({ organizationId: sites.organizationId })diff --git a/server/src/api/sites/createSiteImport.ts b/server/src/api/sites/createSiteImport.tsindex da386709e..8741efb06 100644--- a/server/src/api/sites/createSiteImport.ts+++ b/server/src/api/sites/createSiteImport.ts@@ -1,10 +1,11 @@import { FastifyReply, FastifyRequest } from "fastify";import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";import { importQuotaManager } from "../../services/import/importQuotaManager.js";+import { createImport } from "../../services/import/importStatusManager.js";import { DateTime } from "luxon";import { z } from "zod";import { db } from "../../db/postgres/postgres.js";-import { sites, importStatus } from "../../db/postgres/schema.js";+import { importPlatforms, sites } from "../../db/postgres/schema.js";import { eq } from "drizzle-orm";const createSiteImportRequestSchema = z@@ -12,17 +13,22 @@ const createSiteImportRequestSchema = zparams: z.object({site: z.string().min(1),}),+ body: z.object({+ platform: z.enum(importPlatforms),+ }),}).strict();type CreateSiteImportRequest = {Params: z.infer<typeof createSiteImportRequestSchema.shape.params>;+ Body: z.infer<typeof createSiteImportRequestSchema.shape.body>;};export async function createSiteImport(request: FastifyRequest<CreateSiteImportRequest>, reply: FastifyReply) {try {const parsed = createSiteImportRequestSchema.safeParse({params: request.params,+ body: request.body,});if (!parsed.success) {@@ -30,6 +36,7 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportR}const { site } = parsed.data.params;+ const { platform } = parsed.data.body;const siteId = Number(site);const userHasAccess = await getUserHasAdminAccessToSite(request, site);@@ -64,14 +71,12 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportRconst earliestAllowedDate = oldestAllowedDate.toFormat("yyyy-MM-dd");const latestAllowedDate = DateTime.utc().toFormat("yyyy-MM-dd");- // Create import record (DB generates importId)- const [importRecord] = await db- .insert(importStatus)- .values({- siteId,- organizationId,- })- .returning({ importId: importStatus.importId });+ // Create import record using importStatusManager+ const importRecord = await createImport({+ siteId,+ organizationId,+ platform,+ });return reply.send({data: {diff --git a/server/src/db/postgres/schema.ts b/server/src/db/postgres/schema.tsindex 12b217aa7..38b932d00 100644--- a/server/src/db/postgres/schema.ts+++ b/server/src/db/postgres/schema.ts@@ -622,7 +622,9 @@ export const gscConnections = pgTable("gsc_connections", {updatedAt: timestamp("updated_at", { mode: "string" }).defaultNow().notNull(),});-export const importPlatformEnum = pgEnum("import_platform_enum", ["umami"]);+export const importPlatforms = ["umami"] as const;++export const importPlatformEnum = pgEnum("import_platform_enum", importPlatforms);export const importStatus = pgTable("import_status",@@ -630,7 +632,7 @@ export const importStatus = pgTable(importId: uuid("import_id").primaryKey().notNull().defaultRandom(),siteId: integer("site_id").notNull(),organizationId: text("organization_id").notNull(),- platform: importPlatformEnum("platform"),+ platform: importPlatformEnum("platform").notNull(),importedEvents: integer("imported_events").notNull().default(0),skippedEvents: integer("skipped_events").notNull().default(0),invalidEvents: integer("invalid_events").notNull().default(0),diff --git a/server/src/services/import/importStatusManager.ts b/server/src/services/import/importStatusManager.tsindex aaf8a36f8..7c0d35067 100644--- a/server/src/services/import/importStatusManager.ts+++ b/server/src/services/import/importStatusManager.ts@@ -1,10 +1,26 @@import { db } from "../../db/postgres/postgres.js";import { eq, desc, sql } from "drizzle-orm";-import { importStatus } from "../../db/postgres/schema.js";+import { importPlatforms, importStatus } from "../../db/postgres/schema.js";import { DateTime } from "luxon";export type SelectImportStatus = typeof importStatus.$inferSelect;-export type InsertImportStatus = typeof importStatus.$inferInsert;++export async function createImport(data: {+ siteId: number;+ organizationId: string;+ platform: (typeof importPlatforms)[number];+}): Promise<{ importId: string }> {+ const [result] = await db+ .insert(importStatus)+ .values({+ siteId: data.siteId,+ organizationId: data.organizationId,+ platform: data.platform,+ })+ .returning({ importId: importStatus.importId });++ return result;+}export async function updateImportProgress(importId: string,