FIX: simplify filters on admin-report component (#6193)

app/assets/javascripts/admin/components/admin-report.js.es6

@@ -50,6 +50,7 @@ export default Ember.Component.extend({
   reportOptions: null,
   forcedModes: null,
   showAllReportsLink: false,
+  filters: null,
   startDate: null,
   endDate: null,
   category: null,
@@ -77,7 +78,7 @@ export default Ember.Component.extend({
   didReceiveAttrs() {
     this._super(...arguments);
 
-    const state = this.get("filteringState") || {};
+    const state = this.get("filters") || {};
     this.setProperties({
       category: Category.findById(state.categoryId),
       groupId: state.groupId,

app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6

@@ -77,6 +77,11 @@ export default Ember.Controller.extend(PeriodComputationMixin, {
     }
   },
 
+  @computed("startDate", "endDate")
+  filters(startDate, endDate) {
+    return { startDate, endDate };
+  },
+
   @computed("model.attributes.updated_at")
   updatedTimestamp(updatedAt) {
     return moment(updatedAt).format("LLL");
@@ -88,6 +93,6 @@ export default Ember.Controller.extend(PeriodComputationMixin, {
   },
 
   _reportsForPeriodURL(period) {
-    return Discourse.getURL(`/admin/dashboard/general?period=${period}`);
+    return Discourse.getURL(`/admin?period=${period}`);
   }
 });

app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6

@@ -12,6 +12,16 @@ export default Ember.Controller.extend(PeriodComputationMixin, {
     };
   },
 
+  @computed("startDate", "endDate")
+  filters(startDate, endDate) {
+    return { startDate, endDate };
+  },
+
+  @computed("lastWeek", "endDate")
+  lastWeekfilters(startDate, endDate) {
+    return { startDate, endDate };
+  },
+
   _reportsForPeriodURL(period) {
     return Discourse.getURL(`/admin/dashboard/moderation?period=${period}`);
   }

app/assets/javascripts/admin/controllers/admin-reports-show.js.es6

@@ -15,7 +15,7 @@ export default Ember.Controller.extend({
   },
 
   @computed("category_id", "group_id", "start_date", "end_date")
-  filteringState(categoryId, groupId, startDate, endDate) {
+  filters(categoryId, groupId, startDate, endDate) {
     return {
       categoryId,
       groupId,

app/assets/javascripts/admin/templates/dashboard_next_general.hbs

@@ -18,43 +18,37 @@
             dataSourceName="signups"
             showTrend=true
             forcedModes="chart"
-            startDate=startDate
+            filters=filters}}
-            endDate=endDate}}
 
           {{admin-report
             dataSourceName="topics"
             showTrend=true
             forcedModes="chart"
-            startDate=startDate
+            filters=filters}}
-            endDate=endDate}}
 
           {{admin-report
             dataSourceName="posts"
             showTrend=true
             forcedModes="chart"
-            startDate=startDate
+            filters=filters}}
-            endDate=endDate}}
 
           {{admin-report
             dataSourceName="dau_by_mau"
             showTrend=true
             forcedModes="chart"
-            startDate=startDate
+            filters=filters}}
-            endDate=endDate}}
 
           {{admin-report
             dataSourceName="daily_engaged_users"
             showTrend=true
             forcedModes="chart"
-            startDate=startDate
+            filters=filters}}
-            endDate=endDate}}
 
           {{admin-report
             dataSourceName="new_contributors"
             showTrend=true
             forcedModes="chart"
-            startDate=startDate
+            filters=filters}}
-            endDate=endDate}}
         </div>
       </div>
     </div>
@@ -170,17 +164,13 @@
     <div class="section-column">
       {{admin-report
         dataSourceName="top_referred_topics"
-        reportOptions=topReferredTopicsTopions
+        reportOptions=topReferredTopicsTopions}}
-        startDate=startDate
-        endDate=endDate}}
 
       {{admin-report
         dataSourceName="trending_search"
         reportOptions=trendingSearchOptions
         isEnabled=logSearchQueriesEnabled
-        disabledLabel="admin.dashboard.reports.trending_search.disabled"
+        disabledLabel="admin.dashboard.reports.trending_search.disabled"}}
-        startDate=startDate
-        endDate=endDate}}
       {{{i18n "admin.dashboard.reports.trending_search.more"}}}
     </div>
   </div>

app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs

@@ -17,8 +17,7 @@
 
     <div class="section-body">
       {{admin-report
-        startDate=startDate
+        filters=filters
-        endDate=endDate
         showHeader=false
         dataSourceName="moderators_activity"}}
     </div>
@@ -27,14 +26,12 @@
   <div class="main-section">
     {{admin-report
       dataSourceName="flags_status"
-      startDate=lastWeek
       reportOptions=flagsStatusOptions
-      endDate=endDate}}
+      filters=lastWeekfilters}}
 
     {{admin-report
       dataSourceName="post_edits"
-      startDate=lastWeek
+      filters=lastWeekfilters}}
-      endDate=endDate}}
 
     {{plugin-outlet name="admin-dashboard-moderation-bottom"}}
   </div>

app/assets/javascripts/admin/templates/reports-show.hbs

@@ -3,7 +3,7 @@
     {{admin-report
       showAllReportsLink=true
       dataSourceName=model.type
-      filteringState=filteringState
+      filters=filters
       reportOptions=reportOptions
       showFilteringUI=true
       onRefresh=(action "onParamsChange")}}