Skip to content

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

upgrade filters

Bill Yanga064903c4405
diff --git a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
index 82b3cbfa7..844a1201c 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
@@ -23,11 +23,17 @@ function getParameterNameLabel(parameter: FilterParameter) {
case "referrer":
return "Referrer";
case "pathname":
- return "Page";
+ return "Path";
case "page_title":
return "Page Title";
case "querystring":
return "Query String";
+ case "language":
+ return "Language";
+ case "city":
+ return "City";
+ case "region":
+ return "Region";
default:
return parameter;
}
diff --git a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
index 094c84cfc..f8bbbd1d4 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
@@ -8,15 +8,9 @@ import {
DropdownMenuTrigger,
} from "../../../../../components/ui/dropdown-menu";
import { FilterParameter, FilterType } from "../../../../../lib/store";
-import { useState } from "react";
+import { useMemo, useState } from "react";
import { sleep } from "../../../../../lib/utils";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "../../../../../components/ui/select";
+import { cn } from "../../../../../lib/utils";
import { ValueFilter } from "./ValueFilter";
const FilterOptions: { label: string; value: FilterParameter }[] = [
@@ -24,10 +18,18 @@ const FilterOptions: { label: string; value: FilterParameter }[] = [
label: "Path",
value: "pathname",
},
+ {
+ label: "Page Title",
+ value: "page_title",
+ },
{
label: "Query",
value: "querystring",
},
+ {
+ label: "Referrer",
+ value: "referrer",
+ },
{
label: "Country",
value: "country",
@@ -52,14 +54,6 @@ const FilterOptions: { label: string; value: FilterParameter }[] = [
label: "Browser",
value: "browser",
},
- {
- label: "Referrer",
- value: "referrer",
- },
- {
- label: "Page Title",
- value: "page_title",
- },
{
label: "Language",
value: "language",
@@ -84,6 +78,30 @@ export function NewFilterButton() {
setSelectedOperator("equals");
};
+ const operatorOptions: { label: string; value: FilterType }[] =
+ useMemo(() => {
+ if (
+ selectedFilter?.value === "referrer" ||
+ selectedFilter?.value === "page_title" ||
+ selectedFilter?.value === "language" ||
+ selectedFilter?.value === "country" ||
+ selectedFilter?.value === "region" ||
+ selectedFilter?.value === "city" ||
+ selectedFilter?.value === "querystring"
+ ) {
+ return [
+ { label: "Is", value: "equals" },
+ { label: "Is not", value: "not_equals" },
+ { label: "Contains", value: "contains" },
+ { label: "Not contains", value: "not_contains" },
+ ];
+ }
+ return [
+ { label: "Is", value: "equals" },
+ { label: "Is not", value: "not_equals" },
+ ];
+ }, []);
+
return (
<DropdownMenu
onOpenChange={(isOpen) => {
@@ -107,23 +125,25 @@ export function NewFilterButton() {
{selectedFilter ? (
<div className="flex flex-col gap-2 p-2">
<div>{selectedFilter.label}</div>
- <div className="flex items-center gap-2 text-sm">
- <Select
- onValueChange={(value) =>
- setSelectedOperator(value as FilterType)
- }
- value={selectedOperator}
- >
- <SelectTrigger>
- <SelectValue placeholder="Select" />
- </SelectTrigger>
- <SelectContent>
- <SelectItem value="equals">Is</SelectItem>
- <SelectItem value="not_equals">Is not</SelectItem>
- <SelectItem value="contains">Contains</SelectItem>
- <SelectItem value="not_contains">Not contains</SelectItem>
- </SelectContent>
- </Select>
+ <div className="flex flex-col items-center gap-2 text-sm">
+ <div className="flex w-full rounded-md overflow-hidden">
+ {operatorOptions.map((option) => (
+ <Button
+ key={option.value}
+ type="button"
+ variant={"default"}
+ className={cn(
+ "flex-1 rounded-none text-xs h-8 border-neutral-700 transition-[background-color,color]",
+ selectedOperator === option.value
+ ? "bg-neutral-900 text-white dark:bg-neutral-750"
+ : "bg-white text-neutral-700 hover:bg-neutral-100 dark:bg-neutral-850 dark:text-neutral-300 dark:hover:text-neutral-100"
+ )}
+ onClick={() => setSelectedOperator(option.value)}
+ >
+ {option.label}
+ </Button>
+ ))}
+ </div>
<ValueFilter
parameter={selectedFilter.value}
diff --git a/client/src/components/ui/button.tsx b/client/src/components/ui/button.tsx
index 880eddcc8..a7c987b53 100644
--- a/client/src/components/ui/button.tsx
+++ b/client/src/components/ui/button.tsx
@@ -20,7 +20,7 @@ const buttonVariants = cva(
warning:
"bg-yellow-500 text-neutral-900 shadow-sm hover:bg-yellow-500/90 dark:bg-yellow-600 dark:text-neutral-50 dark:hover:bg-yellow-600/90",
outline:
- "border border-neutral-200 bg-white shadow-sm hover:bg-neutral-100 hover:text-neutral-900 dark:border-neutral-650 dark:bg-neutral-900 dark:hover:bg-neutral-800 dark:hover:text-neutral-50",
+ "border border-neutral-200 bg-white shadow-sm hover:bg-neutral-100 hover:text-neutral-900 dark:border-neutral-700 dark:bg-neutral-900 dark:hover:bg-neutral-800 dark:hover:text-neutral-50",
ghost:
"hover:bg-neutral-100 hover:text-neutral-900 dark:hover:bg-neutral-800 dark:hover:text-neutral-50",
link: "text-neutral-900 underline-offset-4 hover:underline dark:text-neutral-50",
diff --git a/server/src/api/utils.ts b/server/src/api/utils.ts
index 6f8878005..e331cb488 100644
--- a/server/src/api/utils.ts
+++ b/server/src/api/utils.ts
@@ -69,17 +69,22 @@ export function getFilterStatement(filters: string) {
"AND " +
filtersArray
.map((filter: Filter) => {
+ const x =
+ filter.type === "contains" || filter.type === "not_contains"
+ ? "%"
+ : "";
+
if (filter.value.length === 1) {
return `${geSqlParam(filter.parameter)} ${filterTypeToOperator(
filter.type
- )} '${filter.value[0]}'`;
+ )} '${x}${filter.value[0]}${x}'`;
}
const valuesWithOperator = filter.value.map(
(value) =>
`${geSqlParam(filter.parameter)} ${filterTypeToOperator(
filter.type
- )} '${value}'`
+ )} '${x}${value}${x}'`
);
return `(${valuesWithOperator.join(" OR ")})`;