Auto merge of #4129 - Turbo87:tasks, r=Mikek2252

Use ember-concurrency v2 decorator syntax

This is similar to #4069, but converts all the remaining tasks that had concurrency modifiers attached to them.

Author: bors

app/components/follow-button.js

@@ -2,7 +2,7 @@ import { inject as service } from '@ember/service';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 
-import { didCancel, task } from 'ember-concurrency';
+import { didCancel, dropTask, task } from 'ember-concurrency';
 
 import ajax from '../utils/ajax';
 
@@ -23,11 +23,10 @@ export default class extends Component {
     });
   }
 
-  @(task(function* () {
+  @dropTask *followStateTask() {
     let d = yield ajax(`/api/v1/crates/${this.args.crate.name}/following`);
     this.following = d.following;
-  }).drop())
-  followStateTask;
+  }
 
   @task *toggleFollowTask() {
     let crate = this.args.crate;

app/controllers/index.js

@@ -2,7 +2,7 @@ import Controller from '@ember/controller';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 
-import { task } from 'ember-concurrency';
+import { dropTask } from 'ember-concurrency';
 import { reads } from 'macro-decorators';
 
 export default class IndexController extends Controller {
@@ -21,7 +21,7 @@ export default class IndexController extends Controller {
     });
   }
 
-  @(task(function* () {
+  @dropTask *dataTask() {
     let data = yield this.fetcher.ajax('/api/v1/summary');
 
     addCrates(this.store, data.new_crates);
@@ -30,8 +30,7 @@ export default class IndexController extends Controller {
     addCrates(this.store, data.most_recently_downloaded);
 
     return data;
-  }).drop())
-  dataTask;
+  }
 }
 
 function addCrates(store, crates) {

app/controllers/search.js

@@ -3,7 +3,7 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
-import { task } from 'ember-concurrency';
+import { restartableTask } from 'ember-concurrency';
 import { bool, reads } from 'macro-decorators';
 
 import { pagination } from '../utils/pagination';
@@ -54,16 +54,15 @@ export default class SearchController extends Controller {
     });
   }
 
-  @(task(function* () {
+  @restartableTask *dataTask() {
     let { all_keywords, page, per_page, q, sort } = this;
 
     if (q !== null) {
       q = q.trim();
     }
 
     return yield this.store.query('crate', { all_keywords, page, per_page, q, sort });
-  }).restartable())
-  dataTask;
+  }
 
   get exactMatch() {
     return this.model.find(it => it.exact_match);

app/models/version.js

@@ -1,6 +1,6 @@
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 
-import { task } from 'ember-concurrency';
+import { keepLatestTask, task } from 'ember-concurrency';
 import { alias } from 'macro-decorators';
 import semverParse from 'semver/functions/parse';
 import { cached } from 'tracked-toolbox';
@@ -98,7 +98,7 @@ export default class Version extends Model {
   @alias('loadDepsTask.last.value.build') buildDependencies;
   @alias('loadDepsTask.last.value.dev') devDependencies;
 
-  @(task(function* () {
+  @keepLatestTask *loadDepsTask() {
     // trigger the async relationship to load the content
     let dependencies = yield this.dependencies;
 
@@ -107,10 +107,9 @@ export default class Version extends Model {
     let dev = dependencies.filterBy('kind', 'dev').uniqBy('crate_id');
 
     return { normal, build, dev };
-  }).keepLatest())
-  loadDepsTask;
+  }
 
-  @(task(function* () {
+  @keepLatestTask *loadReadmeTask() {
     if (this.readme_path) {
       let response = yield fetch(this.readme_path);
       if (!response.ok) {
@@ -119,8 +118,7 @@ export default class Version extends Model {
 
       return yield response.text();
     }
-  }).keepLatest())
-  loadReadmeTask;
+  }
 
   @task *loadDocsBuildsTask() {
     return yield ajax(`https://docs.rs/crate/${this.crateName}/${this.num}/builds.json`);
@@ -159,25 +157,23 @@ export default class Version extends Model {
     return null;
   }
 
-  @(task(function* () {
+  @keepLatestTask *yankTask() {
     let response = yield fetch(`/api/v1/crates/${this.crate.id}/${this.num}/yank`, { method: 'DELETE' });
     if (!response.ok) {
       throw new Error(`Yank request for ${this.crateName} v${this.num} failed`);
     }
     this.set('yanked', true);
 
     return yield response.text();
-  }).keepLatest())
-  yankTask;
+  }
 
-  @(task(function* () {
+  @keepLatestTask *unyankTask() {
     let response = yield fetch(`/api/v1/crates/${this.crate.id}/${this.num}/unyank`, { method: 'PUT' });
     if (!response.ok) {
       throw new Error(`Unyank request for ${this.crateName} v${this.num} failed`);
     }
     this.set('yanked', false);
 
     return yield response.text();
-  }).keepLatest())
-  unyankTask;
+  }
 }

app/services/chartjs.js

@@ -6,10 +6,10 @@ import differenceInDays from 'date-fns/differenceInDays';
 import endOfDay from 'date-fns/endOfDay';
 import format from 'date-fns/format';
 import startOfDay from 'date-fns/startOfDay';
-import { task } from 'ember-concurrency';
+import { dropTask } from 'ember-concurrency';
 
 export default class ChartJsLoader extends Service {
-  @(task(function* () {
+  @dropTask *loadTask() {
     let {
       Chart,
       LineController,
@@ -66,6 +66,5 @@ export default class ChartJsLoader extends Service {
     });
 
     return Chart;
-  }).drop())
-  loadTask;
+  }
 }

app/services/playground.js

@@ -1,16 +1,15 @@
 import Service from '@ember/service';
 
-import { task } from 'ember-concurrency';
+import { dropTask } from 'ember-concurrency';
 import { alias } from 'macro-decorators';
 
 import ajax from '../utils/ajax';
 
 export default class PlaygroundService extends Service {
   @alias('loadCratesTask.lastSuccessful.value') crates;
 
-  @(task(function* () {
+  @dropTask *loadCratesTask() {
     let response = yield ajax('https://play.rust-lang.org/meta/crates');
     return response.crates;
-  }).drop())
-  loadCratesTask;
+  }
 }

tests/components/download-graph-test.js

@@ -5,7 +5,7 @@ import Service from '@ember/service';
 import { defer } from 'rsvp';
 
 import { hbs } from 'ember-cli-htmlbars';
-import { task } from 'ember-concurrency';
+import { dropTask } from 'ember-concurrency';
 import window from 'ember-window-mock';
 import { setupWindowMock } from 'ember-window-mock/test-support';
 import timekeeper from 'timekeeper';
@@ -35,17 +35,10 @@ module('Component | DownloadGraph', function (hooks) {
     let deferred = defer();
 
     class MockService extends ChartJsLoader {
-      constructor() {
-        super(...arguments);
-        this.originalLoadTask = this.loadTask;
-        this.loadTask = this.mockLoadTask;
-      }
-
-      @(task(function* () {
+      @dropTask *loadTask() {
         yield deferred.promise;
-        return yield this.originalLoadTask.perform();
-      }).drop())
-      mockLoadTask;
+        return yield super.loadTask.perform();
+      }
     }
 
     this.owner.register('service:chartjs', MockService);
@@ -68,10 +61,9 @@ module('Component | DownloadGraph', function (hooks) {
   test('error behavior', async function (assert) {
     class MockService extends Service {
       // eslint-disable-next-line require-yield
-      @(task(function* () {
+      @dropTask *loadTask() {
         throw new Error('nope');
-      }).drop())
-      loadTask;
+      }
     }
 
     this.owner.register('service:chartjs', MockService);