Skip to content

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

feat(filters): enhance Filters and NewFilterButton components with availableFilters prop

Bill Yangfbdfde6732c8
diff --git a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
index 0a0327211..f58fe7439 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
@@ -30,7 +30,7 @@ export function Filters({
return (
<div className="flex gap-2 flex-wrap">
- <NewFilterButton />
+ <NewFilterButton availableFilters={availableFilters} />
{filters.map((filter, i) => {
const disabled =
availableFilters && !availableFilters.includes(filter.parameter);
@@ -45,15 +45,25 @@ export function Filters({
<TooltipTrigger>
<div
key={filter.parameter}
- className={cn("px-2 py-1 rounded-lg text-neutral-400 flex items-center gap-1 text-sm", disabled ? "bg-neutral-900" : "bg-neutral-850")}
+ className={cn(
+ "px-2 py-1 rounded-lg text-neutral-400 flex items-center gap-1 text-sm",
+ disabled ? "bg-neutral-900" : "bg-neutral-850"
+ )}
>
<div
- className={cn(disabled ? "text-neutral-500" : "text-neutral-300")}
+ className={cn(
+ disabled ? "text-neutral-500" : "text-neutral-300"
+ )}
>
{getParameterNameLabel(filter.parameter)}
</div>
<div
- className={cn("text-emerald-400 font-medium cursor-pointer whitespace-nowrap", (filter.type === "not_equals" || filter.type === "not_contains") && "text-red-400")}
+ className={cn(
+ "text-emerald-400 font-medium cursor-pointer whitespace-nowrap",
+ (filter.type === "not_equals" ||
+ filter.type === "not_contains") &&
+ "text-red-400"
+ )}
onClick={() => {
let newType: FilterType = "equals";
if (filter.type === "equals") {
@@ -72,7 +82,10 @@ export function Filters({
{filterTypeToLabel(filter.type)}
</div>
<div
- className={cn("text-neutral-100 font-medium whitespace-nowrap", disabled && "text-neutral-500")}
+ className={cn(
+ "text-neutral-100 font-medium whitespace-nowrap",
+ disabled && "text-neutral-500"
+ )}
>
{getParameterValueLabel(filter, getRegionName)}
</div>
diff --git a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
index b29c42dfe..68daff930 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
@@ -7,11 +7,15 @@ import {
DropdownMenuContent,
DropdownMenuTrigger,
} from "../../../../../components/ui/dropdown-menu";
-import { Filter, useStore } from "../../../../../lib/store";
+import { Filter, FilterParameter, useStore } from "../../../../../lib/store";
import { sleep } from "../../../../../lib/utils";
import { FilterComponent } from "../../shared/Filters/FilterComponent";
-export function NewFilterButton() {
+export function NewFilterButton({
+ availableFilters,
+}: {
+ availableFilters?: FilterParameter[];
+}) {
const { filters, setFilters } = useStore();
const [localFilters, setLocalFilters] = useState<Filter[]>(filters);
@@ -32,7 +36,7 @@ export function NewFilterButton() {
setLocalFilters([
...localFilters,
{
- parameter: "pathname",
+ parameter: availableFilters?.[0] || "pathname",
type: "equals",
value: [],
},
@@ -81,6 +85,7 @@ export function NewFilterButton() {
filter={filter}
index={index}
updateFilter={updateLocalFilters}
+ availableFilters={availableFilters}
/>
))}
</div>
diff --git a/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx b/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx
index 59ac6e1c2..1e86f4fa2 100644
--- a/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx
+++ b/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx
@@ -7,12 +7,7 @@ import {
SelectTrigger,
SelectValue,
} from "../../../../../components/ui/select";
-import {
- Filter,
- FilterParameter,
- FilterType,
- updateFilter,
-} from "../../../../../lib/store";
+import { Filter, FilterParameter, FilterType } from "../../../../../lib/store";
import { FilterOptions, OperatorOptions } from "./const";
import { ValueSelect } from "./ValueSelect";
@@ -20,11 +15,17 @@ export function FilterComponent({
filter,
index,
updateFilter,
+ availableFilters,
}: {
filter: Filter;
index: number;
updateFilter: (filter: Filter | null, index: number) => void;
+ availableFilters?: FilterParameter[];
}) {
+ const availableFilterOptions = availableFilters
+ ? FilterOptions.filter((option) => availableFilters?.includes(option.value))
+ : FilterOptions;
+
return (
<div className="grid grid-cols-[220px_auto] md:grid-cols-[160px_100px_250px_auto] gap-2">
<Select
@@ -44,7 +45,7 @@ export function FilterComponent({
<SelectValue placeholder="Filter" />
</SelectTrigger>
<SelectContent>
- {FilterOptions.map((option) => (
+ {availableFilterOptions.map((option) => (
<SelectItem key={option.value} value={option.value}>
<div className="flex items-center gap-2">
{option.icon}
diff --git a/client/src/app/[site]/components/shared/Filters/utils.ts b/client/src/app/[site]/components/shared/Filters/utils.ts
index 1da2dd6cd..1943024ca 100644
--- a/client/src/app/[site]/components/shared/Filters/utils.ts
+++ b/client/src/app/[site]/components/shared/Filters/utils.ts
@@ -25,6 +25,8 @@ export function getParameterNameLabel(parameter: FilterParameter) {
return "City";
case "region":
return "Region";
+ case "channel":
+ return "Channel";
case "entry_page":
return "Entry Page";
case "exit_page":