UX: Rewind feedback and fixes 2 (#36614)

martin-brennan · web-flow · commit 63257772c40a · 2025-12-11T11:57:22.000+10:00
* Add missing translation string
* Refactor is_rewind_active into the JS service, and undo change
  to plugin.rb looking at whether rewind is disabled
* Replace emoji in best topic titles
diff --git a/plugins/discourse-rewind/app/services/discourse_rewind/action/best_topics.rb b/plugins/discourse-rewind/app/services/discourse_rewind/action/best_topics.rb
@@ -13,7 +13,7 @@ class BestTopics < BaseReport
           },
           {
             topic_id: 2,
-            title: "Best practices for database optimization",
+            title: ":file_cabinet: Best practices for database optimization",
             excerpt: "Learn how to optimize your database queries for better performance...",
             yearly_score: 38.2,
           },
diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/best-topics.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/best-topics.gjs
@@ -28,7 +28,9 @@ export default class BestTopics extends Component {
               >
                 <span class="best-topics --rank"></span>
                 <span class="best-topics --rank"></span>
-                <h2 class="best-topics__header">{{topic.title}}</h2>
+                <h2 class="best-topics__header">{{replaceEmoji
+                    topic.title
+                  }}</h2>
                 <span class="best-topics__excerpt">
                   {{replaceEmoji (htmlSafe topic.excerpt)}}
                 </span>
diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/new-user-interactions.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/new-user-interactions.gjs
@@ -14,7 +14,11 @@ export default class NewUserInteractions extends Component {
   <template>
     <div class="rewind-report-page --new-user-interactions">
       <div class="wordart-container">
-        <div class="wordart-text">your contributions helped</div>
+        <div class="wordart-text">
+          {{i18n
+            "discourse_rewind.reports.new_user_interactions.your_contributions_helped"
+          }}
+        </div>
         <div class="wordart-3d">
           {{#each this.wavyWords as |word|}}
             <span class="wordart-word">
diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/connectors/after-header-panel/rewind-decoration.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/connectors/after-header-panel/rewind-decoration.gjs
@@ -3,14 +3,11 @@ import { service } from "@ember/service";
 import bodyClass from "discourse/helpers/body-class";
 
 export default class AvatarDecorator extends Component {
-  @service currentUser;
   @service rewind;
 
   get showDecorator() {
     return (
-      this.currentUser?.is_rewind_active &&
-      !this.rewind.dismissed &&
-      !this.rewind.disabled
+      this.rewind.active && !this.rewind.dismissed && !this.rewind.disabled
     );
   }
 
diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/connectors/before-panel-body/rewind-callout.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/connectors/before-panel-body/rewind-callout.gjs
@@ -7,14 +7,11 @@ import { i18n } from "discourse-i18n";
 
 export default class RewindCallout extends Component {
   @service router;
-  @service currentUser;
   @service rewind;
 
   get showCallout() {
     return (
-      this.currentUser?.is_rewind_active &&
-      !this.rewind.dismissed &&
-      !this.rewind.disabled
+      this.rewind.active && !this.rewind.dismissed && !this.rewind.disabled
     );
   }
 
diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/connectors/user-activity-bottom/rewind-tab.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/connectors/user-activity-bottom/rewind-tab.gjs
@@ -5,11 +5,10 @@ import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class RewindTab extends Component {
-  @service currentUser;
   @service rewind;
 
   get showNavTab() {
-    return this.currentUser?.is_rewind_active && !this.rewind.disabled;
+    return this.rewind.active && !this.rewind.disabled;
   }
 
   <template>
diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/initializers/rewind-setup.js b/plugins/discourse-rewind/assets/javascripts/discourse/initializers/rewind-setup.js
@@ -13,18 +13,20 @@ export default {
       return;
     }
 
-    if (!this.currentUser.is_rewind_active) {
+    if (!this.rewind.active) {
       return;
     }
 
     withPluginApi((api) => {
-      api.addQuickAccessProfileItem({
-        icon: "repeat",
-        href: "/my/activity/rewind",
-        content: i18n("discourse_rewind.profile_link", {
-          rewindYear: this.rewind.fetchRewindYear,
-        }),
-      });
+      if (!this.rewind.disabled) {
+        api.addQuickAccessProfileItem({
+          icon: "repeat",
+          href: "/my/activity/rewind",
+          content: i18n("discourse_rewind.profile_link", {
+            rewindYear: this.rewind.fetchRewindYear,
+          }),
+        });
+      }
     });
   },
 };
diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/services/rewind.js b/plugins/discourse-rewind/assets/javascripts/discourse/services/rewind.js
@@ -12,6 +12,10 @@ export default class Rewind extends Service {
   @tracked
   _isDisabled = this.currentUser?.user_option?.discourse_rewind_disabled;
 
+  get active() {
+    return this.currentUser?.is_rewind_active;
+  }
+
   get disabled() {
     return this._isDisabled ?? false;
   }
diff --git a/plugins/discourse-rewind/config/locales/client.en.yml b/plugins/discourse-rewind/config/locales/client.en.yml
@@ -133,6 +133,7 @@ en:
           replies: Replies to Posts
           mentions: Mentions
           topics_with_new_users: Topics with New Users
+          your_contributions_helped: your contributions helped
         time_of_day_activity:
           title: Daily Activity Rhythm
           play_button: Play your activity as sound
diff --git a/plugins/discourse-rewind/plugin.rb b/plugins/discourse-rewind/plugin.rb
@@ -65,8 +65,6 @@ def self.year_date_range(date_override = nil)
   end
 
   add_to_serializer(:current_user, :is_rewind_active) do
-    return false if object.user_option&.discourse_rewind_disabled
-
     Rails.env.development? || Date.today.month == 1 || Date.today.month == 12
   end
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class BestTopics < BaseReport`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`topic_id: 2,`
`16`		`- title: "Best practices for database optimization",`
	`16`	`+ title: ":file_cabinet: Best practices for database optimization",`
`17`	`17`	`excerpt: "Learn how to optimize your database queries for better performance...",`
`18`	`18`	`yearly_score: 38.2,`
`19`	`19`	`},`