clean

Author: xfalcox

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

@@ -7,7 +7,7 @@
 
 <div class="cell value today-count">
   <a
-    href="{{this.filterURL}}activity-after%3A{{this.today}}%20order%3A{{this.model.type}}"
+    href="{{this.todayLink}}"
   >
     {{number this.model.todayCount}}
   </a>
@@ -18,7 +18,7 @@
   title={{this.model.yesterdayCountTitle}}
 >
   <a
-    href="{{this.filterURL}}activity-after%3A{{this.yesterday}}%20order%3A{{this.model.type}}"
+    href="{{this.yesterdayLink}}"
   >
     {{number this.model.yesterdayCount}}
   </a>
@@ -30,7 +30,7 @@
   title={{this.model.sevenDaysCountTitle}}
 >
   <a
-    href="{{this.filterURL}}activity-after%3A{{this.lastWeek}}%20order%3A{{this.model.type}}"
+    href="{{this.lastSevenDaysLink}}"
   >
     {{number this.model.lastSevenDaysCount}}
   </a>
@@ -43,11 +43,11 @@
 >
 
   <a
-    href="{{this.filterURL}}activity-after%3A{{this.lastMonth}}%20order%3A{{this.model.type}}"
+    href="{{this.lastThirtyDaysLink}}"
   >
     {{number this.model.lastThirtyDaysCount}}
   </a>
   {{#if this.model.canDisplayTrendIcon}}
     {{d-icon this.model.thirtyDaysTrendIcon}}
   {{/if}}
-</div>
+</div>

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

@@ -5,23 +5,35 @@ import getURL from "discourse-common/lib/get-url";
 @classNames("admin-report-counters")
 @attributeBindings("model.description:title")
 export default class AdminReportEmotion extends Component {
-  get filterURL() {
-    return getURL(`/filter?q=`);
+  get todayLink() {
+    let date = moment().format("YYYY-MM-DD");
+    return this._filterURL(date);
   }
 
-  get today() {
-    return moment().format("YYYY-MM-DD");
+  get yesterdayLink() {
+    let date = moment().subtract(1, "day").format("YYYY-MM-DD");
+    return this._filterURL(date);
   }
 
-  get yesterday() {
-    return moment().subtract(1, "day").format("YYYY-MM-DD");
+  get lastSevenDaysLink() {
+    let date = moment().subtract(1, "week").format("YYYY-MM-DD");
+    return this._filterURL(date);
   }
 
-  get lastWeek() {
-    return moment().subtract(1, "week").format("YYYY-MM-DD");
+  get lastThirtyDaysLink() {
+    let date = moment().subtract(1, "month").format("YYYY-MM-DD");
+    return this._filterURL(date);
   }
 
-  get lastMonth() {
-    return moment().subtract(1, "month").format("YYYY-MM-DD");
+  _baseFilter() {
+    return "/filter?q=activity-after%3A";
+  }
+
+  _model() {
+    return "%20order%3A" + this.model.type;
+  }
+
+  _filterURL(date) {
+    return getURL(`${this._baseFilter()}${date}${this._model()}`);
   }
 }

assets/javascripts/discourse/controllers/admin-dashboard-sentiment.js

@@ -9,7 +9,7 @@ export default class AdminDashboardSentiment extends AdminDashboardTabController
 
   get emotionFilters() {
     return {
-      startDate: moment().subtract(2, "month").format("YYYY-MM-DD"),
+      startDate: moment().subtract(2, "year").format("YYYY-MM-DD"),
       endDate: moment().format("YYYY-MM-DD"),
     };
   }

spec/system/admin_dashboard_spec.rb

@@ -12,4 +12,14 @@
 
     expect(page).to have_css(".section.sentiment")
   end
+
+  xit "displays the emotion table with links" do
+    SiteSetting.ai_sentiment_enabled = true
+    sign_in(admin)
+
+    visit "/admin"
+    find(".navigation-item.sentiment").click()
+
+    expect(page).to have_css(".admin-report.emotion-love .cell.value.today-count a")
+  end
 end