Merge pull request #7966 from stopfstedt/school-admin-email

change form validation rules to prevent empty school admin emails fro…

packages/frontend/app/components/school/emails-editor.js

@@ -1,7 +1,7 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { dropTask } from 'ember-concurrency';
-import { validatable, Custom, IsEmail, Length } from 'ilios-common/decorators/validation';
+import { validatable, Custom, IsEmail, Length, NotBlank } from 'ilios-common/decorators/validation';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { isBlank, typeOf } from '@ember/utils';
@@ -11,7 +11,7 @@ import EmailValidator from 'validator/es/lib/isEmail';
 export default class SchoolEmailsEditorComponent extends Component {
   @service intl;
 
-  @tracked @Length(0, 100) @IsEmail() administratorEmail =
+  @tracked @Length(1, 100) @NotBlank() @IsEmail() administratorEmail =
     this.args.school.iliosAdministratorEmail || '';
   @tracked
   @Length(0, 300)

packages/frontend/tests/integration/components/school/emails-editor-test.js

@@ -49,7 +49,7 @@ module('Integration | Component | school/emails-editor', function (hooks) {
     assert.notOk(component.changeAlertRecipients.hasError);
   });
 
-  test('save with empty data', async function (assert) {
+  test('save with empty change alerts recipients', async function (assert) {
     assert.expect(8);
     const school = this.server.create('school', {
       iliosAdministratorEmail: '[email protected]',
@@ -58,7 +58,7 @@ module('Integration | Component | school/emails-editor', function (hooks) {
     const schoolModel = await this.owner.lookup('service:store').findRecord('school', school.id);
     this.set('school', schoolModel);
     this.set('save', (administratorEmail, changeAlertRecipients) => {
-      assert.strictEqual(administratorEmail, '');
+      assert.strictEqual(administratorEmail, '[email protected]');
       assert.strictEqual(changeAlertRecipients, '');
     });
     await render(
@@ -71,14 +71,37 @@ module('Integration | Component | school/emails-editor', function (hooks) {
     );
     assert.notOk(component.administratorEmail.hasError);
     assert.notOk(component.changeAlertRecipients.hasError);
-    await component.administratorEmail.set('');
     await component.changeAlertRecipients.set('');
     await component.save();
     assert.notOk(component.administratorEmail.hasError);
     assert.notOk(component.changeAlertRecipients.hasError);
   });
 
-  test('validation fails', async function (assert) {
+  test('validation fails if given admin email is empty', async function (assert) {
+    assert.expect(6);
+    const school = this.server.create('school', {
+      iliosAdministratorEmail: '[email protected]',
+      changeAlertRecipients: '[email protected], [email protected]',
+    });
+    const schoolModel = await this.owner.lookup('service:store').findRecord('school', school.id);
+    this.set('school', schoolModel);
+    await render(
+      hbs`<School::EmailsEditor @school={{this.school}} @save={{(noop)}} @cancel={{(noop)}} />`,
+    );
+    assert.strictEqual(component.administratorEmail.value, '[email protected]');
+    assert.strictEqual(
+      component.changeAlertRecipients.value,
+      '[email protected], [email protected]',
+    );
+    assert.notOk(component.administratorEmail.hasError);
+    assert.notOk(component.changeAlertRecipients.hasError);
+    await component.administratorEmail.set('');
+    await component.save();
+    assert.ok(component.administratorEmail.hasError);
+    assert.notOk(component.changeAlertRecipients.hasError);
+  });
+
+  test('validation fails if input contains invalid emails', async function (assert) {
     const school = this.server.create('school');
     const schoolModel = await this.owner.lookup('service:store').findRecord('school', school.id);
     this.set('school', schoolModel);