From 1db0b046cf550be37e3ddaa00981657bb6bc35d0 Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 28 Jun 2024 11:42:00 -0700 Subject: [PATCH 01/18] Replace modifiers in component --- .../school-competencies-collapsed.hbs | 56 +++++++++---------- .../school-competencies-collapsed.js | 19 ++++--- 2 files changed, 37 insertions(+), 38 deletions(-) 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; - }); } From 2e88e6b1eaaf0d27feb75579471840bd6bb916d6 Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 28 Jun 2024 11:47:44 -0700 Subject: [PATCH 02/18] Remove modifiers from component --- packages/frontend/.lint-todo | 4 ++-- .../school-competencies-expanded.hbs | 2 -- .../components/school-competencies-expanded.js | 18 +++++++++--------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo index d8e55f85d5..4c07c2b0a7 100644 --- a/packages/frontend/.lint-todo +++ b/packages/frontend/.lint-todo @@ -1,6 +1,6 @@ +add|ember-template-lint|no-at-ember-render-modifiers|16|4|16|4|46d995f60904f6b6f4b1b6b24bb65b9c97441bc1|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs +add|ember-template-lint|no-at-ember-render-modifiers|28|6|28|6|df94e6558ff62dea69f6f656f668f29b56bcc378|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs 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 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..9f96147345 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)), ); From a55e3172c1c2b05ac5ab3d40a48b8534d78c2b94 Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 28 Jun 2024 11:52:43 -0700 Subject: [PATCH 03/18] Replace element modifiers with straight load The @institution passed here won't ever change without the component being destroyed first so instead of reacting to changes in that data we can just set all these values when it first loads. --- packages/frontend/.lint-todo | 2 - ...rriculum-inventory-institution-manager.hbs | 2 - ...urriculum-inventory-institution-manager.js | 38 +++++-------------- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo index 4c07c2b0a7..52c56ae89a 100644 --- a/packages/frontend/.lint-todo +++ b/packages/frontend/.lint-todo @@ -1,8 +1,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|16|4|16|4|46d995f60904f6b6f4b1b6b24bb65b9c97441bc1|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs add|ember-template-lint|no-at-ember-render-modifiers|28|6|28|6|df94e6558ff62dea69f6f656f668f29b56bcc378|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs 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|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 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([ From 93837f8413d799e8dc086a47ed05963037b535f6 Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 28 Jun 2024 13:13:46 -0700 Subject: [PATCH 04/18] Replace element modifier We can load this value in the constructor as it doesn't need to be reactive, anytime the school here changes the component will have been destroyed. --- packages/frontend/.lint-todo | 2 -- packages/frontend/app/components/school-manager.hbs | 1 - packages/frontend/app/components/school-manager.js | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo index 52c56ae89a..73ea254165 100644 --- a/packages/frontend/.lint-todo +++ b/packages/frontend/.lint-todo @@ -1,8 +1,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|16|4|16|4|46d995f60904f6b6f4b1b6b24bb65b9c97441bc1|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs add|ember-template-lint|no-at-ember-render-modifiers|28|6|28|6|df94e6558ff62dea69f6f656f668f29b56bcc378|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs 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|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 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; } From d61984a83d7490d13ec7a148094d267261c95983 Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Thu, 4 Jul 2024 22:58:03 -0700 Subject: [PATCH 05/18] Replace element modifier Refactoring the data loading here so we don't have to do it when the element is inserted into the DOM. Because this data is now loaded and re-loaded on each change I needed to pay some tricks to show the right values during that process. I also re-wrote the save method here while I was trying to solve display issues, I like it, gonna keep it. --- packages/frontend/.lint-todo | 1 - .../school-session-attributes-expanded.js | 8 +- .../components/school-session-attributes.hbs | 4 +- .../components/school-session-attributes.js | 87 +++++++++---------- 4 files changed, 45 insertions(+), 55 deletions(-) diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo index 73ea254165..2a439b1d4b 100644 --- a/packages/frontend/.lint-todo +++ b/packages/frontend/.lint-todo @@ -1,7 +1,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|16|4|16|4|46d995f60904f6b6f4b1b6b24bb65b9c97441bc1|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs add|ember-template-lint|no-at-ember-render-modifiers|28|6|28|6|df94e6558ff62dea69f6f656f668f29b56bcc378|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs 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|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 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); } From ecff7cbaabe539200c20f5f7c0e57f847890653f Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 5 Jul 2024 10:08:04 -0700 Subject: [PATCH 06/18] Replace element modifier Used getters to access either the user specified value of each passed property or else the one we were sent and replaced the async loading with tracked data. --- packages/frontend/.lint-todo | 2 - .../components/school-session-type-form.hbs | 23 +++-- .../components/school-session-type-form.js | 89 +++++++++++++------ 3 files changed, 72 insertions(+), 42 deletions(-) diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo index 2a439b1d4b..25791228f1 100644 --- a/packages/frontend/.lint-todo +++ b/packages/frontend/.lint-todo @@ -1,8 +1,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|16|4|16|4|46d995f60904f6b6f4b1b6b24bb65b9c97441bc1|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs add|ember-template-lint|no-at-ember-render-modifiers|28|6|28|6|df94e6558ff62dea69f6f656f668f29b56bcc378|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs 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|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 diff --git a/packages/frontend/app/components/school-session-type-form.hbs b/packages/frontend/app/components/school-session-type-form.hbs index 7876b21733..a092d7e50a 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}} +
{{#if @canEditAamcMethod}} - {{#each (sort-by "description" this.filteredAamcMethods) as |aamcMethod| }}
+ {{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..5ded64cc19 100644 --- a/packages/frontend/app/components/school-session-type-form.js +++ b/packages/frontend/app/components/school-session-type-form.js @@ -1,33 +1,77 @@ 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 assessmentValue; + @tracked @NotBlank() @IsHexColor() calendarColorValue; + @tracked isActiveValue; + @tracked selectedAamcMethodIdValue; + @tracked selectedAssessmentOptionIdValue; + @tracked @NotBlank() @Length(1, 100) titleValue; + + @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 assessment() { + return this.assessmentValue ?? this.args.assessment; + } + + get calendarColor() { + return this.calendarColorValue ?? this.args.calendarColor; + } + + get isActive() { + return this.isActiveValue ?? this.args.isActive; + } + + get title() { + return this.titleValue ?? this.args.title; + } + + get selectedAamcMethodId() { + return this.selectedAamcMethodIdValue ?? this.args.selectedAamcMethodId; + } + + get selectedAssessmentOptionId() { + return this.selectedAssessmentOptionIdValue ?? this.args.selectedAssessmentOptionId; + } 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,21 +94,10 @@ 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; - this.assessment = assessment; + this.selectedAamcMethodIdValue = null; + this.assessmentValue = assessment; } saveSessionType = dropTask(async () => { From 790c3274073fec2f1c85f371928a1e8be18adcf5 Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 5 Jul 2024 10:20:20 -0700 Subject: [PATCH 07/18] Replace element modifier We can use a getter for all of this --- packages/frontend/.lint-todo | 1 - .../school-session-type-manager.hbs | 3 +- .../components/school-session-type-manager.js | 33 ++++++++++++++----- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo index 25791228f1..62f92ebdf7 100644 --- a/packages/frontend/.lint-todo +++ b/packages/frontend/.lint-todo @@ -1,7 +1,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|16|4|16|4|46d995f60904f6b6f4b1b6b24bb65b9c97441bc1|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs add|ember-template-lint|no-at-ember-render-modifiers|28|6|28|6|df94e6558ff62dea69f6f656f668f29b56bcc378|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs 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|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 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) => { From d7ab41fdbe4947e454fd0e491c531607d58e04ec Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 5 Jul 2024 10:28:52 -0700 Subject: [PATCH 08/18] Replace element modifier Also pulled out some loading spinners which are very unlikely to ever be seen given where this element falls on the page and how quickly this data loads (and will probably be pre-loaded). --- packages/frontend/.lint-todo | 1 - .../school-session-types-collapsed.hbs | 10 ++-------- .../school-session-types-collapsed.js | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo index 62f92ebdf7..2a69fbaee2 100644 --- a/packages/frontend/.lint-todo +++ b/packages/frontend/.lint-todo @@ -1,7 +1,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|16|4|16|4|46d995f60904f6b6f4b1b6b24bb65b9c97441bc1|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs add|ember-template-lint|no-at-ember-render-modifiers|28|6|28|6|df94e6558ff62dea69f6f656f668f29b56bcc378|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs 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|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 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'); } } From 71f7eb8273d604c23a5c913e210e9b9879bde79a Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 5 Jul 2024 10:42:22 -0700 Subject: [PATCH 09/18] Replace element modifier --- packages/frontend/.lint-todo | 2 -- .../school-session-types-expanded.hbs | 4 +-- .../school-session-types-expanded.js | 33 +++++++++++++------ 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo index 2a69fbaee2..59573d0791 100644 --- a/packages/frontend/.lint-todo +++ b/packages/frontend/.lint-todo @@ -1,8 +1,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|16|4|16|4|46d995f60904f6b6f4b1b6b24bb65b9c97441bc1|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs add|ember-template-lint|no-at-ember-render-modifiers|28|6|28|6|df94e6558ff62dea69f6f656f668f29b56bcc378|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs 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|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 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 From fece75a90d4023fe11079a2dfebcd369a7c52d1b Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 5 Jul 2024 10:56:25 -0700 Subject: [PATCH 10/18] Replace element modifier --- packages/frontend/.lint-todo | 2 -- .../school-vocabulary-term-manager.hbs | 12 ++++----- .../school-vocabulary-term-manager.js | 27 +++++++++---------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo index 59573d0791..cc7f4ef571 100644 --- a/packages/frontend/.lint-todo +++ b/packages/frontend/.lint-todo @@ -1,8 +1,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|16|4|16|4|46d995f60904f6b6f4b1b6b24bb65b9c97441bc1|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs add|ember-template-lint|no-at-ember-render-modifiers|28|6|28|6|df94e6558ff62dea69f6f656f668f29b56bcc378|1719360000000|1734915600000|1750464000000|app/components/locale-chooser.hbs 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|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 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 @@