Lint fixes

lukemelia · lukemelia · commit 4be7de23ad5d · 2023-12-03T16:44:13.000-05:00
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "build": "ember build --environment=production",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
+    "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "release": "release-it",
@@ -68,10 +69,11 @@
     "ember-page-title": "^8.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^11.0.1",
+    "ember-set-helper": "^2.0.1",
     "ember-simulant-test-helpers": "^0.3.2",
     "ember-source": "~3.28.8",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.11.2",
+    "ember-template-lint": "^5.13.0",
     "ember-try": "^3.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^9.0.0",
diff --git a/tests/dummy/app/components/clickable-pane/template.hbs b/tests/dummy/app/components/clickable-pane/template.hbs
@@ -1,4 +1,5 @@
-<div class="ClickablePane" onclick={{action (mut this.clicked) true}}>
+{{!-- template-lint-disable no-invalid-interactive --}}
+<div class="ClickablePane" onclick={{set this 'clicked' true}}>
   {{#if this.clicked}}
     clicked
   {{else}}
diff --git a/tests/dummy/app/components/routable-components/my-schedule/header/template.hbs b/tests/dummy/app/components/routable-components/my-schedule/header/template.hbs
@@ -1,3 +1,4 @@
+{{!-- template-lint-disable no-route-action --}}
 <div ...attributes>
-  <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Close</button>
+  <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Close</button>
 </div>
diff --git a/tests/dummy/app/components/routable-components/my-schedule/template.hbs b/tests/dummy/app/components/routable-components/my-schedule/template.hbs
@@ -1,4 +1,5 @@
 <div ...attributes>
   <h1>My Schedule</h1>
-  <a href="#" {{action (route-action 'drillDownToScheduleItem') '2'}}>Schedule Item 2</a>
+  {{!-- template-lint-disable no-route-action --}}
+  <a href="#" {{on 'click' (route-action 'drillDownToScheduleItem' '2')}}>Schedule Item 2</a>
 </div>
diff --git a/tests/dummy/app/components/routable-components/page/header/template.hbs b/tests/dummy/app/components/routable-components/page/header/template.hbs
@@ -1,11 +1,12 @@
+{{!-- template-lint-disable no-route-action --}}
 <div class={{@class}}>
 
   {{#if @model.isUnderMorePage~}}
-    <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Back</button>
+    <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Back</button>
   {{/if~}}
 
   {{#if @model.hasMySchedule}}
-    <button {{action (route-action 'visitMySchedule')}} class="y-button right-button theme-color icon-button my-schedule-button js-myScheduleButton"></button>
+    <button class="y-button right-button theme-color icon-button my-schedule-button js-myScheduleButton" type="button" {{on 'click' (route-action 'visitMySchedule')}}></button>
   {{/if~}}
 
   <div class="page-title">{{@model.pageTitle}}</div>
diff --git a/tests/dummy/app/components/routable-components/schedule-item/header/template.hbs b/tests/dummy/app/components/routable-components/schedule-item/header/template.hbs
@@ -1,8 +1,9 @@
+{{!-- template-lint-disable no-route-action --}}
 <div  class={{@class}}>
-  <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Back</button>
+  <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Back</button>
 
   {{#if @model.yapp.myScheduleEnabled}}
-    <button {{action (route-action 'visitMySchedule')}} class="y-button right-button theme-color icon-button my-schedule-button"></button>
+    <button class="y-button right-button theme-color icon-button my-schedule-button" type="button" {{on 'click' (route-action 'visitMySchedule')}}></button>
   {{/if}}
 
   <div class="page-title">Schedule Item</div>
diff --git a/tests/dummy/app/components/routable-components/schedule-item/person/header/template.hbs b/tests/dummy/app/components/routable-components/schedule-item/person/header/template.hbs
@@ -1,3 +1,4 @@
+{{!-- template-lint-disable no-route-action --}}
 <div  class={{@class}}>
-  <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Close</button>
+  <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Close</button>
 </div>
diff --git a/tests/dummy/app/components/routable-components/schedule-item/rating-form/header/template.hbs b/tests/dummy/app/components/routable-components/schedule-item/rating-form/header/template.hbs
@@ -1,4 +1,5 @@
+{{!-- template-lint-disable no-route-action --}}
 <div class={{@class}}>
-  <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Back</button>
+  <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Back</button>
   <div class="page-title">Feedback</div>
 </div>
diff --git a/tests/dummy/app/components/routable-components/schedule-item/template.hbs b/tests/dummy/app/components/routable-components/schedule-item/template.hbs
@@ -1,9 +1,10 @@
+{{!-- template-lint-disable no-route-action no-inline-styles require-input-label --}}
 <div ...attributes>
   <div class='y-page-content' style="position:absolute;top:0;bottom:0;left:0;right:0">
     <h1>schedule-item {{@model.slug}}</h1>
-    <button {{action (route-action 'drillDownToRatingForm')}}>Rate</button>
-    <button {{action (route-action 'logThenGoToRating')}}>Log Then Rate</button>
-    <button {{action (route-action 'showAttachedPerson')}}>John Doe</button>
+    <button type="button" {{on 'click' (route-action 'drillDownToRatingForm')}}>Rate</button>
+    <button type="button" {{on 'click' (route-action 'logThenGoToRating')}}>Log Then Rate</button>
+    <button type="button" {{on 'click' (route-action 'showAttachedPerson')}}>John Doe</button>
     <textarea rows="8" cols="40" style="border-style: inset;"></textarea>
     <VerticalPanDetectorPane>
       <ClickablePane />
diff --git a/tests/dummy/app/components/routable-components/track/header/template.hbs b/tests/dummy/app/components/routable-components/track/header/template.hbs
@@ -1,9 +1,10 @@
+{{!-- template-lint-disable no-route-action --}}
 <div class={{@class}}>
   <div class="page-title">{{@model.pageTitle}}</div>
 
-  <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Back</button>
+  <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Back</button>
 
   {{#if @model.hasMySchedule}}
-    <button {{action (route-action 'visitMySchedule')}} class="y-button right-button theme-color icon-button my-schedule-button js-myScheduleButton"></button>
+    <button class="y-button right-button theme-color icon-button my-schedule-button js-myScheduleButton" type="button" {{on 'click' (route-action 'visitMySchedule')}}></button>
   {{/if~}}
 </div>
diff --git a/tests/dummy/app/components/routable-components/track/template.hbs b/tests/dummy/app/components/routable-components/track/template.hbs
@@ -1,4 +1,5 @@
+{{!-- template-lint-disable no-route-action --}}
 <div ...attributes>
   <h1>track {{@model.id}}</h1>
-  <a href="#" {{action (route-action 'drillDownToScheduleItem') '2'}}>Schedule Item 2</a>
+  <a href="#" {{on 'click' (route-action 'drillDownToScheduleItem' '2')}}>Schedule Item 2</a>
 </div>
diff --git a/tests/dummy/app/components/test-components/my-schedule/header/template.hbs b/tests/dummy/app/components/test-components/my-schedule/header/template.hbs
@@ -1,3 +1,4 @@
+{{!-- template-lint-disable no-route-action --}}
 <div class={{@class}}>
-  <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Close</button>
+  <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Close</button>
 </div>
diff --git a/tests/dummy/app/components/test-components/my-schedule/template.hbs b/tests/dummy/app/components/test-components/my-schedule/template.hbs
@@ -1,4 +1,5 @@
+{{!-- template-lint-disable no-route-action --}}
 <div ...attributes>
   <h1>My Schedule</h1>
-  <a href="#" {{action (route-action 'drillDownToScheduleItem') '2'}}>Schedule Item 2</a>
+  <a href="#" {{on 'click' (route-action 'drillDownToScheduleItem' '2')}}>Schedule Item 2</a>
 </div>
diff --git a/tests/dummy/app/components/test-components/page/header/template.hbs b/tests/dummy/app/components/test-components/page/header/template.hbs
@@ -1,10 +1,11 @@
+{{!-- template-lint-disable no-route-action --}}
 <div class={{@class}}>
   {{#if @model.isUnderMorePage~}}
-    <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Back</button>
+    <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Back</button>
   {{/if~}}
 
   {{#if @model.hasMySchedule}}
-    <button {{action (route-action 'visitMySchedule')}} class="y-button right-button theme-color icon-button my-schedule-button js-myScheduleButton"></button>
+    <button class="y-button right-button theme-color icon-button my-schedule-button js-myScheduleButton" type="button" {{on 'click' (route-action 'visitMySchedule')}}></button>
   {{/if~}}
 
   <div class="page-title">{{@model.pageTitle}}</div>
diff --git a/tests/dummy/app/components/test-components/page/template.hbs b/tests/dummy/app/components/test-components/page/template.hbs
@@ -1,10 +1,11 @@
+{{!-- template-lint-disable no-inline-styles no-route-action --}}
 <div ...attributes>
   <div class='y-page-content' style="position:absolute;top:0;bottom:0;left:0;right:0" data-test-route-name={{@controller.routeName}}>
     <h1>page {{@model.id}}</h1>
     {{#if (eq @model.slug 'schedule2') }}
-      <a href="#" {{action 'drillDownToScheduleItem' '1'}}>Schedule Item 1</a>
+      <a href="#" {{on 'click' (route-action 'drillDownToScheduleItem' '1')}}>Schedule Item 1</a>
     {{else if (eq @model.slug 'multi_track') }}
-      <a href="#" {{action 'drillDownToTrack' '1'}}>Track 1</a>
+      <a href="#" {{on 'click' (route-action 'drillDownToTrack' '1')}}>Track 1</a>
     {{/if}}
   </div>
 </div>
diff --git a/tests/dummy/app/components/test-components/schedule-item/header/template.hbs b/tests/dummy/app/components/test-components/schedule-item/header/template.hbs
@@ -1,8 +1,9 @@
+{{!-- template-lint-disable no-route-action --}}
 <div class={{@class}}>
-  <button {{action @back}} class="y-button left-button theme-color back-button">Back</button>
+  <button class="y-button left-button theme-color back-button" type="button" {{on 'click' @back}}>Back</button>
 
   {{#if @model.yapp.myScheduleEnabled}}
-    <button {{action (route-action 'visitMySchedule')}} class="y-button right-button theme-color icon-button my-schedule-button"></button>
+    <button class="y-button right-button theme-color icon-button my-schedule-button" type="button" {{on 'click' (route-action 'visitMySchedule')}}></button>
   {{/if}}
 
   <div class="page-title">Schedule Item</div>
diff --git a/tests/dummy/app/components/test-components/schedule-item/person/header/template.hbs b/tests/dummy/app/components/test-components/schedule-item/person/header/template.hbs
@@ -1,3 +1,4 @@
+{{!-- template-lint-disable no-route-action --}}
 <div class={{@class}}>
-  <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Close</button>
+  <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Close</button>
 </div>
diff --git a/tests/dummy/app/components/test-components/schedule-item/rating-form/header/template.hbs b/tests/dummy/app/components/test-components/schedule-item/rating-form/header/template.hbs
@@ -1,4 +1,5 @@
+{{!-- template-lint-disable no-route-action --}}
 <div class={{@class}}>
-  <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Back</button>
+  <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Back</button>
   <div class="page-title">Feedback</div>
 </div>
diff --git a/tests/dummy/app/components/test-components/schedule-item/template.hbs b/tests/dummy/app/components/test-components/schedule-item/template.hbs
@@ -1,9 +1,10 @@
+{{!-- template-lint-disable no-inline-styles require-input-label no-route-action --}}
 <div ...attributes>
   <div class='y-page-content' style="position:absolute;top:0;bottom:0;left:0;right:0">
     <h1>schedule-item {{@model.slug}}</h1>
-    <button {{action 'drillDownToRatingForm'}}>Rate</button>
-    <button {{action 'logThenGoToRating'}}>Log Then Rate</button>
-    <button {{action 'showAttachedPerson'}}>John Doe</button>
+    <button type="button" {{on 'click' (route-action 'drillDownToRatingForm')}}>Rate</button>
+    <button type="button" {{on 'click' (route-action 'logThenGoToRating')}}>Log Then Rate</button>
+    <button type="button" {{on 'click' (route-action 'showAttachedPerson')}}>John Doe</button>
     <textarea rows="8" cols="40" style="border-style: inset;"></textarea>
     <VerticalPanDetectorPane>
       <ClickablePane />
diff --git a/tests/dummy/app/components/test-components/track/header/template.hbs b/tests/dummy/app/components/test-components/track/header/template.hbs
@@ -1,8 +1,9 @@
+{{!-- template-lint-disable no-route-action --}}
 <div class={{@class}}>
-  <button {{action (route-action 'back')}} class="y-button left-button theme-color back-button">Back</button>
+  <button class="y-button left-button theme-color back-button" type="button" {{on 'click' (route-action 'back')}}>Back</button>
 
   {{#if @model.hasMySchedule}}
-    <button {{action (route-action 'visitMySchedule')}} class="y-button right-button theme-color icon-button my-schedule-button js-myScheduleButton"></button>
+    <button class="y-button right-button theme-color icon-button my-schedule-button js-myScheduleButton" type="button" {{on 'click' (route-action 'visitMySchedule')}}></button>
   {{/if~}}
 
   <div class="page-title">{{@model.pageTitle}}</div>
diff --git a/tests/dummy/app/components/test-components/track/template.hbs b/tests/dummy/app/components/test-components/track/template.hbs
@@ -1,4 +1,5 @@
+{{!-- template-lint-disable no-route-action --}}
 <div ...attributes>
   <h1>track {{@model.id}}</h1>
-  <a href="#" {{action 'drillDownToScheduleItem' '2'}}>Schedule Item 2</a>
+  <a href="#" {{on 'click' (route-action 'drillDownToScheduleItem' '2')}}>Schedule Item 2</a>
 </div>
diff --git a/tests/dummy/app/templates/yapp.hbs b/tests/dummy/app/templates/yapp.hbs
@@ -1,5 +1,6 @@
 <div id='yapp-application' class={{if this.birdsEyeDebugging 'birds-eye-debugging' ''}}>
   {{#each (nav-layer-indices) as |layerIndex|}}
+    {{!-- template-lint-disable no-route-action --}}
     <NavStack
       @layer={{layerIndex}}
       @footer={{if (eq layerIndex 0) (component 'tab-bar')}}
diff --git a/tests/integration/nav-stack-test.js b/tests/integration/nav-stack-test.js
@@ -32,6 +32,7 @@ module('Integration | Component | nav-stack', function (hooks) {
   module('top level page', function () {
     let exampleHbs = hbs`
       {{#if this.shouldRenderNavStack}}
+        {{!-- template-lint-disable no-inline-styles --}}
         <div style="width:320px;height:480px;position:relative">
           <NavStack
               @layer={{0}}
@@ -40,11 +41,11 @@ module('Integration | Component | nav-stack', function (hooks) {
           />
         </div>
       {{/if}}
-      {{to-nav-stack
-        layer=0
-        item=(component 'test-components/page' model=this.pageModel controller=this.controller)
-        header=(component 'test-components/page/header' model=this.pageModel controller=this.controller)
-      }}
+      <ToNavStack
+        @layer={{0}}
+        @item={{component 'test-components/page' model=this.pageModel controller=this.controller}}
+        @header={{component 'test-components/page/header' model=this.pageModel controller=this.controller}}
+      />
     `;
     test('it renders', async function (assert) {
       await this.renderNavStack(exampleHbs);
@@ -58,19 +59,20 @@ module('Integration | Component | nav-stack', function (hooks) {
   module('more page', function () {
     let exampleHbs = hbs`
       {{#if this.shouldRenderNavStack}}
+        {{!-- template-lint-disable no-inline-styles --}}
         <div style="width:320px;height:480px;position:relative">
           <NavStack
-              @layer={{0}}
-              @footer={{component 'tab-bar'}}
-              @back={{this.back}}
+            @layer={{0}}
+            @footer={{component 'tab-bar'}}
+            @back={{this.back}}
           />
         </div>
       {{/if}}
-      {{to-nav-stack
-        layer=0
-        item=(component 'test-components/yapp/more' model=this.moreModel controller=this.controller)
-        header=(component 'test-components/yapp/more/header' model=this.moreModel controller=this.controller)
-      }}
+      <ToNavStack
+        @layer={{0}}
+        @item={{component 'test-components/yapp/more' model=this.moreModel controller=this.controller}}
+        @header={{component 'test-components/yapp/more/header' model=this.moreModel controller=this.controller}}
+      />
     `;
     test('it renders', async function (assert) {
       await this.renderNavStack(exampleHbs);
@@ -84,6 +86,7 @@ module('Integration | Component | nav-stack', function (hooks) {
   module('drilled down one level', function () {
     let exampleHbs = hbs`
       {{#if this.shouldRenderNavStack}}
+        {{!-- template-lint-disable no-inline-styles --}}
         <div style="width:320px;height:480px;position:relative">
           <NavStack
               @layer={{0}}
@@ -92,16 +95,16 @@ module('Integration | Component | nav-stack', function (hooks) {
           />
         </div>
       {{/if}}
-      {{to-nav-stack
-        layer=0
-        item=(component 'test-components/page' model=this.pageModel controller=this.controller)
-        header=(component 'test-components/page/header' model=this.pageModel controller=this.controller)
-      }}
-      {{to-nav-stack
-        layer=0
-        item=(component 'test-components/track' model=this.trackModel controller=this.controller)
-        header=(component 'test-components/track/header' model=this.trackModel controller=this.controller)
-      }}
+      <ToNavStack
+        @layer={{0}}
+        @item={{component 'test-components/page' model=this.pageModel controller=this.controller}}
+        @header={{component 'test-components/page/header' model=this.pageModel controller=this.controller}}
+      />
+      <ToNavStack
+        @layer={{0}}
+        @item={{component 'test-components/track' model=this.trackModel controller=this.controller}}
+        @header={{component 'test-components/track/header' model=this.trackModel controller=this.controller}}
+      />
     `;
     test('it renders', async function (assert) {
       await this.renderNavStack(exampleHbs);
@@ -115,30 +118,31 @@ module('Integration | Component | nav-stack', function (hooks) {
   module('drilled down two levels', function (hooks) {
     let exampleHbs = hbs`
       {{#if this.shouldRenderNavStack}}
+        {{!-- template-lint-disable no-inline-styles --}}
         <div style="width:320px;height:480px;position:relative">
           <NavStack
-              @layer={{0}}
-              @footer={{component 'tab-bar'}}
-              @back={{this.back}}
+            @layer={{0}}
+            @footer={{component 'tab-bar'}}
+            @back={{this.back}}
           />
         </div>
       {{/if}}
-      {{to-nav-stack
-        layer=0
-        item=(component 'test-components/page' model=this.pageModel controller=this.controller)
-        header=(component 'test-components/page/header' model=this.pageModel controller=this.controller)
-      }}
-      {{to-nav-stack
-        layer=0
-        item=(component 'test-components/track' model=this.trackModel controller=this.controller)
-        header=(component 'test-components/track/header' model=this.trackModel controller=this.controller)
-      }}
+      <ToNavStack
+        @layer={{0}}
+        @item={{component 'test-components/page' model=this.pageModel controller=this.controller}}
+        @header={{component 'test-components/page/header' model=this.pageModel controller=this.controller}}
+      />
+      <ToNavStack
+        @layer={{0}}
+        @item={{component 'test-components/track' model=this.trackModel controller=this.controller}}
+        @header={{component 'test-components/track/header' model=this.trackModel controller=this.controller}}
+      />
       {{#if this.isThirdLevelShowing}}
-        {{to-nav-stack
-          layer=0
-          item=(component 'test-components/schedule-item' model=this.scheduleItemModel controller=this.controller)
-          header=(component 'test-components/schedule-item/header' model=this.scheduleItemModel controller=this.controller back=this.back)
-        }}
+        <ToNavStack
+          @layer={{0}}
+          @item={{component 'test-components/schedule-item' model=this.scheduleItemModel controller=this.controller}}
+          @header={{component 'test-components/schedule-item/header' model=this.scheduleItemModel controller=this.controller back=this.back}}
+        />
       {{/if}}
     `;
     hooks.beforeEach(function () {
@@ -335,6 +339,7 @@ module('Integration | Component | nav-stack', function (hooks) {
   module('page under more', function () {
     let exampleHbs = hbs`
       {{#if this.shouldRenderNavStack}}
+        {{!-- template-lint-disable no-inline-styles --}}
         <div style="width:320px;height:480px;position:relative">
           <NavStack
               @layer={{0}}
@@ -343,16 +348,16 @@ module('Integration | Component | nav-stack', function (hooks) {
           />
         </div>
       {{/if}}
-      {{to-nav-stack
-        layer=0
-        item=(component 'test-components/yapp/more' model=this.moreModel controller=this.controller)
-        header=(component 'test-components/yapp/more/header' model=this.moreModel controller=this.controller)
-      }}
-      {{to-nav-stack
-        layer=0
-        item=(component 'test-components/page' model=this.pageModel controller=this.controller)
-        header=(component 'test-components/page/header' model=this.pageModel controller=this.controller)
-      }}
+      <ToNavStack
+        @layer={{0}}
+        @item={{component 'test-components/yapp/more' model=this.moreModel controller=this.controller}}
+        @header={{component 'test-components/yapp/more/header' model=this.moreModel controller=this.controller}}
+      />
+      <ToNavStack
+        @layer={{0}}
+        @item={{component 'test-components/page' model=this.pageModel controller=this.controller}}
+        @header={{component 'test-components/page/header' model=this.pageModel controller=this.controller}}
+      />
     `;
     test('it renders', async function (assert) {
       await this.renderNavStack(exampleHbs);
diff --git a/yarn.lock b/yarn.lock
