FEATURE: automatically delete replies on a topic after N days. (#9209)

app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs

@@ -7,46 +7,32 @@
       value=selection
     }}
   </div>
-
-  <div>
-    {{#if showTimeOnly}}
+  {{#if publishToCategory}}
+    <div class="control-group">
+      <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
+      {{category-chooser
+        value=topicTimer.category_id
+        excludeCategoryId=excludeCategoryId
+        onChange=(action (mut topicTimer.category_id))
+      }}
+    </div>
+  {{/if}}
+  {{#if showFutureDateInput}}
+    <div class="control-group">
       {{future-date-input
         input=(readonly topicTimer.updateTime)
+        duration=(readonly topicTimer.duration)
         label="topic.topic_status_update.when"
         statusType=selection
         includeWeekend=true
         basedOnLastPost=topicTimer.based_on_last_post
-        onChangeInput=onChangeUpdateTime
-      }}
-    {{else if publishToCategory}}
-      <div class="control-group">
-        <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
-        {{category-chooser
-          value=topicTimer.category_id
-          excludeCategoryId=excludeCategoryId
-          onChange=(action (mut topicTimer.category_id))
-        }}
-      </div>
-
-      {{future-date-input
-        input=(readonly topicTimer.updateTime)
-        label="topic.topic_status_update.when"
-        statusType=selection
-        includeWeekend=true
+        onChangeInput=onChangeInput
+        onChangeDuration=onChangeDuration
         categoryId=topicTimer.category_id
-        basedOnLastPost=topicTimer.based_on_last_post
-        onChangeInput=onChangeUpdateTime
-      }}
-    {{else if autoClose}}
-      {{future-date-input
-        input=topicTimer.updateTime
-        label="topic.topic_status_update.when"
-        statusType=selection
-        includeWeekend=true
-        basedOnLastPost=topicTimer.based_on_last_post
         lastPostedAt=model.last_posted_at
-        onChangeInput=onChangeUpdateTime
+        isBasedOnDuration=autoDeleteReplies
+        durationType=durationType
       }}
-    {{/if}}
-  </div>
+    </div>
+  {{/if}}
 </form>

app/assets/javascripts/discourse/templates/components/future-date-input.hbs

@@ -1,4 +1,5 @@
 <div class="future-date-input">
+  {{#unless isBasedOnDuration}}
   <div class="control-group">
     <label>{{displayLabel}}</label>
     {{future-date-input-selector
@@ -16,6 +17,7 @@
       onChange=(action (mut selection))
     }}
   </div>
+  {{/unless}}
 
   {{#if displayDateAndTimePicker}}
     <div class="control-group">
@@ -33,11 +35,11 @@
     </div>
   {{/if}}
 
-  {{#if isBasedOnLastPost}}
+  {{#if displayNumberInput}}
     <div class="control-group">
       <label>
-        {{i18n 'topic.topic_status_update.num_of_hours'}}
-        {{text-field value=input type="number"}}
+        {{durationLabel}}
+        {{text-field value=duration type="number"}}
       </label>
     </div>