DEV: Add size filter

Author: keegangeorge

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)

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,