Remove route action helper addon (#1924)

This is throwing deprecations as of Ember 3.6. It’s not that widely-used in the application and route actions aren’t that favoured in the RFC discussion, so we decided to remove it. emberjs/rfcs#394
travis-ci · Dec 11, 2018 · 9833724 · 9833724
1 parent c88390b
commit 9833724
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 78 deletions.
diff --git a/app/components/owner-not-found.js b/app/components/owner-not-found.js
@@ -4,10 +4,4 @@ import { inject as service } from '@ember/service';
 export default Component.extend({
   auth: service(),
   features: service(),
-
-  actions: {
-    signIn() {
-      this.get('signIn')();
-    }
-  }
 });
diff --git a/app/components/repository-sidebar.js b/app/components/repository-sidebar.js
@@ -59,7 +59,7 @@ export default Component.extend({
 
     showMyRepositories: function () {
       this.set('tabStates.sidebarTab', 'owned');
-      this.attrs.showRepositories();
+      this.router.transitionTo('index');
     },
 
     onQueryChange(query) {

diff --git a/app/routes/application.js b/app/routes/application.js
@@ -135,15 +135,6 @@ export default TravisRoute.extend(BuildFaviconMixin, KeyboardShortcuts, {
         return true;
       }
     },
-
-    showRepositories() {
-      this.transitionTo('index');
-    },
-
-    viewSearchResults(query) {
-      this.transitionTo('search', query);
-    }
-
   },
 
   afterSignIn() {

diff --git a/app/services/auth.js b/app/services/auth.js
@@ -6,6 +6,7 @@ import { Promise as EmberPromise } from 'rsvp';
 import Service, { inject as service } from '@ember/service';
 import config from 'travis/config/environment';
 import { alias } from '@ember/object/computed';
+import { getOwner } from '@ember/application';
 
 import URLPolyfill from 'travis/utils/url';
 
@@ -285,4 +286,15 @@ export default Service.extend({
   }),
 
   permissions: alias('currentUser.permissions'),
+
+  actions: {
+    signIn(runAfterSignIn) {
+      let applicationRoute = getOwner(this).lookup('route:application');
+      applicationRoute.send('signIn', runAfterSignIn);
+    },
+
+    signOut() {
+      this.signOut();
+    }
+  }
 });
diff --git a/app/templates/components/zendesk-request-form.hbs b/app/templates/components/zendesk-request-form.hbs
@@ -78,7 +78,7 @@
       <button
         title="Sign into Travis CI"
         class="hero-button"
-        {{action (route-action 'signIn' false)}}
+        {{action (action 'signIn' false target=auth)}}
         data-test-zendesk-form-log-in-button
       >
         {{svg-jar 'icon-repooctocat' }} Sign in with GitHub

diff --git a/app/templates/getting-started.hbs b/app/templates/getting-started.hbs
@@ -49,9 +49,7 @@
   {{#if auth.signedIn}}
   {{#unless features.dashboard}}
     <aside id="left" class="{{unless auth.signedIn 'hidden'}}">
-      {{repository-sidebar
-        showRepositories=(route-action 'showRepositories')
-        viewSearchResults=(route-action 'viewSearchResults')}}
+      {{repository-sidebar}}
     </aside>
   {{/unless}}
   {{/if}}

diff --git a/app/templates/index.hbs b/app/templates/index.hbs
@@ -16,17 +16,15 @@
     {{#if auth.signedIn}}
     {{#unless features.dashboard}}
       <aside id="left" class="{{unless auth.signedIn 'hidden'}}">
-        {{repository-sidebar
-          showRepositories=(route-action 'showRepositories')
-          viewSearchResults=(route-action 'viewSearchResults')}}
+        {{repository-sidebar}}
       </aside>
     {{/unless}}
     {{/if}}
   </div>
 {{else}}
   <div class='wrapper centered'>
     {{component landingPage
-      signIn=(route-action 'signIn')
-      signOut=(route-action 'signOut')}}
+      signIn=(action 'signIn' target=auth)
+      signOut=(action 'signOut' target=auth)}}
   </div>
 {{/if}}
diff --git a/app/templates/owner-error.hbs b/app/templates/owner-error.hbs
@@ -1,3 +1,3 @@
 {{#error-page-layout}}
-  {{owner-not-found ownerLogin=model.ownerName signIn=(route-action 'signIn')}}
+  {{owner-not-found ownerLogin=model.ownerName}}
 {{/error-page-layout}}
diff --git a/app/templates/repo.hbs b/app/templates/repo.hbs
@@ -27,9 +27,7 @@
   {{#if auth.signedIn}}
   {{#unless features.dashboard}}
     <aside id="left" class="{{unless auth.signedIn 'hidden'}}">
-      {{repository-sidebar
-        showRepositories=(route-action 'showRepositories')
-        viewSearchResults=(route-action 'viewSearchResults')}}
+      {{repository-sidebar}}
     </aside>
   {{/unless}}
   {{/if}}

diff --git a/app/templates/search.hbs b/app/templates/search.hbs
@@ -20,9 +20,7 @@
   {{#if auth.signedIn}}
   {{#unless features.dashboard}}
     <aside id="left" class="{{unless auth.signedIn 'hidden'}}">
-      {{repository-sidebar
-        showRepositories=(route-action 'showRepositories')
-        viewSearchResults=(route-action 'viewSearchResults')}}
+      {{repository-sidebar}}
     </aside>
   {{/unless}}
   {{/if}}

diff --git a/app/templates/signin.hbs b/app/templates/signin.hbs
@@ -7,7 +7,7 @@
   <h1 class="content-title auth">We're so glad you're here!</h1>
   <h2 class="content-subtitle">Please sign in to view your repositories.</h2>
   <p>
-    <button type="button" {{action (route-action 'signIn')}} title="Sign into Travis CI" class="content-button">Sign in with GitHub</button>
+    <button type="button" {{action (action 'signIn' target=auth)}} title="Sign into Travis CI" class="content-button">Sign in with GitHub</button>
   </p>
 {{/if}}
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,7 +73,6 @@
     "ember-qunit": "^4.0.0",
     "ember-qunit-nice-errors": "1.2.0",
     "ember-resolver": "^5.0.1",
-    "ember-route-action-helper": "^2.0.3",
     "ember-sinon": "^3.0.0",
     "ember-source": "~3.5.1",
     "ember-svg-jar": "^1.2.1",