DEV: Update eslint-config-discourse, use prettier for hbs (#414)

.github/workflows/plugin-linting.yml

@@ -41,8 +41,8 @@ jobs:
         shell: bash
         run: |
           yarn prettier -v
-          if [ 0 -lt $(find assets admin/assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
+          if [ 0 -lt $(find assets admin/assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" -or -name "*.hbs" \) 2> /dev/null | wc -l) ]; then
-            yarn prettier --list-different "assets/**/*.{scss,js,es6}"
+            yarn prettier --list-different "assets/**/*.{scss,js,es6,hbs}"
           fi
           if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
             yarn prettier --list-different "test/**/*.{js,es6}"
@@ -50,7 +50,12 @@ jobs:
 
       - name: Ember template lint
         if: ${{ !cancelled() }}
-        run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts admin/assets/javascripts
+        run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts
+
+      # Separated due to https://github.com/ember-template-lint/ember-template-lint/issues/2758
+      - name: Ember template lint (admin)
+        if: ${{ !cancelled() }}
+        run: yarn ember-template-lint --no-error-on-unmatched-pattern admin/assets/javascripts
 
       - name: Rubocop
         if: ${{ !cancelled() }}

assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs

@@ -1,5 +1,7 @@
 <div class="control-group">
-  <label class="control-label" for="search-assigned-to">{{i18n "search.advanced.assigned.label"}}</label>
+  <label class="control-label" for="search-assigned-to">{{i18n
+      "search.advanced.assigned.label"
+    }}</label>
   <div class="controls">
     {{email-group-user-chooser
       value=searchedTerms.assigned

assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs

@@ -1,6 +1,10 @@
 <div class="control-group">
-  <label class="control-label">{{i18n "discourse_assign.admin.groups.manage.interaction.assign"}}</label>
+  <label class="control-label">{{i18n
-  <label for="visiblity">{{i18n "discourse_assign.admin.groups.manage.interaction.assignable_levels.title"}}</label>
+      "discourse_assign.admin.groups.manage.interaction.assign"
+    }}</label>
+  <label for="visiblity">{{i18n
+      "discourse_assign.admin.groups.manage.interaction.assignable_levels.title"
+    }}</label>
 
   {{combo-box
     name="alias"

assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs

@@ -1,5 +1,6 @@
 {{#if currentUser.can_assign}}
   {{#link-to "userActivity.assigned"}}
-    {{d-icon "user-plus"}} {{i18n "discourse_assign.assigned"}}
+    {{d-icon "user-plus"}}
+    {{i18n "discourse_assign.assigned"}}
   {{/link-to}}
 {{/if}}

assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs

@@ -1,13 +1,13 @@
-{{!--
+{{!
   The `~` syntax strip spaces between the elements, making it produce
   `<a class=topic-post-badges>Some text</a><span class=topic-post-badges>`,
   with no space between them.
   This causes the topic-post-badge to be considered the same word as "text"
   at the end of the link, preventing it from line wrapping onto its own line.
---}}
+}}
 {{#if bulkSelectEnabled}}
   <td class="bulk-select topic-list-data">
-    <input type="checkbox" class="bulk-select">
+    <input type="checkbox" class="bulk-select" />
   </td>
 {{/if}}
 <td class="main-link clearfix topic-list-data" colspan="1">
@@ -21,7 +21,13 @@
       {{~topic-featured-link topic}}
     {{~/if}}
     {{~#if showTopicPostBadges}}
-      {{~raw "topic-post-badges" unread=topic.unread unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
+      {{~raw
+        "topic-post-badges"
+        unread=topic.unread
+        unseen=topic.unseen
+        url=topic.lastUnreadUrl
+        newDotText=newDotText
+      }}
     {{~/if}}
   </span>
   <div class="link-bottom-line">
@@ -31,7 +37,13 @@
       {{/unless}}
     {{/unless}}
     {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
-    {{raw "list/action-list" topic=topic postNumbers=topic.liked_post_numbers className="likes" icon="heart"}}
+    {{raw
+      "list/action-list"
+      topic=topic
+      postNumbers=topic.liked_post_numbers
+      className="likes"
+      icon="heart"
+    }}
   </div>
   {{#if expandPinned}}
     {{raw "list/topic-excerpt" topic=topic}}
@@ -44,8 +56,16 @@
 
 {{raw "list/posts-count-column" topic=topic}}
 
-<td class="num views {{topic.viewsHeat}} topic-list-data">{{number topic.views numberKey="views_long"}}</td>
+<td class="num views {{topic.viewsHeat}} topic-list-data">{{number
-{{raw "list/activity-column" topic=topic class="num topic-list-data" tagName="td"}}
+    topic.views
+    numberKey="views_long"
+  }}</td>
+{{raw
+  "list/activity-column"
+  topic=topic
+  class="num topic-list-data"
+  tagName="td"
+}}
 <td class="topic-list-data">
   {{#if topic.assigned_to_user}}
     {{assign-actions-dropdown
@@ -63,9 +83,6 @@
       reassign=reassign
     }}
   {{else}}
-    {{assign-actions-dropdown
+    {{assign-actions-dropdown topic=topic unassign=unassign}}
-      topic=topic
-      unassign=unassign
-    }}
   {{/if}}
 </td>

assets/javascripts/discourse/templates/components/assigned-topic-list.hbs

@@ -1,6 +1,7 @@
 {{#unless skipHeader}}
   <thead class="topic-list-header assigned-topic-list-header">
-    {{raw "topic-list-header"
+    {{raw
+      "topic-list-header"
       canBulkSelect=canBulkSelect
       canDoBulkActions=canDoBulkActions
       toggleInTitle=toggleInTitle

assets/javascripts/discourse/templates/components/group-assigned-filter.hbs

@@ -1,7 +1,14 @@
 {{#if showAvatar}}
-  {{#link-to "group.assigned.show" filter.username_lower (query-params order=order ascending=ascending search=search)}}
+  {{#link-to
+    "group.assigned.show"
+    filter.username_lower
+    (query-params order=order ascending=ascending search=search)
+  }}
     <div class="assign-image">
-      <a href={{filter.userPath}} data-user-card={{filter.username}}>{{avatar filter imageSize="large"}}</a>
+      <a href={{filter.userPath}} data-user-card={{filter.username}}>{{avatar
+          filter
+          imageSize="large"
+        }}</a>
     </div>
 
     <div class="assign-names">
@@ -14,7 +21,11 @@
     </div>
   {{/link-to}}
 {{else if groupName}}
-  {{#link-to "group.assigned.show" filter (query-params order=order ascending=ascending search=search)}}
+  {{#link-to
+    "group.assigned.show"
+    filter
+    (query-params order=order ascending=ascending search=search)
+  }}
     <div class="assign-image">
       {{d-icon "group-plus"}}
     </div>
@@ -27,7 +38,11 @@
     </div>
   {{/link-to}}
 {{else}}
-  {{#link-to "group.assigned.show" filter (query-params order=order ascending=ascending search=search)}}
+  {{#link-to
+    "group.assigned.show"
+    filter
+    (query-params order=order ascending=ascending search=search)
+  }}
     <div class="assign-everyone">
       {{i18n "discourse_assign.group_everyone"}}
     </div>

assets/javascripts/discourse/templates/components/group-assigned-menu-item.hbs

@@ -1,3 +1,4 @@
 {{#link-to "group.assigned"}}
-  {{d-icon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}} ({{group.assignment_count}})
+  {{d-icon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}}
+  ({{group.assignment_count}})
 {{/link-to}}

assets/javascripts/discourse/templates/components/user-menu/assigns-list-empty-state.hbs

@@ -4,11 +4,13 @@
   </span>
   <div class="empty-state-body">
     <p>
-      {{html-safe (i18n
+      {{html-safe
-        "user.no_assignments_body"
+        (i18n
-        icon=(d-icon "user-plus")
+          "user.no_assignments_body"
-        preferencesUrl=(get-url "/my/preferences/notifications")
+          icon=(d-icon "user-plus")
-      )}}
+          preferencesUrl=(get-url "/my/preferences/notifications")
+        )
+      }}
     </p>
   </div>
 </div>

assets/javascripts/discourse/templates/group-topics-list.hbs

@@ -10,7 +10,11 @@
     }}
   </div>
 </div>
-{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}}
+{{#load-more
+  class="paginated-topics-list"
+  selector=".paginated-topics-list .topic-list tr"
+  action=(action "loadMore")
+}}
 
   {{basic-assigned-topic-list
     topicList=model

assets/javascripts/discourse/templates/group/assigned.hbs

@@ -1,5 +1,8 @@
 <section class="user-secondary-navigation group-assignments">
-  {{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked"}}
+  {{#mobile-nav
+    class="activity-nav"
+    desktopClass="action-list activity-list nav-stacked"
+  }}
     {{#if isDesktop}}
       <div class="search-div">
         {{input

assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs

@@ -12,10 +12,16 @@
       <div class="topic-excerpt">
         {{html-safe topic.excerpt}}
         {{#if topic.excerptTruncated}}
-          {{#unless topic.canClearPin}}<a href={{topic.url}}>{{i18n "read_more"}}</a>{{/unless}}
+          {{#unless topic.canClearPin}}<a href={{topic.url}}>{{i18n
+                "read_more"
+              }}</a>{{/unless}}
         {{/if}}
         {{#if topic.canClearPin}}
-          <a href {{action "clearPin" topic}} title={{i18n "topic.clear_pin.help"}}>{{i18n "topic.clear_pin.title"}}</a>
+          <a
+            href
+            {{action "clearPin" topic}}
+            title={{i18n "topic.clear_pin.help"}}
+          >{{i18n "topic.clear_pin.title"}}</a>
         {{/if}}
       </div>
     {{/if}}
@@ -37,18 +43,23 @@
         reassign=reassign
       }}
     {{else}}
-      {{assign-actions-dropdown
+      {{assign-actions-dropdown topic=topic unassign=unassign}}
-        topic=topic
-        unassign=unassign
-      }}
     {{/if}}
   </div>
   <div class="clearfix"></div>
   <div class="topic-item-stats clearfix">
     {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
     <div class="pull-right topic-list-num">
-      {{raw "list/activity-column" topic=topic tagName="div" class="num activity last"}}
+      {{raw
-      <a href={{topic.lastPostUrl}} title="{{i18n "last_post"}}: {{html-safe raw-date topic.bumped_at}}">{{topic.last_poster_username}}</a>
+        "list/activity-column"
+        topic=topic
+        tagName="div"
+        class="num activity last"
+      }}
+      <a
+        href={{topic.lastPostUrl}}
+        title="{{i18n 'last_post'}}: {{html-safe raw-date topic.bumped_at}}"
+      >{{topic.last_poster_username}}</a>
     </div>
     {{#unless hideCategory}}
       <div class="category">

assets/javascripts/discourse/templates/modal/assign-user.hbs

@@ -1,6 +1,6 @@
 {{#d-modal-body class="assign"}}
   <div>
-    <div class="control-group {{if this.assigneeError "assignee-error"}}">
+    <div class="control-group {{if this.assigneeError 'assignee-error'}}">
       <label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
       {{email-group-user-chooser
         autocomplete="off"
@@ -13,7 +13,9 @@
           mobilePlacementStrategy="absolute"
           filterPlaceholder=placeholderKey
           includeGroups=true
-          customSearchOptions=(hash assignableGroups=true defaultSearchResults=this.assignSuggestions)
+          customSearchOptions=(hash
+            assignableGroups=true defaultSearchResults=this.assignSuggestions
+          )
           groupMembersOf=allowedGroups
           maximum=1
           autofocus=autofocus
@@ -22,7 +24,8 @@
       }}
       {{#if this.assigneeError}}
         <span class="error-label">
-          {{d-icon "exclamation-triangle"}} {{i18n "discourse_assign.assign_modal.choose_assignee"}}
+          {{d-icon "exclamation-triangle"}}
+          {{i18n "discourse_assign.assign_modal.choose_assignee"}}
         </span>
       {{/if}}
     </div>
@@ -41,16 +44,26 @@
 
     <div class="control-group assign-status">
       <label>
-        {{i18n "discourse_assign.assign_modal.note_label"}}&nbsp;<span class="label-optional">{{i18n "discourse_assign.assign_modal.optional_label"}}</span>
+        {{i18n "discourse_assign.assign_modal.note_label"}}&nbsp;<span
+          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
+        key-down=(action "handleTextAreaKeydown")
+      }}
     </div>
   </div>
 {{/d-modal-body}}
 
 <div class="modal-footer">
   {{d-button
-    label= (if model.reassign "discourse_assign.reassign.title" "discourse_assign.assign_modal.assign")
+    label=(if
+      model.reassign
+      "discourse_assign.reassign.title"
+      "discourse_assign.assign_modal.assign"
+    )
     icon=inviteIcon
     action=(action "assign")
     class="btn-primary"

assets/javascripts/discourse/templates/user-assigned-topics.hbs

@@ -17,7 +17,11 @@
     </div>
   </div>
 
-  {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}}
+  {{#load-more
+    class="paginated-topics-list"
+    selector=".paginated-topics-list .topic-list tr"
+    action=(action "loadMore")
+  }}
     {{basic-assigned-topic-list
       topicList=model
       hideCategory=hideCategory