Release 3.38.0

Author: sleidig

package-lock.json

@@ -47,6 +47,6 @@ export class AppComponent {
    */
   private detectConfigMode() {
     const currentUrl = this.router.url;
-    this.configFullscreen = currentUrl.startsWith("/admin/entity");
+    this.configFullscreen = currentUrl.startsWith("/admin/entity/");
   }
 }

src/app/app.component.ts

@@ -231,8 +231,8 @@ export class Note extends Entity {
    * @param child The child or the id of the child to add to the notes
    */
   addChild(child: Child | string) {
-    const childId = typeof child === "string" ? child : child.getId();
-    if (this.children.includes(childId)) {
+    const childId = typeof child === "string" ? child : child?.getId();
+    if (!childId || this.children.includes(childId)) {
       return;
     }
 

src/app/child-dev-project/notes/model/note.ts

@@ -13,8 +13,14 @@ import { ChildSchoolRelation } from "../../children/model/childSchoolRelation";
 describe("NotesRelatedToEntityComponent", () => {
   let component: NotesRelatedToEntityComponent;
   let fixture: ComponentFixture<NotesRelatedToEntityComponent>;
+  const originalNoteSchema_relatedEntities =
+    Note.schema.get("relatedEntities").additional;
 
   beforeEach(waitForAsync(() => {
+    Note.schema.get("relatedEntities").additional = [
+      ChildSchoolRelation.ENTITY_TYPE,
+    ];
+
     TestBed.configureTestingModule({
       imports: [NotesRelatedToEntityComponent, MockedTestingModule.withState()],
     }).compileComponents();
@@ -23,10 +29,13 @@ describe("NotesRelatedToEntityComponent", () => {
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(NotesRelatedToEntityComponent);
     component = fixture.componentInstance;
-    component.entity = new Child("1");
-    fixture.detectChanges();
   }));
 
+  afterEach(() => {
+    Note.schema.get("relatedEntities").additional =
+      originalNoteSchema_relatedEntities;
+  });
+
   it("should create", () => {
     expect(component).toBeTruthy();
   });
@@ -81,6 +90,21 @@ describe("NotesRelatedToEntityComponent", () => {
     expect(note.schools).toEqual([`${Child.ENTITY_TYPE}:someSchool`]);
   });
 
+  it("should handle ChildSchoolRelation links also if they are arrays", async () => {
+    const relation = new ChildSchoolRelation();
+    relation.schoolId = ["School:1"] as any; // assume entity config was overwritten to hold array
+    relation.childId = ["Child:1", "Child:2"] as any; // assume entity config was overwritten to hold array
+
+    component.entity = relation;
+    await component.ngOnInit();
+
+    const newNote = component.createNewRecordFactory()();
+
+    expect(newNote.relatedEntities).toContain(relation.getId());
+    expect(newNote.children).toEqual(relation.childId);
+    expect(newNote.schools).toEqual(relation.schoolId);
+  });
+
   it("should create a new note and fill it with indirectly related references (2-hop) of the types allowed for note.relatedEntities", () => {
     @DatabaseEntity("EntityWithRelations")
     class EntityWithRelations extends Entity {

src/app/child-dev-project/notes/notes-related-to-entity/notes-related-to-entity.component.spec.ts

@@ -75,14 +75,31 @@ export class NotesRelatedToEntityComponent
       const newNote = super.createNewRecordFactory()();
       //TODO: generalize this code - possibly by only using relatedEntities to link other records here? see #1501
       if (this.entity.getType() === ChildSchoolRelation.ENTITY_TYPE) {
-        newNote.addChild((this.entity as ChildSchoolRelation).childId);
-        newNote.addSchool((this.entity as ChildSchoolRelation).schoolId);
+        for (const childId of asArray(
+          (this.entity as ChildSchoolRelation).childId,
+        )) {
+          if (childId) {
+            newNote.addChild(childId);
+          }
+        }
+
+        for (const schooldId of asArray(
+          (this.entity as ChildSchoolRelation).schoolId,
+        )) {
+          if (schooldId) {
+            newNote.addSchool(schooldId);
+          }
+        }
       }
 
-      newNote.relatedEntities.push(this.entity.getId());
-      this.getIndirectlyRelatedEntityIds(this.entity).forEach((e) =>
-        newNote.relatedEntities.push(e),
-      );
+      for (const e of [
+        this.entity.getId(),
+        ...this.getIndirectlyRelatedEntityIds(this.entity),
+      ]) {
+        if (!newNote.relatedEntities.includes(e)) {
+          newNote.relatedEntities.push(e);
+        }
+      }
 
       return newNote;
     };

src/app/child-dev-project/notes/notes-related-to-entity/notes-related-to-entity.component.ts

@@ -44,7 +44,7 @@ import { merge } from "rxjs";
 import { filter } from "rxjs/operators";
 import { uniqueIdValidator } from "app/core/common-components/entity-form/unique-id-validator/unique-id-validator";
 import { ConfigureEntityFieldValidatorComponent } from "./configure-entity-field-validator/configure-entity-field-validator.component";
-import { DynamicValidator } from "app/core/common-components/entity-form/dynamic-form-validators/form-validator-config";
+import { FormValidatorConfig } from "app/core/common-components/entity-form/dynamic-form-validators/form-validator-config";
 import { AnonymizeOptionsComponent } from "app/core/common-components/anonymize-options/anonymize-options.component";
 import { MatCheckbox } from "@angular/material/checkbox";
 
@@ -184,7 +184,7 @@ export class AdminEntityFieldComponent implements OnChanges {
     }
   }
 
-  entityFieldValidatorChanges(validatorData: DynamicValidator) {
+  entityFieldValidatorChanges(validatorData: FormValidatorConfig) {
     this.schemaFieldsForm.get("validators").setValue(validatorData);
   }
   private autoGenerateId() {

src/app/core/admin/admin-entity-details/admin-entity-field/admin-entity-field.component.ts

@@ -49,4 +49,28 @@ describe("ConfigureEntityFieldValidatorComponent", () => {
   it("should create", () => {
     expect(component).toBeTruthy();
   });
+
+  it("should remove unchanged default values before emitting output", () => {
+    // set up
+    const testFormValues = {
+      required: true,
+      min: null,
+      max: 100,
+      regex: "abc",
+      validEmail: false,
+      uniqueId: "",
+    };
+
+    // execute
+    const actualResult =
+      component.removeDefaultValuesFromValidatorConfig(testFormValues);
+
+    // check result
+    const expectedResult = {
+      required: true,
+      max: 100,
+      regex: "abc",
+    };
+    expect(actualResult).toEqual(expectedResult);
+  });
 });

src/app/core/admin/admin-entity-details/admin-entity-field/configure-entity-field-validator/configure-entity-field-validator.component.spec.ts

@@ -8,7 +8,7 @@ import {
 } from "@angular/forms";
 import { MatCheckboxModule } from "@angular/material/checkbox";
 import { EntitySchemaField } from "app/core/entity/schema/entity-schema-field";
-import { DynamicValidator } from "app/core/common-components/entity-form/dynamic-form-validators/form-validator-config";
+import { FormValidatorConfig } from "app/core/common-components/entity-form/dynamic-form-validators/form-validator-config";
 import { CommonModule } from "@angular/common";
 import { HelpButtonComponent } from "../../../../common-components/help-button/help-button.component";
 
@@ -28,8 +28,17 @@ import { HelpButtonComponent } from "../../../../common-components/help-button/h
 })
 export class ConfigureEntityFieldValidatorComponent implements OnInit {
   validatorForm: FormGroup;
+
+  /**
+   * the field definition with the currently existing validator settings to be edited
+   */
   @Input() entitySchemaField: EntitySchemaField;
-  @Output() entityValidatorChanges = new EventEmitter<DynamicValidator>();
+
+  /**
+   * Emit the latest state of the validators config whenever the user changed it in the displayed form.
+   */
+  @Output() entityValidatorChanges = new EventEmitter<FormValidatorConfig>();
+
   constructor(private fb: FormBuilder) {}
 
   ngOnInit() {
@@ -58,7 +67,31 @@ export class ConfigureEntityFieldValidatorComponent implements OnInit {
     }
 
     this.validatorForm.valueChanges.subscribe((value) => {
-      this.entityValidatorChanges.emit(this.validatorForm.getRawValue());
+      const rawValues = this.validatorForm.getRawValue();
+      const cleanedValues =
+        this.removeDefaultValuesFromValidatorConfig(rawValues);
+
+      this.entityValidatorChanges.emit(cleanedValues);
     });
   }
+
+  /**
+   * Removes default fields and returns a validator config that only contains explicitly activated validators.
+   * @param validators form values including default values that are unchanged
+   */
+  removeDefaultValuesFromValidatorConfig(
+    validators: FormValidatorConfig,
+  ): FormValidatorConfig {
+    for (let key of Object.keys(validators)) {
+      if (isDefaultValue(validators[key])) {
+        delete validators[key];
+      }
+    }
+
+    function isDefaultValue(value): boolean {
+      return value === false || value === "" || value === null;
+    }
+
+    return validators;
+  }
 }

src/app/core/admin/admin-entity-details/admin-entity-field/configure-entity-field-validator/configure-entity-field-validator.component.ts

@@ -0,0 +1,39 @@
+<p style="color: red">
+  This is an internal server admin preview and not stable functionality yet.
+</p>
+
+<div class="flex-row gap-regular">
+  <button mat-raised-button color="accent" (click)="create()">
+    Add New Entity Type
+  </button>
+
+  <button mat-stroked-button color="accent" (click)="loadEntityTypes(false)">
+    Also load internal types
+  </button>
+</div>
+
+<table mat-table [dataSource]="entityTypes">
+  <ng-container matColumnDef="label">
+    <th mat-header-cell *matHeaderCellDef class="table-header">Entity Type</th>
+
+    <td mat-cell *matCellDef="let row">
+      {{ row.label }}
+    </td>
+  </ng-container>
+
+  <ng-container matColumnDef="icon">
+    <th mat-header-cell *matHeaderCellDef class="table-header">Icon</th>
+
+    <td mat-cell *matCellDef="let row">
+      <fa-icon *ngIf="row.icon" [icon]="row.icon"></fa-icon>
+    </td>
+  </ng-container>
+
+  <tr mat-header-row *matHeaderRowDef="columnsToDisplay"></tr>
+  <tr
+    mat-row
+    *matRowDef="let row; columns: columnsToDisplay"
+    [routerLink]="['/admin', 'entity', row.ENTITY_TYPE]"
+    style="cursor: pointer"
+  ></tr>
+</table>

src/app/core/admin/admin-entity-types/admin-entity-types.component.html

@@ -0,0 +1,4 @@
+.table-header {
+  font-weight: bold;
+  font-style: italic;
+}