Merge pull request #8185 from stopfstedt/5711_multiday_event_creation

prevent offering from being updated with invalid hour/minute input for end-date.
ilios · Oct 16, 2024 · 7646e01 · 7646e01
2 parents 5d0a228 + b128938
commit 7646e01
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 0 deletions.
diff --git a/packages/ilios-common/addon/components/offering-form.js b/packages/ilios-common/addon/components/offering-form.js
@@ -525,6 +525,11 @@ export default class OfferingForm extends Component {
   }
 
   updateDurationHours = restartableTask(async (hours) => {
+    // The corresponding input field passes an empty string if the input blank or invalid.
+    // Here, we ignore invalid input and exit early.
+    if ('' === hours) {
+      return;
+    }
     await timeout(DEBOUNCE_DELAY);
     this.addErrorDisplayFor('durationHours');
     this.addErrorDisplayFor('durationMinutes');
@@ -535,6 +540,11 @@ export default class OfferingForm extends Component {
   });
 
   updateDurationMinutes = restartableTask(async (minutes) => {
+    // The corresponding input field passes an empty string if the input blank or invalid.
+    // Here, we ignore invalid input and exit early.
+    if ('' === minutes) {
+      return;
+    }
     await timeout(DEBOUNCE_DELAY);
     this.addErrorDisplayFor('durationHours');
     this.addErrorDisplayFor('durationMinutes');

diff --git a/packages/test-app/tests/integration/components/offering-form-test.js b/packages/test-app/tests/integration/components/offering-form-test.js
@@ -470,6 +470,56 @@ module('Integration | Component | offering form', function (hooks) {
     assert.ok(component.duration.minutes.hasError);
   });
 
+  test('blanking minutes or hours is ignored', async function (assert) {
+    await render(hbs`<OfferingForm @close={{(noop)}} @save={{(noop)}} />`);
+
+    // Verify the initial end-date.
+    assert.strictEqual(
+      this.intl.formatDate(DateTime.fromObject({ hour: 9, minute: 0 }).toJSDate(), {
+        month: '2-digit',
+        day: '2-digit',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+      }),
+      component.endDate.value,
+    );
+
+    // Change the duration, verify the calculated end-date.
+    await component.duration.minutes.set('4');
+    await component.duration.hours.set('9');
+    const newEndDate = this.intl.formatDate(
+      DateTime.fromObject({ hour: 17, minute: 4 }).toJSDate(),
+      {
+        month: '2-digit',
+        day: '2-digit',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+      },
+    );
+    assert.strictEqual(newEndDate, component.endDate.value);
+
+    // Provide blank input for the duration fields, verify that the end-date does not change again.
+    await component.duration.minutes.set('');
+    await component.duration.hours.set('');
+    assert.strictEqual(newEndDate, component.endDate.value);
+
+    // Change the duration again, verify that the calculated end-date has changed and is correct.
+    await component.duration.minutes.set('12');
+    await component.duration.hours.set('2');
+    assert.strictEqual(
+      this.intl.formatDate(DateTime.fromObject({ hour: 10, minute: 12 }).toJSDate(), {
+        month: '2-digit',
+        day: '2-digit',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+      }),
+      component.endDate.value,
+    );
+  });
+
   test('learner manager is not present in small-group mode', async function (assert) {
     await render(hbs`<OfferingForm @close={{(noop)}} @smallGroupMode={{true}} />`);
     assert.notOk(component.learnerManager.learnerSelectionManager.isPresent);