FIX: Filtering and client-side

Author: keegangeorge

assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs

@@ -16,14 +16,20 @@ export default class AdminReportSentimentAnalysis extends Component {
     return ["#2ecc71", "#95a5a6", "#e74c3c"];
   }
 
+  calculateNeutralScore(data) {
+    return data.total_count - (data.positive_count + data.negative_count);
+  }
+
   get transformedData() {
+    console.log(this.args.model);
     return this.args.model.data.map((data) => {
+      console.log("called", data);
       return {
-        category_name: data.category_name,
+        title: data.category_name || data.tag_name,
         scores: [
-          data.overall_scores.positive,
-          data.overall_scores.neutral,
-          data.overall_scores.negative,
+          data.positive_count,
+          this.calculateNeutralScore(data),
+          data.negative_count,
         ],
         posts: data.posts,
       };
@@ -32,7 +38,6 @@ export default class AdminReportSentimentAnalysis extends Component {
 
   @action
   showDetails(data) {
-    console.log(data);
     this.selectedChart = data;
   }
 
@@ -69,9 +74,9 @@ export default class AdminReportSentimentAnalysis extends Component {
 
   doughnutTitle(data) {
     if (data.posts?.length > 0) {
-      return `${data.category_name} (${data.posts.length})`;
+      return `${data.title} (${data.posts.length})`;
     } else {
-      return data.category_name;
+      return data.title;
     }
   }
 
@@ -103,7 +108,7 @@ export default class AdminReportSentimentAnalysis extends Component {
     {{#if this.selectedChart}}
       <div class="admin-report-sentiment-analysis-details">
         <h3 class="admin-report-sentiment-analysis-details__title">
-          {{this.selectedChart.category_name}}
+          {{this.selectedChart.title}}
         </h3>
 
         <ul class="admin-report-sentiment-analysis-details__scores">

lib/sentiment/sentiment_analysis_report.rb

@@ -8,21 +8,22 @@ class SentimentAnalysisReport
       def self.register!(plugin)
         plugin.add_report("sentiment_analysis") do |report|
           report.modes = [:sentiment_analysis]
-          sentiment_data = DiscourseAi::Sentiment::SentimentAnalysisReport.fetch_data(report)
-
-          report.data = sentiment_data
-
-          # TODO: connect filter to make the report data change.
-          filter_type = report.filters.dig(:filter_type) || "Category"
+          category_filter = report.filters.dig(:filter_by)
           report.add_filter(
             "filter_by",
             type: "list",
-            default: filter_type,
+            default: category_filter,
             choices: [{ id: "category", name: "Category" }, { id: "tag", name: "Tag" }],
             allow_any: false,
             auto_insert_none_item: false,
           )
 
+          sentiment_data = DiscourseAi::Sentiment::SentimentAnalysisReport.fetch_data(report)
+
+          report.data = sentiment_data
+
+          # TODO: connect filter to make the report data change.
+
           report.labels = [
             I18n.t("discourse_ai.sentiment.reports.sentiment_analysis.positive"),
             I18n.t("discourse_ai.sentiment.reports.sentiment_analysis.neutral"),
@@ -95,6 +96,8 @@ def self.fetch_data(report)
             report_end: report.end_date,
             threshold: threshold,
           )
+
+        grouped_sentiments
       end
     end
   end