Skip to content

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

Merge branch 'master' into umami-import

Edward Cui40ffbb63f0e1
diff --cc client/src/components/SiteSettings/SiteSettings.tsx
index 511a72c5d,95300edf5..9119d6157
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@@ -17,9 -17,7 +17,8 @@@ import
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { SiteResponse, useGetSite } from "@/api/admin/sites";
-import { useUserOrganizations } from "../../api/admin/organizations";
+import { useUserOrganizations } from "@/api/admin/organizations";
- import { ApiKeyManager } from "./ApiKeyManager";
+import { ImportManager } from "./ImportManager";
import { ScriptBuilder } from "./ScriptBuilder";
import { SiteConfiguration } from "./SiteConfiguration";
@@@ -59,25 -57,15 +58,20 @@@ function SiteSettingsInner({ siteMetada
<DialogDescription>Manage settings for {siteMetadata.domain}</DialogDescription>
</DialogHeader>
<Tabs value={activeTab} onValueChange={setActiveTab} className="pb-4">
- <TabsList className="grid w-full grid-cols-4">
- <TabsList className="grid w-full grid-cols-2">
++ <TabsList className="grid w-full grid-cols-3">
<TabsTrigger value="settings">Site Settings</TabsTrigger>
<TabsTrigger value="script">Tracking Script</TabsTrigger>
- <TabsTrigger value="apikey">API Key</TabsTrigger>
+ <TabsTrigger value="import">Import</TabsTrigger>
</TabsList>
<TabsContent value="script" className="pt-4 space-y-4 max-h-[70vh] overflow-y-auto">
<ScriptBuilder siteId={siteMetadata.id ?? String(siteMetadata.siteId)} />
</TabsContent>
- <TabsContent value="apikey" className="pt-4 space-y-4 max-h-[70vh] overflow-y-auto">
- <ApiKeyManager siteId={siteMetadata.siteId} disabled={disabled} />
- </TabsContent>
-
+ <TabsContent value="import" className="pt-4 space-y-4 max-h-[70vh] overflow-y-auto">
+ <ImportManager siteId={siteMetadata.siteId} disabled={disabled} />
+ </TabsContent>
+
<TabsContent value="settings">
<SiteConfiguration siteMetadata={siteMetadata} disabled={disabled} onClose={() => setDialogOpen(false)} />
</TabsContent>
diff --cc server/src/db/postgres/schema.ts
index 38b932d00,a2e52f8dc..c2c09a412
--- a/server/src/db/postgres/schema.ts
+++ b/server/src/db/postgres/schema.ts
@@@ -12,11 -12,9 +12,11 @@@ import
text,
timestamp,
unique,
+ pgEnum,
+ uuid,
} from "drizzle-orm/pg-core";
- // User table
+ // User table (BetterAuth)
export const user = pgTable(
"user",
{
diff --cc server/src/index.ts
index 045107bec,6ca7bf9a5..066823237
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@@ -349,13 -354,8 +357,14 @@@ server.get("/api/performance/by-dimensi
server.post("/api/session-replay/record/:site", recordSessionReplay);
server.get("/api/session-replay/list/:site", getSessionReplays);
server.get("/api/session-replay/:sessionId/:site", getSessionReplayEvents);
+ server.delete("/api/session-replay/:sessionId/:site", deleteSessionReplay);
+// Imports
+server.get("/api/get-site-imports/:site", getSiteImports);
+server.post("/api/create-site-import/:site", createSiteImport);
+server.post("/api/batch-import-events/:site/:importId", batchImportEvents);
+server.delete("/api/delete-site-import/:site/:importId", deleteSiteImport);
+
// Administrative
server.get("/api/config", getConfig);
server.post("/api/add-site", addSite);