diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo index d8e55f85d5..2080df9e80 100644 --- a/packages/frontend/.lint-todo +++ b/packages/frontend/.lint-todo @@ -1,24 +1,4 @@ add|ember-template-lint|no-at-ember-render-modifiers|5|2|5|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1719360000000|1734915600000|1750464000000|app/components/new-directory-user.hbs -add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1719360000000|1734915600000|1750464000000|app/components/school-competencies-collapsed.hbs -add|ember-template-lint|no-at-ember-render-modifiers|5|2|5|2|d0274adc777d08699935bd8c5f7a4a3346d93065|1719360000000|1734915600000|1750464000000|app/components/school-competencies-collapsed.hbs -add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1719360000000|1734915600000|1750464000000|app/components/school-competencies-expanded.hbs -add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|d0274adc777d08699935bd8c5f7a4a3346d93065|1719360000000|1734915600000|1750464000000|app/components/school-competencies-expanded.hbs -add|ember-template-lint|no-at-ember-render-modifiers|5|4|5|4|7312526529ca39ed820819d1478d8e1b8f555279|1719360000000|1734915600000|1750464000000|app/components/school-curriculum-inventory-institution-manager.hbs -add|ember-template-lint|no-at-ember-render-modifiers|6|4|6|4|58a8dc317204df6b5fac13a4349906b0c7b1db7b|1719360000000|1734915600000|1750464000000|app/components/school-curriculum-inventory-institution-manager.hbs -add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|7312526529ca39ed820819d1478d8e1b8f555279|1719360000000|1734915600000|1750464000000|app/components/school-manager.hbs -add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|66a5b0f89c3a88a7c0b541518f72e20531cd4be7|1719360000000|1734915600000|1750464000000|app/components/school-session-attributes.hbs -add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|1d825ec0c79a15f259a520b8cd57683cbcbef5a2|1719360000000|1734915600000|1750464000000|app/components/school-session-attributes.hbs -add|ember-template-lint|no-at-ember-render-modifiers|5|4|5|4|23cd787c79c34a628dadb6e96dd4004d42eebb79|1719360000000|1734915600000|1750464000000|app/components/school-session-type-form.hbs -add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1719360000000|1734915600000|1750464000000|app/components/school-session-type-manager.hbs -add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|66a5b0f89c3a88a7c0b541518f72e20531cd4be7|1719360000000|1734915600000|1750464000000|app/components/school-session-types-collapsed.hbs -add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|a90be151f45cd8ab32827e9247a9a9eb7f1baef2|1719360000000|1734915600000|1750464000000|app/components/school-session-types-collapsed.hbs -add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|66a5b0f89c3a88a7c0b541518f72e20531cd4be7|1719360000000|1734915600000|1750464000000|app/components/school-session-types-expanded.hbs -add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|af2ee7cd6f5c12e29ee3d5dc0ec4a76db43b7556|1719360000000|1734915600000|1750464000000|app/components/school-session-types-expanded.hbs -add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|66a5b0f89c3a88a7c0b541518f72e20531cd4be7|1719360000000|1734915600000|1750464000000|app/components/school-vocabularies-expanded.hbs -add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|df089fc2824cc65ff8a25e7787cf29a1911298b6|1719360000000|1734915600000|1750464000000|app/components/school-vocabularies-expanded.hbs -add|ember-template-lint|no-at-ember-render-modifiers|5|4|5|4|7312526529ca39ed820819d1478d8e1b8f555279|1719360000000|1734915600000|1750464000000|app/components/school-vocabulary-manager.hbs -add|ember-template-lint|no-at-ember-render-modifiers|5|4|5|4|1fe23f11c7d96a9f1082ef86c3d1f725c2212c21|1719360000000|1734915600000|1750464000000|app/components/school-vocabulary-term-manager.hbs -add|ember-template-lint|no-at-ember-render-modifiers|6|4|6|4|99e02f01ac450458b91299ca7b0c6e67d69d26d2|1719360000000|1734915600000|1750464000000|app/components/school-vocabulary-term-manager.hbs add|ember-template-lint|no-at-ember-render-modifiers|4|4|4|4|5d93dc162628c4faaa7bce9ef9bfba305f14ce38|1719360000000|1734915600000|1750464000000|app/components/unassigned-students-summary.hbs add|ember-template-lint|no-at-ember-render-modifiers|5|4|5|4|5f7f17419fe451673ab74fb58778311bc01912c0|1719360000000|1734915600000|1750464000000|app/components/unassigned-students-summary.hbs add|ember-template-lint|no-at-ember-render-modifiers|5|4|5|4|ddf86727990ead62165fe28c6dff53552a4d49b7|1719360000000|1734915600000|1750464000000|app/components/user-menu.hbs @@ -79,8 +59,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|5|2|5|2|fc55335d86e2b3d97a0 add|ember-template-lint|no-at-ember-render-modifiers|6|2|6|2|12443b4ba50f603e3c3af3d9e10ce840e7b67d9e|1719360000000|1734915600000|1750464000000|app/components/program-year/objective-list-item.hbs add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|286929067e02096dda5597efc45c876218621874|1719360000000|1734915600000|1750464000000|app/components/program-year/objectives.hbs add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|f37fd8ee0b117114a09137593ed6f113b2c80806|1719360000000|1734915600000|1750464000000|app/components/program-year/objectives.hbs -add|ember-template-lint|no-at-ember-render-modifiers|6|4|6|4|7312526529ca39ed820819d1478d8e1b8f555279|1719360000000|1734915600000|1750464000000|app/components/school/emails-editor.hbs -add|ember-template-lint|no-at-ember-render-modifiers|7|4|7|4|534e66e31edefd389dd85626b3fe99ddc2d7750a|1719360000000|1734915600000|1750464000000|app/components/school/emails-editor.hbs add|ember-template-lint|no-at-ember-render-modifiers|10|6|10|6|d919d2af254f782c01fe2ba15416673e52e91124|1719360000000|1734915600000|1750464000000|app/components/reports/subject/new/academic-year.hbs add|ember-template-lint|no-at-ember-render-modifiers|11|6|11|6|940005188b476a060b0e5d3f05baea24ba178878|1719360000000|1734915600000|1750464000000|app/components/reports/subject/new/academic-year.hbs add|ember-template-lint|no-at-ember-render-modifiers|10|6|10|6|d919d2af254f782c01fe2ba15416673e52e91124|1719360000000|1734915600000|1750464000000|app/components/reports/subject/new/competency.hbs diff --git a/packages/frontend/app/components/school-competencies-collapsed.hbs b/packages/frontend/app/components/school-competencies-collapsed.hbs index 2910a5ce7d..494294256b 100644 --- a/packages/frontend/app/components/school-competencies-collapsed.hbs +++ b/packages/frontend/app/components/school-competencies-collapsed.hbs @@ -1,8 +1,6 @@
@@ -19,34 +17,30 @@
- {{#if this.load.isRunning}} - - {{else}} -
- - - - - +
+
- {{t "general.competencyDomain"}} - - {{t "general.summary"}} -
+ + + + + + + + {{#each (sort-by "title" this.domains) as |domain|}} + + + - - - {{#each (sort-by "title" this.domains) as |domain|}} - - - - - {{/each}} - -
+ {{t "general.competencyDomain"}} + + {{t "general.summary"}} +
+ {{domain.title}} + + {{t "general.subCompetencyCount" count=domain.childCount}} +
- {{domain.title}} - - {{t "general.subCompetencyCount" count=domain.childCount}} -
-
- {{/if}} + {{/each}} + + +
diff --git a/packages/frontend/app/components/school-competencies-collapsed.js b/packages/frontend/app/components/school-competencies-collapsed.js index c83d67f252..cca97d62c6 100644 --- a/packages/frontend/app/components/school-competencies-collapsed.js +++ b/packages/frontend/app/components/school-competencies-collapsed.js @@ -1,12 +1,21 @@ import Component from '@glimmer/component'; -import { tracked } from '@glimmer/tracking'; -import { restartableTask } from 'ember-concurrency'; +import { cached, tracked } from '@glimmer/tracking'; +import { TrackedAsyncData } from 'ember-async-data'; export default class SchoolCompetenciesCollapsedComponent extends Component { @tracked competenciesRelationship; + @cached + get schoolCompetenciesData() { + return new TrackedAsyncData(this.args.school.competencies); + } + get competencies() { - return this.competenciesRelationship ? this.competenciesRelationship.slice() : []; + if (this.schoolCompetenciesData.isResolved) { + return this.schoolCompetenciesData.value; + } + + return []; } get domains() { @@ -20,8 +29,4 @@ export default class SchoolCompetenciesCollapsedComponent extends Component { return competency.belongsTo('parent').id(); }); } - - load = restartableTask(async () => { - this.competenciesRelationship = await this.args.school.competencies; - }); } diff --git a/packages/frontend/app/components/school-competencies-expanded.hbs b/packages/frontend/app/components/school-competencies-expanded.hbs index d8132f6d9a..539e6dccd2 100644 --- a/packages/frontend/app/components/school-competencies-expanded.hbs +++ b/packages/frontend/app/components/school-competencies-expanded.hbs @@ -1,7 +1,5 @@
diff --git a/packages/frontend/app/components/school-competencies-expanded.js b/packages/frontend/app/components/school-competencies-expanded.js index 02103e7736..982389bd60 100644 --- a/packages/frontend/app/components/school-competencies-expanded.js +++ b/packages/frontend/app/components/school-competencies-expanded.js @@ -1,27 +1,27 @@ import Component from '@glimmer/component'; import { service } from '@ember/service'; import { all } from 'rsvp'; -import { tracked } from '@glimmer/tracking'; +import { cached, tracked } from '@glimmer/tracking'; import { action } from '@ember/object'; -import { dropTask, restartableTask } from 'ember-concurrency'; +import { dropTask } from 'ember-concurrency'; import { filterBy, uniqueValues } from 'ilios-common/utils/array-helpers'; +import { TrackedAsyncData } from 'ember-async-data'; export default class SchoolCompetenciesExpandedComponent extends Component { @service store; @tracked competenciesToAdd = []; @tracked competenciesToRemove = []; - @tracked schoolCompetencies; - load = restartableTask(async () => { - this.cleanup(); - this.schoolCompetencies = await this.args.school.competencies; - }); + @cached + get schoolCompetenciesData() { + return new TrackedAsyncData(this.args.school.competencies); + } get competencies() { - if (!this.schoolCompetencies) { + if (!this.schoolCompetenciesData.isResolved) { return []; } - const arr = [...this.schoolCompetencies.slice(), ...this.competenciesToAdd]; + const arr = [...this.schoolCompetenciesData.value, ...this.competenciesToAdd]; return uniqueValues( arr.filter((competency) => !this.competenciesToRemove.includes(competency)), ); @@ -80,10 +80,11 @@ export default class SchoolCompetenciesExpandedComponent extends Component { } save = dropTask(async () => { - const domainsToRemove = this.schoolCompetencies.filter((competency) => { + const competencies = this.schoolCompetenciesData.value; + const domainsToRemove = competencies.filter((competency) => { return !competency.belongsTo('parent').id() && !this.competencies.includes(competency); }); - const competenciesToRemove = this.schoolCompetencies.filter((competency) => { + const competenciesToRemove = competencies.filter((competency) => { return competency.belongsTo('parent').id() && !this.competencies.includes(competency); }); @@ -104,6 +105,5 @@ export default class SchoolCompetenciesExpandedComponent extends Component { // cleanup this.cleanup(); this.args.setSchoolManageCompetencies(false); - this.schoolCompetencies = await this.args.school.competencies; }); } diff --git a/packages/frontend/app/components/school-curriculum-inventory-institution-manager.hbs b/packages/frontend/app/components/school-curriculum-inventory-institution-manager.hbs index f3c517f998..b795645a37 100644 --- a/packages/frontend/app/components/school-curriculum-inventory-institution-manager.hbs +++ b/packages/frontend/app/components/school-curriculum-inventory-institution-manager.hbs @@ -2,8 +2,6 @@
{ this.addErrorDisplaysFor([ diff --git a/packages/frontend/app/components/school-manager.hbs b/packages/frontend/app/components/school-manager.hbs index 430b788c67..90ca0db3d8 100644 --- a/packages/frontend/app/components/school-manager.hbs +++ b/packages/frontend/app/components/school-manager.hbs @@ -1,7 +1,6 @@
diff --git a/packages/frontend/app/components/school-manager.js b/packages/frontend/app/components/school-manager.js index 438d7ce2c5..bc5f64eced 100644 --- a/packages/frontend/app/components/school-manager.js +++ b/packages/frontend/app/components/school-manager.js @@ -11,8 +11,8 @@ export default class SchoolManagerComponent extends Component { @service flashMessages; @tracked @NotBlank() @Length(1, 60) title; - @action - load() { + constructor() { + super(...arguments); this.title = this.args.school.title; } diff --git a/packages/frontend/app/components/school-session-attributes-expanded.js b/packages/frontend/app/components/school-session-attributes-expanded.js index 7d63e6b2bc..300670488b 100644 --- a/packages/frontend/app/components/school-session-attributes-expanded.js +++ b/packages/frontend/app/components/school-session-attributes-expanded.js @@ -64,12 +64,14 @@ export default class SchoolSessionAttributesExpandedComponent extends Component } save = dropTask(async () => { - await this.args.saveAll({ + //read the flipped values before we reset them + const all = { showSessionAttendanceRequired: this.showSessionAttendanceRequired, showSessionSupplemental: this.showSessionSupplemental, showSessionSpecialAttireRequired: this.showSessionSpecialAttireRequired, showSessionSpecialEquipmentRequired: this.showSessionSpecialEquipmentRequired, - }); - this.resetFlipped(); + }; + this.resetFlipped(); //reset before we save, otherwise there will be a flash of the old values + await this.args.saveAll(all); }); } diff --git a/packages/frontend/app/components/school-session-attributes.hbs b/packages/frontend/app/components/school-session-attributes.hbs index 1db9b58163..7f42abcd75 100644 --- a/packages/frontend/app/components/school-session-attributes.hbs +++ b/packages/frontend/app/components/school-session-attributes.hbs @@ -1,11 +1,9 @@
- {{#if this.load.lastSuccessful}} + {{#if (or this.schoolConfigsData.isResolved this.save.isRunning)}} {{#if @details}} { - const schoolConfigs = (await school.configurations).slice(); - this.showSessionAttendanceRequiredConfig = findBy( - schoolConfigs, - 'name', - 'showSessionAttendanceRequired', - ); - this.showSessionSupplementalConfig = findBy(schoolConfigs, 'name', 'showSessionSupplemental'); - this.showSessionSpecialAttireRequiredConfig = findBy( - schoolConfigs, - 'name', - 'showSessionSpecialAttireRequired', - ); - this.showSessionSpecialEquipmentRequiredConfig = findBy( - schoolConfigs, - 'name', - 'showSessionSpecialEquipmentRequired', - ); - }); + @cached + get schoolConfigsData() { + return new TrackedAsyncData(this.args.school.configurations); + } + + @cached + get schoolConfigs() { + const rhett = new Map(); + if (this.schoolConfigsData.isResolved) { + this.schoolConfigsData.value.forEach((config) => { + rhett.set(config.name, JSON.parse(config.value)); + }); + } + return rhett; + } get showSessionAttendanceRequired() { - return JSON.parse(this.showSessionAttendanceRequiredConfig?.value ?? null); + return this.schoolConfigs.get('showSessionAttendanceRequired') || null; } get showSessionSupplemental() { - return JSON.parse(this.showSessionSupplementalConfig?.value ?? null); + return this.schoolConfigs.get('showSessionSupplemental') || null; } get showSessionSpecialAttireRequired() { - return JSON.parse(this.showSessionSpecialAttireRequiredConfig?.value ?? null); + return this.schoolConfigs.get('showSessionSpecialAttireRequired') || null; } get showSessionSpecialEquipmentRequired() { - return JSON.parse(this.showSessionSpecialEquipmentRequiredConfig?.value ?? null); + return this.schoolConfigs.get('showSessionSpecialEquipmentRequired') || null; } save = dropTask(async (newValues) => { - const names = [ - 'showSessionAttendanceRequired', - 'showSessionSupplemental', - 'showSessionSpecialAttireRequired', - 'showSessionSpecialEquipmentRequired', - ]; - const toSave = []; - for (let i = 0; i < names.length; i++) { - const name = names[i]; - const config = await this.args.school.setConfigValue(name, newValues[name]); - if (config) { - toSave.push(config); - } - } try { - await all(toSave.map((o) => o.save())); + const needToSave = await Promise.all( + this.schoolConfigNames.map((name) => { + const value = newValues[name]; + if (value !== null) { + return this.args.school.setConfigValue(name, value); + } + }), + ); + + const toSave = needToSave.filter(Boolean); + await Promise.all(toSave.map((o) => o.save())); } finally { this.args.manage(false); } diff --git a/packages/frontend/app/components/school-session-type-form.hbs b/packages/frontend/app/components/school-session-type-form.hbs index 7876b21733..c750b3d78d 100644 --- a/packages/frontend/app/components/school-session-type-form.hbs +++ b/packages/frontend/app/components/school-session-type-form.hbs @@ -2,13 +2,10 @@
- {{#if this.load.isRunning}} - - {{else}} -
+ {{#if this.isLoaded}} +
+ {{else}} + {{/if}}
{{/let}} diff --git a/packages/frontend/app/components/school-session-type-form.js b/packages/frontend/app/components/school-session-type-form.js index f1e1df0f67..dd36ebf79c 100644 --- a/packages/frontend/app/components/school-session-type-form.js +++ b/packages/frontend/app/components/school-session-type-form.js @@ -1,33 +1,53 @@ import Component from '@glimmer/component'; -import { tracked } from '@glimmer/tracking'; +import { cached, tracked } from '@glimmer/tracking'; import { action } from '@ember/object'; import { service } from '@ember/service'; -import { dropTask, restartableTask } from 'ember-concurrency'; +import { dropTask } from 'ember-concurrency'; import { validatable, IsHexColor, Length, NotBlank } from 'ilios-common/decorators/validation'; import { findById, sortBy } from 'ilios-common/utils/array-helpers'; +import { TrackedAsyncData } from 'ember-async-data'; @validatable export default class SchoolSessionTypeFormComponent extends Component { @service store; - @tracked assessment; - @tracked @NotBlank() @IsHexColor() calendarColor; - @tracked isActive; - @tracked selectedAamcMethodId; - @tracked selectedAssessmentOptionId; - @tracked @NotBlank() @Length(1, 100) title; - @tracked assessmentOptions = []; - @tracked aamcMethods = []; + @tracked assessment = this.args.assessment ?? false; + @tracked @NotBlank() @IsHexColor() calendarColor = this.args.calendarColor || null; + @tracked isActive = this.args.isActive ?? true; + @tracked selectedAamcMethodId = this.args.selectedAamcMethodId || null; + @tracked selectedAssessmentOptionId = this.args.selectedAssessmentOptionId || null; + @tracked @NotBlank() @Length(1, 100) title = this.args.title || ''; + + @cached + get assessmentOptionsData() { + return new TrackedAsyncData(this.store.findAll('assessment-option')); + } + + get assessmentOptions() { + return this.assessmentOptionsData.isResolved ? this.assessmentOptionsData.value : []; + } + + @cached + get aamcMethodData() { + return new TrackedAsyncData(this.store.findAll('aamc-method')); + } + + get aamcMethods() { + return this.aamcMethodData.isResolved ? this.aamcMethodData.value : []; + } + + get isLoaded() { + return this.assessmentOptionsData.isResolved && this.aamcMethodData.isResolved; + } get filteredAamcMethods() { - return this.aamcMethods.filter((aamcMethod) => { - const id = aamcMethod.get('id'); - if (id !== this.selectedAamcMethodId && !aamcMethod.get('active')) { + return this.aamcMethods.filter(({ id, active }) => { + if (id !== this.selectedAamcMethodId && !active) { return false; } if (this.assessment) { - return id.indexOf('AM') === 0; + return id.startsWith('AM'); } else { - return id.indexOf('IM') === 0; + return id.startsWith('IM'); } }); } @@ -50,17 +70,6 @@ export default class SchoolSessionTypeFormComponent extends Component { return null; } - load = restartableTask(async () => { - this.assessment = this.args.assessment; - this.calendarColor = this.args.calendarColor; - this.isActive = this.args.isActive; - this.title = this.args.title; - this.selectedAssessmentOptionId = this.args.selectedAssessmentOptionId; - this.selectedAamcMethodId = this.args.selectedAamcMethodId; - this.assessmentOptions = (await this.store.findAll('assessment-option')).slice(); - this.aamcMethods = (await this.store.findAll('aamc-method')).slice(); - }); - @action updateAssessment(assessment) { this.selectedAamcMethodId = null; diff --git a/packages/frontend/app/components/school-session-type-manager.hbs b/packages/frontend/app/components/school-session-type-manager.hbs index de5ff60ae6..f9afc74886 100644 --- a/packages/frontend/app/components/school-session-type-manager.hbs +++ b/packages/frontend/app/components/school-session-type-manager.hbs @@ -1,10 +1,9 @@
- {{#if this.readonlySessionType}} + {{#if this.isLoaded}}
{{@sessionType.title}}
diff --git a/packages/frontend/app/components/school-session-type-manager.js b/packages/frontend/app/components/school-session-type-manager.js index b665338f1d..7ae02ff1ad 100644 --- a/packages/frontend/app/components/school-session-type-manager.js +++ b/packages/frontend/app/components/school-session-type-manager.js @@ -1,19 +1,36 @@ import Component from '@glimmer/component'; import { service } from '@ember/service'; -import { dropTask, restartableTask } from 'ember-concurrency'; -import { tracked } from '@glimmer/tracking'; +import { dropTask } from 'ember-concurrency'; +import { cached } from '@glimmer/tracking'; +import { TrackedAsyncData } from 'ember-async-data'; export default class SchoolSessionTypeManagerComponent extends Component { @service store; - @tracked readonlySessionType; - load = restartableTask(async () => { + @cached + get assessmentOptionsData() { + return new TrackedAsyncData(this.store.findAll('assessment-option')); + } + + @cached + get aamcMethodData() { + return new TrackedAsyncData(this.store.findAll('aamc-method')); + } + + get isLoaded() { + return this.assessmentOptionsData.isResolved && this.aamcMethodData.isResolved; + } + + get readonlySessionType() { const { title, calendarColor, assessment, active: isActive } = this.args.sessionType; - const assessmentOption = await this.args.sessionType.assessmentOption; + const assessmentOption = this.assessmentOptionsData.value.find( + ({ id }) => id === this.args.sessionType.belongsTo('assessmentOption').id(), + ); const selectedAssessmentOptionId = assessmentOption?.id; - const firstAamcMethod = await this.args.sessionType.firstAamcMethod; + + const firstAamcMethod = this.args.sessionType.firstAamcMethod; const selectedAamcMethodId = firstAamcMethod?.id; - this.readonlySessionType = { + return { title, calendarColor, assessment, @@ -21,7 +38,7 @@ export default class SchoolSessionTypeManagerComponent extends Component { selectedAamcMethodId, isActive, }; - }); + } save = dropTask( async (title, calendarColor, assessment, assessmentOption, aamcMethod, isActive) => { diff --git a/packages/frontend/app/components/school-session-types-collapsed.hbs b/packages/frontend/app/components/school-session-types-collapsed.hbs index ec9416e12c..62150f540e 100644 --- a/packages/frontend/app/components/school-session-types-collapsed.hbs +++ b/packages/frontend/app/components/school-session-types-collapsed.hbs @@ -1,7 +1,5 @@
@@ -36,10 +34,8 @@ {{t "general.assessmentMethods"}} - {{#if this.load.lastSuccessful}} + {{#if this.isLoaded}} {{this.assessmentMethods.length}} - {{else}} - {{/if}} @@ -48,10 +44,8 @@ {{t "general.instructionalMethods"}} - {{#if this.load.lastSuccessful}} + {{#if this.isLoaded}} {{this.instructionalMethods.length}} - {{else}} - {{/if}} diff --git a/packages/frontend/app/components/school-session-types-collapsed.js b/packages/frontend/app/components/school-session-types-collapsed.js index 42b093018d..c9c275e757 100644 --- a/packages/frontend/app/components/school-session-types-collapsed.js +++ b/packages/frontend/app/components/school-session-types-collapsed.js @@ -1,20 +1,23 @@ import Component from '@glimmer/component'; -import { restartableTask } from 'ember-concurrency'; -import { tracked } from '@glimmer/tracking'; +import { cached } from '@glimmer/tracking'; import { filterBy } from 'ilios-common/utils/array-helpers'; +import { TrackedAsyncData } from 'ember-async-data'; export default class SchoolSessionTypesCollapseComponent extends Component { - @tracked sessionTypes = []; + @cached + get sessionTypesData() { + return new TrackedAsyncData(this.args.school.sessionTypes); + } - load = restartableTask(async (element, [school]) => { - this.sessionTypes = await school.sessionTypes; - }); + get isLoaded() { + return this.sessionTypesData.isResolved; + } get instructionalMethods() { - return filterBy(this.sessionTypes, 'assessment', false); + return filterBy(this.sessionTypesData.value, 'assessment', false); } get assessmentMethods() { - return filterBy(this.sessionTypes, 'assessment'); + return filterBy(this.sessionTypesData.value, 'assessment'); } } diff --git a/packages/frontend/app/components/school-session-types-expanded.hbs b/packages/frontend/app/components/school-session-types-expanded.hbs index 466502e18d..f615e0355b 100644 --- a/packages/frontend/app/components/school-session-types-expanded.hbs +++ b/packages/frontend/app/components/school-session-types-expanded.hbs @@ -1,7 +1,5 @@
@@ -56,7 +54,7 @@ @save={{perform this.update}} @canUpdate={{@canUpdate}} /> - {{else if (and (is-array this.sessionTypes) this.sessionTypes.length)}} + {{else if (and this.isLoaded this.sessionTypes.length)}} { - this.sessionTypes = await school.sessionTypes; - this.isCollapsible = !this.isManaging && this.sessionTypes.length; - }); + @cached + get sessionTypesData() { + return new TrackedAsyncData(this.args.school.sessionTypes); + } + + get isLoaded() { + return this.sessionTypesData.isResolved; + } + + get isCollapsible() { + return ( + !this.isManaging && this.sessionTypesData.isResolved && this.sessionTypesData.value.length + ); + } + + get sessionTypes() { + return this.sessionTypesData.isResolved ? this.sessionTypesData.value : []; + } get managedSessionType() { - if (!this.sessionTypes) { + if (!this.sessionTypesData.isResolved) { return null; } - return findById(this.sessionTypes.slice(), this.args.managedSessionTypeId); + return findById(this.sessionTypes, this.args.managedSessionTypeId); } @action diff --git a/packages/frontend/app/components/school-vocabularies-expanded.hbs b/packages/frontend/app/components/school-vocabularies-expanded.hbs index 46405d39c6..a98a16c2e2 100644 --- a/packages/frontend/app/components/school-vocabularies-expanded.hbs +++ b/packages/frontend/app/components/school-vocabularies-expanded.hbs @@ -1,13 +1,9 @@
- {{#if this.load.isRunning}} - - {{else}} + {{#if this.isLoaded}}
{{#if this.isCollapsible}}
+ {{else}} + {{/if}}
diff --git a/packages/frontend/app/components/school-vocabularies-expanded.js b/packages/frontend/app/components/school-vocabularies-expanded.js index a71dc2542c..ace67540d2 100644 --- a/packages/frontend/app/components/school-vocabularies-expanded.js +++ b/packages/frontend/app/components/school-vocabularies-expanded.js @@ -1,14 +1,13 @@ import Component from '@glimmer/component'; -import { tracked } from '@glimmer/tracking'; +import { cached } from '@glimmer/tracking'; import { action } from '@ember/object'; import { service } from '@ember/service'; -import { dropTask, restartableTask } from 'ember-concurrency'; -import { map } from 'rsvp'; +import { dropTask } from 'ember-concurrency'; import { findById } from 'ilios-common/utils/array-helpers'; +import { TrackedAsyncData } from 'ember-async-data'; export default class SchoolVocabulariesExpandedComponent extends Component { @service store; - @tracked schoolVocabularies = []; #loadedSchools = {}; @@ -31,17 +30,36 @@ export default class SchoolVocabulariesExpandedComponent extends Component { return this.#loadedSchools[schoolId]; } - load = restartableTask(async () => { - await this.loadSchool(this.args.school.id); - const vocabularies = (await this.args.school.vocabularies).slice(); - this.schoolVocabularies = await map(vocabularies, async (vocabulary) => { - const terms = await vocabulary.terms; + @cached + get schoolData() { + return new TrackedAsyncData(this.loadSchool(this.args.school.id)); + } + + @cached + get vocabularyData() { + return new TrackedAsyncData(this.args.school.vocabularies); + } + + get isLoaded() { + return this.schoolData.isResolved && this.vocabularyData.isResolved; + } + + get schoolVocabularies() { + return this.vocabularyData.value.map((vocabulary) => { + const terms = vocabulary + .hasMany('terms') + .ids() + .map((id) => { + return id ? this.store.peekRecord('term', id) : null; + }) + .filter(Boolean); + return { vocabulary, terms, }; }); - }); + } get managedVocabulary() { if (!this.args.managedVocabularyId || !this.schoolVocabularies.length) { diff --git a/packages/frontend/app/components/school-vocabulary-manager.hbs b/packages/frontend/app/components/school-vocabulary-manager.hbs index 3eb18b9069..0ad6d77457 100644 --- a/packages/frontend/app/components/school-vocabulary-manager.hbs +++ b/packages/frontend/app/components/school-vocabulary-manager.hbs @@ -2,7 +2,6 @@
@@ -36,12 +35,12 @@ - + {{else}} {{this.title}} diff --git a/packages/frontend/app/components/school-vocabulary-manager.js b/packages/frontend/app/components/school-vocabulary-manager.js index 9dd818eaa3..d32da930f0 100644 --- a/packages/frontend/app/components/school-vocabulary-manager.js +++ b/packages/frontend/app/components/school-vocabulary-manager.js @@ -15,8 +15,7 @@ export default class SchoolVocabularyManagerComponent extends Component { @NotBlank() @Length(1, 200) @Custom('validateTitleCallback', 'validateTitleMessageCallback') - title; - @tracked isActive = false; + titleValue; @tracked newTerm; @cached @@ -42,19 +41,17 @@ export default class SchoolVocabularyManagerComponent extends Component { ); } - @action - load() { - this.title = this.args.vocabulary.title; - this.isActive = this.args.vocabulary.active; + get title() { + return this.titleValue || this.args.vocabulary.title; } changeTitle = dropTask(async () => { - this.addErrorDisplayFor('title'); + this.addErrorDisplayFor('titleValue'); const isValid = await this.isValid(); if (!isValid) { return false; } - this.removeErrorDisplayFor('title'); + this.removeErrorDisplayFor('titleValue'); this.args.vocabulary.title = this.title; await this.args.vocabulary.save(); }); @@ -62,7 +59,7 @@ export default class SchoolVocabularyManagerComponent extends Component { @action revertTitleChanges() { this.removeErrorDisplayFor('title'); - this.title = this.args.vocabulary.title; + this.titleValue = this.args.vocabulary.title; } @action @@ -82,7 +79,7 @@ export default class SchoolVocabularyManagerComponent extends Component { return vocab !== this.args.vocabulary; }); const siblingTitles = mapBy(siblings, 'title'); - return !siblingTitles.includes(this.title); + return !siblingTitles.includes(this.titleValue); } validateTitleMessageCallback() { diff --git a/packages/frontend/app/components/school-vocabulary-term-manager.hbs b/packages/frontend/app/components/school-vocabulary-term-manager.hbs index 6a63ad87fa..f7ca68830e 100644 --- a/packages/frontend/app/components/school-vocabulary-term-manager.hbs +++ b/packages/frontend/app/components/school-vocabulary-term-manager.hbs @@ -2,8 +2,6 @@
{{#if this.isLoading}} @@ -62,14 +60,14 @@ type="text" value={{this.title}} disabled={{isSaving}} - {{on "input" (pick "target.value" (set this.title))}} - {{on "keyup" (fn this.addErrorDisplayFor "title")}} + {{on "input" (pick "target.value" (set this.titleValue))}} + {{on "keyup" (fn this.addErrorDisplayFor "titleValue")}} > {{else}} {{this.title}} {{/if}} - + {{#if (and @canDelete (not this.children.length) (not @term.hasAssociations))}} {{#if @canUpdate}} @@ -111,7 +109,7 @@