Format healthchecks template

ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs

@@ -1,68 +1,59 @@
-<Route
+<Route @name={{routeName}} as |route|>
-  @name={{routeName}}
-as |route|>
   {{#let
-    (filter (action 'syntheticNodeSearchPropertyFilter' route.model.item) searchProperties) as |filteredSearchProperties|}}
+    (filter (action 'syntheticNodeSearchPropertyFilter' route.model.item) searchProperties)
+    as |filteredSearchProperties|
+  }}
     {{#let
-
+      (hash value=(or sortBy 'Status:asc') change=(action (mut sortBy) value='target.selected'))
-      (hash
-        value=(or sortBy "Status:asc")
-        change=(action (mut sortBy) value="target.selected")
-      )
-
       (hash
         status=(hash
           value=(if status (split status ',') undefined)
-          change=(action (mut status) value="target.selectedItems")
+          change=(action (mut status) value='target.selectedItems')
         )
         check=(hash
           value=(if check (split check ',') undefined)
-          change=(action (mut check) value="target.selectedItems")
+          change=(action (mut check) value='target.selectedItems')
         )
         searchproperty=(hash
-          value=(if (not-eq searchproperty undefined)
+          value=(if
-            (split searchproperty ',')
+            (not-eq searchproperty undefined) (split searchproperty ',') filteredSearchProperties
-            filteredSearchProperties 
           )
-          change=(action (mut searchproperty) value="target.selectedItems")
+          change=(action (mut searchproperty) value='target.selectedItems')
           default=filteredSearchProperties
         )
       )
-
+      (filter
-      (filter 
         (action 'syntheticNodeHealthCheckFilter' route.model.item)
-        (merge-checks (array route.model.item.Checks route.model.proxy.Checks) route.model.proxy.ServiceProxy.Expose.Checks)
+        (merge-checks
+          (array route.model.item.Checks route.model.proxy.Checks)
+          route.model.proxy.ServiceProxy.Expose.Checks
+        )
       )
+      as |sort filters items|
+    }}
+      <div class='tab-section'>
 
-    as |sort filters items|}}
+        {{#if (gt items.length 0)}}
-    <div class="tab-section">
+          <input type='checkbox' id='toolbar-toggle' />
-
-        {{#if (gt items.length 0) }}
-          <input type="checkbox" id="toolbar-toggle" />
           <Consul::HealthCheck::SearchBar
             @search={{search}}
-            @onsearch={{action (mut search) value="target.value"}}
+            @onsearch={{action (mut search) value='target.value'}}
-
             @sort={{sort}}
-
             @filter={{filters}}
           />
         {{/if}}
 
-        {{#let (find-by "Type" "serf" items) as |serf|}}
+        {{#let (find-by 'Type' 'serf' items) as |serf|}}
-          {{#if (and serf (eq serf.Status "critical"))}}
+          {{#if (and serf (eq serf.Status 'critical'))}}
-            <Notice
+            <Notice data-test-critical-serf-notice @type='warning' as |notice|>
-              data-test-critical-serf-notice
-              @type="warning"
-            as |notice|>
               <notice.Header>
                 <h2>
-                  {{t "routes.dc.services.instance.healthchecks.critical-serf-notice.header"}}
+                  {{t 'routes.dc.services.instance.healthchecks.critical-serf-notice.header'}}
                 </h2>
               </notice.Header>
               <notice.Body>
                 {{t
-                  "routes.dc.services.instance.healthchecks.critical-serf-notice.body"
+                  'routes.dc.services.instance.healthchecks.critical-serf-notice.body'
                   htmlSafe=true
                 }}
               </notice.Body>
@@ -70,30 +61,30 @@ as |route|>
           {{/if}}
         {{/let}}
         <DataCollection
-          @type="health-check"
+          @type='health-check'
           @sort={{sort.value}}
           @filters={{filters}}
           @search={{search}}
           @items={{items}}
-        as |collection|>
+          as |collection|
+        >
           <collection.Collection>
-            <Consul::HealthCheck::List
+            <Consul::HealthCheck::List @items={{collection.items}} />
-              @items={{collection.items}}
-            />
           </collection.Collection>
           <collection.Empty>
             <EmptyState>
-              <BlockSlot @name="body">
+              <BlockSlot @name='body'>
-                {{t "routes.dc.services.instance.healthchecks.empty"
+                {{t
+                  'routes.dc.services.instance.healthchecks.empty'
                   items=items.length
                   htmlSafe=true
                 }}
               </BlockSlot>
             </EmptyState>
-            </collection.Empty>
+          </collection.Empty>
-          </DataCollection>
+        </DataCollection>
 
-    </div>
+      </div>
     {{/let}}
   {{/let}}
 </Route>