Skip to content
This repository was archived by the owner on Jul 22, 2025. It is now read-only.

Commit 93395d8

Browse files
committed
Removal filter setting handling as is getting deprecated soon
1 parent 0b1059e commit 93395d8

File tree

2 files changed

+4
-44
lines changed

2 files changed

+4
-44
lines changed

assets/javascripts/discourse/components/admin-report-emotion.hbs

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,63 +6,30 @@
66
</div>
77

88
<div class="cell value today-count">
9-
{{#if this.filterEnabled}}
10-
<a
11-
href="{{this.filterURL}}activity-after%3A{{this.today}}%20order%3A{{this.model.type}}"
12-
>
13-
{{number this.model.todayCount}}
14-
</a>
15-
{{else}}
16-
{{number this.model.todayCount}}
17-
{{/if}}
9+
{{number this.model.todayCount}}
1810
</div>
1911

2012
<div
2113
class="cell value yesterday-count {{this.model.yesterdayTrend}}"
2214
title={{this.model.yesterdayCountTitle}}
2315
>
24-
{{#if this.filterEnabled}}
25-
<a
26-
href="{{this.filterURL}}activity-after%3A{{this.yesterday}}%20order%3A{{this.model.type}}"
27-
>
28-
{{number this.model.yesterdayCount}}
29-
</a>
30-
{{else}}
31-
{{number this.model.yesterdayCount}}
32-
{{/if}}
16+
{{number this.model.yesterdayCount}}
3317
{{d-icon this.model.yesterdayTrendIcon}}
3418
</div>
3519

3620
<div
3721
class="cell value sevendays-count {{this.model.sevenDaysTrend}}"
3822
title={{this.model.sevenDaysCountTitle}}
3923
>
40-
{{#if this.filterEnabled}}
41-
<a
42-
href="{{this.filterURL}}activity-after%3A{{this.lastWeek}}%20order%3A{{this.model.type}}"
43-
>
44-
{{number this.model.lastSevenDaysCount}}
45-
</a>
46-
{{else}}
47-
{{number this.model.lastSevenDaysCount}}
48-
{{/if}}
24+
{{number this.model.lastSevenDaysCount}}
4925
{{d-icon this.model.sevenDaysTrendIcon}}
5026
</div>
5127

5228
<div
5329
class="cell value thirty-days-count {{this.model.thirtyDaysTrend}}"
5430
title={{this.model.thirtyDaysCountTitle}}
5531
>
56-
{{#if this.filterEnabled}}
57-
<a
58-
href="{{this.filterURL}}activity-after%3A{{this.lastMonth}}%20order%3A{{this.model.type}}"
59-
>
60-
{{number this.model.lastThirtyDaysCount}}
61-
</a>
62-
{{else}}
63-
{{number this.model.lastThirtyDaysCount}}
64-
{{/if}}
65-
32+
{{number this.model.lastThirtyDaysCount}}
6633
{{#if this.model.canDisplayTrendIcon}}
6734
{{d-icon this.model.thirtyDaysTrendIcon}}
6835
{{/if}}

assets/javascripts/discourse/components/admin-report-emotion.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import Component from "@ember/component";
2-
import { service } from "@ember/service";
32
import { attributeBindings, classNames } from "@ember-decorators/component";
43
import getURL from "discourse-common/lib/get-url";
54

65
@classNames("admin-report-counters")
76
@attributeBindings("model.description:title")
87
export default class AdminReportEmotion extends Component {
9-
@service siteSettings;
10-
118
get filterURL() {
129
return getURL(`/filter?q=`);
1310
}
@@ -27,8 +24,4 @@ export default class AdminReportEmotion extends Component {
2724
get lastMonth() {
2825
return moment().subtract(1, "month").format("YYYY-MM-DD");
2926
}
30-
31-
get filterEnabled() {
32-
return this.siteSettings.experimental_topics_filter;
33-
}
3427
}

0 commit comments

Comments
 (0)