DEV: enforces ember-template-lint: simple-unless (#9146)

.template-lintrc.js

@@ -9,6 +9,7 @@ module.exports = {
     "no-invalid-interactive": true,
     "link-rel-noopener": true,
     "no-unnecessary-concat": true,
-    "no-unused-block-params": true
+    "no-unused-block-params": true,
+    "simple-unless": true
   }
 };

app/assets/javascripts/admin/templates/components/admin-report.hbs

@@ -58,7 +58,28 @@
 
   <div class="body">
     <div class="main">
-      {{#unless showError}}
+      {{#if showError}}
+        {{#if showTimeoutError}}
+          <div class="alert alert-error report-alert timeout">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.timeout_error"}}</span>
+          </div>
+        {{/if}}
+
+        {{#if showExceptionError}}
+          <div class="alert alert-error report-alert exception">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.exception_error"}}</span>
+          </div>
+        {{/if}}
+
+        {{#if showNotFoundError}}
+          <div class="alert alert-error report-alert not-found">
+            {{d-icon "exclamation-triangle"}}
+            <span>{{i18n "admin.dashboard.not_found_error"}}</span>
+          </div>
+        {{/if}}
+      {{else}}
         {{#if hasData}}
           {{#if currentMode}}
             {{component modeComponent model=model options=options}}
@@ -91,28 +112,7 @@
             </div>
           {{/if}}
         {{/if}}
-      {{else}}
+      {{/if}}
-        {{#if showTimeoutError}}
-          <div class="alert alert-error report-alert timeout">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.timeout_error"}}</span>
-          </div>
-        {{/if}}
-
-        {{#if showExceptionError}}
-          <div class="alert alert-error report-alert exception">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.exception_error"}}</span>
-          </div>
-        {{/if}}
-
-        {{#if showNotFoundError}}
-          <div class="alert alert-error report-alert not-found">
-            {{d-icon "exclamation-triangle"}}
-            <span>{{i18n "admin.dashboard.not_found_error"}}</span>
-          </div>
-        {{/if}}
-      {{/unless}}
     </div>
 
     {{#if showFilteringUI}}

app/assets/javascripts/admin/templates/components/themes-list-item.hbs

@@ -7,7 +7,9 @@
     </span>
 
     <span class="icons">
-      {{#unless theme.selected}}
+      {{#if theme.selected}}
+        {{d-icon "caret-right"}}
+      {{else}}
         {{#if theme.default}}
           {{d-icon "check" class="default-indicator" title="admin.customize.theme.default_theme_tooltip"}}
         {{/if}}
@@ -20,9 +22,7 @@
         {{#unless theme.enabled}}
           {{d-icon "ban" class="light-grey-icon" title="admin.customize.theme.disabled_component_tooltip"}}
         {{/unless}}
-      {{else}}
+      {{/if}}
-        {{d-icon "caret-right"}}
-      {{/unless}}
     </span>
   </div>
 

app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs

@@ -76,7 +76,14 @@
             {{/if}}
           </td>
           <td class="col actions">
-            {{#unless item.editing}}
+            {{#if item.editing}}
+              {{d-button
+                class="btn-default"
+                action=(action "save")
+                actionParam=item
+                label="admin.logs.save"}}
+              <a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
+            {{else}}
               {{d-button
                 class="btn-default btn-danger"
                 action=(action "destroy")
@@ -102,14 +109,7 @@
                   icon="ban"
                   label="admin.logs.screened_ips.actions.block"}}
               {{/if}}
-            {{else}}
+            {{/if}}
-              {{d-button
-                class="btn-default"
-                action=(action "save")
-                actionParam=item
-                label="admin.logs.save"}}
-              <a href {{action "cancel" item}}>{{i18n "cancel"}}</a>
-            {{/unless}}
           </td>
         </tr>
       {{/each}}

app/assets/javascripts/discourse/templates/components/user-card-contents.hbs

@@ -52,13 +52,13 @@
             {{/if}}
           </h1>
           {{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser" user)) tagName=''}}
-          {{#unless nameFirst}}
+          {{#if nameFirst}}
+            <h2 class='username'>{{username}}</h2>
+          {{else}}
             {{#if user.name}}
               <h2 class='full-name'>{{user.name}}</h2>
             {{/if}}
-          {{else}}
+          {{/if}}
-            <h2 class='username'>{{username}}</h2>
-          {{/unless}}
           {{#if user.title}}
             <h2>{{user.title}}</h2>
           {{/if}}

app/assets/javascripts/discourse/templates/full-page-search.hbs

@@ -67,7 +67,9 @@
 
     {{plugin-outlet name="full-page-search-below-search-info" args=(hash search=searchTerm)}}
 
-    {{#unless searching}}
+    {{#if searching}}
+      {{loading-spinner size="medium"}}
+    {{else}}
       <div class="search-results">
         {{#load-more selector=".fps-result" action=(action "loadMore")}}
           {{#each model.posts as |result|}}
@@ -172,9 +174,7 @@
           {{/conditional-loading-spinner}}
         {{/load-more}}
       </div>
-    {{else}}
+    {{/if}}
-      {{loading-spinner size="medium"}}
-    {{/unless}}
   </div>
 
   <div class="search-advanced-sidebar">

app/assets/javascripts/select-kit/templates/components/multi-select.hbs

@@ -7,7 +7,11 @@
   }}
 
   {{#select-kit/select-kit-body selectKit=selectKit}}
-    {{#unless selectKit.isLoading}}
+    {{#if selectKit.isLoading}}
+      <span class="is-loading">
+        {{loading-spinner size="small"}}
+      </span>
+    {{else}}
       {{#if selectKit.filter}}
       {{#if selectKit.hasNoContent}}
         <span class="no-content">
@@ -23,11 +27,7 @@
           value=value
         }}
       {{/each}}
-    {{else}}
+    {{/if}}
-      <span class="is-loading">
-        {{loading-spinner size="small"}}
-      </span>
-    {{/unless}}
   {{/select-kit/select-kit-body}}
 
   <div class="select-kit-wrapper"></div>

app/assets/javascripts/select-kit/templates/components/single-select.hbs

@@ -9,7 +9,13 @@
   {{#select-kit/select-kit-body selectKit=selectKit}}
     {{component selectKit.options.filterComponent selectKit=selectKit}}
 
-    {{#unless selectKit.isLoading}}
+    {{#if selectKit.isLoading}}
+      <span class="is-loading">
+        {{#if site}}
+          {{loading-spinner size="small"}}
+        {{/if}}
+      </span>
+    {{else}}
       {{#if selectKit.filter}}
       {{#if selectKit.hasNoContent}}
         <span class="no-content">
@@ -25,13 +31,7 @@
           value=value
         }}
       {{/each}}
-    {{else}}
+    {{/if}}
-      <span class="is-loading">
-        {{#if site}}
-          {{loading-spinner size="small"}}
-        {{/if}}
-      </span>
-    {{/unless}}
   {{/select-kit/select-kit-body}}
 
   <div class="select-kit-wrapper"></div>