Skip to content

Commit a6552e6

Browse files
committed
convert task invocation syntax to ember-concurrency v5.
1 parent 6295e30 commit a6552e6

147 files changed

Lines changed: 425 additions & 420 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

packages/frontend/app/components/assign-students/root.gjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
22
import { tracked } from '@glimmer/tracking';
33
import { isBlank } from '@ember/utils';
44
import { action } from '@ember/object';
5-
import { dropTask, restartableTask, timeout } from 'ember-concurrency';
5+
import { task, timeout } from 'ember-concurrency';
66
import { findById, mapBy, sortBy, uniqueValues } from 'ilios-common/utils/array-helpers';
77
import { service } from '@ember/service';
88
import { all } from 'rsvp';
@@ -76,12 +76,12 @@ export default class AssignStudentsRootComponent extends Component {
7676
);
7777
}
7878

79-
setQuery = restartableTask(async (q) => {
79+
setQuery = task({ restartable: true }, async (q) => {
8080
await timeout(DEBOUNCE_DELAY);
8181
this.args.setQuery(q);
8282
});
8383

84-
save = dropTask(async (cohort) => {
84+
save = task({ drop: true }, async (cohort) => {
8585
this.savedUserIds = [];
8686
const studentsToModify = this.selectedStudents;
8787
if (!cohort || studentsToModify.length < 1) {

packages/frontend/app/components/bulk-new-users.gjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { action } from '@ember/object';
44
import { service } from '@ember/service';
55
import { isPresent } from '@ember/utils';
66
import { filter } from 'rsvp';
7-
import { dropTask, restartableTask } from 'ember-concurrency';
7+
import { task } from 'ember-concurrency';
88
import PapaParse from 'papaparse';
99
import { DateTime } from 'luxon';
1010
import { findById, mapBy } from 'ilios-common/utils/array-helpers';
@@ -237,7 +237,7 @@ export default class BulkNewUsersComponent extends Component {
237237
});
238238
}
239239

240-
updateSelectedFile = restartableTask(async (files) => {
240+
updateSelectedFile = task({ restartable: true }, async (files) => {
241241
// Check for the various File API support.
242242
if (window.File && window.FileReader && window.FileList && window.Blob) {
243243
if (files.length > 0) {
@@ -248,11 +248,11 @@ export default class BulkNewUsersComponent extends Component {
248248
}
249249
});
250250

251-
setSchool = restartableTask(async (id) => {
251+
setSchool = task({ restartable: true }, async (id) => {
252252
this.schoolId = id;
253253
});
254254

255-
parseFile = restartableTask(async (file) => {
255+
parseFile = task({ restartable: true }, async (file) => {
256256
const proposedUsers = await this.getFileContents(file);
257257
this.validUsers = await filter(proposedUsers, async (obj) => {
258258
return await obj.isValid();
@@ -262,7 +262,7 @@ export default class BulkNewUsersComponent extends Component {
262262
this.proposedUsers = proposedUsers;
263263
});
264264

265-
save = dropTask(async () => {
265+
save = task({ drop: true }, async () => {
266266
this.savedUserIds = [];
267267
const nonStudentMode = this.nonStudentMode;
268268
const selectedSchool = this.bestSelectedSchool;

packages/frontend/app/components/competency-title-editor.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from '@glimmer/component';
22
import { tracked } from '@glimmer/tracking';
33
import { action } from '@ember/object';
4-
import { dropTask } from 'ember-concurrency';
4+
import { task } from 'ember-concurrency';
55
import YupValidations from 'ilios-common/classes/yup-validations';
66
import { string } from 'yup';
77
import EditableField from 'ilios-common/components/editable-field';
@@ -29,7 +29,7 @@ export default class CompetencyTitleEditorComponent extends Component {
2929
this.title = this.args.competency.title;
3030
}
3131

32-
save = dropTask(async () => {
32+
save = task({ drop: true }, async () => {
3333
this.validations.addErrorDisplayForAllFields();
3434
const isValid = await this.validations.isValid();
3535
if (!isValid) {

packages/frontend/app/components/connection-status.gjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from '@glimmer/component';
22
import { tracked } from '@glimmer/tracking';
3-
import { restartableTask, timeout } from 'ember-concurrency';
3+
import { task, timeout } from 'ember-concurrency';
44
import { registerDestructor } from '@ember/destroyable';
55
import { action } from '@ember/object';
66
import FaIcon from 'ilios-common/components/fa-icon';
@@ -48,7 +48,7 @@ export default class ConnectionStatusComponent extends Component {
4848
this.changeConnectionState.perform(false);
4949
}
5050

51-
changeConnectionState = restartableTask(async (isOnline) => {
51+
changeConnectionState = task({ restartable: true }, async (isOnline) => {
5252
this.timer = 5;
5353
this.multiplier = 1;
5454
this.stopAttemptingToReconnect = false;
@@ -60,7 +60,7 @@ export default class ConnectionStatusComponent extends Component {
6060
}
6161
});
6262

63-
reconnect = restartableTask(async (force) => {
63+
reconnect = task({ restartable: true }, async (force) => {
6464
await timeout(1);
6565
if (navigator.onLine) {
6666
this.changeConnectionState.perform(true);

packages/frontend/app/components/courses/new.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { cached, tracked } from '@glimmer/tracking';
33
import { action } from '@ember/object';
44
import { service } from '@ember/service';
55
import { DateTime } from 'luxon';
6-
import { dropTask } from 'ember-concurrency';
6+
import { task } from 'ember-concurrency';
77
import { TrackedAsyncData } from 'ember-async-data';
88
import YupValidations from 'ilios-common/classes/yup-validations';
99
import { number, string } from 'yup';
@@ -79,7 +79,7 @@ export default class CoursesNewComponent extends Component {
7979
}
8080
}
8181

82-
saveCourse = dropTask(async () => {
82+
saveCourse = task({ drop: true }, async () => {
8383
this.validations.addErrorDisplayForAllFields();
8484
const isValid = await this.validations.isValid();
8585
if (!isValid) {

packages/frontend/app/components/courses/root.gjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Component from '@glimmer/component';
22
import { service } from '@ember/service';
3-
import { dropTask } from 'ember-concurrency';
3+
import { task } from 'ember-concurrency';
44
import { DateTime } from 'luxon';
55
import { TrackedAsyncData } from 'ember-async-data';
66
import { cached, tracked } from '@glimmer/tracking';
@@ -175,7 +175,7 @@ export default class CoursesRootComponent extends Component {
175175
return defaultYear;
176176
}
177177
178-
removeCourse = dropTask(async (course) => {
178+
removeCourse = task({ drop: true }, async (course) => {
179179
const courses = await this.selectedSchool.courses;
180180
courses.splice(courses.indexOf(course), 1);
181181
this.selectedSchool.set('courses', courses);
@@ -186,7 +186,7 @@ export default class CoursesRootComponent extends Component {
186186
}
187187
});
188188
189-
saveNewCourse = dropTask(async (newCourse) => {
189+
saveNewCourse = task({ drop: true }, async (newCourse) => {
190190
newCourse.setDatesBasedOnYear();
191191
this.newCourse = await newCourse.save();
192192
this.showNewCourseForm = false;

packages/frontend/app/components/curriculum-inventory/new-report.gjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
22
import { cached, tracked } from '@glimmer/tracking';
33
import { action } from '@ember/object';
44
import { service } from '@ember/service';
5-
import { dropTask } from 'ember-concurrency';
5+
import { task } from 'ember-concurrency';
66
import { TrackedAsyncData } from 'ember-async-data';
77
import YupValidations from 'ilios-common/classes/yup-validations';
88
import { string } from 'yup';
@@ -61,7 +61,7 @@ export default class CurriculumInventoryNewReportComponent extends Component {
6161
return rhett;
6262
}
6363

64-
save = dropTask(async () => {
64+
save = task({ drop: true }, async () => {
6565
this.validations.addErrorDisplayForAllFields();
6666
const isValid = await this.validations.isValid();
6767
if (!isValid) {
@@ -91,7 +91,7 @@ export default class CurriculumInventoryNewReportComponent extends Component {
9191
this.selectedYear = Number(year);
9292
}
9393

94-
keyboard = dropTask(async (ev) => {
94+
keyboard = task({ drop: true }, async (ev) => {
9595
const keyCode = ev.keyCode;
9696

9797
if (13 === keyCode) {

packages/frontend/app/components/curriculum-inventory/new-sequence-block.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
22
import { cached, tracked } from '@glimmer/tracking';
33
import { action } from '@ember/object';
44
import { service } from '@ember/service';
5-
import { dropTask } from 'ember-concurrency';
5+
import { task } from 'ember-concurrency';
66
import { TrackedAsyncData } from 'ember-async-data';
77
import { findById } from 'ilios-common/utils/array-helpers';
88
import YupValidations from 'ilios-common/classes/yup-validations';
@@ -383,7 +383,7 @@ export default class CurriculumInventoryNewSequenceBlock extends Component {
383383
}
384384
}
385385

386-
save = dropTask(async () => {
386+
save = task({ drop: true }, async () => {
387387
this.validations.addErrorDisplayForAllFields();
388388
const isValid = await this.validations.isValid();
389389
if (!isValid) {

packages/frontend/app/components/curriculum-inventory/report-details.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from '@glimmer/component';
22
import { service } from '@ember/service';
33
import { tracked } from '@glimmer/tracking';
4-
import { dropTask } from 'ember-concurrency';
4+
import { task } from 'ember-concurrency';
55
import ReportHeader from 'frontend/components/curriculum-inventory/report-header';
66
import set from 'ember-set-helper/helpers/set';
77
import t from 'ember-intl/helpers/t';
@@ -25,7 +25,7 @@ export default class CurriculumInventoryReportDetailsComponent extends Component
2525
return this.args.canUpdate && !this.isFinalizing;
2626
}
2727

28-
finalize = dropTask(async () => {
28+
finalize = task({ drop: true }, async () => {
2929
const newExport = this.store.createRecord('curriculum-inventory-export', {
3030
report: this.args.report,
3131
});

packages/frontend/app/components/curriculum-inventory/report-header.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from '@glimmer/component';
22
import { tracked } from '@glimmer/tracking';
33
import { action } from '@ember/object';
4-
import { restartableTask } from 'ember-concurrency';
4+
import { task } from 'ember-concurrency';
55
import YupValidations from 'ilios-common/classes/yup-validations';
66
import { string } from 'yup';
77
import EditableField from 'ilios-common/components/editable-field';
@@ -26,7 +26,7 @@ export default class CurriculumInventoryReportHeaderComponent extends Component
2626
name: string().trim().required().max(60),
2727
});
2828

29-
saveName = restartableTask(async () => {
29+
saveName = task({ restartable: true }, async () => {
3030
this.validations.addErrorDisplayFor('name');
3131
const isValid = await this.validations.isValid();
3232
if (!isValid) {

0 commit comments

Comments
 (0)