From 1ed3a89ac9831b442fc14fd4b11a3fd52e735efd Mon Sep 17 00:00:00 2001
From: Kyle Zhao <kzhao.sw@gmail.com>
Date: Wed, 25 Jul 2018 21:48:38 -0400
Subject: [PATCH] UX: clear topic timer text when manually closing/opening
 (#6123)

* UX: clear topic timer text when manually closing/opening

* added test for clearing topic timer status text
---
 .../components/topic-timer-info.js.es6        |  5 ++
 .../javascripts/discourse/templates/topic.hbs |  2 +
 .../acceptance/topic-edit-timer-test.js.es6   | 55 +++++++++++++++++++
 3 files changed, 62 insertions(+)

diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
index 2771a5504f1..6a3306a55a5 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -8,6 +8,7 @@ export default Ember.Component.extend(
     _delayedRerender: null,
 
     rerenderTriggers: [
+      "topicClosed",
       "statusType",
       "executeAt",
       "basedOnLastPost",
@@ -18,6 +19,10 @@ export default Ember.Component.extend(
     buildBuffer(buffer) {
       if (!this.get("executeAt")) return;
 
+      const topicStatus = this.get("topicClosed") ? "close" : "open";
+      const topicStatusKnown = this.get("topicClosed") !== undefined;
+      if (topicStatusKnown && topicStatus === this.get("statusType")) return;
+
       let statusUpdateAt = moment(this.get("executeAt"));
 
       let duration = moment.duration(statusUpdateAt - moment());
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 61cce48c1be..94870de470a 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -223,12 +223,14 @@
 
               {{#if model.private_topic_timer.execute_at}}
                 {{topic-timer-info
+                    topicClosed=model.closed
                     statusType=model.private_topic_timer.status_type
                     executeAt=model.private_topic_timer.execute_at
                     duration=model.private_topic_timer.duration}}
               {{/if}}
 
               {{topic-timer-info
+                  topicClosed=model.closed
                   statusType=model.topic_timer.status_type
                   executeAt=model.topic_timer.execute_at
                   basedOnLastPost=model.topic_timer.based_on_last_post
diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
index f437f298840..99851739e40 100644
--- a/test/javascripts/acceptance/topic-edit-timer-test.js.es6
+++ b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
@@ -1,6 +1,12 @@
 import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
 acceptance("Topic - Edit timer", { loggedIn: true });
 
+const response = object => [
+  200,
+  { "Content-Type": "application/json" },
+  object
+];
+
 QUnit.test("default", assert => {
   const timerType = selectKit(".select-kit.timer-type");
   const futureDateInputSelector = selectKit(".future-date-input-selector");
@@ -253,3 +259,52 @@ QUnit.test("auto delete", assert => {
     assert.ok(regex.test(html));
   });
 });
+
+QUnit.test(
+  "Manually closing before the timer will clear the status text",
+  async assert => {
+    // prettier-ignore
+    server.post("/t/280/timer", () => // eslint-disable-line no-undef
+      response({
+        success: "OK",
+        execute_at: new Date(
+          new Date().getTime() + 1 * 60 * 60 * 1000
+        ).toISOString(),
+        duration: 1,
+        based_on_last_post: false,
+        closed: false,
+        category_id: null
+      })
+    );
+
+    // prettier-ignore
+    server.put("/t/internationalization-localization/280/status", () => // eslint-disable-line no-undef
+      response({
+        success: "OK",
+        topic_status_update: null
+      })
+    );
+
+    const futureDateInputSelector = selectKit(".future-date-input-selector");
+
+    await visit("/t/internationalization-localization");
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-status-update button");
+    await futureDateInputSelector.expand().selectRowByValue("next_week");
+    await click(".modal-footer button.btn-primary");
+
+    const regex = /will automatically close in/g;
+    const topicStatusInfo = find(".topic-status-info")
+      .html()
+      .trim();
+    assert.ok(regex.test(topicStatusInfo));
+
+    await click(".toggle-admin-menu");
+    await click(".topic-admin-close button");
+
+    const newTopicStatusInfo = find(".topic-status-info")
+      .html()
+      .trim();
+    assert.notOk(regex.test(newTopicStatusInfo));
+  }
+);