From d93ce0dac9ac99654d26f7f5dd44d677b87f47d0 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 3 Feb 2025 16:29:23 -0800
Subject: [PATCH 01/21] FEATURE: New sentiment analysis visualization report

WIP
---
 .../admin-report-sentiment-analysis.gjs           |  9 +++++++++
 assets/javascripts/initializers/admin-reports.js  |  5 +++++
 config/locales/server.en.yml                      |  3 +++
 lib/sentiment/entry_point.rb                      |  1 +
 lib/sentiment/sentiment_analysis_report.rb        | 15 +++++++++++++++
 5 files changed, 33 insertions(+)
 create mode 100644 assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
 create mode 100644 lib/sentiment/sentiment_analysis_report.rb

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
new file mode 100644
index 000000000..168f5c4e3
--- /dev/null
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -0,0 +1,9 @@
+import Component from "@glimmer/component";
+
+export default class AdminReportSentimentAnalysis extends Component {
+  <template>
+    <div>
+      {{! TODO }}
+    </div>
+  </template>
+}
diff --git a/assets/javascripts/initializers/admin-reports.js b/assets/javascripts/initializers/admin-reports.js
index d22711d8b..7a1789f52 100644
--- a/assets/javascripts/initializers/admin-reports.js
+++ b/assets/javascripts/initializers/admin-reports.js
@@ -1,5 +1,6 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
 import AdminReportEmotion from "discourse/plugins/discourse-ai/discourse/components/admin-report-emotion";
+import AdminReportSentimentAnalysis from "../discourse/components/admin-report-sentiment-analysis";
 
 export default {
   name: "discourse-ai-admin-reports",
@@ -12,6 +13,10 @@ export default {
 
     withPluginApi("2.0.1", (api) => {
       api.registerReportModeComponent("emotion", AdminReportEmotion);
+      api.registerReportModeComponent(
+        "sentiment-analysis",
+        AdminReportSentimentAnalysis
+      );
     });
   },
 };
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e490ef24c..68e5e7315 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -104,6 +104,9 @@ en:
       flagged_by_nsfw: The AI plugin flagged this after classifying at least one of the attached images as NSFW.
 
   reports:
+    sentiment_analysis:
+      title: "Sentiment analysis"
+      description: "todo"
     overall_sentiment:
       title: "Overall sentiment"
       description: 'The chart compares the number of posts classified as either positive or negative. These are calculated when positive or negative scores > the set threshold score. This means neutral posts are not shown. Personal messages (PMs) are also excluded. Classified with "cardiffnlp/twitter-roberta-base-sentiment-latest"'
diff --git a/lib/sentiment/entry_point.rb b/lib/sentiment/entry_point.rb
index 4735dbd49..2325f81ee 100644
--- a/lib/sentiment/entry_point.rb
+++ b/lib/sentiment/entry_point.rb
@@ -17,6 +17,7 @@ def inject_into(plugin)
         EmotionFilterOrder.register!(plugin)
         EmotionDashboardReport.register!(plugin)
         SentimentDashboardReport.register!(plugin)
+        SentimentAnalysisReport.register!(plugin)
       end
     end
   end
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
new file mode 100644
index 000000000..d3cf2cf3a
--- /dev/null
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module DiscourseAi
+  module Sentiment
+    class SentimentAnalysisReport
+      def self.register!(plugin)
+        plugin.add_report("sentiment_analysis") do |report|
+          # TODO: Implement the report
+          # report.modes = []
+          # reprot.data = {}
+        end
+      end
+    end
+  end
+end

From 49b62dba18b177c5387576aee32dd238195dcb4d Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 4 Feb 2025 16:03:56 -0800
Subject: [PATCH 02/21] DEV: Successfully test adding `dougnut` type chart

---
 .../admin-report-sentiment-analysis.gjs       | 21 ++++++++++++++++++-
 .../javascripts/initializers/admin-reports.js |  2 +-
 lib/sentiment/sentiment_analysis_report.rb    |  4 ++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index 168f5c4e3..83407b0df 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -1,9 +1,28 @@
 import Component from "@glimmer/component";
+import Chart from "admin/components/chart";
 
 export default class AdminReportSentimentAnalysis extends Component {
+  get chartConfig() {
+    return {
+      type: "doughnut",
+      data: {
+        labels: ["Positive", "Negative", "Neutral"],
+        datasets: [
+          {
+            data: [300, 50, 100],
+            backgroundColor: ["#28a745", "#dc3545", "#ffc107"],
+          },
+        ],
+      },
+    };
+  }
+
   <template>
     <div>
-      {{! TODO }}
+      <Chart
+        @chartConfig={{this.chartConfig}}
+        class="admin-report-chart admin-report-doughnut"
+      />
     </div>
   </template>
 }
diff --git a/assets/javascripts/initializers/admin-reports.js b/assets/javascripts/initializers/admin-reports.js
index 7a1789f52..519d33e5f 100644
--- a/assets/javascripts/initializers/admin-reports.js
+++ b/assets/javascripts/initializers/admin-reports.js
@@ -14,7 +14,7 @@ export default {
     withPluginApi("2.0.1", (api) => {
       api.registerReportModeComponent("emotion", AdminReportEmotion);
       api.registerReportModeComponent(
-        "sentiment-analysis",
+        "sentiment_analysis",
         AdminReportSentimentAnalysis
       );
     });
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index d3cf2cf3a..f495982c1 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -6,8 +6,8 @@ class SentimentAnalysisReport
       def self.register!(plugin)
         plugin.add_report("sentiment_analysis") do |report|
           # TODO: Implement the report
-          # report.modes = []
-          # reprot.data = {}
+          report.modes = [:sentiment_analysis]
+          report.data = [300, 50, 100]
         end
       end
     end

From 99ac3cf8272101abe64bd8405535da0265c2d741 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 4 Feb 2025 16:52:15 -0800
Subject: [PATCH 03/21] WIP...

---
 .../admin-report-sentiment-analysis.gjs       | 57 ++++++++++++++++---
 .../modules/sentiment/common/dashboard.scss   | 24 ++++++++
 2 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index 83407b0df..3176992a4 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -6,23 +6,66 @@ export default class AdminReportSentimentAnalysis extends Component {
     return {
       type: "doughnut",
       data: {
-        labels: ["Positive", "Negative", "Neutral"],
+        labels: ["Positive", "Neutral", "Negative"],
         datasets: [
           {
             data: [300, 50, 100],
-            backgroundColor: ["#28a745", "#dc3545", "#ffc107"],
+            backgroundColor: ["#2ecc71", "#95a5a6", "#e74c3c"],
           },
         ],
       },
+      options: {
+        responsive: true,
+        plugins: {
+          legend: {
+            position: "bottom",
+          },
+        },
+      },
+      plugins: [
+        {
+          id: "centerText",
+          afterDraw: function (chart) {
+            const cssVarColor =
+              getComputedStyle(document.documentElement).getPropertyValue(
+                "--primary"
+              ) || "#000";
+            const cssFontSize =
+              getComputedStyle(document.documentElement).getPropertyValue(
+                "--font-down-2"
+              ) || "1.3em";
+            const cssFontFamily =
+              getComputedStyle(document.documentElement).getPropertyValue(
+                "--font-family"
+              ) || "sans-serif";
+
+            const { ctx, chartArea } = chart;
+            const centerX = (chartArea.left + chartArea.right) / 2;
+            const centerY = (chartArea.top + chartArea.bottom) / 2;
+
+            ctx.restore();
+            ctx.textAlign = "center";
+            ctx.textBaseline = "middle";
+            ctx.fillStyle = cssVarColor.trim();
+            ctx.font = `${cssFontSize.trim()} ${cssFontFamily.trim()}`;
+
+            // TODO: populate with actual tag / category title
+            ctx.fillText("member-experience", centerX, centerY);
+            ctx.save();
+          },
+        },
+      ],
     };
   }
 
   <template>
-    <div>
-      <Chart
-        @chartConfig={{this.chartConfig}}
-        class="admin-report-chart admin-report-doughnut"
-      />
+    {{! TODO each-loop based on data, display doughnut component }}
+    <div class="admin-report-sentiment-analysis">
+      <Chart @chartConfig={{this.chartConfig}} class="admin-report-doughnut" />
+      <Chart @chartConfig={{this.chartConfig}} class="admin-report-doughnut" />
+      <Chart @chartConfig={{this.chartConfig}} class="admin-report-doughnut" />
+      <Chart @chartConfig={{this.chartConfig}} class="admin-report-doughnut" />
+      <Chart @chartConfig={{this.chartConfig}} class="admin-report-doughnut" />
     </div>
   </template>
 }
diff --git a/assets/stylesheets/modules/sentiment/common/dashboard.scss b/assets/stylesheets/modules/sentiment/common/dashboard.scss
index a80717ea2..4730dde95 100644
--- a/assets/stylesheets/modules/sentiment/common/dashboard.scss
+++ b/assets/stylesheets/modules/sentiment/common/dashboard.scss
@@ -9,3 +9,27 @@
     }
   }
 }
+
+.admin-report.sentiment-analyis {
+  .filters {
+    order: 1;
+    width: 100%;
+  }
+
+  .main {
+    order: 2;
+  }
+}
+
+.admin-report-sentiment-analysis {
+  margin-top: 1rem;
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+  gap: 2.5rem;
+  justify-items: center;
+
+  .admin-report-doughnut {
+    max-width: 300px; /* Adjust size */
+    max-height: 300px;
+  }
+}

From 606ae7b9e278f52a61c46c454b0a93f21ede49b7 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Wed, 5 Feb 2025 16:17:30 -0800
Subject: [PATCH 04/21] DEV: First version with real data

---
 .../admin-report-sentiment-analysis.gjs       | 186 ++++++++++++------
 .../discourse/components/doughnut-chart.gjs   |  65 ++++++
 .../modules/sentiment/common/dashboard.scss   | 110 ++++++++++-
 config/locales/client.en.yml                  |   5 +
 config/locales/server.en.yml                  |   2 +-
 lib/sentiment/entry_point.rb                  |   3 +
 lib/sentiment/sentiment_analysis_report.rb    | 108 +++++++++-
 7 files changed, 411 insertions(+), 68 deletions(-)
 create mode 100644 assets/javascripts/discourse/components/doughnut-chart.gjs

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index 3176992a4..d149235c6 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -1,71 +1,143 @@
 import Component from "@glimmer/component";
