🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
improve filters
Bill Yangce61d19f68bd
diff --git a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsxindex d4271a34f..fb0a0fe5c 100644--- a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx+++ b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx@@ -1,4 +1,3 @@-import { countries } from "countries-list";import { X } from "lucide-react";import {Filter,@@ -8,8 +7,8 @@ import {updateFilter,useStore,} from "../../../../../lib/store";-import { NewFilterButton } from "./NewFilterButton";import { getCountryName } from "../../../../../lib/utils";+import { NewFilterButton } from "./NewFilterButton";function getParameterNameLabel(parameter: FilterParameter) {switch (parameter) {diff --git a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsxindex 3a5b24580..094c84cfc 100644--- a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx+++ b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx@@ -77,14 +77,18 @@ export function NewFilterButton() {const [open, setOpen] = useState(false);+ const onClose = async () => {+ setOpen(false);+ await sleep(100);+ setSelectedFilter(null);+ setSelectedOperator("equals");+ };+return (<DropdownMenu- onOpenChange={async (isOpen) => {+ onOpenChange={(isOpen) => {if (!isOpen) {- setOpen(false);- await sleep(100);- setSelectedFilter(null);- setSelectedOperator("equals");+ onClose();}}}open={open}@@ -124,7 +128,7 @@ export function NewFilterButton() {<ValueFilterparameter={selectedFilter.value}type={selectedOperator}- onComplete={() => setOpen(false)}+ onComplete={() => onClose()}/></div></div>diff --git a/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx b/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsxindex 8f5ea4b5c..1019fd993 100644--- a/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx+++ b/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx@@ -36,7 +36,11 @@ interface ValueFilterProps {}export function ValueFilter({ parameter, type, onComplete }: ValueFilterProps) {- const { data, isLoading } = useSingleCol({ parameter, limit: 1000 });+ const { data, isLoading } = useSingleCol({+ parameter,+ limit: 1000,+ useFilters: false,+ });const [open, setOpen] = useState(false);diff --git a/client/src/app/[site]/main/components/MainSection/BucketSelection.tsx b/client/src/app/[site]/main/components/MainSection/BucketSelection.tsxindex ac70bc9b6..19f5983c4 100644--- a/client/src/app/[site]/main/components/MainSection/BucketSelection.tsx+++ b/client/src/app/[site]/main/components/MainSection/BucketSelection.tsx@@ -77,22 +77,22 @@ const getOptions = (time: Time) => {return (<SelectContent>- {timeRangeLength <= 7 && (+ {timeRangeLength <= 30 && (<SelectItem size="sm" value="hour">Hour</SelectItem>)}- {timeRangeLength <= 31 && timeRangeLength > 1 && (+ {timeRangeLength > 1 && (<SelectItem size="sm" value="day">Day</SelectItem>)}- {timeRangeLength >= 28 && timeRangeLength <= 180 && (+ {timeRangeLength >= 28 && (<SelectItem size="sm" value="week">Week</SelectItem>)}- {timeRangeLength >= 60 && timeRangeLength <= 365 && (+ {timeRangeLength >= 60 && (<SelectItem size="sm" value="month">Month</SelectItem>diff --git a/client/src/hooks/api.ts b/client/src/hooks/api.tsindex 2b39582cb..8a11a56f3 100644--- a/client/src/hooks/api.ts+++ b/client/src/hooks/api.ts@@ -29,10 +29,12 @@ export function useSingleCol({parameter,limit = 10000,periodTime,+ useFilters = true,}: {parameter: FilterParameter;limit?: number;periodTime?: PeriodTime;+ useFilters?: boolean;}): UseQueryResult<APIResponse<{ value: string; count: number; percentage: number }[]>> {@@ -49,9 +51,9 @@ export function useSingleCol({startDate ? `startDate=${startDate}&` : ""}${endDate ? `endDate=${endDate}&` : ""- }timezone=${timezone}&site=${site}¶meter=${parameter}&filters=${JSON.stringify(- filters- )}${limit ? `&limit=${limit}` : ""}`+ }timezone=${timezone}&site=${site}¶meter=${parameter}${+ limit ? `&limit=${limit}` : ""+ }${useFilters ? `&filters=${JSON.stringify(filters)}` : ""}`).then((res) => res.json());},staleTime: Infinity,diff --git a/server/src/api/utils.ts b/server/src/api/utils.tsindex b0aa12015..0409ee34b 100644--- a/server/src/api/utils.ts+++ b/server/src/api/utils.ts@@ -58,6 +58,9 @@ export const geSqlParam = (parameter: FilterParameter) => {};export function getFilterStatement(filters: string) {+ if (!filters) {+ return "";+ }const filtersArray = JSON.parse(filters);if (filtersArray.length === 0) {return "";