From a655a009fade4671e4a2d38f0a0f7ce89d201d80 Mon Sep 17 00:00:00 2001
From: Isaac Janzen <50783505+janzenisaac@users.noreply.github.com>
Date: Wed, 26 Apr 2023 15:30:50 -0500
Subject: [PATCH] DEV: Use angle bracket syntax (#460)

- Use angle bracket syntax (updated via https://github.com/ember-codemods/ember-angle-brackets-codemod)
- Update deprecated options being passed to components (eg. @input -> on "input")
---
 .../assigned-to-filter.hbs                    | 12 +++----
 .../assigned-advanced-search.hbs              | 12 +++----
 .../assign-settings.hbs                       | 10 +++---
 .../assignable-interaction-fields.hbs         | 16 ++++-----
 .../user-activity-bottom/assigned-list.hbs    |  4 +--
 .../user-messages-nav/assigned-messages.hbs   |  4 +--
 .../components/basic-assigned-topic-list.hbs  | 10 ++++--
 .../components/group-assigned-filter.hbs      | 36 +++++++++----------
 .../components/group-assigned-menu-item.hbs   |  4 +--
 .../components/remind-assigns-frequency.hbs   | 14 ++++----
 .../discourse/templates/group-topics-list.hbs | 26 +++++++-------
 .../discourse/templates/group/assigned.hbs    | 30 ++++++++--------
 .../components/assigned-topic-list-item.hbs   |  2 +-
 .../components/basic-assigned-topic-list.hbs  | 10 ++++--
 .../discourse/templates/modal/assign-user.hbs | 27 +++++++-------
 .../templates/user-assigned-topics.hbs        | 26 +++++++-------
 16 files changed, 127 insertions(+), 116 deletions(-)

diff --git a/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs b/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs
index 9ccf44f..9c179f9 100644
--- a/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs
+++ b/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs
@@ -1,15 +1,15 @@
 <div class="reviewable-filter discourse-assign-assign-to-filter">
   <label class="filter-label">{{i18n "discourse_assign.assigned_to"}}</label>
-  {{email-group-user-chooser
-    value=additionalFilters.assigned_to
-    onChange=(action "updateAssignedTo")
+  <EmailGroupUserChooser
+    @value={{additionalFilters.assigned_to}}
+    @onChange={{action "updateAssignedTo"}}
     autocomplete="off"
-    options=(hash
+    @options={{hash
       maximum=1
       fullWidthWrap=true
       filterPlaceholder=placeholderKey
       includeGroups=false
       groupMembersOf=allowedGroups
-    )
-  }}
+    }}
+  />
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs b/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs
index deadbb3..9ccc30e 100644
--- a/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs
+++ b/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs
@@ -3,15 +3,15 @@
       "search.advanced.assigned.label"
     }}</label>
   <div class="controls">
-    {{email-group-user-chooser
-      value=searchedTerms.assigned
-      onChange=(action "onChangeAssigned")
-      options=(hash
+    <EmailGroupUserChooser
+      @value={{searchedTerms.assigned}}
+      @onChange={{action "onChangeAssigned"}}
+      @options={{hash
         maximum=1
         excludeCurrentUser=false
         includeGroups=true
         customSearchOptions=(hash assignableGroups=true)
-      )
-    }}
+      }}
+    />
   </div>
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse-assign/connectors/category-custom-settings/assign-settings.hbs b/assets/javascripts/discourse-assign/connectors/category-custom-settings/assign-settings.hbs
index 5787708..05009e3 100644
--- a/assets/javascripts/discourse-assign/connectors/category-custom-settings/assign-settings.hbs
+++ b/assets/javascripts/discourse-assign/connectors/category-custom-settings/assign-settings.hbs
@@ -2,11 +2,11 @@
 <section class="field">
   <div class="enable-accepted-answer">
     <label class="checkbox-label">
-      {{input
-        type="checkbox"
-        checked=(readonly category.enable_unassigned_filter)
-        change=(action "onChangeSetting" value="target.checked")
-      }}
+      <Input
+        @type="checkbox"
+        @checked={{readonly category.enable_unassigned_filter}}
+        {{on "change" (action "onChangeSetting" value="target.checked")}}
+      />
       {{i18n "discourse_assign.add_unassigned_filter"}}
     </label>
   </div>
diff --git a/assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs b/assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
index 8e5241e..87913f7 100644
--- a/assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
+++ b/assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
@@ -6,12 +6,12 @@
       "discourse_assign.admin.groups.manage.interaction.assignable_levels.title"
     }}</label>
 
