Skip to content

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

Add channel filter and update Referrers component

Bill Yangcbb3b4bea8f8
diff --git a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
index b97391ab0..f38782797 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
@@ -30,6 +30,10 @@ const FilterOptions: { label: string; value: FilterParameter }[] = [
label: "Referrer",
value: "referrer",
},
+ {
+ label: "Channel",
+ value: "channel",
+ },
{
label: "Country",
value: "country",
@@ -38,10 +42,10 @@ const FilterOptions: { label: string; value: FilterParameter }[] = [
label: "Region",
value: "iso_3166_2",
},
- // {
- // label: "City",
- // value: "city",
- // },
+ {
+ label: "City",
+ value: "city",
+ },
{
label: "Device Type",
value: "device_type",
diff --git a/client/src/app/[site]/main/components/sections/Referrers.tsx b/client/src/app/[site]/main/components/sections/Referrers.tsx
index b1b9bcd3c..15df31f3a 100644
--- a/client/src/app/[site]/main/components/sections/Referrers.tsx
+++ b/client/src/app/[site]/main/components/sections/Referrers.tsx
@@ -9,7 +9,8 @@ import {
import { Card, CardContent } from "../../../../../components/ui/card";
import { StandardSection } from "../../../components/shared/StandardSection/StandardSection";
import { StandardSectionRealtime } from "../../../components/shared/StandardSection/StandardSectionRealtime";
-type Tab = "referrers";
+
+type Tab = "referrers" | "channels";
export function Referrers({ isRealtime = false }: { isRealtime?: boolean }) {
const [tab, setTab] = useState<Tab>("referrers");
@@ -26,6 +27,7 @@ export function Referrers({ isRealtime = false }: { isRealtime?: boolean }) {
>
<TabsList>
<TabsTrigger value="referrers">Referrers</TabsTrigger>
+ <TabsTrigger value="channels">Channels</TabsTrigger>
</TabsList>
<TabsContent value="referrers">
<ComponentToUse
@@ -45,6 +47,18 @@ export function Referrers({ isRealtime = false }: { isRealtime?: boolean }) {
)}
/>
</TabsContent>
+ <TabsContent value="channels">
+ <ComponentToUse
+ filterParameter="channel"
+ title="Channels"
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
+ // getLink={(e) => `https://${e.value}`}
+ getLabel={(e) => (
+ <div className="flex items-center">{e.value}</div>
+ )}
+ />
+ </TabsContent>
</Tabs>
</CardContent>
</Card>
diff --git a/client/src/lib/store.ts b/client/src/lib/store.ts
index 13adeb54c..40157a8bb 100644
--- a/client/src/lib/store.ts
+++ b/client/src/lib/store.ts
@@ -80,6 +80,7 @@ export type FilterParameter =
| "querystring"
| "iso_3166_2"
| "event_name"
+ | "channel"
// derivative parameters
| "entry_page"
| "exit_page"
diff --git a/server/src/api/types.ts b/server/src/api/types.ts
index 6741f4ff1..d9ca13e82 100644
--- a/server/src/api/types.ts
+++ b/server/src/api/types.ts
@@ -14,6 +14,7 @@ export type FilterParameter =
| "querystring"
| "iso_3166_2"
| "event_name"
+ | "channel"
// derivative parameters
| "entry_page"
| "exit_page"