A platform for community discussion. Free, open, simple.
FIX: Clear report group filters (#42879)
Krzysztof Kotlareked9f07d9f5ce
diff --git a/frontend/discourse/admin/components/admin-report.gjs b/frontend/discourse/admin/components/admin-report.gjsindex 8d6e8787551..ea78afb8e6f 100644--- a/frontend/discourse/admin/components/admin-report.gjs+++ b/frontend/discourse/admin/components/admin-report.gjs@@ -44,6 +44,18 @@ const TABLE_OPTIONS = {const CHART_OPTIONS = {};+export function updateReportFilters(filters, id, value) {+ const customFilters = { ...filters };++ if (value === null || typeof value === "undefined") {+ delete customFilters[id];+ } else {+ customFilters[id] = value;+ }++ return customFilters;+}+export default class AdminReport extends Component {@service siteSettings;@@ -352,15 +364,9 @@ export default class AdminReport extends Component {@actionapplyFilter(id, value) {- let customFilters = this.args.filters?.customFilters || {};-- if (typeof value === "undefined") {- delete customFilters[id];- } else {- customFilters[id] = value;- }-- this.refreshReport({ filters: customFilters });+ this.refreshReport({+ filters: updateReportFilters(this.args.filters?.customFilters, id, value),+ });}@actiondiff --git a/frontend/discourse/tests/integration/components/admin-report-test.gjs b/frontend/discourse/tests/integration/components/admin-report-test.gjsindex 24a3081ce5c..2afe2edcd13 100644--- a/frontend/discourse/tests/integration/components/admin-report-test.gjs+++ b/frontend/discourse/tests/integration/components/admin-report-test.gjs@@ -1,12 +1,22 @@import { click, fillIn, render, triggerEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import AdminReport from "discourse/admin/components/admin-report";+import AdminReport, {+ updateReportFilters,+} from "discourse/admin/components/admin-report";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import pretender, { response } from "discourse/tests/helpers/create-pretender";module("Integration | Component | AdminReport", function (hooks) {setupRenderingTest(hooks);+ test("clearing a group filter removes it", function (assert) {+ assert.deepEqual(+ updateReportFilters({ group: 88 }, "group", null),+ {},+ "omits the group filter"+ );+ });+test("default", async function (assert) {await render(<template><AdminReport @dataSourceName="signups" /></template>