-  {{combo-box
-    name="alias"
-    valueProperty="value"
-    value=assignableLevel
-    content=assignableLevelOptions
-    class="groups-form-assignable-level"
-    onChange=(action (mut model.assignable_level))
-  }}
+  <ComboBox
+    @name="alias"
+    @valueProperty="value"
+    @value={{assignableLevel}}
+    @content={{assignableLevelOptions}}
+    @class="groups-form-assignable-level"
+    @onChange={{action (mut model.assignable_level)}}
+  />
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs b/assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs
index c7a6d57..80e7d10 100644
--- a/assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs
+++ b/assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs
@@ -1,6 +1,6 @@
 {{#if currentUser.can_assign}}
-  {{#link-to "userActivity.assigned"}}
+  <LinkTo @route="userActivity.assigned">
     {{d-icon "user-plus"}}
     {{i18n "discourse_assign.assigned"}}
-  {{/link-to}}
+  </LinkTo>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs b/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs
index b04996b..319c8c4 100644
--- a/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs
+++ b/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs
@@ -1,4 +1,4 @@
-{{#link-to "userPrivateMessages.assigned" model}}
+<LinkTo @route="userPrivateMessages.assigned" @model={{model}}>
   {{d-icon "user-plus" class="glyph"}}
   {{i18n "discourse_assign.assigned"}}
-{{/link-to}}
\ No newline at end of file
+</LinkTo>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs b/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs
index 7f06a5c..21de06d 100644
--- a/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs
+++ b/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs
@@ -1,8 +1,12 @@
-{{#conditional-loading-spinner condition=loading}}
+<ConditionalLoadingSpinner @condition={{loading}}>
   {{#if hasIncoming}}
     <div class="show-mores">
       <a href class="alert alert-info clickable" {{action showInserted}}>
-        {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+        <CountI18n
+          @key="topic_count_"
+          @suffix="latest"
+          @count={{incomingCount}}
+        />
       </a>
     </div>
   {{/if}}
@@ -33,4 +37,4 @@
       </div>
     {{/unless}}
   {{/if}}
-{{/conditional-loading-spinner}}
\ No newline at end of file
+</ConditionalLoadingSpinner>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/group-assigned-filter.hbs b/assets/javascripts/discourse/templates/components/group-assigned-filter.hbs
index 8b780ec..14733de 100644
--- a/assets/javascripts/discourse/templates/components/group-assigned-filter.hbs
+++ b/assets/javascripts/discourse/templates/components/group-assigned-filter.hbs
@@ -1,9 +1,9 @@
 {{#if showAvatar}}
-  {{#link-to
-    "group.assigned.show"
-    filter.username_lower
-    (query-params order=order ascending=ascending search=search)
-  }}
+  <LinkTo
+    @route="group.assigned.show"
+    @model={{filter.username_lower}}
+    @query={{hash order=order ascending=ascending search=search}}
+  >
     <div class="assign-image">
       <a href={{filter.userPath}} data-user-card={{filter.username}}>{{avatar
           filter
@@ -19,13 +19,13 @@
     <div class="assign-count">
       {{filter.assignments_count}}
     </div>
-  {{/link-to}}
+  </LinkTo>
 {{else if groupName}}
-  {{#link-to
-    "group.assigned.show"
-    filter
-    (query-params order=order ascending=ascending search=search)
-  }}
+  <LinkTo
+    @route="group.assigned.show"
+    @model={{filter}}
+    @query={{hash order=order ascending=ascending search=search}}
+  >
     <div class="assign-image">
       {{d-icon "group-plus"}}
     </div>
@@ -36,18 +36,18 @@
     <div class="assign-count">
       {{assignmentCount}}
     </div>
-  {{/link-to}}
+  </LinkTo>
 {{else}}
-  {{#link-to
-    "group.assigned.show"
-    filter
-    (query-params order=order ascending=ascending search=search)
-  }}
+  <LinkTo
+    @route="group.assigned.show"
+    @model={{filter}}
+    @query={{hash order=order ascending=ascending search=search}}
+  >
     <div class="assign-everyone">
       {{i18n "discourse_assign.group_everyone"}}
     </div>
     <div class="assign-count">
       {{assignmentCount}}
     </div>
-  {{/link-to}}
+  </LinkTo>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/group-assigned-menu-item.hbs b/assets/javascripts/discourse/templates/components/group-assigned-menu-item.hbs
index 8ed597d..2b9aff1 100644
--- a/assets/javascripts/discourse/templates/components/group-assigned-menu-item.hbs
+++ b/assets/javascripts/discourse/templates/components/group-assigned-menu-item.hbs
@@ -1,4 +1,4 @@
-{{#link-to "group.assigned"}}
+<LinkTo @route="group.assigned">
   {{d-icon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}}
   ({{group.assignment_count}})
-{{/link-to}}
\ No newline at end of file
+</LinkTo>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs b/assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs
index 8791629..751a8b7 100644
--- a/assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs
+++ b/assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs
@@ -1,12 +1,12 @@
 {{#if siteSettings.assign_enabled}}
   <div class="controls controls-dropdown">
     <label>{{i18n "discourse_assign.reminders_frequency.description"}}</label>
-    {{combo-box
-      id="remind-assigns-frequency"
-      valueProperty="value"
-      content=availableFrequencies
-      value=selectedFrequency
-      onChange=(action (mut user.custom_fields.remind_assigns_frequency))
-    }}
+    <ComboBox
+      @id="remind-assigns-frequency"
+      @valueProperty="value"
+      @content={{availableFrequencies}}
+      @value={{selectedFrequency}}
+      @onChange={{action (mut user.custom_fields.remind_assigns_frequency)}}
+    />
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/group-topics-list.hbs b/assets/javascripts/discourse/templates/group-topics-list.hbs
index 3e7867b..ed19ee7 100644
--- a/assets/javascripts/discourse/templates/group-topics-list.hbs
+++ b/assets/javascripts/discourse/templates/group-topics-list.hbs
@@ -1,20 +1,20 @@
 <div class="topic-search-div">
   <div class="inline-form full-width">
-    {{input
+    <Input
       class="no-blur"
-      value=(readonly search)
-      placeholder=(i18n "discourse_assign.topic_search_placeholder")
-      input=(action "onChangeFilter" value="target.value")
+      @value={{readonly search}}
+      placeholder={{i18n "discourse_assign.topic_search_placeholder"}}
       autocomplete="off"
-      type="search"
-    }}
+      @type="search"
+      {{on "input" (action "onChangeFilter" value="target.value")}}
+    />
   </div>
 </div>
-{{#load-more
-  class="paginated-topics-list"
-  selector=".paginated-topics-list .topic-list tr"
-  action=(action "loadMore")
-}}
+<LoadMore
+  @class="paginated-topics-list"
+  @selector=".paginated-topics-list .topic-list tr"
+  @action={{action "loadMore"}}
+>
 
   {{basic-assigned-topic-list
     topicList=model
@@ -36,5 +36,5 @@
     scrollOnLoad=true
   }}
 
-  {{conditional-loading-spinner condition=model.loadingMore}}
-{{/load-more}}
\ No newline at end of file
+  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+</LoadMore>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/group/assigned.hbs b/assets/javascripts/discourse/templates/group/assigned.hbs
index 60b305d..1d505f8 100644
--- a/assets/javascripts/discourse/templates/group/assigned.hbs
+++ b/assets/javascripts/discourse/templates/group/assigned.hbs
@@ -1,20 +1,22 @@
 <section class="user-secondary-navigation group-assignments">
-  {{#mobile-nav
-    class="activity-nav"
-    desktopClass="action-list activity-list nav-stacked"
-  }}
+  <MobileNav
+    @class="activity-nav"
+    @desktopClass="action-list activity-list nav-stacked"
+  >
     {{#if isDesktop}}
       <div class="search-div">
-        {{input
-          type="text"
-          placeholder=(i18n "discourse_assign.sidebar_name_filter_placeholder")
-          value=(readonly filterName)
+        <Input
+          @type="text"
+          placeholder={{i18n
+            "discourse_assign.sidebar_name_filter_placeholder"
+          }}
+          @value={{readonly filterName}}
           class="search"
-          input=(action "onChangeFilterName" value="target.value")
-        }}
+          {{on "input" (action "onChangeFilterName" value="target.value")}}
+        />
       </div>
     {{/if}}
-    {{#load-more selector=".activity-nav li" action=(action "loadMore")}}
+    <LoadMore @selector=".activity-nav li" @action={{action "loadMore"}}>
       {{group-assigned-filter
         showAvatar=false
         filter="everyone"
@@ -44,9 +46,9 @@
           order=order
         }}
       {{/each}}
-      {{conditional-loading-spinner condition=loading}}
-    {{/load-more}}
-  {{/mobile-nav}}
+      <ConditionalLoadingSpinner @condition={{loading}} />
+    </LoadMore>
+  </MobileNav>
 </section>
 <section class="user-content">
   {{outlet}}
diff --git a/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs b/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs
index 16ba554..b689531 100644
--- a/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs
+++ b/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs
@@ -1,6 +1,6 @@
 <td class="topic-list-data">
   <div class="main-link">
-    {{topic-status topic=topic}}
+    <TopicStatus @topic={{topic}} />
     {{~#if isPrivateMessage}}
       {{~d-icon "envelope" class="private-message-icon"}}
     {{~/if}}
diff --git a/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs b/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs
index 9efbaad..40f52a6 100644
--- a/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs
+++ b/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs
@@ -1,8 +1,12 @@
-{{#conditional-loading-spinner condition=loading}}
+<ConditionalLoadingSpinner @condition={{loading}}>
   {{#if hasIncoming}}
     <div class="show-mores">
       <a href class="alert alert-info clickable" {{action showInserted}}>
-        {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+        <CountI18n
+          @key="topic_count_"
+          @suffix="latest"
+          @count={{incomingCount}}
+        />
       </a>
     </div>
   {{/if}}
@@ -29,4 +33,4 @@
       {{i18n "choose_topic.none_found"}}
     </div>
   {{/if}}
-{{/conditional-loading-spinner}}
\ No newline at end of file
+</ConditionalLoadingSpinner>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/modal/assign-user.hbs b/assets/javascripts/discourse/templates/modal/assign-user.hbs
index db1e97e..ffcb211 100644
--- a/assets/javascripts/discourse/templates/modal/assign-user.hbs
+++ b/assets/javascripts/discourse/templates/modal/assign-user.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body class="assign"}}
+<DModalBody @class="assign">
   <div>
     <div class="control-group {{if this.assigneeError 'assignee-error'}}">
       <label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
@@ -34,12 +34,12 @@
     {{#if this.statusEnabled}}
       <div class="control-group assign-status">
         <label>{{i18n "discourse_assign.assign_modal.status_label"}}</label>
-        {{combo-box
-          id="assign-status"
-          content=availableStatuses
-          value=status
-          onChange=(action (mut model.status))
-        }}
+        <ComboBox
+          @id="assign-status"
+          @content={{availableStatuses}}
+          @value={{status}}
+          @onChange={{action (mut model.status)}}
+        />
       </div>
     {{/if}}
 
@@ -49,14 +49,15 @@
           class="label-optional"
         >{{i18n "discourse_assign.assign_modal.optional_label"}}</span>
       </label>
-      {{textarea
-        id="assign-modal-note"
-        value=model.note
-        key-down=(action "handleTextAreaKeydown")
-      }}
+      <Textarea
+        id={{"assign-modal-note"}}
+        @value={{model.note}}
+        {{! template-lint-disable no-down-event-binding }}
+        {{on "keydown" (action "handleTextAreaKeydown")}}
+      />
     </div>
   </div>
-{{/d-modal-body}}
+</DModalBody>
 
 <div class="modal-footer">
   {{d-button
diff --git a/assets/javascripts/discourse/templates/user-assigned-topics.hbs b/assets/javascripts/discourse/templates/user-assigned-topics.hbs
index 7bf99d5..5ccd0b5 100644
--- a/assets/javascripts/discourse/templates/user-assigned-topics.hbs
+++ b/assets/javascripts/discourse/templates/user-assigned-topics.hbs
@@ -6,22 +6,22 @@
 {{else}}
   <div class="topic-search-div">
     <div class="inline-form full-width">
-      {{input
+      <Input
         class="no-blur"
-        value=(readonly search)
-        placeholder=(i18n "discourse_assign.topic_search_placeholder")
-        input=(action "onChangeFilter" value="target.value")
+        @value={{readonly search}}
+        placeholder={{i18n "discourse_assign.topic_search_placeholder"}}
         autocomplete="off"
-        type="search"
-      }}
+        @type="search"
+        {{on "input" (action "onChangeFilter" value="target.value")}}
+      />
     </div>
   </div>
 
-  {{#load-more
-    class="paginated-topics-list"
-    selector=".paginated-topics-list .topic-list tr"
-    action=(action "loadMore")
-  }}
+  <LoadMore
+    @class="paginated-topics-list"
+    @selector=".paginated-topics-list .topic-list tr"
+    @action={{action "loadMore"}}
+  >
     {{basic-assigned-topic-list
       topicList=model
       hideCategory=hideCategory
@@ -39,6 +39,6 @@
       scrollOnLoad=true
     }}
 
-    {{conditional-loading-spinner condition=model.loadingMore}}
-  {{/load-more}}
+    <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+  </LoadMore>
 {{/if}}
\ No newline at end of file