From b7d1864d0a6e1f249d572c1e0bf088d1f24c32b7 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 27 Jul 2018 01:22:00 -0400 Subject: [PATCH] FIX: simplify filters on admin-report component (#6193) --- .../admin/components/admin-report.js.es6 | 3 ++- .../admin-dashboard-next-general.js.es6 | 7 ++++- .../admin-dashboard-next-moderation.js.es6 | 10 +++++++ .../controllers/admin-reports-show.js.es6 | 2 +- .../templates/dashboard_next_general.hbs | 26 ++++++------------- .../templates/dashboard_next_moderation.hbs | 9 +++---- .../admin/templates/reports-show.hbs | 2 +- 7 files changed, 31 insertions(+), 28 deletions(-) diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6 index a33a05f3403..74c96f814a0 100644 --- a/app/assets/javascripts/admin/components/admin-report.js.es6 +++ b/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, diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6 index 878af5c4aa2..b8b74739677 100644 --- a/app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6 +++ b/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}`); } }); diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 index afe81cbf51f..059bcd61766 100644 --- a/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 +++ b/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}`); } diff --git a/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6 index fdabfd896e3..c86bbb60ecc 100644 --- a/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6 +++ b/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, diff --git a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs index 17b3c56d049..0d03c548aae 100644 --- a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs +++ b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs @@ -18,43 +18,37 @@ dataSourceName="signups" showTrend=true forcedModes="chart" - startDate=startDate - endDate=endDate}} + filters=filters}} {{admin-report dataSourceName="topics" showTrend=true forcedModes="chart" - startDate=startDate - endDate=endDate}} + filters=filters}} {{admin-report dataSourceName="posts" showTrend=true forcedModes="chart" - startDate=startDate - endDate=endDate}} + filters=filters}} {{admin-report dataSourceName="dau_by_mau" showTrend=true forcedModes="chart" - startDate=startDate - endDate=endDate}} + filters=filters}} {{admin-report dataSourceName="daily_engaged_users" showTrend=true forcedModes="chart" - startDate=startDate - endDate=endDate}} + filters=filters}} {{admin-report dataSourceName="new_contributors" showTrend=true forcedModes="chart" - startDate=startDate - endDate=endDate}} + filters=filters}} @@ -170,17 +164,13 @@
{{admin-report dataSourceName="top_referred_topics" - reportOptions=topReferredTopicsTopions - startDate=startDate - endDate=endDate}} + reportOptions=topReferredTopicsTopions}} {{admin-report dataSourceName="trending_search" reportOptions=trendingSearchOptions isEnabled=logSearchQueriesEnabled - disabledLabel="admin.dashboard.reports.trending_search.disabled" - startDate=startDate - endDate=endDate}} + disabledLabel="admin.dashboard.reports.trending_search.disabled"}} {{{i18n "admin.dashboard.reports.trending_search.more"}}}
diff --git a/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs b/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs index 133519fb98c..5a5eb153e36 100644 --- a/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs +++ b/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs @@ -17,8 +17,7 @@
{{admin-report - startDate=startDate - endDate=endDate + filters=filters showHeader=false dataSourceName="moderators_activity"}}
@@ -27,14 +26,12 @@
{{admin-report dataSourceName="flags_status" - startDate=lastWeek reportOptions=flagsStatusOptions - endDate=endDate}} + filters=lastWeekfilters}} {{admin-report dataSourceName="post_edits" - startDate=lastWeek - endDate=endDate}} + filters=lastWeekfilters}} {{plugin-outlet name="admin-dashboard-moderation-bottom"}}
diff --git a/app/assets/javascripts/admin/templates/reports-show.hbs b/app/assets/javascripts/admin/templates/reports-show.hbs index 8649abe5db1..d595ff46e9f 100644 --- a/app/assets/javascripts/admin/templates/reports-show.hbs +++ b/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")}}