Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

fix bug when removed filter do not update

Francis Cao0651168823bf
diff --git a/src/components/input/FilterEditForm.tsx b/src/components/input/FilterEditForm.tsx
index fd0f8d48d..f9458f99e 100644
--- a/src/components/input/FilterEditForm.tsx
+++ b/src/components/input/FilterEditForm.tsx
@@ -102,13 +102,7 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
<Button onPress={handleReset}>{t(labels.reset)}</Button>
<Row alignItems="center" justifyContent="flex-end" gridColumn="span 2" gap>
<Button onPress={onClose}>{t(labels.cancel)}</Button>
- <Button
- variant="primary"
- onPress={handleSave}
- isDisabled={
- currentFilters.filter(f => f.value).length === 0 && !currentSegment && !currentCohort
- }
- >
+ <Button variant="primary" onPress={handleSave}>
{t(labels.apply)}
</Button>
</Row>
diff --git a/src/components/input/WebsiteFilterButton.tsx b/src/components/input/WebsiteFilterButton.tsx
index e2484727a..1f04e2929 100644
--- a/src/components/input/WebsiteFilterButton.tsx
+++ b/src/components/input/WebsiteFilterButton.tsx
@@ -1,6 +1,6 @@
import { Checkbox, Row } from '@umami/react-zen';
import { useState } from 'react';
-import { useMessages, useNavigation } from '@/components/hooks';
+import { useFilters, useMessages, useNavigation } from '@/components/hooks';
import { ListFilter } from '@/components/icons';
import { DialogButton } from '@/components/input/DialogButton';
import { FilterEditForm } from '@/components/input/FilterEditForm';
@@ -15,14 +15,17 @@ export function WebsiteFilterButton({
}) {
const { t, labels } = useMessages();
const { updateParams, pathname, router, query } = useNavigation();
+ const { filters: currentFilters } = useFilters();
const [excludeBounce, setExcludeBounce] = useState(!!query.excludeBounce);
const isOverview =
/^\/teams\/[^/]+\/websites\/[^/]+$/.test(pathname) || /^\/share\/[^/]+$/.test(pathname);
const handleChange = ({ filters, segment, cohort, match }: any) => {
const params = filtersArrayToObject(filters);
+ const cleared = Object.fromEntries(currentFilters.map(f => [f.name, undefined]));
const url = updateParams({
+ ...cleared,
...params,
segment,
cohort,