-import Chart from "admin/components/chart";
+import { tracked } from "@glimmer/tracking";
+import { fn, hash } from "@ember/helper";
+import { on } from "@ember/modifier";
+import { action, get } from "@ember/object";
+import closeOnClickOutside from "discourse/modifiers/close-on-click-outside";
+import dIcon from "discourse-common/helpers/d-icon";
+import { i18n } from "discourse-i18n";
+import DoughnutChart from "./doughnut-chart";
+import PostList from "discourse/components/post-list";
 
 export default class AdminReportSentimentAnalysis extends Component {
-  get chartConfig() {
-    return {
-      type: "doughnut",
-      data: {
-        labels: ["Positive", "Neutral", "Negative"],
-        datasets: [
-          {
-            data: [300, 50, 100],
-            backgroundColor: ["#2ecc71", "#95a5a6", "#e74c3c"],
-          },
+  @tracked selectedChart = null;
+
+  get labels() {
+    return ["Positive", "Neutral", "Negative"];
+  }
+
+  get colors() {
+    return ["#2ecc71", "#95a5a6", "#e74c3c"];
+  }
+
+  get transformedData() {
+    return this.args.model.data.map((data) => {
+      return {
+        category_name: data.category_name,
+        scores: [
+          data.overall_scores.positive,
+          data.overall_scores.neutral,
+          data.overall_scores.negative,
         ],
-      },
-      options: {
-        responsive: true,
-        plugins: {
-          legend: {
-            position: "bottom",
-          },
-        },
-      },
-      plugins: [
-        {
-          id: "centerText",
-          afterDraw: function (chart) {
-            const cssVarColor =
-              getComputedStyle(document.documentElement).getPropertyValue(
-                "--primary"
-              ) || "#000";
-            const cssFontSize =
-              getComputedStyle(document.documentElement).getPropertyValue(
-                "--font-down-2"
-              ) || "1.3em";
-            const cssFontFamily =
-              getComputedStyle(document.documentElement).getPropertyValue(
-                "--font-family"
-              ) || "sans-serif";
+        // TODO slicing 3 posts for now
+        posts: data.posts,
+      };
+    });
+  }
 
-            const { ctx, chartArea } = chart;
-            const centerX = (chartArea.left + chartArea.right) / 2;
-            const centerY = (chartArea.top + chartArea.bottom) / 2;
+  @action
+  showDetails(data) {
+    console.log(data);
+    this.selectedChart = data;
+  }
 
-            ctx.restore();
-            ctx.textAlign = "center";
-            ctx.textBaseline = "middle";
-            ctx.fillStyle = cssVarColor.trim();
-            ctx.font = `${cssFontSize.trim()} ${cssFontFamily.trim()}`;
+  sentimentTopScore(post) {
+    const { positive_score, neutral_score, negative_score } = post;
+    const maxScore = Math.max(positive_score, neutral_score, negative_score);
 
-            // TODO: populate with actual tag / category title
-            ctx.fillText("member-experience", centerX, centerY);
-            ctx.save();
-          },
-        },
-      ],
-    };
+    if (maxScore === positive_score) {
+      return {
+        id: "positive",
+        text: i18n(
+          "discourse_ai.sentiments.sentiment_analysis.score_types.positive"
+        ),
+        icon: "face-smile",
+      };
+    } else if (maxScore === neutral_score) {
+      return {
+        id: "neutral",
+        text: i18n(
+          "discourse_ai.sentiments.sentiment_analysis.score_types.neutral"
+        ),
+        icon: "face-meh",
+      };
+    } else {
+      return {
+        id: "negative",
+        text: i18n(
+          "discourse_ai.sentiments.sentiment_analysis.score_types.negative"
+        ),
+        icon: "face-angry",
+      };
+    }
   }
 
   <template>
-    {{! TODO each-loop based on data, display doughnut component }}
+    {{! TODO add more details about posts on click + tag data }}
     <div class="admin-report-sentiment-analysis">
-      <Chart @chartConfig={{this.chartConfig}} class="admin-report-doughnut" />
-      <Chart @chartConfig={{this.chartConfig}} class="admin-report-doughnut" />
-      <Chart @chartConfig={{this.chartConfig}} class="admin-report-doughnut" />
-      <Chart @chartConfig={{this.chartConfig}} class="admin-report-doughnut" />
-      <Chart @chartConfig={{this.chartConfig}} class="admin-report-doughnut" />
+      {{#each this.transformedData as |data|}}
+        <div
+          class="admin-report-sentiment-analysis__chart-wrapper"
+          {{on "click" (fn this.showDetails data)}}
+          {{closeOnClickOutside
+            (fn (mut this.selectedChart) null)
+            (hash
+              targetSelector=".admin-report-sentiment-analysis-details"
+              secondaryTargetSelector=".admin-report-sentiment-analysis"
+            )
+          }}
+        >
+          <DoughnutChart
+            @labels={{this.labels}}
+            @colors={{this.colors}}
+            @data={{data.scores}}
+            @doughnutTitle={{data.category_name}}
+          />
+        </div>
+      {{/each}}
     </div>
+
+    {{#if this.selectedChart}}
+      <div class="admin-report-sentiment-analysis-details">
+        <h3 class="admin-report-sentiment-analysis-details__title">
+          {{this.selectedChart.category_name}}
+        </h3>
+
+        <ul class="admin-report-sentiment-analysis-details__scores">
+          <li>
+            {{dIcon "face-smile" style="color: #2ecc71"}}
+            {{i18n
+              "discourse_ai.sentiments.sentiment_analysis.score_types.positive"
+            }}:
+            {{get this.selectedChart.scores 0}}</li>
+          <li>
+            {{dIcon "face-meh"}}
+            {{i18n
+              "discourse_ai.sentiments.sentiment_analysis.score_types.neutral"
+            }}:
+            {{get this.selectedChart.scores 1}}</li>
+          <li>
+            {{dIcon "face-angry"}}
+            {{i18n
+              "discourse_ai.sentiments.sentiment_analysis.score_types.negative"
+            }}:
+            {{get this.selectedChart.scores 2}}</li>
+        </ul>
+
+        <PostList @posts={{this.selectedChart.posts}} @urlPath="postUrl">
+          <:abovePostItemExcerpt as |post|>
+            {{#let (this.sentimentTopScore post) as |score|}}
+              <span
+                class="admin-report-sentiment-analysis-details__post-score"
+                data-sentiment-score={{score.id}}
+              >
+                {{dIcon score.icon}}
+                {{score.text}}
+              </span>
+            {{/let}}
+          </:abovePostItemExcerpt>
+        </PostList>
+      </div>
+    {{/if}}
   </template>
 }
diff --git a/assets/javascripts/discourse/components/doughnut-chart.gjs b/assets/javascripts/discourse/components/doughnut-chart.gjs
new file mode 100644
index 000000000..b1e2c85b7
--- /dev/null
+++ b/assets/javascripts/discourse/components/doughnut-chart.gjs
@@ -0,0 +1,65 @@
+import Component from "@glimmer/component";
+import Chart from "admin/components/chart";
+
+export default class DoughnutChart extends Component {
+  get config() {
+    const doughnutTitle = this.args.doughnutTitle || "";
+
+    return {
+      type: "doughnut",
+      data: {
+        labels: this.args.labels,
+        datasets: [
+          {
+            data: this.args.data,
+            backgroundColor: this.args.colors,
+          },
+        ],
+      },
+      options: {
+        responsive: true,
+        plugins: {
+          legend: {
+            position: this.args.legendPosition || "bottom",
+          },
+        },
+      },
+      plugins: [
+        {
+          id: "centerText",
+          afterDraw: function (chart) {
+            const cssVarColor =
+              getComputedStyle(document.documentElement).getPropertyValue(
+                "--primary"
+              ) || "#000";
+            const cssFontSize =
+              getComputedStyle(document.documentElement).getPropertyValue(
+                "--font-down-2"
+              ) || "1.3em";
+            const cssFontFamily =
+              getComputedStyle(document.documentElement).getPropertyValue(
+                "--font-family"
+              ) || "sans-serif";
+
+            const { ctx, chartArea } = chart;
+            const centerX = (chartArea.left + chartArea.right) / 2;
+            const centerY = (chartArea.top + chartArea.bottom) / 2;
+
+            ctx.restore();
+            ctx.textAlign = "center";
+            ctx.textBaseline = "middle";
+            ctx.fillStyle = cssVarColor.trim();
+            ctx.font = `${cssFontSize.trim()} ${cssFontFamily.trim()}`;
+
+            ctx.fillText(doughnutTitle, centerX, centerY);
+            ctx.save();
+          },
+        },
+      ],
+    };
+  }
+
+  <template>
+    <Chart @chartConfig={{this.config}} class="admin-report-doughnut" />
+  </template>
+}
diff --git a/assets/stylesheets/modules/sentiment/common/dashboard.scss b/assets/stylesheets/modules/sentiment/common/dashboard.scss
index 4730dde95..9edb24317 100644
--- a/assets/stylesheets/modules/sentiment/common/dashboard.scss
+++ b/assets/stylesheets/modules/sentiment/common/dashboard.scss
@@ -10,26 +10,120 @@
   }
 }
 
-.admin-report.sentiment-analyis {
+@mixin report-container-box() {
+  border: 1px solid var(--primary-low);
+  border-radius: var(--d-border-radius);
+  padding: 1rem;
+}
+
+.admin-report.sentiment-analysis .body {
+  display: flex;
+  flex-flow: row wrap;
+  gap: 1rem;
+
   .filters {
     order: 1;
-    width: 100%;
+    width: 300px;
+    @include report-container-box();
+    margin-left: 0;
+    // width: 300px;
   }
 
   .main {
+    flex: 100%;
+
+    display: flex;
     order: 2;
+    gap: 1rem;
   }
 }
 
 .admin-report-sentiment-analysis {
-  margin-top: 1rem;
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-  gap: 2.5rem;
-  justify-items: center;
+  @include report-container-box();
+  flex: 2;
+  display: flex;
+  flex-flow: row wrap;
+  gap: 3rem;
 
   .admin-report-doughnut {
-    max-width: 300px; /* Adjust size */
+    max-width: 300px;
     max-height: 300px;
+    padding: 0.25rem;
+  }
+
+  &__chart-wrapper {
+    transition: transform 0.25s ease, box-shadow 0.25s ease;
+    border-radius: var(--d-border-radius);
+
+    &:hover {
+      @include transform(translateY(-1rem));
+      box-shadow: var(--shadow-card);
+      cursor: pointer;
+    }
+  }
+}
+
+:root {
+  --d-sentiment-report-positive-rgb: 46, 204, 112;
+  --d-sentiment-report-neutral-rgb: 149, 166, 167;
+  --d-sentiment-report-negative-rgb: 231, 77, 60;
+}
+
+.admin-report-sentiment-analysis-details {
+  @include report-container-box();
+  flex: 1;
+  display: flex;
+  flex-flow: column nowrap;
+
+  &__title {
+    font-size: var(--font-up-2);
+  }
+
+  &__scores {
+    display: flex;
+    flex-flow: column wrap;
+    align-items: flex-start;
+    justify-content: flex-start;
+    gap: 0.25rem;
+    list-style: none;
+    margin-left: 0;
+    background: var(--primary-very-low);
+    padding: 1rem;
+    border-radius: var(--d-border-radius);
+
+    .d-icon-face-smile {
+      color: rgb(var(--d-sentiment-report-positive-rgb));
+    }
+
+    .d-icon-face-meh {
+      color: rgb(var(--d-sentiment-report-neutral-rgb));
+    }
+
+    .d-icon-face-angry {
+      color: rgb(var(--d-sentiment-report-negative-rgb));
+    }
+  }
+
+  &__post-score {
+    border-radius: var(--d-border-radius);
+    background: var(--primary-very-low);
+    margin-top: 0.5rem;
+    padding: 0.25rem;
+    font-size: var(--font-down-1);
+    display: inline-block;
+    &[data-sentiment-score="positive"] {
+      color: rgb(var(--d-sentiment-report-positive-rgb));
+      background: rgba(var(--d-sentiment-report-positive-rgb), 0.1);
+    }
+
+    &[data-sentiment-score="neutral"] {
+      color: rgb(var(--d-sentiment-report-neutral-rgb));
+      background: rgba(var(--d-sentiment-report-neutral-rgb), 0.1);
+    }
+
+    &[data-sentiment-score="negative"] {
+      color: rgb(var(--d-sentiment-report-negative-rgb));
+      background: rgba(var(--d-sentiment-report-negative-rgb), 0.1);
+    }
   }
 }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 300d30c1b..05be971e8 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -633,6 +633,11 @@ en:
       sentiments:
         dashboard:
           title: "Sentiment"
+        sentiment_analysis:
+          score_types:
+            positive: "Positive"
+            neutral: "Neutral"
+            negative: "Negative"
 
       summarization:
         chat:
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 68e5e7315..e18a05893 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -106,7 +106,7 @@ en:
   reports:
     sentiment_analysis:
       title: "Sentiment analysis"
-      description: "todo"
+      description: "This report provides sentiment analysis for posts, grouped by category, with positive, negative, and neutral scores for each post and category."
     overall_sentiment:
       title: "Overall sentiment"
       description: 'The chart compares the number of posts classified as either positive or negative. These are calculated when positive or negative scores > the set threshold score. This means neutral posts are not shown. Personal messages (PMs) are also excluded. Classified with "cardiffnlp/twitter-roberta-base-sentiment-latest"'
diff --git a/lib/sentiment/entry_point.rb b/lib/sentiment/entry_point.rb
index 2325f81ee..c886675d7 100644
--- a/lib/sentiment/entry_point.rb
+++ b/lib/sentiment/entry_point.rb
@@ -14,6 +14,9 @@ def inject_into(plugin)
         plugin.on(:post_created, &sentiment_analysis_cb)
         plugin.on(:post_edited, &sentiment_analysis_cb)
 
+        additional_icons = %w[face-smile face-meh face-angry]
+        additional_icons.each { |icon| plugin.register_svg_icon(icon) }
+
         EmotionFilterOrder.register!(plugin)
         EmotionDashboardReport.register!(plugin)
         SentimentDashboardReport.register!(plugin)
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index f495982c1..16b621bb1 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -1,13 +1,117 @@
 # frozen_string_literal: true
+# TODO: Currently returns all posts, need to add pagination!
 
 module DiscourseAi
   module Sentiment
     class SentimentAnalysisReport
       def self.register!(plugin)
         plugin.add_report("sentiment_analysis") do |report|
-          # TODO: Implement the report
           report.modes = [:sentiment_analysis]
-          report.data = [300, 50, 100]
+
+          sentiment_data =
+            DB
+              .query(<<~SQL, report_start: report.start_date, report_end: report.end_date)
+WITH topic_tags_cte AS (
+  SELECT 
+      tt.topic_id,
+      string_agg(DISTINCT tags.name, ',') AS tag_names
+  FROM topic_tags tt
+  JOIN tags ON tags.id = tt.tag_id
+  GROUP BY tt.topic_id
+)
+SELECT
+    t.id AS topic_id,
+    t.title,
+    p.id AS post_id,
+    p.post_number,
+    u.username,
+    LEFT(p.cooked, 300) AS post_excerpt,
+    c.id AS category_id,
+    c.name AS category_name,
+    COALESCE(tt.tag_names, '') AS tag_names,
+    (cr.classification::jsonb->'positive')::float AS positive_score,
+    (cr.classification::jsonb->'negative')::float AS negative_score
+FROM classification_results cr
+JOIN posts p 
+    ON p.id = cr.target_id 
+    AND cr.target_type = 'Post'
+JOIN topics t 
+    ON t.id = p.topic_id
+JOIN categories c 
+    ON c.id = t.category_id
+JOIN users u
+    ON u.id = p.user_id
+LEFT JOIN topic_tags_cte tt
+    ON tt.topic_id = t.id
+WHERE 
+    (p.created_at > :report_start AND p.created_at < :report_end)
+    AND cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest'
+    AND p.deleted_at IS NULL
+    AND p.hidden = FALSE
+    AND t.deleted_at IS NULL
+    AND t.visible = TRUE
+    AND t.archetype != 'private_message'
+    AND c.read_restricted = FALSE
+ORDER BY c.name, (cr.classification::jsonb->'negative')::float DESC
+SQL
+              .map do |row|
+                # Add neutral score and structure data
+                positive_score = row.positive_score || 0.0
+                negative_score = row.negative_score || 0.0
+                neutral_score = 1.0 - (positive_score + negative_score)
+
+                {
+                  category_name: row.category_name,
+                  topic_id: row.topic_id,
+                  title: row.title,
+                  post_id: row.post_id,
+                  post_number: row.post_number,
+                  username: row.username,
+                  post_excerpt: row.post_excerpt,
+                  category_id: row.category_id,
+                  tag_names: row.tag_names,
+                  positive_score: positive_score,
+                  negative_score: negative_score,
+                  neutral_score: neutral_score,
+                }
+              end
+
+          # Group posts by category
+          # ! TODO: by tags?
+          grouped_data = sentiment_data.group_by { |row| row[:category_name] }
+          report.data =
+            grouped_data.map do |category_name, posts|
+              total_positive = posts.sum { |p| p[:positive_score] }
+              total_negative = posts.sum { |p| p[:negative_score] }
+              total_neutral = posts.sum { |p| p[:neutral_score] }
+              count = posts.size.to_f
+
+              {
+                category_name: category_name,
+                overall_scores: {
+                  positive: (total_positive / count).round(2),
+                  negative: (total_negative / count).round(2),
+                  neutral: (total_neutral / count).round(2),
+                },
+                posts:
+                  posts.map do |p|
+                    {
+                      topic_id: p[:topic_id],
+                      title: p[:title],
+                      post_id: p[:post_id],
+                      post_number: p[:post_number],
+                      username: p[:username],
+                      excerpt: p[:post_excerpt],
+                      category_id: p[:category_id],
+                      tag_names: p[:tag_names],
+                      positive_score: p[:positive_score].round(2),
+                      negative_score: p[:negative_score].round(2),
+                      neutral_score: p[:neutral_score].round(2),
+                      postUrl: "/t/#{p[:topic_id]}/#{p[:post_number]}",
+                    }
+                  end,
+              }
+            end
         end
       end
     end

From da7e8a5fb3e32a9a4fc4f615e3fd04425fa163f2 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Wed, 5 Feb 2025 19:26:12 -0800
Subject: [PATCH 05/21] updates

---
 .../admin-report-sentiment-analysis.gjs       |   3 +-
 .../modules/sentiment/common/dashboard.scss   |   5 +-
 lib/sentiment/sentiment_analysis_report.rb    | 143 +++++++++---------
 3 files changed, 79 insertions(+), 72 deletions(-)

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index d149235c6..a658f122c 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";
 import { fn, hash } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action, get } from "@ember/object";
+import PostList from "discourse/components/post-list";
 import closeOnClickOutside from "discourse/modifiers/close-on-click-outside";
 import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import DoughnutChart from "./doughnut-chart";
-import PostList from "discourse/components/post-list";
 
 export default class AdminReportSentimentAnalysis extends Component {
   @tracked selectedChart = null;
@@ -29,7 +29,6 @@ export default class AdminReportSentimentAnalysis extends Component {
           data.overall_scores.neutral,
           data.overall_scores.negative,
         ],
-        // TODO slicing 3 posts for now
         posts: data.posts,
       };
     });
diff --git a/assets/stylesheets/modules/sentiment/common/dashboard.scss b/assets/stylesheets/modules/sentiment/common/dashboard.scss
index 9edb24317..07303dec1 100644
--- a/assets/stylesheets/modules/sentiment/common/dashboard.scss
+++ b/assets/stylesheets/modules/sentiment/common/dashboard.scss
@@ -31,10 +31,11 @@
 
   .main {
     flex: 100%;
-
     display: flex;
     order: 2;
     gap: 1rem;
+    align-items: flex-start;
+    max-height: 100vh;
   }
 }
 
@@ -74,6 +75,8 @@
   flex: 1;
   display: flex;
   flex-flow: column nowrap;
+  overflow-y: auto;
+  height: 100%;
 
   &__title {
     font-size: var(--font-up-2);
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index 16b621bb1..6d25af529 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-# TODO: Currently returns all posts, need to add pagination!
+
+# TODO: Currently returns all posts, need to add pagination?
 
 module DiscourseAi
   module Sentiment
@@ -7,74 +8,7 @@ class SentimentAnalysisReport
       def self.register!(plugin)
         plugin.add_report("sentiment_analysis") do |report|
           report.modes = [:sentiment_analysis]
-
-          sentiment_data =
-            DB
-              .query(<<~SQL, report_start: report.start_date, report_end: report.end_date)
-WITH topic_tags_cte AS (
-  SELECT 
-      tt.topic_id,
-      string_agg(DISTINCT tags.name, ',') AS tag_names
-  FROM topic_tags tt
-  JOIN tags ON tags.id = tt.tag_id
-  GROUP BY tt.topic_id
-)
-SELECT
-    t.id AS topic_id,
-    t.title,
-    p.id AS post_id,
-    p.post_number,
-    u.username,
-    LEFT(p.cooked, 300) AS post_excerpt,
-    c.id AS category_id,
-    c.name AS category_name,
-    COALESCE(tt.tag_names, '') AS tag_names,
-    (cr.classification::jsonb->'positive')::float AS positive_score,
-    (cr.classification::jsonb->'negative')::float AS negative_score
-FROM classification_results cr
-JOIN posts p 
-    ON p.id = cr.target_id 
-    AND cr.target_type = 'Post'
-JOIN topics t 
-    ON t.id = p.topic_id
-JOIN categories c 
-    ON c.id = t.category_id
-JOIN users u
-    ON u.id = p.user_id
-LEFT JOIN topic_tags_cte tt
-    ON tt.topic_id = t.id
-WHERE 
-    (p.created_at > :report_start AND p.created_at < :report_end)
-    AND cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest'
-    AND p.deleted_at IS NULL
-    AND p.hidden = FALSE
-    AND t.deleted_at IS NULL
-    AND t.visible = TRUE
-    AND t.archetype != 'private_message'
-    AND c.read_restricted = FALSE
-ORDER BY c.name, (cr.classification::jsonb->'negative')::float DESC
-SQL
-              .map do |row|
-                # Add neutral score and structure data
-                positive_score = row.positive_score || 0.0
-                negative_score = row.negative_score || 0.0
-                neutral_score = 1.0 - (positive_score + negative_score)
-
-                {
-                  category_name: row.category_name,
-                  topic_id: row.topic_id,
-                  title: row.title,
-                  post_id: row.post_id,
-                  post_number: row.post_number,
-                  username: row.username,
-                  post_excerpt: row.post_excerpt,
-                  category_id: row.category_id,
-                  tag_names: row.tag_names,
-                  positive_score: positive_score,
-                  negative_score: negative_score,
-                  neutral_score: neutral_score,
-                }
-              end
+          sentiment_data = DiscourseAi::Sentiment::SentimentAnalysisReport.fetch_data(report)
 
           # Group posts by category
           # ! TODO: by tags?
@@ -114,6 +48,77 @@ def self.register!(plugin)
             end
         end
       end
+
+      def self.fetch_data(report)
+        DB
+          .query(<<~SQL, report_start: report.start_date, report_end: report.end_date)
+          WITH topic_tags_cte AS (
+              SELECT 
+                  tt.topic_id,
+                  string_agg(DISTINCT tags.name, ',') AS tag_names
+              FROM topic_tags tt
+              JOIN tags ON tags.id = tt.tag_id
+              GROUP BY tt.topic_id
+          )
+          SELECT
+              t.id AS topic_id,
+              t.title,
+              p.id AS post_id,
+              p.post_number,
+              u.username,
+              LEFT(p.cooked, 300) AS post_excerpt,
+              c.id AS category_id,
+              c.name AS category_name,
+              COALESCE(tt.tag_names, '') AS tag_names,
+              (cr.classification::jsonb->'positive')::float AS positive_score,
+              (cr.classification::jsonb->'negative')::float AS negative_score
+          FROM classification_results cr
+          JOIN posts p 
+              ON p.id = cr.target_id 
+              AND cr.target_type = 'Post'
+          JOIN topics t 
+              ON t.id = p.topic_id
+          JOIN categories c 
+              ON c.id = t.category_id
+          JOIN users u
+              ON u.id = p.user_id
+          LEFT JOIN topic_tags_cte tt
+              ON tt.topic_id = t.id
+          WHERE 
+              p.created_at BETWEEN :report_start AND :report_end
+              AND cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest'
+              AND p.deleted_at IS NULL
+              AND p.hidden = FALSE
+              AND t.deleted_at IS NULL
+              AND t.visible = TRUE
+              AND t.archetype != 'private_message'
+              AND c.read_restricted = FALSE
+          ORDER BY 
+              c.name, 
+              (cr.classification::jsonb->'negative')::float DESC
+        SQL
+          .map do |row|
+            # Add neutral score and structure data
+            positive_score = row.positive_score || 0.0
+            negative_score = row.negative_score || 0.0
+            neutral_score = 1.0 - (positive_score + negative_score)
+
+            {
+              category_name: row.category_name,
+              topic_id: row.topic_id,
+              title: row.title,
+              post_id: row.post_id,
+              post_number: row.post_number,
+              username: row.username,
+              post_excerpt: row.post_excerpt,
+              category_id: row.category_id,
+              tag_names: row.tag_names,
+              positive_score: positive_score,
+              negative_score: negative_score,
+              neutral_score: neutral_score,
+            }
+          end
+      end
     end
   end
 end

From eba49a8fbf671078ba96b11734040363c38dd3f5 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Wed, 5 Feb 2025 20:08:04 -0800
Subject: [PATCH 06/21] getting started on filters

---
 .../admin-report-sentiment-analysis.gjs         | 16 ++++++++++------
 config/locales/client.en.yml                    |  5 +++++
 config/locales/server.en.yml                    |  4 ++++
 lib/sentiment/sentiment_analysis_report.rb      | 17 +++++++++++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index a658f122c..df0187403 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -12,10 +12,6 @@ import DoughnutChart from "./doughnut-chart";
 export default class AdminReportSentimentAnalysis extends Component {
   @tracked selectedChart = null;
 
-  get labels() {
-    return ["Positive", "Neutral", "Negative"];
-  }
-
   get colors() {
     return ["#2ecc71", "#95a5a6", "#e74c3c"];
   }
@@ -71,6 +67,14 @@ export default class AdminReportSentimentAnalysis extends Component {
     }
   }
 
+  doughnutTitle(data) {
+    if (data.posts?.length > 0) {
+      return `${data.category_name} (${data.posts.length})`;
+    } else {
+      return data.category_name;
+    }
+  }
+
   <template>
     {{! TODO add more details about posts on click + tag data }}
     <div class="admin-report-sentiment-analysis">
@@ -87,10 +91,10 @@ export default class AdminReportSentimentAnalysis extends Component {
           }}
         >
           <DoughnutChart
-            @labels={{this.labels}}
+            @labels={{@model.labels}}
             @colors={{this.colors}}
             @data={{data.scores}}
-            @doughnutTitle={{data.category_name}}
+            @doughnutTitle={{this.doughnutTitle data}}
           />
         </div>
       {{/each}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 05be971e8..ca81852ba 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -15,6 +15,11 @@ en:
         emotion:
           title: "Emotion"
           description: "The table lists a count of posts classified with a determined emotion. Classified with the model 'SamLowe/roberta-base-go_emotions'."
+        reports:
+          filters:
+            filter_by:
+              label: "Filter by"
+
   js:
     discourse_automation:
       scriptables:
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e18a05893..9485fb4e5 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -413,6 +413,10 @@ en:
           anger: "Anger 😡"
           joy: "Joy 😀"
           disgust: "Disgust 🤢"
+        sentiment_analysis:
+          positive: "Positive"
+          negative: "Negative"
+          neutral: "Neutral"
 
     llm:
       configuration:
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index 6d25af529..cb79a5224 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -46,6 +46,23 @@ def self.register!(plugin)
                   end,
               }
             end
+
+          # TODO: connect filter to make the report data change.
+          filter_type = report.filters.dig(:filter_type) || "Category"
+          report.add_filter(
+            "filter_by",
+            type: "list",
+            default: filter_type,
+            choices: [{ id: "category", name: "Category" }, { id: "tag", name: "Tag" }],
+            allow_any: false,
+            auto_insert_none_item: false,
+          )
+
+          report.labels = [
+            I18n.t("discourse_ai.sentiment.reports.sentiment_analysis.positive"),
+            I18n.t("discourse_ai.sentiment.reports.sentiment_analysis.neutral"),
+            I18n.t("discourse_ai.sentiment.reports.sentiment_analysis.negative"),
+          ]
         end
       end
 

From feaa02f4abb298899deebcdae56ea9f2bd18c29e Mon Sep 17 00:00:00 2001
From: Rafael Silva <xfalcox@gmail.com>
Date: Fri, 7 Feb 2025 18:47:39 -0300
Subject: [PATCH 07/21] Refactor sentiment analysis query

---
 lib/sentiment/sentiment_analysis_report.rb | 160 ++++++++-------------
 1 file changed, 60 insertions(+), 100 deletions(-)

diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index cb79a5224..54571c35b 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -10,42 +10,7 @@ def self.register!(plugin)
           report.modes = [:sentiment_analysis]
           sentiment_data = DiscourseAi::Sentiment::SentimentAnalysisReport.fetch_data(report)
 
-          # Group posts by category
-          # ! TODO: by tags?
-          grouped_data = sentiment_data.group_by { |row| row[:category_name] }
-          report.data =
-            grouped_data.map do |category_name, posts|
-              total_positive = posts.sum { |p| p[:positive_score] }
-              total_negative = posts.sum { |p| p[:negative_score] }
-              total_neutral = posts.sum { |p| p[:neutral_score] }
-              count = posts.size.to_f
-
-              {
-                category_name: category_name,
-                overall_scores: {
-                  positive: (total_positive / count).round(2),
-                  negative: (total_negative / count).round(2),
-                  neutral: (total_neutral / count).round(2),
-                },
-                posts:
-                  posts.map do |p|
-                    {
-                      topic_id: p[:topic_id],
-                      title: p[:title],
-                      post_id: p[:post_id],
-                      post_number: p[:post_number],
-                      username: p[:username],
-                      excerpt: p[:post_excerpt],
-                      category_id: p[:category_id],
-                      tag_names: p[:tag_names],
-                      positive_score: p[:positive_score].round(2),
-                      negative_score: p[:negative_score].round(2),
-                      neutral_score: p[:neutral_score].round(2),
-                      postUrl: "/t/#{p[:topic_id]}/#{p[:post_number]}",
-                    }
-                  end,
-              }
-            end
+          report.data = sentiment_data
 
           # TODO: connect filter to make the report data change.
           filter_type = report.filters.dig(:filter_type) || "Category"
@@ -67,74 +32,69 @@ def self.register!(plugin)
       end
 
       def self.fetch_data(report)
-        DB
-          .query(<<~SQL, report_start: report.start_date, report_end: report.end_date)
-          WITH topic_tags_cte AS (
-              SELECT 
-                  tt.topic_id,
-                  string_agg(DISTINCT tags.name, ',') AS tag_names
-              FROM topic_tags tt
-              JOIN tags ON tags.id = tt.tag_id
-              GROUP BY tt.topic_id
+        grouping = report.filters.dig(:filter_by).to_sym
+        threshold = 0.6
+
+        sentiment_count_sql = Proc.new { |sentiment| <<~SQL }
+          COUNT(
+            CASE WHEN (cr.classification::jsonb->'#{sentiment}')::float > :threshold THEN 1 ELSE NULL END
           )
-          SELECT
-              t.id AS topic_id,
-              t.title,
-              p.id AS post_id,
-              p.post_number,
-              u.username,
-              LEFT(p.cooked, 300) AS post_excerpt,
-              c.id AS category_id,
-              c.name AS category_name,
-              COALESCE(tt.tag_names, '') AS tag_names,
-              (cr.classification::jsonb->'positive')::float AS positive_score,
-              (cr.classification::jsonb->'negative')::float AS negative_score
-          FROM classification_results cr
-          JOIN posts p 
-              ON p.id = cr.target_id 
-              AND cr.target_type = 'Post'
-          JOIN topics t 
-              ON t.id = p.topic_id
-          JOIN categories c 
-              ON c.id = t.category_id
-          JOIN users u
-              ON u.id = p.user_id
-          LEFT JOIN topic_tags_cte tt
-              ON tt.topic_id = t.id
-          WHERE 
-              p.created_at BETWEEN :report_start AND :report_end
-              AND cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest'
-              AND p.deleted_at IS NULL
-              AND p.hidden = FALSE
-              AND t.deleted_at IS NULL
-              AND t.visible = TRUE
-              AND t.archetype != 'private_message'
-              AND c.read_restricted = FALSE
-          ORDER BY 
-              c.name, 
-              (cr.classification::jsonb->'negative')::float DESC
         SQL
-          .map do |row|
-            # Add neutral score and structure data
-            positive_score = row.positive_score || 0.0
-            negative_score = row.negative_score || 0.0
-            neutral_score = 1.0 - (positive_score + negative_score)
 
-            {
-              category_name: row.category_name,
-              topic_id: row.topic_id,
-              title: row.title,
-              post_id: row.post_id,
-              post_number: row.post_number,
-              username: row.username,
-              post_excerpt: row.post_excerpt,
-              category_id: row.category_id,
-              tag_names: row.tag_names,
-              positive_score: positive_score,
-              negative_score: negative_score,
-              neutral_score: neutral_score,
-            }
+        grouping_clause =
+          case grouping
+          when :category
+            <<~SQL
+                c.name AS category_name,
+              SQL
+          when :tag
+            <<~SQL
+                  tags.name AS tag_name,
+              SQL
+          else
+            raise Discourse::InvalidParameters
+          end
+
+        grouping_join =
+          case grouping
+          when :category
+            <<~SQL
+              INNER JOIN categories c ON c.id = t.category_id
+            SQL
+          when :tag
+            <<~SQL
+              INNER JOIN topic_tags tt ON tt.topic_id = p.topic_id
+              INNER JOIN tags ON tags.id = tt.tag_id
+            SQL
+          else
+            raise Discourse::InvalidParameters
           end
+
+        grouped_sentiments =
+          DB.query(
+            <<~SQL,
+              SELECT
+                #{grouping_clause}
+                #{sentiment_count_sql.call("positive")} AS positive_count,
+                #{sentiment_count_sql.call("negative")} AS negative_count,
+                COUNT(*) AS total_count
+              FROM
+                classification_results AS cr
+              INNER JOIN posts p ON p.id = cr.target_id AND cr.target_type = 'Post'
+              INNER JOIN topics t ON t.id = p.topic_id
+              #{grouping_join}
+              WHERE
+                t.archetype = 'regular' AND
+                p.user_id > 0 AND
+                cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest' AND
+                (p.created_at > :report_start AND p.created_at < :report_end)
+              GROUP BY 1
+              ORDER BY 1 ASC
+            SQL
+            report_start: report.start_date,
+            report_end: report.end_date,
+            threshold: threshold,
+          )
       end
     end
   end

From 4325813fb20d686a34fabf70e09dbb2d99c920fc Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 10 Feb 2025 14:25:22 -0800
Subject: [PATCH 08/21] FIX: Filtering and client-side

---
 .../admin-report-sentiment-analysis.gjs       | 21 ++++++++++++-------
 lib/sentiment/sentiment_analysis_report.rb    | 17 ++++++++-------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index df0187403..de6d3e65d 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/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">
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index 54571c35b..321725d19 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/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

From 5ef594acbb4acb28aa661c0d6b6cdf46593f4e45 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 10 Feb 2025 14:51:11 -0800
Subject: [PATCH 09/21] DEV: Add group_by

---
 config/locales/client.en.yml               |  6 ++++--
 lib/sentiment/sentiment_analysis_report.rb | 13 ++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ca81852ba..74f053377 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -17,8 +17,10 @@ en:
           description: "The table lists a count of posts classified with a determined emotion. Classified with the model 'SamLowe/roberta-base-go_emotions'."
         reports:
           filters:
-            filter_by:
-              label: "Filter by"
+            group_by:
+              label: "Group by"
+            sort_by:
+              label: "Sort by"
 
   js:
     discourse_automation:
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index 321725d19..878b374cd 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -8,9 +8,9 @@ class SentimentAnalysisReport
       def self.register!(plugin)
         plugin.add_report("sentiment_analysis") do |report|
           report.modes = [:sentiment_analysis]
-          category_filter = report.filters.dig(:filter_by)
+          category_filter = report.filters.dig(:group_by) || :category
           report.add_filter(
-            "filter_by",
+            "group_by",
             type: "list",
             default: category_filter,
             choices: [{ id: "category", name: "Category" }, { id: "tag", name: "Tag" }],
@@ -18,6 +18,13 @@ def self.register!(plugin)
             auto_insert_none_item: false,
           )
 
+          report.add_filter(
+            "sort_by",
+            type: "list",
+            default: "size",
+            choices: [{ id: "size", name: "Size" }, { id: "name", name: "Name" }],
+          )
+
           sentiment_data = DiscourseAi::Sentiment::SentimentAnalysisReport.fetch_data(report)
 
           report.data = sentiment_data
@@ -33,7 +40,7 @@ def self.register!(plugin)
       end
 
       def self.fetch_data(report)
-        grouping = report.filters.dig(:filter_by).to_sym
+        grouping = report.filters.dig(:group_by).to_sym
         threshold = 0.6
 
         sentiment_count_sql = Proc.new { |sentiment| <<~SQL }

From 576affcad38db00b0a2541ed5c58dc21a8839df4 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Mon, 10 Feb 2025 15:00:32 -0800
Subject: [PATCH 10/21] DEV: Add size filter

---
 .../admin-report-sentiment-analysis.gjs       |  9 ++++----
 lib/sentiment/sentiment_analysis_report.rb    | 21 +++++++++++++++----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index de6d3e65d..65c5097a4 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -21,9 +21,7 @@ export default class AdminReportSentimentAnalysis extends Component {
   }
 
   get transformedData() {
-    console.log(this.args.model);
     return this.args.model.data.map((data) => {
-      console.log("called", data);
       return {
         title: data.category_name || data.tag_name,
         scores: [
@@ -32,6 +30,7 @@ export default class AdminReportSentimentAnalysis extends Component {
           data.negative_count,
         ],
         posts: data.posts,
+        total_score: data.total_count,
       };
     });
   }
@@ -73,19 +72,19 @@ export default class AdminReportSentimentAnalysis extends Component {
   }
 
   doughnutTitle(data) {
-    if (data.posts?.length > 0) {
-      return `${data.title} (${data.posts.length})`;
+    if (data?.total_score) {
+      return `${data.title} (${data.total_score})`;
     } else {
       return data.title;
     }
   }
 
   <template>
-    {{! TODO add more details about posts on click + tag data }}
     <div class="admin-report-sentiment-analysis">
       {{#each this.transformedData as |data|}}
         <div
           class="admin-report-sentiment-analysis__chart-wrapper"
+          role="button"
           {{on "click" (fn this.showDetails data)}}
           {{closeOnClickOutside
             (fn (mut this.selectedChart) null)
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index 878b374cd..6e21180fe 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -17,12 +17,14 @@ def self.register!(plugin)
             allow_any: false,
             auto_insert_none_item: false,
           )
-
+          size_filter = report.filters.dig(:sort_by) || :size
           report.add_filter(
             "sort_by",
             type: "list",
-            default: "size",
-            choices: [{ id: "size", name: "Size" }, { id: "name", name: "Name" }],
+            default: size_filter,
+            choices: [{ id: "size", name: "Size" }, { id: "alphabetical", name: "Alphabetical" }],
+            allow_any: false,
+            auto_insert_none_item: false,
           )
 
           sentiment_data = DiscourseAi::Sentiment::SentimentAnalysisReport.fetch_data(report)
@@ -41,6 +43,7 @@ def self.register!(plugin)
 
       def self.fetch_data(report)
         grouping = report.filters.dig(:group_by).to_sym
+        sorting = report.filters.dig(:sort_by).to_sym
         threshold = 0.6
 
         sentiment_count_sql = Proc.new { |sentiment| <<~SQL }
@@ -78,6 +81,16 @@ def self.fetch_data(report)
             raise Discourse::InvalidParameters
           end
 
+        order_by_clause =
+          case sorting
+          when :size
+            "ORDER BY total_count DESC"
+          when :alphabetical
+            "ORDER BY 1 ASC"
+          else
+            raise Discourse::InvalidParameters
+          end
+
         grouped_sentiments =
           DB.query(
             <<~SQL,
@@ -97,7 +110,7 @@ def self.fetch_data(report)
                 cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest' AND
                 (p.created_at > :report_start AND p.created_at < :report_end)
               GROUP BY 1
-              ORDER BY 1 ASC
+              #{order_by_clause}
             SQL
             report_start: report.start_date,
             report_end: report.end_date,

From c71e0e7a6e213d0bac8ff1af2465ed797f2f102d Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Wed, 12 Feb 2025 15:10:15 -0800
Subject: [PATCH 11/21] DEV: Sentiment posts endpoint

---
 .../sentiment/sentiment_controller.rb         |  83 ++++++++++++++
 .../ai_sentiment_post_serializer.rb           |  26 +++++
 .../admin-report-sentiment-analysis.gjs       | 104 ++++++++++++------
 .../modules/sentiment/common/dashboard.scss   |  14 ++-
 config/routes.rb                              |   4 +
 lib/sentiment/sentiment_analysis_report.rb    |   4 +-
 lib/sentiment/sentiment_dashboard_report.rb   |   2 +-
 7 files changed, 197 insertions(+), 40 deletions(-)
 create mode 100644 app/controllers/discourse_ai/sentiment/sentiment_controller.rb
 create mode 100644 app/serializers/ai_sentiment_post_serializer.rb

diff --git a/app/controllers/discourse_ai/sentiment/sentiment_controller.rb b/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
new file mode 100644
index 000000000..82eed2873
--- /dev/null
+++ b/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module DiscourseAi
+  module Sentiment
+    class SentimentController < ::ApplicationController
+      SENTIMENT_THRESHOLD = 0.6
+      requires_plugin ::DiscourseAi::PLUGIN_NAME
+      requires_login
+
+      def posts
+        group_by = params[:group_by]&.to_sym
+        group_value = params[:group_value]
+        start_date = params[:start_date]
+        end_date = params[:end_date]
+        threshold = SENTIMENT_THRESHOLD
+
+        if %i[category tag].exclude?(group_by) || group_value.blank?
+          raise Discourse::InvalidParameters
+        end
+
+        case group_by
+        when :category
+          grouping_clause = "c.name"
+          grouping_join = "INNER JOIN categories c ON c.id = t.category_id"
+        when :tag
+          grouping_clause = "tags.name"
+          grouping_join =
+            "INNER JOIN topic_tags tt ON tt.topic_id = p.topic_id INNER JOIN tags ON tags.id = tt.tag_id"
+        else
+          raise Discourse::InvalidParameters
+        end
+
+        posts =
+          DB.query(
+            <<~SQL,
+          SELECT
+            p.id AS post_id,
+            p.topic_id,
+            t.title AS topic_title,
+            p.cooked as post_cooked,
+            p.user_id,
+            p.post_number,
+            u.username,
+            u.name,
+            u.uploaded_avatar_id,
+            (CASE 
+              WHEN (cr.classification::jsonb->'positive')::float > :threshold THEN 'positive'
+              WHEN (cr.classification::jsonb->'negative')::float > :threshold THEN 'negative'
+              ELSE 'neutral'
+            END) AS sentiment
+          FROM posts p
+          INNER JOIN topics t ON t.id = p.topic_id
+          INNER JOIN classification_results cr ON cr.target_id = p.id AND cr.target_type = 'Post'
+          LEFT JOIN users u ON u.id = p.user_id
+          #{grouping_join}
+          WHERE
+            #{grouping_clause} = :group_value AND
+            t.archetype = 'regular' AND
+            p.user_id > 0 AND
+            cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest' AND
+            (p.created_at > :start_date AND p.created_at < :end_date)
+          ORDER BY p.created_at DESC
+        SQL
+            group_value: group_value,
+            start_date: start_date,
+            end_date: end_date,
+            threshold: threshold,
+          )
+
+        render_json_dump(
+          serialize_data(
+            posts,
+            AiSentimentPostSerializer,
+            scope: guardian,
+            add_raw: true,
+            add_excerpt: true,
+            add_title: true,
+          ),
+        )
+      end
+    end
+  end
+end
diff --git a/app/serializers/ai_sentiment_post_serializer.rb b/app/serializers/ai_sentiment_post_serializer.rb
new file mode 100644
index 000000000..264f6df28
--- /dev/null
+++ b/app/serializers/ai_sentiment_post_serializer.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class AiSentimentPostSerializer < ApplicationSerializer
+  attributes :post_id,
+             :topic_id,
+             :topic_title,
+             :post_number,
+             :username,
+             :name,
+             :avatar_template,
+             :excerpt,
+             :sentiment,
+             :truncated
+
+  def avatar_template
+    User.avatar_template(object.username, object.uploaded_avatar_id)
+  end
+
+  def excerpt
+    Post.excerpt(object.post_cooked)
+  end
+
+  def truncated
+    true
+  end
+end
diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index 65c5097a4..c6d151bed 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -4,6 +4,9 @@ import { fn, hash } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action, get } from "@ember/object";
 import PostList from "discourse/components/post-list";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import Post from "discourse/models/post";
 import closeOnClickOutside from "discourse/modifiers/close-on-click-outside";
 import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
@@ -11,6 +14,7 @@ import DoughnutChart from "./doughnut-chart";
 
 export default class AdminReportSentimentAnalysis extends Component {
   @tracked selectedChart = null;
+  @tracked posts = null;
 
   get colors() {
     return ["#2ecc71", "#95a5a6", "#e74c3c"];
@@ -20,6 +24,18 @@ export default class AdminReportSentimentAnalysis extends Component {
     return data.total_count - (data.positive_count + data.negative_count);
   }
 
+  get currentGroupFilter() {
+    return this.args.model.available_filters.find(
+      (filter) => filter.id === "group_by"
+    ).default;
+  }
+
+  get currentSortFilter() {
+    return this.args.model.available_filters.find(
+      (filter) => filter.id === "sort_by"
+    ).default;
+  }
+
   get transformedData() {
     return this.args.model.data.map((data) => {
       return {
@@ -29,45 +45,56 @@ export default class AdminReportSentimentAnalysis extends Component {
           this.calculateNeutralScore(data),
           data.negative_count,
         ],
-        posts: data.posts,
         total_score: data.total_count,
       };
     });
   }
 
   @action
-  showDetails(data) {
+  async showDetails(data) {
     this.selectedChart = data;
-  }
+    try {
+      const posts = await ajax(`/discourse-ai/sentiment/posts`, {
+        data: {
+          group_by: this.currentGroupFilter,
+          group_value: data.title,
+          start_date: this.args.model.start_date,
+          end_date: this.args.model.end_date,
+        },
+      });
 
-  sentimentTopScore(post) {
-    const { positive_score, neutral_score, negative_score } = post;
-    const maxScore = Math.max(positive_score, neutral_score, negative_score);
+      this.posts = posts.map((post) => Post.create(post));
+    } catch (e) {
+      popupAjaxError(e);
+    }
+  }
 
-    if (maxScore === positive_score) {
-      return {
-        id: "positive",
-        text: i18n(
-          "discourse_ai.sentiments.sentiment_analysis.score_types.positive"
-        ),
-        icon: "face-smile",
-      };
-    } else if (maxScore === neutral_score) {
-      return {
-        id: "neutral",
-        text: i18n(
-          "discourse_ai.sentiments.sentiment_analysis.score_types.neutral"
-        ),
-        icon: "face-meh",
-      };
-    } else {
-      return {
-        id: "negative",
-        text: i18n(
-          "discourse_ai.sentiments.sentiment_analysis.score_types.negative"
-        ),
-        icon: "face-angry",
-      };
+  sentimentMapping(sentiment) {
+    switch (sentiment) {
+      case "positive":
+        return {
+          id: "positive",
+          text: i18n(
+            "discourse_ai.sentiments.sentiment_analysis.score_types.positive"
+          ),
+          icon: "face-smile",
+        };
+      case "neutral":
+        return {
+          id: "neutral",
+          text: i18n(
+            "discourse_ai.sentiments.sentiment_analysis.score_types.neutral"
+          ),
+          icon: "face-meh",
+        };
+      case "negative":
+        return {
+          id: "negative",
+          text: i18n(
+            "discourse_ai.sentiments.sentiment_analysis.score_types.negative"
+          ),
+          icon: "face-angry",
+        };
     }
   }
 
@@ -131,15 +158,22 @@ export default class AdminReportSentimentAnalysis extends Component {
             {{get this.selectedChart.scores 2}}</li>
         </ul>
 
-        <PostList @posts={{this.selectedChart.posts}} @urlPath="postUrl">
+        <PostList
+          @posts={{this.posts}}
+          @urlPath="url"
+          @idPath="post_id"
+          @titlePath="topic_title"
+          @usernamePath="username"
+          class="admin-report-sentiment-analysis-details__post-list"
+        >
           <:abovePostItemExcerpt as |post|>
-            {{#let (this.sentimentTopScore post) as |score|}}
+            {{#let (this.sentimentMapping post.sentiment) as |sentiment|}}
               <span
                 class="admin-report-sentiment-analysis-details__post-score"
-                data-sentiment-score={{score.id}}
+                data-sentiment-score={{sentiment.id}}
               >
-                {{dIcon score.icon}}
-                {{score.text}}
+                {{dIcon sentiment.icon}}
+                {{sentiment.text}}
               </span>
             {{/let}}
           </:abovePostItemExcerpt>
diff --git a/assets/stylesheets/modules/sentiment/common/dashboard.scss b/assets/stylesheets/modules/sentiment/common/dashboard.scss
index 07303dec1..307384334 100644
--- a/assets/stylesheets/modules/sentiment/common/dashboard.scss
+++ b/assets/stylesheets/modules/sentiment/common/dashboard.scss
@@ -26,7 +26,6 @@
     width: 300px;
     @include report-container-box();
     margin-left: 0;
-    // width: 300px;
   }
 
   .main {
@@ -129,4 +128,17 @@
       background: rgba(var(--d-sentiment-report-negative-rgb), 0.1);
     }
   }
+
+  &__post-list {
+    .avatar-wrapper,
+    .avatar-link {
+      width: calc(48px * 0.75);
+      height: calc(48px * 0.75);
+    }
+
+    img.avatar {
+      width: 100%;
+      height: 100%;
+    }
+  }
 }
diff --git a/config/routes.rb b/config/routes.rb
index 44dd09880..3861c2dd0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -43,6 +43,10 @@
     get "/t/:topic_id" => "summary#show", :constraints => { topic_id: /\d+/ }
     get "/channels/:channel_id" => "chat_summary#show"
   end
+
+  scope module: :sentiment, path: "/sentiment", defaults: { format: :json } do
+    get "/posts" => "sentiment#posts"
+  end
 end
 
 Discourse::Application.routes.draw do
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index 6e21180fe..812d6c472 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# TODO: Currently returns all posts, need to add pagination?
-
 module DiscourseAi
   module Sentiment
     class SentimentAnalysisReport
@@ -44,7 +42,7 @@ def self.register!(plugin)
       def self.fetch_data(report)
         grouping = report.filters.dig(:group_by).to_sym
         sorting = report.filters.dig(:sort_by).to_sym
-        threshold = 0.6
+        threshold = DiscourseAi::Sentiment::SentimentController::SENTIMENT_THRESHOLD
 
         sentiment_count_sql = Proc.new { |sentiment| <<~SQL }
           COUNT(
diff --git a/lib/sentiment/sentiment_dashboard_report.rb b/lib/sentiment/sentiment_dashboard_report.rb
index 3101126a1..8097a6320 100644
--- a/lib/sentiment/sentiment_dashboard_report.rb
+++ b/lib/sentiment/sentiment_dashboard_report.rb
@@ -6,7 +6,7 @@ class SentimentDashboardReport
       def self.register!(plugin)
         plugin.add_report("overall_sentiment") do |report|
           report.modes = [:stacked_chart]
-          threshold = 0.6
+          threshold = DiscourseAi::Sentiment::SentimentController::SENTIMENT_THRESHOLD
 
           sentiment_count_sql = Proc.new { |sentiment| <<~SQL }
             COUNT(

From c0b3a188a772e14c9cdceafcb5eb1c181c2aaea5 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Wed, 12 Feb 2025 15:13:01 -0800
Subject: [PATCH 12/21] FIX: Icon

---
 .../discourse/components/admin-report-sentiment-analysis.gjs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index c6d151bed..a1f1bc537 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -4,11 +4,11 @@ import { fn, hash } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action, get } from "@ember/object";
 import PostList from "discourse/components/post-list";
+import dIcon from "discourse/helpers/d-icon";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Post from "discourse/models/post";
 import closeOnClickOutside from "discourse/modifiers/close-on-click-outside";
-import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import DoughnutChart from "./doughnut-chart";
 

From 2c19684515878a81b23b12395ba44c66a0a13c02 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Thu, 13 Feb 2025 12:04:31 -0800
Subject: [PATCH 13/21] FIX: Filter defaults

---
 lib/sentiment/sentiment_analysis_report.rb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index 812d6c472..48bc9883c 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -3,10 +3,14 @@
 module DiscourseAi
   module Sentiment
     class SentimentAnalysisReport
+      GROUP_BY_FILTER_DEFAULT = :category
+      SORT_BY_FILTER_DEFAULT = :size
+
       def self.register!(plugin)
         plugin.add_report("sentiment_analysis") do |report|
           report.modes = [:sentiment_analysis]
-          category_filter = report.filters.dig(:group_by) || :category
+
+          category_filter = report.filters.dig(:group_by) || GROUP_BY_FILTER_DEFAULT
           report.add_filter(
             "group_by",
             type: "list",
@@ -15,7 +19,8 @@ def self.register!(plugin)
             allow_any: false,
             auto_insert_none_item: false,
           )
-          size_filter = report.filters.dig(:sort_by) || :size
+
+          size_filter = report.filters.dig(:sort_by) || SORT_BY_FILTER_DEFAULT
           report.add_filter(
             "sort_by",
             type: "list",
@@ -40,8 +45,8 @@ def self.register!(plugin)
       end
 
       def self.fetch_data(report)
-        grouping = report.filters.dig(:group_by).to_sym
-        sorting = report.filters.dig(:sort_by).to_sym
+        grouping = (report.filters.dig(:group_by) || GROUP_BY_FILTER_DEFAULT).to_sym
+        sorting = (report.filters.dig(:sort_by) || SORT_BY_FILTER_DEFAULT).to_sym
         threshold = DiscourseAi::Sentiment::SentimentController::SENTIMENT_THRESHOLD
 
         sentiment_count_sql = Proc.new { |sentiment| <<~SQL }

From b7e707aee773892cebd3535677170ca80ab7b378 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Fri, 14 Feb 2025 11:09:43 -0800
Subject: [PATCH 14/21] DEV: Conditionally disable/enable category/tag filters

---
 .../modules/sentiment/common/dashboard.scss   | 42 +++++++++++++++-
 config/locales/client.en.yml                  |  2 +
 lib/sentiment/sentiment_analysis_report.rb    | 49 ++++++++++++++++---
 3 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/assets/stylesheets/modules/sentiment/common/dashboard.scss b/assets/stylesheets/modules/sentiment/common/dashboard.scss
index 307384334..18dff8203 100644
--- a/assets/stylesheets/modules/sentiment/common/dashboard.scss
+++ b/assets/stylesheets/modules/sentiment/common/dashboard.scss
@@ -22,10 +22,48 @@
   gap: 1rem;
 
   .filters {
-    order: 1;
-    width: 300px;
     @include report-container-box();
+    order: 1;
+    width: 100%;
     margin-left: 0;
+    flex-flow: row wrap;
+    align-items: flex-start;
+    justify-content: flex-start;
+    gap: 0.5rem;
+
+    .control {
+      min-width: 200px;
+    }
+
+    .control:first-child {
+      flex: 1;
+    }
+
+    .control:nth-child(2) {
+      flex: 1;
+    }
+
+    .control:nth-child(3) {
+      flex: 1;
+    }
+
+    .control:nth-child(4) {
+      flex: 1;
+    }
+
+    .control:nth-child(5) {
+      flex: 1;
+    }
+
+    .control:nth-child(6) {
+      flex-basis: 49%;
+      align-self: flex-end;
+    }
+
+    .control:last-child {
+      flex-basis: 49%;
+      align-self: flex-end;
+    }
   }
 
   .main {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 74f053377..5f6399cef 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -21,6 +21,8 @@ en:
               label: "Group by"
             sort_by:
               label: "Sort by"
+            tag:
+              label: "Tag"
 
   js:
     discourse_automation:
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index 48bc9883c..c788716cd 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -10,11 +10,11 @@ def self.register!(plugin)
         plugin.add_report("sentiment_analysis") do |report|
           report.modes = [:sentiment_analysis]
 
-          category_filter = report.filters.dig(:group_by) || GROUP_BY_FILTER_DEFAULT
+          group_by_filter = report.filters.dig(:group_by) || GROUP_BY_FILTER_DEFAULT
           report.add_filter(
             "group_by",
             type: "list",
-            default: category_filter,
+            default: group_by_filter,
             choices: [{ id: "category", name: "Category" }, { id: "tag", name: "Tag" }],
             allow_any: false,
             auto_insert_none_item: false,
@@ -30,12 +30,27 @@ def self.register!(plugin)
             auto_insert_none_item: false,
           )
 
-          sentiment_data = DiscourseAi::Sentiment::SentimentAnalysisReport.fetch_data(report)
+          report.add_category_filter(disabled: group_by_filter.to_sym == :tag)
 
-          report.data = sentiment_data
+          tag_filter = report.filters.dig(:tag) || "any"
+          tag_choices =
+            Tag
+              .all
+              .map { |tag| { id: tag.name, name: tag.name } }
+              .unshift({ id: "any", name: "Any" })
+          report.add_filter(
+            "tag",
+            type: "list",
+            default: tag_filter,
+            choices: tag_choices,
+            allow_any: false,
+            auto_insert_none_item: false,
+            disabled: group_by_filter.to_sym == :category,
+          )
 
-          # TODO: connect filter to make the report data change.
+          sentiment_data = DiscourseAi::Sentiment::SentimentAnalysisReport.fetch_data(report)
 
+          report.data = sentiment_data
           report.labels = [
             I18n.t("discourse_ai.sentiment.reports.sentiment_analysis.positive"),
             I18n.t("discourse_ai.sentiment.reports.sentiment_analysis.neutral"),
@@ -45,9 +60,12 @@ def self.register!(plugin)
       end
 
       def self.fetch_data(report)
+        threshold = DiscourseAi::Sentiment::SentimentController::SENTIMENT_THRESHOLD
+
         grouping = (report.filters.dig(:group_by) || GROUP_BY_FILTER_DEFAULT).to_sym
         sorting = (report.filters.dig(:sort_by) || SORT_BY_FILTER_DEFAULT).to_sym
-        threshold = DiscourseAi::Sentiment::SentimentController::SENTIMENT_THRESHOLD
+        category_filter = report.filters.dig(:category)
+        tag_filter = report.filters.dig(:tag)
 
         sentiment_count_sql = Proc.new { |sentiment| <<~SQL }
           COUNT(
@@ -94,6 +112,22 @@ def self.fetch_data(report)
             raise Discourse::InvalidParameters
           end
 
+        where_clause =
+          case grouping
+          when :category
+            if category_filter.nil?
+              ""
+            else
+              "AND c.id = :category_filter"
+            end
+          when :tag
+            if tag_filter.nil? || tag_filter == "any"
+              ""
+            else
+              "AND tags.name = :tag_filter"
+            end
+          end
+
         grouped_sentiments =
           DB.query(
             <<~SQL,
@@ -112,12 +146,15 @@ def self.fetch_data(report)
                 p.user_id > 0 AND
                 cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest' AND
                 (p.created_at > :report_start AND p.created_at < :report_end)
+                #{where_clause}
               GROUP BY 1
               #{order_by_clause}
             SQL
             report_start: report.start_date,
             report_end: report.end_date,
             threshold: threshold,
+            category_filter: category_filter,
+            tag_filter: tag_filter,
           )
 
         grouped_sentiments

From 89158717553af6b5b751c92b68e5addaf20b025d Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Fri, 14 Feb 2025 12:57:35 -0800
Subject: [PATCH 15/21] DEV: Add staff constraint and cleanup css

---
 .../sentiment/sentiment_controller.rb         |  4 +--
 .../modules/sentiment/common/dashboard.scss   | 26 ++++---------------
 config/routes.rb                              |  2 +-
 lib/sentiment/constants.rb                    |  9 +++++++
 lib/sentiment/sentiment_analysis_report.rb    |  3 ++-
 lib/sentiment/sentiment_dashboard_report.rb   |  4 ++-
 6 files changed, 22 insertions(+), 26 deletions(-)
 create mode 100644 lib/sentiment/constants.rb

diff --git a/app/controllers/discourse_ai/sentiment/sentiment_controller.rb b/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
index 82eed2873..cf6869b64 100644
--- a/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
+++ b/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
@@ -2,8 +2,8 @@
 
 module DiscourseAi
   module Sentiment
-    class SentimentController < ::ApplicationController
-      SENTIMENT_THRESHOLD = 0.6
+    class SentimentController < ::Admin::StaffController
+      include Constants
       requires_plugin ::DiscourseAi::PLUGIN_NAME
       requires_login
 
diff --git a/assets/stylesheets/modules/sentiment/common/dashboard.scss b/assets/stylesheets/modules/sentiment/common/dashboard.scss
index 18dff8203..5399837ba 100644
--- a/assets/stylesheets/modules/sentiment/common/dashboard.scss
+++ b/assets/stylesheets/modules/sentiment/common/dashboard.scss
@@ -35,34 +35,18 @@
       min-width: 200px;
     }
 
-    .control:first-child {
+    .control:nth-of-type(-n + 4) {
       flex: 1;
     }
 
-    .control:nth-child(2) {
-      flex: 1;
-    }
-
-    .control:nth-child(3) {
-      flex: 1;
-    }
-
-    .control:nth-child(4) {
-      flex: 1;
-    }
-
-    .control:nth-child(5) {
-      flex: 1;
-    }
-
-    .control:nth-child(6) {
+    .control:nth-of-type(n + 6) {
       flex-basis: 49%;
       align-self: flex-end;
     }
 
-    .control:last-child {
-      flex-basis: 49%;
-      align-self: flex-end;
+    // Hides tag selector when showing subcategories selector
+    .control:nth-of-type(6):nth-last-of-type(3) {
+      display: none;
     }
   }
 
diff --git a/config/routes.rb b/config/routes.rb
index 3861c2dd0..6004fe910 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,7 +45,7 @@
   end
 
   scope module: :sentiment, path: "/sentiment", defaults: { format: :json } do
-    get "/posts" => "sentiment#posts"
+    get "/posts" => "sentiment#posts", :constraints => StaffConstraint.new
   end
 end
 
diff --git a/lib/sentiment/constants.rb b/lib/sentiment/constants.rb
new file mode 100644
index 000000000..42d21db54
--- /dev/null
+++ b/lib/sentiment/constants.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DiscourseAi
+  module Sentiment
+    module Constants
+      SENTIMENT_THRESHOLD = 0.6
+    end
+  end
+end
diff --git a/lib/sentiment/sentiment_analysis_report.rb b/lib/sentiment/sentiment_analysis_report.rb
index c788716cd..17ad72cb8 100644
--- a/lib/sentiment/sentiment_analysis_report.rb
+++ b/lib/sentiment/sentiment_analysis_report.rb
@@ -3,6 +3,7 @@
 module DiscourseAi
   module Sentiment
     class SentimentAnalysisReport
+      include Constants
       GROUP_BY_FILTER_DEFAULT = :category
       SORT_BY_FILTER_DEFAULT = :size
 
@@ -60,7 +61,7 @@ def self.register!(plugin)
       end
 
       def self.fetch_data(report)
-        threshold = DiscourseAi::Sentiment::SentimentController::SENTIMENT_THRESHOLD
+        threshold = SENTIMENT_THRESHOLD
 
         grouping = (report.filters.dig(:group_by) || GROUP_BY_FILTER_DEFAULT).to_sym
         sorting = (report.filters.dig(:sort_by) || SORT_BY_FILTER_DEFAULT).to_sym
diff --git a/lib/sentiment/sentiment_dashboard_report.rb b/lib/sentiment/sentiment_dashboard_report.rb
index 8097a6320..19d04eb0c 100644
--- a/lib/sentiment/sentiment_dashboard_report.rb
+++ b/lib/sentiment/sentiment_dashboard_report.rb
@@ -3,10 +3,12 @@
 module DiscourseAi
   module Sentiment
     class SentimentDashboardReport
+      include Constants
+
       def self.register!(plugin)
         plugin.add_report("overall_sentiment") do |report|
           report.modes = [:stacked_chart]
-          threshold = DiscourseAi::Sentiment::SentimentController::SENTIMENT_THRESHOLD
+          threshold = SENTIMENT_THRESHOLD
 
           sentiment_count_sql = Proc.new { |sentiment| <<~SQL }
             COUNT(

From d9ec52c2fadf919660ccd7bc41a2c8834fb03301 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Feb 2025 09:51:13 -0800
Subject: [PATCH 16/21] wip

---
 .../admin-report-sentiment-analysis.gjs       |  2 +-
 spec/reports/sentiment_analysis_spec.rb       | 18 +++++++++++
 .../sentiment/sentiment_controller_spec.rb    | 30 +++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 spec/reports/sentiment_analysis_spec.rb
 create mode 100644 spec/requests/sentiment/sentiment_controller_spec.rb

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index a1f1bc537..5876e8507 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -10,7 +10,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import Post from "discourse/models/post";
 import closeOnClickOutside from "discourse/modifiers/close-on-click-outside";
 import { i18n } from "discourse-i18n";
-import DoughnutChart from "./doughnut-chart";
+import DoughnutChart from "discourse/plugins/discourse-ai/discourse/components/doughtnut-chart";
 
 export default class AdminReportSentimentAnalysis extends Component {
   @tracked selectedChart = null;
diff --git a/spec/reports/sentiment_analysis_spec.rb b/spec/reports/sentiment_analysis_spec.rb
new file mode 100644
index 000000000..0b0463ac4
--- /dev/null
+++ b/spec/reports/sentiment_analysis_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+RSpec.describe DiscourseAi::Sentiment::SentimentAnalysisReport do
+  fab!(:user_1) { Fabricate(:user) }
+  fab!(:user_2) { Fabricate(:user) }
+  fab!(:post_1) { Fabricate(:post, user: user_1) }
+  fab!(:post_2) { Fabricate(:post, user: user_2) }
+
+  before do
+    SiteSetting.discourse_ai_enabled = true
+    SiteSetting.ai_embeddings_enabled = false
+  end
+
+  it "contains the correct filters" do
+    report = Report.find("sentiment_analysis")
+    pp report.availble_filters.keys
+  end
+end
diff --git a/spec/requests/sentiment/sentiment_controller_spec.rb b/spec/requests/sentiment/sentiment_controller_spec.rb
new file mode 100644
index 000000000..80fa01bd3
--- /dev/null
+++ b/spec/requests/sentiment/sentiment_controller_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+RSpec.describe DiscourseAi::Sentiment::SentimentController do
+  describe "#posts" do
+    fab!(:user)
+    fab!(:category)
+    fab!(:post) { Fabricate(:post, user: user) }
+    fab!(:embedding_definition)
+
+    # before do
+    # SiteSetting.ai_embeddings_enabled = false
+    # SiteSetting.ai_embeddings_selected_model = ""
+    # sign_in(user)
+    # end
+
+    it "returns a posts based on params" do
+      get "/discourse-ai/sentiment/posts.json",
+          params: {
+            group_by: "category",
+            group_value: category.name,
+            start_date: 1.month.ago.to_s,
+            end_date: 0.days.ago.to_s,
+            threshold: 0.6,
+          }
+
+      pp response.inspect
+      expect(response).to be_successful
+    end
+  end
+end

From 19d93d5c74c52068ce1620865cc5ac529e6fa70d Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Feb 2025 10:14:40 -0800
Subject: [PATCH 17/21] fix import

---
 .../discourse/components/admin-report-sentiment-analysis.gjs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
index 5876e8507..77e29a9b1 100644
--- a/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
+++ b/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs
@@ -10,7 +10,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import Post from "discourse/models/post";
 import closeOnClickOutside from "discourse/modifiers/close-on-click-outside";
 import { i18n } from "discourse-i18n";
-import DoughnutChart from "discourse/plugins/discourse-ai/discourse/components/doughtnut-chart";
+import DoughnutChart from "discourse/plugins/discourse-ai/discourse/components/doughnut-chart";
 
 export default class AdminReportSentimentAnalysis extends Component {
   @tracked selectedChart = null;

From 91b4521a01fd023cc9dbc7db0ace5a7cd4265519 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Feb 2025 10:39:00 -0800
Subject: [PATCH 18/21] FIX: mixin bug in specs

---
 assets/stylesheets/modules/sentiment/common/dashboard.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/stylesheets/modules/sentiment/common/dashboard.scss b/assets/stylesheets/modules/sentiment/common/dashboard.scss
index 5399837ba..1b217b868 100644
--- a/assets/stylesheets/modules/sentiment/common/dashboard.scss
+++ b/assets/stylesheets/modules/sentiment/common/dashboard.scss
@@ -78,7 +78,7 @@
     border-radius: var(--d-border-radius);
 
     &:hover {
-      @include transform(translateY(-1rem));
+      transform: translateY(-1rem);
       box-shadow: var(--shadow-card);
       cursor: pointer;
     }

From d28bdfc97649cd35aaf4e0104f0dda3787ad5511 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Feb 2025 12:25:39 -0800
Subject: [PATCH 19/21] FIX: component import error for non-admins

---
 .../javascripts/discourse/components/doughnut-chart.gjs  | 4 +++-
 assets/javascripts/initializers/admin-reports.js         | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/assets/javascripts/discourse/components/doughnut-chart.gjs b/assets/javascripts/discourse/components/doughnut-chart.gjs
index b1e2c85b7..a9327d482 100644
--- a/assets/javascripts/discourse/components/doughnut-chart.gjs
+++ b/assets/javascripts/discourse/components/doughnut-chart.gjs
@@ -60,6 +60,8 @@ export default class DoughnutChart extends Component {
   }
 
   <template>
-    <Chart @chartConfig={{this.config}} class="admin-report-doughnut" />
+    {{#if this.config}}
+      <Chart @chartConfig={{this.config}} class="admin-report-doughnut" />
+    {{/if}}
   </template>
 }
diff --git a/assets/javascripts/initializers/admin-reports.js b/assets/javascripts/initializers/admin-reports.js
index 519d33e5f..e338e9d09 100644
--- a/assets/javascripts/initializers/admin-reports.js
+++ b/assets/javascripts/initializers/admin-reports.js
@@ -1,6 +1,5 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
 import AdminReportEmotion from "discourse/plugins/discourse-ai/discourse/components/admin-report-emotion";
-import AdminReportSentimentAnalysis from "../discourse/components/admin-report-sentiment-analysis";
 
 export default {
   name: "discourse-ai-admin-reports",
@@ -11,7 +10,13 @@ export default {
       return;
     }
 
-    withPluginApi("2.0.1", (api) => {
+    // We need to import dynamically with CommonJS require because
+    // using ESM import would cause the component to be imported globally
+    // and cause errors for non-admin users since the component is only available to admins
+    const AdminReportSentimentAnalysis =
+      require("discourse/plugins/discourse-ai/discourse/components/admin-report-sentiment-analysis").default;
+
+    withPluginApi((api) => {
       api.registerReportModeComponent("emotion", AdminReportEmotion);
       api.registerReportModeComponent(
         "sentiment_analysis",

From 43e2fafca1a3b9553e9e358889379ae70c657100 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 18 Feb 2025 13:17:59 -0800
Subject: [PATCH 20/21] DEV: Complete specs

---
 .../sentiment/sentiment_controller.rb         |  6 ++--
 .../javascripts/initializers/admin-reports.js |  2 +-
 spec/reports/sentiment_analysis_spec.rb       | 22 ++++++++-----
 .../sentiment/sentiment_controller_spec.rb    | 33 +++++++++++--------
 4 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/app/controllers/discourse_ai/sentiment/sentiment_controller.rb b/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
index cf6869b64..f0b15ff8e 100644
--- a/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
+++ b/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
@@ -9,8 +9,8 @@ class SentimentController < ::Admin::StaffController
 
       def posts
         group_by = params[:group_by]&.to_sym
-        group_value = params[:group_value]
-        start_date = params[:start_date]
+        group_value = params[:group_value].presence
+        start_date = params[:start_date].presence
         end_date = params[:end_date]
         threshold = SENTIMENT_THRESHOLD
 
@@ -58,7 +58,7 @@ def posts
             t.archetype = 'regular' AND
             p.user_id > 0 AND
             cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest' AND
-            (p.created_at > :start_date AND p.created_at < :end_date)
+            ((:start_date IS NULL OR p.created_at > :start_date) AND (:end_date IS NULL OR p.created_at < :end_date))
           ORDER BY p.created_at DESC
         SQL
             group_value: group_value,
diff --git a/assets/javascripts/initializers/admin-reports.js b/assets/javascripts/initializers/admin-reports.js
index e338e9d09..1dd1a45e7 100644
--- a/assets/javascripts/initializers/admin-reports.js
+++ b/assets/javascripts/initializers/admin-reports.js
@@ -11,7 +11,7 @@ export default {
     }
 
     // We need to import dynamically with CommonJS require because
-    // using ESM import would cause the component to be imported globally
+    // using ESM import in an initializer would cause the component to be imported globally
     // and cause errors for non-admin users since the component is only available to admins
     const AdminReportSentimentAnalysis =
       require("discourse/plugins/discourse-ai/discourse/components/admin-report-sentiment-analysis").default;
diff --git a/spec/reports/sentiment_analysis_spec.rb b/spec/reports/sentiment_analysis_spec.rb
index 0b0463ac4..d251877c7 100644
--- a/spec/reports/sentiment_analysis_spec.rb
+++ b/spec/reports/sentiment_analysis_spec.rb
@@ -1,18 +1,22 @@
 # frozen_string_literal: true
 
 RSpec.describe DiscourseAi::Sentiment::SentimentAnalysisReport do
-  fab!(:user_1) { Fabricate(:user) }
-  fab!(:user_2) { Fabricate(:user) }
-  fab!(:post_1) { Fabricate(:post, user: user_1) }
-  fab!(:post_2) { Fabricate(:post, user: user_2) }
+  fab!(:admin)
+  fab!(:category)
+  fab!(:topic) { Fabricate(:topic, category: category) }
+  fab!(:post) { Fabricate(:post, user: admin, topic: topic) }
+  fab!(:post_2) { Fabricate(:post, user: admin, topic: topic) }
+  fab!(:classification_result) { Fabricate(:classification_result, target: post) }
 
-  before do
-    SiteSetting.discourse_ai_enabled = true
-    SiteSetting.ai_embeddings_enabled = false
-  end
+  before { SiteSetting.ai_sentiment_enabled = true }
 
   it "contains the correct filters" do
     report = Report.find("sentiment_analysis")
-    pp report.availble_filters.keys
+    expect(report.available_filters).to include("group_by", "sort_by", "category", "tag")
+  end
+
+  it "contains the correct labels" do
+    report = Report.find("sentiment_analysis")
+    expect(report.labels).to eq(%w[Positive Neutral Negative])
   end
 end
diff --git a/spec/requests/sentiment/sentiment_controller_spec.rb b/spec/requests/sentiment/sentiment_controller_spec.rb
index 80fa01bd3..a875e84d2 100644
--- a/spec/requests/sentiment/sentiment_controller_spec.rb
+++ b/spec/requests/sentiment/sentiment_controller_spec.rb
@@ -2,29 +2,36 @@
 
 RSpec.describe DiscourseAi::Sentiment::SentimentController do
   describe "#posts" do
-    fab!(:user)
+    fab!(:admin)
     fab!(:category)
-    fab!(:post) { Fabricate(:post, user: user) }
-    fab!(:embedding_definition)
+    fab!(:topic) { Fabricate(:topic, category: category) }
+    fab!(:post) { Fabricate(:post, user: admin, topic: topic) }
+    fab!(:post_2) { Fabricate(:post, user: admin, topic: topic) }
+    fab!(:classification_result) { Fabricate(:classification_result, target: post) }
 
-    # before do
-    # SiteSetting.ai_embeddings_enabled = false
-    # SiteSetting.ai_embeddings_selected_model = ""
-    # sign_in(user)
-    # end
+    before do
+      SiteSetting.ai_sentiment_enabled = true
+      sign_in(admin)
+    end
 
     it "returns a posts based on params" do
-      get "/discourse-ai/sentiment/posts.json",
+      post.reload
+      classification_result.reload
+
+      get "/discourse-ai/sentiment/posts",
           params: {
             group_by: "category",
             group_value: category.name,
-            start_date: 1.month.ago.to_s,
-            end_date: 0.days.ago.to_s,
-            threshold: 0.6,
+            threshold: 0.0,
           }
 
-      pp response.inspect
       expect(response).to be_successful
+
+      posts = JSON.parse(response.body)
+      posts.each do |post|
+        expect(post).to have_key("sentiment")
+        expect(post["sentiment"]).to match(/positive|negative|neutral/)
+      end
     end
   end
 end

From 933d95222a83321adc8b77b0854da0792a4da293 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Thu, 20 Feb 2025 08:47:11 -0800
Subject: [PATCH 21/21] DEV: Apply feedback from review

---
 .../discourse_ai/sentiment/sentiment_controller.rb   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/controllers/discourse_ai/sentiment/sentiment_controller.rb b/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
index f0b15ff8e..6fbe3fd2f 100644
--- a/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
+++ b/app/controllers/discourse_ai/sentiment/sentiment_controller.rb
@@ -5,18 +5,15 @@ module Sentiment
     class SentimentController < ::Admin::StaffController
       include Constants
       requires_plugin ::DiscourseAi::PLUGIN_NAME
-      requires_login
 
       def posts
-        group_by = params[:group_by]&.to_sym
-        group_value = params[:group_value].presence
+        group_by = params.required(:group_by)&.to_sym
+        group_value = params.required(:group_value).presence
         start_date = params[:start_date].presence
         end_date = params[:end_date]
         threshold = SENTIMENT_THRESHOLD
 
-        if %i[category tag].exclude?(group_by) || group_value.blank?
-          raise Discourse::InvalidParameters
-        end
+        raise Discourse::InvalidParameters if %i[category tag].exclude?(group_by)
 
         case group_by
         when :category
@@ -26,8 +23,6 @@ def posts
           grouping_clause = "tags.name"
           grouping_join =
             "INNER JOIN topic_tags tt ON tt.topic_id = p.topic_id INNER JOIN tags ON tags.id = tt.tag_id"
-        else
-          raise Discourse::InvalidParameters
         end
 
         posts =
@@ -59,6 +54,7 @@ def posts
             p.user_id > 0 AND
             cr.model_used = 'cardiffnlp/twitter-roberta-base-sentiment-latest' AND
             ((:start_date IS NULL OR p.created_at > :start_date) AND (:end_date IS NULL OR p.created_at < :end_date))
+            AND p.deleted_at IS NULL
           ORDER BY p.created_at DESC
         SQL
             group_value: group_value,