Merge pull request #8178 from michaelchadwick/remove-new-course-rende…

…r-modifier Remove Course->New render modifier
ilios · Oct 7, 2024 · fee5dba · fee5dba
2 parents 384c925 + b6cc5c6
commit fee5dba
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 33 deletions.
diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo
@@ -7,7 +7,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|23cd787c79c34a628da
 add|ember-template-lint|no-at-ember-render-modifiers|5|2|5|2|e5120f87b74c5ae8e4c76b9089e0b4a4504c6e3c|1722902400000|1730682000000|1754006400000|app/components/user-profile-roles.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|1fb0566922ce4f066916e5e2931f650f69d7cfba|1722902400000|1730682000000|1754006400000|app/components/visualizer-program-year-objectives.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|5|2|5|2|38e65b45b56fdfd4160d3b0884114b6643e3a036|1722902400000|1730682000000|1754006400000|app/components/visualizer-program-year-objectives.hbs
-add|ember-template-lint|no-at-ember-render-modifiers|4|4|4|4|23cd787c79c34a628dadb6e96dd4004d42eebb79|1722902400000|1730682000000|1754006400000|app/components/courses/new.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|5|2|5|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1722902400000|1730682000000|1754006400000|app/components/curriculum-inventory/new-report.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1722902400000|1730682000000|1754006400000|app/components/curriculum-inventory/new-sequence-block.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|5|2|5|2|77e3831e4ae1b00caee1f808711f2e26ab452a23|1722902400000|1730682000000|1754006400000|app/components/curriculum-inventory/new-sequence-block.hbs

diff --git a/packages/frontend/app/components/courses/new.hbs b/packages/frontend/app/components/courses/new.hbs
@@ -1,5 +1,5 @@
 {{#let (unique-id) as |templateId|}}
-  <div class="courses-new" {{did-insert (perform this.load)}} data-test-courses-new>
+  <div class="courses-new" data-test-courses-new>
     {{#unless this.load.isRunning}}
       <h4>
         {{t "general.newCourse"}}
@@ -28,26 +28,28 @@
           <label for="year-{{templateId}}">
             {{t "general.academicYear"}}:
           </label>
-          <select
-            id="year-{{templateId}}"
-            data-test-year
-            {{on "change" (pick "target.value" this.setYear)}}
-          >
-            <option disabled="" selected={{is-empty this.selectedYear}} value="">
-              {{t "general.selectAcademicYear"}}
-            </option>
-            {{#each this.years as |year|}}
-              <option selected={{eq year this.selectedYear}} value={{year}}>
-                {{#if this.academicYearCrossesCalendarYearBoundaries}}
-                  {{year}}
-                  -
-                  {{add year 1}}
-                {{else}}
-                  {{year}}
-                {{/if}}
+          {{#if this.academicYearCrossesCalendarYearBoundariesData.isResolved}}
+            <select
+              id="year-{{templateId}}"
+              data-test-year
+              {{on "change" (pick "target.value" this.setYear)}}
+            >
+              <option disabled="" selected={{is-empty this.selectedYear}} value="">
+                {{t "general.selectAcademicYear"}}
               </option>
-            {{/each}}
-          </select>
+              {{#each this.years as |year|}}
+                <option selected={{eq year this.selectedYear}} value={{year}}>
+                  {{#if this.academicYearCrossesCalendarYearBoundaries}}
+                    {{year}}
+                    -
+                    {{add year 1}}
+                  {{else}}
+                    {{year}}
+                  {{/if}}
+                </option>
+              {{/each}}
+            </select>
+          {{/if}}
         </div>
         <div class="buttons">
           <button

diff --git a/packages/frontend/app/components/courses/new.js b/packages/frontend/app/components/courses/new.js
@@ -1,10 +1,11 @@
 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 { DateTime } from 'luxon';
 import { validatable, Length, NotBlank } from 'ilios-common/decorators/validation';
-import { dropTask, restartableTask } from 'ember-concurrency';
+import { dropTask } from 'ember-concurrency';
+import { TrackedAsyncData } from 'ember-async-data';
 
 @validatable
 export default class CoursesNewComponent extends Component {
@@ -14,13 +15,29 @@ export default class CoursesNewComponent extends Component {
 
   @tracked @NotBlank() selectedYear;
   @tracked @NotBlank() @Length(3, 200) title;
-  @tracked academicYearCrossesCalendarYearBoundaries;
   @tracked years;
 
   constructor() {
     super(...arguments);
     const thisYear = DateTime.now().year;
     this.years = [thisYear - 2, thisYear - 1, thisYear, thisYear + 1, thisYear + 2];
+
+    if (this.args.currentYear && this.years.includes(parseInt(this.args.currentYear.id, 10))) {
+      this.setYear(this.args.currentYear.id);
+    }
+  }
+
+  @cached
+  get academicYearCrossesCalendarYearBoundariesData() {
+    return new TrackedAsyncData(
+      this.iliosConfig.itemFromConfig('academicYearCrossesCalendarYearBoundaries'),
+    );
+  }
+
+  get academicYearCrossesCalendarYearBoundaries() {
+    return this.academicYearCrossesCalendarYearBoundariesData.isResolved
+      ? this.academicYearCrossesCalendarYearBoundariesData.value
+      : false;
   }
 
   @action
@@ -45,15 +62,6 @@ export default class CoursesNewComponent extends Component {
     }
   }
 
-  load = restartableTask(async () => {
-    this.academicYearCrossesCalendarYearBoundaries = await this.iliosConfig.itemFromConfig(
-      'academicYearCrossesCalendarYearBoundaries',
-    );
-    if (this.args.currentYear && this.years.includes(parseInt(this.args.currentYear.id, 10))) {
-      this.setYear(this.args.currentYear.id);
-    }
-  });
-
   saveCourse = dropTask(async () => {
     this.addErrorDisplayFor('title');
     const isValid = await this.isValid();