🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Restrict data imports on free tier
Edward Cui85b338c17253
diff --git a/client/src/components/SiteSettings/ImportManager.tsx b/client/src/components/SiteSettings/ImportManager.tsxindex fdb87a337..6e2576ad5 100644--- a/client/src/components/SiteSettings/ImportManager.tsx+++ b/client/src/components/SiteSettings/ImportManager.tsx@@ -26,6 +26,7 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/compimport { IS_CLOUD } from "@/lib/const";import { CsvParser } from "@/lib/import/csvParser";import { ImportPlatform } from "@/types/import";+import { DisabledOverlay } from "@/components/DisabledOverlay";interface ImportManagerProps {siteId: number;@@ -187,254 +188,258 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {!selectedFile || !selectedPlatform || !!fileError || createImportMutation.isPending || disabled || hasActiveImport;return (- <div className="space-y-6">- {/* Import Section */}- <Card>- <CardHeader>- <CardTitle className="flex items-center gap-2">- <Upload className="h-5 w-5" />- Import Data- </CardTitle>- <CardDescription>Import data from other analytics platforms.</CardDescription>- </CardHeader>- <CardContent className="space-y-4">- {/* Active Import Warning */}- {hasActiveImport && (- <Alert>- <AlertCircle className="h-4 w-4" />- <AlertDescription>- You have an active import in progress. Please wait for it to complete before starting a new import.- </AlertDescription>- </Alert>- )}-- <form onSubmit={onSubmit} className="space-y-4">- {/* Platform Selection */}- <div className="space-y-2">- <Label htmlFor="platform">Platform</Label>- <Select value={selectedPlatform} onValueChange={(value: ImportPlatform) => setSelectedPlatform(value)}>- <SelectTrigger id="platform" disabled={disabled || createImportMutation.isPending || hasActiveImport}>- <SelectValue placeholder="Select platform" />- </SelectTrigger>- <SelectContent>- <SelectItem value="umami">Umami</SelectItem>- <SelectItem value="simple_analytics">Simple Analytics</SelectItem>- </SelectContent>- </Select>- </div>-- {/* File Upload */}- <div className="space-y-2">- <Label htmlFor="file" className="flex items-center gap-2">- <FileText className="h-4 w-4" />- CSV File- </Label>- <Input- ref={fileInputRef}- id="file"- type="file"- accept=".csv"- multiple={false}- onChange={handleFileChange}- disabled={disabled || createImportMutation.isPending || hasActiveImport}- />- {fileError && <p className="text-sm text-red-600">{fileError}</p>}- </div>-- {/* Import Button */}- <Button type="submit" disabled={isImportDisabled} className="w-full sm:w-auto">- {createImportMutation.isPending ? (- <>- <Loader2 className="mr-2 h-4 w-4 animate-spin" />- Importing...- </>- ) : (- <>- <Upload className="mr-2 h-4 w-4" />- Import- </>- )}- </Button>- </form>-- {/* Import Error */}- {createImportMutation.isError && (- <Alert variant="destructive">- <div className="flex items-center gap-2">+ <DisabledOverlay message="Data Import" requiredPlan="standard">+ <div className="space-y-6">+ {/* Import Section */}+ <Card>+ <CardHeader>+ <CardTitle className="flex items-center gap-2">+ <Upload className="h-5 w-5" />+ Import Data+ </CardTitle>+ <CardDescription>Import data from other analytics platforms.</CardDescription>+ </CardHeader>+ <CardContent className="space-y-4">+ {/* Active Import Warning */}+ {hasActiveImport && (+ <Alert><AlertCircle className="h-4 w-4" /><AlertDescription>- {createImportMutation.error.message || "Failed to import file. Please try again."}+ You have an active import in progress. Please wait for it to complete before starting a new import.</AlertDescription>+ </Alert>+ )}++ <form onSubmit={onSubmit} className="space-y-4">+ {/* Platform Selection */}+ <div className="space-y-2">+ <Label htmlFor="platform">Platform</Label>+ <Select value={selectedPlatform} onValueChange={(value: ImportPlatform) => setSelectedPlatform(value)}>+ <SelectTrigger id="platform" disabled={disabled || createImportMutation.isPending || hasActiveImport}>+ <SelectValue placeholder="Select platform" />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="umami">Umami</SelectItem>+ <SelectItem value="simple_analytics">Simple Analytics</SelectItem>+ </SelectContent>+ </Select></div>- </Alert>- )}- {/* Delete Error Message */}- {deleteMutation.isError && (- <Alert variant="destructive">- <div className="flex items-center gap-2">+ {/* File Upload */}+ <div className="space-y-2">+ <Label htmlFor="file" className="flex items-center gap-2">+ <FileText className="h-4 w-4" />+ CSV File+ </Label>+ <Input+ ref={fileInputRef}+ id="file"+ type="file"+ accept=".csv"+ multiple={false}+ onChange={handleFileChange}+ disabled={disabled || createImportMutation.isPending || hasActiveImport}+ />+ {fileError && <p className="text-sm text-red-600">{fileError}</p>}+ </div>++ {/* Import Button */}+ <Button type="submit" disabled={isImportDisabled} className="w-full sm:w-auto">+ {createImportMutation.isPending ? (+ <>+ <Loader2 className="mr-2 h-4 w-4 animate-spin" />+ Importing...+ </>+ ) : (+ <>+ <Upload className="mr-2 h-4 w-4" />+ Import+ </>+ )}+ </Button>+ </form>++ {/* Import Error */}+ {createImportMutation.isError && (+ <Alert variant="destructive">+ <div className="flex items-center gap-2">+ <AlertCircle className="h-4 w-4" />+ <AlertDescription>+ {createImportMutation.error.message || "Failed to import file. Please try again."}+ </AlertDescription>+ </div>+ </Alert>+ )}++ {/* Delete Error Message */}+ {deleteMutation.isError && (+ <Alert variant="destructive">+ <div className="flex items-center gap-2">+ <AlertCircle className="h-4 w-4" />+ <AlertDescription>+ {deleteMutation.error.message || "Failed to delete import. Please try again."}+ </AlertDescription>+ </div>+ </Alert>+ )}+ </CardContent>+ </Card>++ {/* Import History */}+ <Card>+ <CardHeader>+ <CardTitle>Import History</CardTitle>+ <CardDescription>Track the status of your data imports</CardDescription>+ </CardHeader>+ <CardContent>+ {isLoading && !data ? (+ <div className="flex items-center justify-center py-8">+ <Loader2 className="h-6 w-6 animate-spin mr-2" />+ <span>Loading import history...</span>+ </div>+ ) : error ? (+ <Alert variant="destructive"><AlertCircle className="h-4 w-4" />- <AlertDescription>- {deleteMutation.error.message || "Failed to delete import. Please try again."}- </AlertDescription>+ <AlertDescription>Failed to load import history. Please try refreshing the page.</AlertDescription>+ </Alert>+ ) : !data?.data?.length ? (+ <div className="text-center py-8 text-muted-foreground">+ <FileText className="h-8 w-8 mx-auto mb-2 opacity-50" />+ <p>No imports yet</p>+ <p className="text-sm">Upload a CSV file to get started</p>+ </div>+ ) : (+ <div className="rounded-md">+ <Table>+ <TableHeader>+ <TableRow>+ <TableHead>Started At</TableHead>+ <TableHead>Platform</TableHead>+ <TableHead>Status</TableHead>+ <TableHead className="text-right">Imported</TableHead>+ <TableHead className="text-right">Skipped</TableHead>+ <TableHead className="text-right">Invalid</TableHead>+ <TableHead className="text-center">Actions</TableHead>+ </TableRow>+ </TableHeader>+ <TableBody>+ {sortedImports.map(imp => {+ const statusInfo = getStatusInfo(imp.completedAt);+ const StatusIcon = statusInfo.icon;+ const startedAt = DateTime.fromSQL(imp.startedAt).toFormat("MMM dd, yyyy HH:mm");++ return (+ <TableRow key={imp.importId}>+ <TableCell className="font-medium">{startedAt}</TableCell>+ <TableCell>+ <Badge variant="outline">{formatPlatformName(imp.platform)}</Badge>+ </TableCell>+ <TableCell>+ <Badge className={`${statusInfo.color} flex items-center gap-1`}>+ <StatusIcon className={`h-3 w-3 ${imp.completedAt === null ? "animate-spin" : ""}`} />+ {statusInfo.label}+ </Badge>+ </TableCell>+ <TableCell className="text-right">{imp.importedEvents.toLocaleString()}</TableCell>+ <TableCell className="text-right">+ {imp.skippedEvents > 0 ? (+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span className="text-yellow-600 cursor-help">+ {imp.skippedEvents.toLocaleString()}+ </span>+ </TooltipTrigger>+ <TooltipContent>+ <p className="text-sm">Events exceeded quota or date range limits</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ ) : (+ <span className="text-muted-foreground">0</span>+ )}+ </TableCell>+ <TableCell className="text-right">+ {imp.invalidEvents > 0 ? (+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span className="text-red-600 cursor-help">+ {imp.invalidEvents.toLocaleString()}+ </span>+ </TooltipTrigger>+ <TooltipContent>+ <p className="text-sm">Events failed validation</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ ) : (+ <span className="text-muted-foreground">0</span>+ )}+ </TableCell>+ <TableCell className="text-center">+ {imp.completedAt !== null && (+ <Button+ variant="outline"+ size="sm"+ onClick={() => handleDeleteClick(imp.importId)}+ disabled={disabled || deleteMutation.isPending}+ className="h-8 w-8 p-0"+ >+ {deleteMutation.isPending && deleteMutation.variables === imp.importId ? (+ <Loader2 className="h-4 w-4 animate-spin" />+ ) : (+ <Trash2 className="h-4 w-4" />+ )}+ </Button>+ )}+ </TableCell>+ </TableRow>+ );+ })}+ </TableBody>+ </Table></div>- </Alert>- )}- </CardContent>- </Card>-- {/* Import History */}- <Card>- <CardHeader>- <CardTitle>Import History</CardTitle>- <CardDescription>Track the status of your data imports</CardDescription>- </CardHeader>- <CardContent>- {isLoading && !data ? (- <div className="flex items-center justify-center py-8">- <Loader2 className="h-6 w-6 animate-spin mr-2" />- <span>Loading import history...</span>- </div>- ) : error ? (- <Alert variant="destructive">- <AlertCircle className="h-4 w-4" />- <AlertDescription>Failed to load import history. Please try refreshing the page.</AlertDescription>- </Alert>- ) : !data?.data?.length ? (- <div className="text-center py-8 text-muted-foreground">- <FileText className="h-8 w-8 mx-auto mb-2 opacity-50" />- <p>No imports yet</p>- <p className="text-sm">Upload a CSV file to get started</p>- </div>- ) : (- <div className="rounded-md">- <Table>- <TableHeader>- <TableRow>- <TableHead>Started At</TableHead>- <TableHead>Platform</TableHead>- <TableHead>Status</TableHead>- <TableHead className="text-right">Imported</TableHead>- <TableHead className="text-right">Skipped</TableHead>- <TableHead className="text-right">Invalid</TableHead>- <TableHead className="text-center">Actions</TableHead>- </TableRow>- </TableHeader>- <TableBody>- {sortedImports.map(imp => {- const statusInfo = getStatusInfo(imp.completedAt);- const StatusIcon = statusInfo.icon;- const startedAt = DateTime.fromSQL(imp.startedAt).toFormat("MMM dd, yyyy HH:mm");-- return (- <TableRow key={imp.importId}>- <TableCell className="font-medium">{startedAt}</TableCell>- <TableCell>- <Badge variant="outline">{formatPlatformName(imp.platform)}</Badge>- </TableCell>- <TableCell>- <Badge className={`${statusInfo.color} flex items-center gap-1`}>- <StatusIcon className={`h-3 w-3 ${imp.completedAt === null ? "animate-spin" : ""}`} />- {statusInfo.label}- </Badge>- </TableCell>- <TableCell className="text-right">{imp.importedEvents.toLocaleString()}</TableCell>- <TableCell className="text-right">- {imp.skippedEvents > 0 ? (- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <span className="text-yellow-600 cursor-help">- {imp.skippedEvents.toLocaleString()}- </span>- </TooltipTrigger>- <TooltipContent>- <p className="text-sm">Events exceeded quota or date range limits</p>- </TooltipContent>- </Tooltip>- </TooltipProvider>- ) : (- <span className="text-muted-foreground">0</span>- )}- </TableCell>- <TableCell className="text-right">- {imp.invalidEvents > 0 ? (- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <span className="text-red-600 cursor-help">{imp.invalidEvents.toLocaleString()}</span>- </TooltipTrigger>- <TooltipContent>- <p className="text-sm">Events failed validation</p>- </TooltipContent>- </Tooltip>- </TooltipProvider>- ) : (- <span className="text-muted-foreground">0</span>- )}- </TableCell>- <TableCell className="text-center">- {imp.completedAt !== null && (- <Button- variant="outline"- size="sm"- onClick={() => handleDeleteClick(imp.importId)}- disabled={disabled || deleteMutation.isPending}- className="h-8 w-8 p-0"- >- {deleteMutation.isPending && deleteMutation.variables === imp.importId ? (- <Loader2 className="h-4 w-4 animate-spin" />- ) : (- <Trash2 className="h-4 w-4" />- )}- </Button>- )}- </TableCell>- </TableRow>- );- })}- </TableBody>- </Table>- </div>- )}- </CardContent>- </Card>-- {/* Confirmation Dialog */}- <AlertDialog open={showConfirmDialog} onOpenChange={setShowConfirmDialog}>- <AlertDialogContent>- <AlertDialogHeader>- <AlertDialogTitle>Confirm Large File Import</AlertDialogTitle>- <AlertDialogDescription>- You're about to import a large file ({selectedFile ? formatFileSize(selectedFile.size) : "?"}). This may- take several minutes to process. Are you sure you want to continue?- </AlertDialogDescription>- </AlertDialogHeader>- <AlertDialogFooter>- <AlertDialogCancel>Cancel</AlertDialogCancel>- <AlertDialogAction onClick={executeImport}>Yes, Import File</AlertDialogAction>- </AlertDialogFooter>- </AlertDialogContent>- </AlertDialog>-- {/* Delete Confirmation Dialog */}- <AlertDialog open={!!importToDelete} onOpenChange={open => !open && setImportToDelete(null)}>- <AlertDialogContent>- <AlertDialogHeader>- <AlertDialogTitle>Delete Import</AlertDialogTitle>- <AlertDialogDescription>- Are you sure you want to delete this import? This action cannot be undone. The import data and associated- files will be permanently removed.- </AlertDialogDescription>- </AlertDialogHeader>- <AlertDialogFooter>- <AlertDialogCancel>Cancel</AlertDialogCancel>- <AlertDialogAction onClick={handleDeleteConfirm} className="bg-red-600 hover:bg-red-700">- Delete Import- </AlertDialogAction>- </AlertDialogFooter>- </AlertDialogContent>- </AlertDialog>- </div>+ )}+ </CardContent>+ </Card>++ {/* Confirmation Dialog */}+ <AlertDialog open={showConfirmDialog} onOpenChange={setShowConfirmDialog}>+ <AlertDialogContent>+ <AlertDialogHeader>+ <AlertDialogTitle>Confirm Large File Import</AlertDialogTitle>+ <AlertDialogDescription>+ You're about to import a large file ({selectedFile ? formatFileSize(selectedFile.size) : "?"}). This may+ take several minutes to process. Are you sure you want to continue?+ </AlertDialogDescription>+ </AlertDialogHeader>+ <AlertDialogFooter>+ <AlertDialogCancel>Cancel</AlertDialogCancel>+ <AlertDialogAction onClick={executeImport}>Yes, Import File</AlertDialogAction>+ </AlertDialogFooter>+ </AlertDialogContent>+ </AlertDialog>++ {/* Delete Confirmation Dialog */}+ <AlertDialog open={!!importToDelete} onOpenChange={open => !open && setImportToDelete(null)}>+ <AlertDialogContent>+ <AlertDialogHeader>+ <AlertDialogTitle>Delete Import</AlertDialogTitle>+ <AlertDialogDescription>+ Are you sure you want to delete this import? This action cannot be undone. The import data and+ associated files will be permanently removed.+ </AlertDialogDescription>+ </AlertDialogHeader>+ <AlertDialogFooter>+ <AlertDialogCancel>Cancel</AlertDialogCancel>+ <AlertDialogAction onClick={handleDeleteConfirm} className="bg-red-600 hover:bg-red-700">+ Delete Import+ </AlertDialogAction>+ </AlertDialogFooter>+ </AlertDialogContent>+ </AlertDialog>+ </div>+ </DisabledOverlay>);}diff --git a/server/src/api/sites/batchImportEvents.ts b/server/src/api/sites/batchImportEvents.tsindex e153f3558..132bdd7e7 100644--- a/server/src/api/sites/batchImportEvents.ts+++ b/server/src/api/sites/batchImportEvents.ts@@ -7,8 +7,10 @@ import { UmamiEvent, UmamiImportMapper } from "../../services/import/mappings/umimport { SimpleAnalyticsEvent, SimpleAnalyticsImportMapper } from "../../services/import/mappings/simpleAnalytics.js";import { importQuotaManager } from "../../services/import/importQuotaManager.js";import { db } from "../../db/postgres/postgres.js";-import { sites } from "../../db/postgres/schema.js";+import { organization, sites } from "../../db/postgres/schema.js";import { eq } from "drizzle-orm";+import { getBestSubscription } from "../../lib/subscriptionUtils.js";+import { IS_CLOUD } from "../../lib/const.js";const batchImportRequestSchema = z.object({@@ -60,8 +62,12 @@ export async function batchImportEvents(request: FastifyRequest<BatchImportReque}const [siteRecord] = await db- .select({ organizationId: sites.organizationId })+ .select({+ organizationId: sites.organizationId,+ stripeCustomerId: organization.stripeCustomerId,+ }).from(sites)+ .leftJoin(organization, eq(sites.organizationId, organization.id)).where(eq(sites.siteId, site)).limit(1);@@ -69,6 +75,16 @@ export async function batchImportEvents(request: FastifyRequest<BatchImportRequereturn reply.status(404).send({ error: "Site not found" });}+ if (IS_CLOUD) {+ const subscription = await getBestSubscription(siteRecord.organizationId, siteRecord.stripeCustomerId);++ if (subscription.source === "free") {+ return reply.status(403).send({+ error: "Data import is not available on the free plan. Please upgrade to a paid plan.",+ });+ }+ }+try {const quotaTracker = await importQuotaManager.getTracker(siteRecord.organizationId);@@ -76,11 +92,7 @@ export async function batchImportEvents(request: FastifyRequest<BatchImportRequeif (importRecord.platform === "umami") {transformedEvents = UmamiImportMapper.transform(events as UmamiEvent[], site, importId);} else if (importRecord.platform === "simple_analytics") {- transformedEvents = SimpleAnalyticsImportMapper.transform(- events as SimpleAnalyticsEvent[],- site,- importId- );+ transformedEvents = SimpleAnalyticsImportMapper.transform(events as SimpleAnalyticsEvent[], site, importId);} else {return reply.status(400).send({ error: "Unsupported platform" });}diff --git a/server/src/api/sites/createSiteImport.ts b/server/src/api/sites/createSiteImport.tsindex 9842ff034..c93befca5 100644--- a/server/src/api/sites/createSiteImport.ts+++ b/server/src/api/sites/createSiteImport.ts@@ -5,8 +5,10 @@ import { createImport } from "../../services/import/importStatusManager.js";import { DateTime } from "luxon";import { z } from "zod";import { db } from "../../db/postgres/postgres.js";-import { importPlatforms, sites } from "../../db/postgres/schema.js";+import { importPlatforms, organization, sites } from "../../db/postgres/schema.js";import { eq } from "drizzle-orm";+import { getBestSubscription } from "../../lib/subscriptionUtils.js";+import { IS_CLOUD } from "../../lib/const.js";const createSiteImportRequestSchema = z.object({@@ -44,8 +46,12 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportR}const [siteRecord] = await db- .select({ organizationId: sites.organizationId })+ .select({+ organizationId: sites.organizationId,+ stripeCustomerId: organization.stripeCustomerId,+ }).from(sites)+ .leftJoin(organization, eq(sites.organizationId, organization.id)).where(eq(sites.siteId, site)).limit(1);@@ -55,6 +61,16 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportRconst organizationId = siteRecord.organizationId;+ if (IS_CLOUD) {+ const subscription = await getBestSubscription(organizationId, siteRecord.stripeCustomerId);++ if (subscription.source === "free") {+ return reply.status(403).send({+ error: "Data import is not available on the free plan. Please upgrade to a paid plan.",+ });+ }+ }+if (!importQuotaManager.startImport(organizationId)) {return reply.status(429).send({ error: "Only 1 concurrent import allowed per organization" });}