Skip to content

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

render country names, disable adding dupe filters, and fix card dialog

Bill Yang2979e9cacdb9
diff --git a/client/src/app/[site]/components/Filters/Filters.tsx b/client/src/app/[site]/components/Filters/Filters.tsx
index 1dadf39ad..d6d8510e8 100644
--- a/client/src/app/[site]/components/Filters/Filters.tsx
+++ b/client/src/app/[site]/components/Filters/Filters.tsx
@@ -5,6 +5,7 @@ import {
removeFilter,
useStore,
} from "../../../../lib/store";
+import { countries } from "countries-list";
function getParameterNameLabel(parameter: FilterParameter) {
switch (parameter) {
@@ -28,7 +29,9 @@ function getParameterNameLabel(parameter: FilterParameter) {
function getParameterValueLabel(filter: Filter) {
switch (filter.parameter) {
case "country":
- return filter.value;
+ return (
+ countries[filter.value as keyof typeof countries]?.name ?? filter.value
+ );
case "device_type":
return filter.value;
case "operating_system":
diff --git a/client/src/app/[site]/components/shared/StandardCard.tsx b/client/src/app/[site]/components/shared/StandardCard.tsx
index 92fcfaa70..b2cf4534b 100644
--- a/client/src/app/[site]/components/shared/StandardCard.tsx
+++ b/client/src/app/[site]/components/shared/StandardCard.tsx
@@ -90,7 +90,14 @@ export function StandardCard<T extends { percentage: number; count: number }>({
{data?.data?.map((e) => (
<div
key={getKey(e)}
- className="relative flex items-center mr-3"
+ className="relative flex items-center mr-3 cursor-pointer hover:bg-neutral-850 "
+ onClick={() =>
+ addFilter({
+ parameter: filterParameter,
+ value: getValue(e),
+ type: "equals",
+ })
+ }
>
<div
className="absolute inset-0 bg-fuchsia-400 py-2 opacity-30 rounded-md"
diff --git a/client/src/lib/store.ts b/client/src/lib/store.ts
index d5777db78..4a38b98ad 100644
--- a/client/src/lib/store.ts
+++ b/client/src/lib/store.ts
@@ -297,7 +297,15 @@ export const goForward = () => {
export const addFilter = (filter: Filter) => {
const { filters, setFilters } = useStore.getState();
- setFilters([...filters, filter]);
+ const filterExists = filters.some(
+ (f) =>
+ f.parameter === filter.parameter &&
+ f.value === filter.value &&
+ f.type === filter.type
+ );
+ if (!filterExists) {
+ setFilters([...filters, filter]);
+ }
};
export const removeFilter = (filter: Filter) => {