Use ember-concurrency v2 decorator syntax

Turbo87 · Turbo87 · commit 1441e69d034e · 2021-10-20T23:20:09.000+02:00
diff --git a/app/components/email-input.js b/app/components/email-input.js
@@ -12,7 +12,7 @@ export default class EmailInput extends Component {
   @tracked isEditing = false;
   @tracked disableResend = false;
 
-  @task(function* () {
+  @task *resendEmailTask() {
     try {
       yield this.args.user.resendVerificationEmail();
       this.disableResend = true;
@@ -23,16 +23,15 @@ export default class EmailInput extends Component {
         this.notifications.error('Unknown error in resending message');
       }
     }
-  })
-  resendEmailTask;
+  }
 
   @action
   editEmail() {
     this.value = this.args.user.email;
     this.isEditing = true;
   }
 
-  @task(function* () {
+  @task *saveEmailTask() {
     let userEmail = this.value;
     let user = this.args.user;
 
@@ -49,6 +48,5 @@ export default class EmailInput extends Component {
 
       this.notifications.error(`Error in saving email: ${msg}`);
     }
-  })
-  saveEmailTask;
+  }
 }
diff --git a/app/components/follow-button.js b/app/components/follow-button.js
@@ -29,7 +29,7 @@ export default class extends Component {
   }).drop())
   followStateTask;
 
-  @task(function* () {
+  @task *toggleFollowTask() {
     let crate = this.args.crate;
 
     try {
@@ -42,6 +42,5 @@ export default class extends Component {
         } crate. Please try again later!`,
       );
     }
-  })
-  toggleFollowTask;
+  }
 }
diff --git a/app/components/pending-owner-invite-row.js b/app/components/pending-owner-invite-row.js
@@ -10,7 +10,7 @@ export default class PendingOwnerInviteRow extends Component {
   @tracked isAccepted = false;
   @tracked isDeclined = false;
 
-  @task(function* () {
+  @task *acceptInvitationTask() {
     this.args.invite.set('accepted', true);
 
     try {
@@ -23,10 +23,9 @@ export default class PendingOwnerInviteRow extends Component {
         this.notifications.error('Error in accepting invite');
       }
     }
-  })
-  acceptInvitationTask;
+  }
 
-  @task(function* () {
+  @task *declineInvitationTask() {
     this.args.invite.set('accepted', false);
 
     try {
@@ -39,6 +38,5 @@ export default class PendingOwnerInviteRow extends Component {
         this.notifications.error('Error in declining invite');
       }
     }
-  })
-  declineInvitationTask;
+  }
 }
diff --git a/app/components/settings/api-tokens.js b/app/components/settings/api-tokens.js
@@ -19,7 +19,7 @@ export default class ApiTokens extends Component {
     this.newToken = this.store.createRecord('api-token');
   }
 
-  @task(function* () {
+  @task *saveTokenTask() {
     let token = this.newToken;
 
     try {
@@ -34,10 +34,9 @@ export default class ApiTokens extends Component {
 
       this.notifications.error(msg);
     }
-  })
-  saveTokenTask;
+  }
 
-  @task(function* (token) {
+  @task *revokeTokenTask(token) {
     try {
       yield token.destroyRecord();
       this.args.tokens.removeObject(token);
@@ -49,6 +48,5 @@ export default class ApiTokens extends Component {
 
       this.notifications.error(msg);
     }
-  })
-  revokeTokenTask;
+  }
 }
diff --git a/app/controllers/crate/settings.js b/app/controllers/crate/settings.js
@@ -9,7 +9,7 @@ export default class CrateSettingsController extends Controller {
   crate = null;
   username = '';
 
-  @task(function* () {
+  @task *addOwnerTask() {
     const username = this.username;
 
     try {
@@ -22,10 +22,8 @@ export default class CrateSettingsController extends Controller {
         this.notifications.error('Error sending invite');
       }
     }
-  })
-  addOwnerTask;
-
-  @task(function* (owner) {
+  }
+  @task *removeOwnerTask(owner) {
     try {
       yield this.crate.removeOwner(owner.get('login'));
 
@@ -45,6 +43,5 @@ export default class CrateSettingsController extends Controller {
 
       this.notifications.error(message);
     }
-  })
-  removeOwnerTask;
+  }
 }
diff --git a/app/controllers/crate/version.js b/app/controllers/crate/version.js
@@ -25,7 +25,7 @@ export default class CrateVersionController extends Controller {
 
   @alias('loadReadmeTask.last.value') readme;
 
-  @task(function* () {
+  @task *loadReadmeTask() {
     let version = this.currentVersion;
 
     let readme = version.loadReadmeTask.lastSuccessful
@@ -41,6 +41,5 @@ export default class CrateVersionController extends Controller {
     }
 
     return readme;
-  })
-  loadReadmeTask;
+  }
 }
diff --git a/app/controllers/dashboard.js b/app/controllers/dashboard.js
@@ -37,14 +37,13 @@ export default class DashboardController extends Controller {
     return this.myFollowing.length > TO_SHOW;
   }
 
-  @task(function* () {
+  @task *loadMoreTask() {
     let page = this.myFeed.length / 10 + 1;
 
     let data = yield ajax(`/api/v1/me/updates?page=${page}`);
     let versions = data.versions.map(version => this.store.push(this.store.normalize('version', version)));
 
     this.myFeed.pushObjects(versions);
     this.set('hasMore', data.meta.more);
-  })
-  loadMoreTask;
+  }
 }
diff --git a/app/models/version.js b/app/models/version.js
@@ -124,10 +124,9 @@ export default class Version extends Model {
   }).keepLatest())
   loadReadmeTask;
 
-  @task(function* () {
+  @task *loadDocsBuildsTask() {
     return yield ajax(`https://docs.rs/crate/${this.crateName}/${this.num}/builds.json`);
-  })
-  loadDocsBuildsTask;
+  }
 
   @computed('loadDocsBuildsTask.lastSuccessful.value')
   get hasDocsRsLink() {
diff --git a/app/routes/application.js b/app/routes/application.js
@@ -45,9 +45,8 @@ export default class ApplicationRoute extends Route {
     return true;
   }
 
-  @task(function* () {
+  @task *preloadPlaygroundCratesTask() {
     yield rawTimeout(1000);
     yield this.playground.loadCratesTask.perform();
-  })
-  preloadPlaygroundCratesTask;
+  }
 }
diff --git a/app/services/progress.js b/app/services/progress.js
@@ -3,7 +3,7 @@ import { htmlSafe } from '@ember/template';
 import { tracked } from '@glimmer/tracking';
 import Ember from 'ember';
 
-import { didCancel, rawTimeout, task } from 'ember-concurrency';
+import { didCancel, dropTask, rawTimeout, task } from 'ember-concurrency';
 
 const SPEED = 200;
 
@@ -24,7 +24,7 @@ export default class ProgressService extends Service {
     });
   }
 
