From 53a198ad5541c4e7cdffbbc47d66266ab8bda0ba Mon Sep 17 00:00:00 2001
From: Shane Scanlon <shane@turtlestack.dev>
Date: Wed, 14 Feb 2024 11:40:40 -0500
Subject: [PATCH] FIX: Hide timer info on topic status toggle (#25596)

Use topic.topic_status_update value to hide timer info after status
change.
---
 .../app/components/topic-timer-info.js        |  9 ++++
 .../discourse/app/templates/topic.hbs         |  1 +
 .../tests/acceptance/topic-edit-timer-test.js | 51 +++++++++++++++++++
 .../discourse/tests/fixtures/topic.js         |  1 +
 4 files changed, 62 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/components/topic-timer-info.js b/app/assets/javascripts/discourse/app/components/topic-timer-info.js
index 8d54e60675c..949a9457c3d 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timer-info.js
+++ b/app/assets/javascripts/discourse/app/components/topic-timer-info.js
@@ -69,7 +69,16 @@ export default Component.extend({
 
     const topicStatus = this.topicClosed ? "close" : "open";
     const topicStatusKnown = this.topicClosed !== undefined;
+    const topicStatusUpdate = this.statusUpdate !== undefined;
     if (topicStatusKnown && topicStatus === this.statusType) {
+      if (!topicStatusUpdate) {
+        return;
+      }
+
+      // The topic status has just been toggled, so we can hide the timer info.
+      this.set("showTopicTimer", null);
+      // The timer has already been removed on the back end. The front end is not aware of the change yet.
+      this.set("executeAt", null);
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 7a025c49098..b5cc8aec10a 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -462,6 +462,7 @@
               <TopicTimerInfo
                 @topicClosed={{this.model.closed}}
                 @statusType={{this.model.topic_timer.status_type}}
+                @statusUpdate={{this.model.topic_status_update}}
                 @executeAt={{this.model.topic_timer.execute_at}}
                 @basedOnLastPost={{this.model.topic_timer.based_on_last_post}}
                 @durationMinutes={{this.model.topic_timer.duration_minutes}}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js
index e360e431fc6..6b9e9d018c1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js
@@ -426,4 +426,55 @@ acceptance("Topic - Edit timer", function (needs) {
 
     assert.notOk(exists(".topic-timer-heading"));
   });
+
+  test("Close timer removed after manual close", async function (assert) {
+    updateCurrentUser({ moderator: true, trust_level: 4 });
+
+    await visit("/t/internationalization-localization");
+    await click(".toggle-admin-menu");
+    await click(".admin-topic-timer-update button");
+    await click("#tap_tile_tomorrow");
+    await click(".edit-topic-timer-modal button.btn-primary");
+
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-close button");
+
+    assert.notOk(exists(".topic-timer-heading"));
+  });
+
+  test("Open timer removed after manual open", async function (assert) {
+    updateCurrentUser({ moderator: true, trust_level: 4 });
+
+    await visit("/t/internationalization-localization");
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-close button");
+
+    await click(".toggle-admin-menu");
+    await click(".admin-topic-timer-update button");
+    await click("#tap_tile_tomorrow");
+    await click(".edit-topic-timer-modal button.btn-primary");
+
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-open button");
+
+    assert.notOk(exists(".topic-timer-heading"));
+  });
+
+  test("timer removed after manual toggle close and open", async function (assert) {
+    updateCurrentUser({ moderator: true, trust_level: 4 });
+
+    await visit("/t/internationalization-localization");
+    await click(".toggle-admin-menu");
+    await click(".admin-topic-timer-update button");
+    await click("#tap_tile_tomorrow");
+    await click(".edit-topic-timer-modal button.btn-primary");
+
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-close button");
+
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-open button");
+
+    assert.notOk(exists(".topic-timer-heading"));
+  });
 });
diff --git a/app/assets/javascripts/discourse/tests/fixtures/topic.js b/app/assets/javascripts/discourse/tests/fixtures/topic.js
index d6af54ef25a..14ba8c54df9 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/topic.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/topic.js
@@ -2186,6 +2186,7 @@ export default {
       auto_close_at: null,
       auto_close_hours: null,
       auto_close_based_on_last_post: false,
+      can_close_topic: true,
       created_by: {
         id: 255,
         username: "uwe_keim",