From e9e6d80eace63f26ebf669dfd66a0b1c41ca1538 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 3 Jan 2025 17:11:20 +0100 Subject: [PATCH 1/3] simple word cloud --- .../discourse_rewind/rewind/action/word_cloud.rb | 2 +- .../discourse/components/reports/word-cloud.gjs | 12 ++++++++++-- assets/javascripts/discourse/components/rewind.gjs | 10 ++-------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/services/discourse_rewind/rewind/action/word_cloud.rb b/app/services/discourse_rewind/rewind/action/word_cloud.rb index 6a92b50..311ad5f 100644 --- a/app/services/discourse_rewind/rewind/action/word_cloud.rb +++ b/app/services/discourse_rewind/rewind/action/word_cloud.rb @@ -27,7 +27,7 @@ module DiscourseRewind ndoc DESC, word LIMIT - 100 + 5 ), lex AS ( SELECT DISTINCT ON (lexeme) to_tsvector('english', word) as lexeme, diff --git a/assets/javascripts/discourse/components/reports/word-cloud.gjs b/assets/javascripts/discourse/components/reports/word-cloud.gjs index fde9398..3e1063e 100644 --- a/assets/javascripts/discourse/components/reports/word-cloud.gjs +++ b/assets/javascripts/discourse/components/reports/word-cloud.gjs @@ -2,8 +2,16 @@ import Component from "@glimmer/component"; export default class WordCloud extends Component { } diff --git a/assets/javascripts/discourse/components/rewind.gjs b/assets/javascripts/discourse/components/rewind.gjs index 5a332ad..4b20116 100644 --- a/assets/javascripts/discourse/components/rewind.gjs +++ b/assets/javascripts/discourse/components/rewind.gjs @@ -113,16 +113,10 @@ export default class Rewind extends Component {
{{#if (eq report.identifier "reactions")}} - - - - + {{else if (eq report.identifier "word-cloud")}} + {{else if (eq report.identifier "activity-calendar")}} - - - - {{/if}} {{!-- {{else if (eq report.identifier "fbff")}} From 0ef77503de1f07f482faacdf0059a282dd5cab6d Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 3 Jan 2025 17:12:19 +0100 Subject: [PATCH 2/3] clean --- .../discourse/components/reports/activity-calendar.gjs | 3 --- 1 file changed, 3 deletions(-) diff --git a/assets/javascripts/discourse/components/reports/activity-calendar.gjs b/assets/javascripts/discourse/components/reports/activity-calendar.gjs index 0deed08..067f1fb 100644 --- a/assets/javascripts/discourse/components/reports/activity-calendar.gjs +++ b/assets/javascripts/discourse/components/reports/activity-calendar.gjs @@ -1,6 +1,5 @@ import Component from "@glimmer/component"; import { action } from "@ember/object"; -import { and, eq } from "truth-helpers"; import concatClass from "discourse/helpers/concat-class"; const ROWS = 7; @@ -8,8 +7,6 @@ const COLS = 53; export default class ActivityCalendar extends Component { get rowsArray() { - console.log(this.args.report.data); - const data = this.args.report.data; let rowsArray = []; From 9847ecfe6e2c8f9fd318d4be9437c14f718679a0 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 3 Jan 2025 17:25:18 +0100 Subject: [PATCH 3/3] bests posts/topics --- .../rewind/action/best_posts.rb | 2 +- .../rewind/action/best_topics.rb | 2 +- .../components/reports/best-posts.gjs | 17 +++++++++++++++-- .../components/reports/best-topics.gjs | 18 ++++++++++++++++-- .../discourse/components/rewind.gjs | 4 ++++ assets/stylesheets/common/best-posts.scss | 6 ++++++ assets/stylesheets/common/best-topics.scss | 6 ++++++ assets/stylesheets/common/index.scss | 2 ++ 8 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 assets/stylesheets/common/best-posts.scss create mode 100644 assets/stylesheets/common/best-topics.scss diff --git a/app/services/discourse_rewind/rewind/action/best_posts.rb b/app/services/discourse_rewind/rewind/action/best_posts.rb index bd016b2..3f676ed 100644 --- a/app/services/discourse_rewind/rewind/action/best_posts.rb +++ b/app/services/discourse_rewind/rewind/action/best_posts.rb @@ -10,7 +10,7 @@ module DiscourseRewind .where(deleted_at: nil) .where("post_number > 1") .order("like_count DESC NULLS LAST") - .limit(5) + .limit(3) .pluck(:id, :topic_id, :like_count, :reply_count, :raw, :cooked) { data: best_posts, identifier: "best-posts" } diff --git a/app/services/discourse_rewind/rewind/action/best_topics.rb b/app/services/discourse_rewind/rewind/action/best_topics.rb index dcdfa12..99a473f 100644 --- a/app/services/discourse_rewind/rewind/action/best_topics.rb +++ b/app/services/discourse_rewind/rewind/action/best_topics.rb @@ -9,7 +9,7 @@ module DiscourseRewind .references(:topic) .where(topic: { deleted_at: nil, created_at: date, user_id: user.id }) .order("yearly_score DESC NULLS LAST") - .limit(5) + .limit(3) .pluck(:topic_id, :title, :excerpt, :yearly_score) .map do |topic_id, title, excerpt, yearly_score| { topic_id: topic_id, title: title, excerpt: excerpt, yearly_score: yearly_score } diff --git a/assets/javascripts/discourse/components/reports/best-posts.gjs b/assets/javascripts/discourse/components/reports/best-posts.gjs index 3112e8c..bcac2cb 100644 --- a/assets/javascripts/discourse/components/reports/best-posts.gjs +++ b/assets/javascripts/discourse/components/reports/best-posts.gjs @@ -1,9 +1,22 @@ import Component from "@glimmer/component"; +import { get } from "@ember/object"; +import { htmlSafe } from "@ember/template"; export default class BestPosts extends Component { } diff --git a/assets/javascripts/discourse/components/reports/best-topics.gjs b/assets/javascripts/discourse/components/reports/best-topics.gjs index 7faf2ab..c67181d 100644 --- a/assets/javascripts/discourse/components/reports/best-topics.gjs +++ b/assets/javascripts/discourse/components/reports/best-topics.gjs @@ -1,9 +1,23 @@ import Component from "@glimmer/component"; +import { concat } from "@ember/helper"; export default class BestTopics extends Component { } diff --git a/assets/javascripts/discourse/components/rewind.gjs b/assets/javascripts/discourse/components/rewind.gjs index 4b20116..92411a0 100644 --- a/assets/javascripts/discourse/components/rewind.gjs +++ b/assets/javascripts/discourse/components/rewind.gjs @@ -115,6 +115,10 @@ export default class Rewind extends Component { {{else if (eq report.identifier "word-cloud")}} + {{else if (eq report.identifier "best-posts")}} + + {{else if (eq report.identifier "best-topics")}} + {{else if (eq report.identifier "activity-calendar")}} {{/if}} diff --git a/assets/stylesheets/common/best-posts.scss b/assets/stylesheets/common/best-posts.scss new file mode 100644 index 0000000..649a7b7 --- /dev/null +++ b/assets/stylesheets/common/best-posts.scss @@ -0,0 +1,6 @@ +.-best-posts { + .rewind-report-container { + flex-direction: column; + gap: 1em; + } +} diff --git a/assets/stylesheets/common/best-topics.scss b/assets/stylesheets/common/best-topics.scss new file mode 100644 index 0000000..36a3219 --- /dev/null +++ b/assets/stylesheets/common/best-topics.scss @@ -0,0 +1,6 @@ +.-best-topics { + .rewind-report-container { + flex-direction: column; + gap: 1em; + } +} diff --git a/assets/stylesheets/common/index.scss b/assets/stylesheets/common/index.scss index 41cfe7f..e917869 100644 --- a/assets/stylesheets/common/index.scss +++ b/assets/stylesheets/common/index.scss @@ -4,4 +4,6 @@ @import "post-received-reactions"; @import "post-used-reactions"; @import "activity-calendar"; +@import "best-posts"; +@import "best-topics"; @import "blobs";