-  @task(function* (promise) {
+  @task *counterTask(promise) {
     this.updateTask.perform().catch(error => {
       if (!didCancel(error)) {
         // this task shouldn't be able to fail, but if it does we'll let Sentry know
@@ -33,10 +33,9 @@ export default class ProgressService extends Service {
     });
 
     yield promise;
-  })
-  counterTask;
+  }
 
-  @(task(function* () {
+  @dropTask *updateTask() {
     if (Ember.testing) return;
 
     let progress = 0;
@@ -69,6 +68,5 @@ export default class ProgressService extends Service {
     this._style = `transition: width ${SPEED}ms linear; width: 100%`;
     yield rawTimeout(SPEED);
     this._style = `transition: opacity ${SPEED * 2}ms linear; width: 100%; opacity: 0`;
-  }).drop())
-  updateTask;
+  }
 }
diff --git a/app/services/session.js b/app/services/session.js
@@ -1,7 +1,7 @@
 import { alias } from '@ember/object/computed';
 import Service, { inject as service } from '@ember/service';
 
-import { race, rawTimeout, task, waitForEvent } from 'ember-concurrency';
+import { dropTask, race, rawTimeout, task, waitForEvent } from 'ember-concurrency';
 import window from 'ember-window-mock';
 
 import ajax from '../utils/ajax';
@@ -46,7 +46,7 @@ export default class SessionService extends Service {
    * @see https://developer.github.com/v3/oauth/#redirect-users-to-request-github-access
    * @see `github-authorize` route
    */
-  @task(function* () {
+  @task *loginTask() {
     let windowDimensions = [
       'width=1000',
       'height=450',
@@ -109,20 +109,18 @@ export default class SessionService extends Service {
     if (transition) {
       transition.retry();
     }
-  })
-  loginTask;
+  }
 
-  @task(function* (window) {
+  @task *windowCloseWatcherTask(window) {
     while (true) {
       if (window.closed) {
         return { closed: true };
       }
       yield rawTimeout(10);
     }
-  })
-  windowCloseWatcherTask;
+  }
 
-  @task(function* () {
+  @task *logoutTask() {
     yield ajax(`/api/private/session`, { method: 'DELETE' });
 
     this.savedTransition = null;
@@ -132,10 +130,9 @@ export default class SessionService extends Service {
     this.sentry.setUser(null);
 
     this.router.transitionTo('index');
-  })
-  logoutTask;
+  }
 
-  @(task(function* () {
+  @dropTask *loadUserTask() {
     if (!this.isLoggedIn) return {};
 
     let response;
@@ -152,6 +149,5 @@ export default class SessionService extends Service {
     this.sentry.setUser({ id });
 
     return { currentUser, ownedCrates };
-  }).drop())
-  loadUserTask;
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export default class EmailInput extends Component {`
`12`	`12`	`@tracked isEditing = false;`
`13`	`13`	`@tracked disableResend = false;`
`14`	`14`
`15`		`- @task(function* () {`
	`15`	`+ @task *resendEmailTask() {`
`16`	`16`	`try {`
`17`	`17`	`yield this.args.user.resendVerificationEmail();`
`18`	`18`	`this.disableResend = true;`
`@@ -23,16 +23,15 @@ export default class EmailInput extends Component {`
`23`	`23`	`this.notifications.error('Unknown error in resending message');`
`24`	`24`	`}`
`25`	`25`	`}`
`26`		`- })`
`27`		`- resendEmailTask;`
	`26`	`+ }`
`28`	`27`
`29`	`28`	`@action`
`30`	`29`	`editEmail() {`
`31`	`30`	`this.value = this.args.user.email;`
`32`	`31`	`this.isEditing = true;`
`33`	`32`	`}`
`34`	`33`
`35`		`- @task(function* () {`
	`34`	`+ @task *saveEmailTask() {`
`36`	`35`	`let userEmail = this.value;`
`37`	`36`	`let user = this.args.user;`
`38`	`37`
`@@ -49,6 +48,5 @@ export default class EmailInput extends Component {`
`49`	`48`
`50`	`49`	this.notifications.error(`Error in saving email: ${msg}`);
`51`	`50`	`}`
`52`		`- })`
`53`		`- saveEmailTask;`
	`51`	`+ }`
`54`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export default class extends Component {`
`29`	`29`	`}).drop())`
`30`	`30`	`followStateTask;`
`31`	`31`
`32`		`- @task(function* () {`
	`32`	`+ @task *toggleFollowTask() {`
`33`	`33`	`let crate = this.args.crate;`
`34`	`34`
`35`	`35`	`try {`
`@@ -42,6 +42,5 @@ export default class extends Component {`
`42`	`42`	} crate. Please try again later!`,
`43`	`43`	`);`
`44`	`44`	`}`
`45`		`- })`
`46`		`- toggleFollowTask;`
	`45`	`+ }`
`47`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export default class PendingOwnerInviteRow extends Component {`
`10`	`10`	`@tracked isAccepted = false;`
`11`	`11`	`@tracked isDeclined = false;`
`12`	`12`
`13`		`- @task(function* () {`
	`13`	`+ @task *acceptInvitationTask() {`
`14`	`14`	`this.args.invite.set('accepted', true);`
`15`	`15`
`16`	`16`	`try {`
`@@ -23,10 +23,9 @@ export default class PendingOwnerInviteRow extends Component {`
`23`	`23`	`this.notifications.error('Error in accepting invite');`
`24`	`24`	`}`
`25`	`25`	`}`
`26`		`- })`
`27`		`- acceptInvitationTask;`
	`26`	`+ }`
`28`	`27`
`29`		`- @task(function* () {`
	`28`	`+ @task *declineInvitationTask() {`
`30`	`29`	`this.args.invite.set('accepted', false);`
`31`	`30`
`32`	`31`	`try {`
`@@ -39,6 +38,5 @@ export default class PendingOwnerInviteRow extends Component {`
`39`	`38`	`this.notifications.error('Error in declining invite');`
`40`	`39`	`}`
`41`	`40`	`}`
`42`		`- })`
`43`		`- declineInvitationTask;`
	`41`	`+ }`
`44`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export default class ApiTokens extends Component {`
`19`	`19`	`this.newToken = this.store.createRecord('api-token');`
`20`	`20`	`}`
`21`	`21`
`22`		`- @task(function* () {`
	`22`	`+ @task *saveTokenTask() {`
`23`	`23`	`let token = this.newToken;`
`24`	`24`
`25`	`25`	`try {`
`@@ -34,10 +34,9 @@ export default class ApiTokens extends Component {`
`34`	`34`
`35`	`35`	`this.notifications.error(msg);`
`36`	`36`	`}`
`37`		`- })`
`38`		`- saveTokenTask;`
	`37`	`+ }`
`39`	`38`
`40`		`- @task(function* (token) {`
	`39`	`+ @task *revokeTokenTask(token) {`
`41`	`40`	`try {`
`42`	`41`	`yield token.destroyRecord();`
`43`	`42`	`this.args.tokens.removeObject(token);`
`@@ -49,6 +48,5 @@ export default class ApiTokens extends Component {`
`49`	`48`
`50`	`49`	`this.notifications.error(msg);`
`51`	`50`	`}`
`52`		`- })`
`53`		`- revokeTokenTask;`
	`51`	`+ }`
`54`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export default class CrateSettingsController extends Controller {`
`9`	`9`	`crate = null;`
`10`	`10`	`username = '';`
`11`	`11`
`12`		`- @task(function* () {`
	`12`	`+ @task *addOwnerTask() {`
`13`	`13`	`const username = this.username;`
`14`	`14`
`15`	`15`	`try {`
`@@ -22,10 +22,8 @@ export default class CrateSettingsController extends Controller {`
`22`	`22`	`this.notifications.error('Error sending invite');`
`23`	`23`	`}`
`24`	`24`	`}`
`25`		`- })`
`26`		`- addOwnerTask;`
`27`		`-`
`28`		`- @task(function* (owner) {`
	`25`	`+ }`
	`26`	`+ @task *removeOwnerTask(owner) {`
`29`	`27`	`try {`
`30`	`28`	`yield this.crate.removeOwner(owner.get('login'));`
`31`	`29`
`@@ -45,6 +43,5 @@ export default class CrateSettingsController extends Controller {`
`45`	`43`
`46`	`44`	`this.notifications.error(message);`
`47`	`45`	`}`
`48`		`- })`
`49`		`- removeOwnerTask;`
	`46`	`+ }`
`50`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export default class CrateVersionController extends Controller {`
`25`	`25`
`26`	`26`	`@alias('loadReadmeTask.last.value') readme;`
`27`	`27`
`28`		`- @task(function* () {`
	`28`	`+ @task *loadReadmeTask() {`
`29`	`29`	`let version = this.currentVersion;`
`30`	`30`
`31`	`31`	`let readme = version.loadReadmeTask.lastSuccessful`
`@@ -41,6 +41,5 @@ export default class CrateVersionController extends Controller {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`return readme;`
`44`		`- })`
`45`		`- loadReadmeTask;`
	`44`	`+ }`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,13 @@ export default class DashboardController extends Controller {`
`37`	`37`	`return this.myFollowing.length > TO_SHOW;`
`38`	`38`	`}`
`39`	`39`
`40`		`- @task(function* () {`
	`40`	`+ @task *loadMoreTask() {`
`41`	`41`	`let page = this.myFeed.length / 10 + 1;`
`42`	`42`
`43`	`43`	let data = yield ajax(`/api/v1/me/updates?page=${page}`);
`44`	`44`	`let versions = data.versions.map(version => this.store.push(this.store.normalize('version', version)));`
`45`	`45`
`46`	`46`	`this.myFeed.pushObjects(versions);`
`47`	`47`	`this.set('hasMore', data.meta.more);`
`48`		`- })`
`49`		`- loadMoreTask;`
	`48`	`+ }`
`50`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,8 @@ export default class ApplicationRoute extends Route {`
`45`	`45`	`return true;`
`46`	`46`	`}`
`47`	`47`
`48`		`- @task(function* () {`
	`48`	`+ @task *preloadPlaygroundCratesTask() {`
`49`	`49`	`yield rawTimeout(1000);`
`50`	`50`	`yield this.playground.loadCratesTask.perform();`
`51`		`- })`
`52`		`- preloadPlaygroundCratesTask;`
	`51`	`+ }`
`53`	`52`	`}`