Release 3.38.1

Author: sleidig

package-lock.json

@@ -42,7 +42,7 @@
     "@fortawesome/free-regular-svg-icons": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@ngneat/until-destroy": "^10.0.0",
-    "@sentry/browser": "^7.117.0",
+    "@sentry/browser": "^8.13.0",
     "angulartics2": "^12.2.1",
     "assert": "^2.1.0",
     "crypto-es": "^2.1.0",

package.json

@@ -94,16 +94,16 @@ export class AdminEntityComponent implements OnInit {
 
     this.configDetailsView = this.loadViewConfig(
       EntityConfigService.getDetailsViewId(this.entityConstructor),
-    );
+    ) ?? { entityType: this.entityType, panels: [] };
     this.configListView = this.loadViewConfig(
       EntityConfigService.getListViewId(this.entityConstructor),
-    );
+    ) ?? { entityType: this.entityType };
     this.configEntitySettings = this.entityConstructor;
   }
 
   private loadViewConfig<C = EntityDetailsConfig | EntityListConfig>(
     viewId: string,
-  ): C {
+  ): C | undefined {
     const viewConfig: ViewConfig<C> = this.configService.getConfig(viewId);
 
     // work on a deep copy as we are editing in place (for titles, sections, etc.)

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

@@ -25,7 +25,7 @@ export const adminRoutes: Routes = [
     component: RoutedViewComponent,
     data: {
       component: "AdminEntityTypes",
-      entity: "Config",
+      entityType: "Config",
       requiredPermissionOperation: "update",
     },
     canActivate: [EntityPermissionGuard],
@@ -35,7 +35,7 @@ export const adminRoutes: Routes = [
     component: RoutedViewComponent,
     data: {
       component: "AdminEntity",
-      entity: "Config",
+      entityType: "Config",
       requiredPermissionOperation: "update",
     },
     canActivate: [EntityPermissionGuard],
@@ -47,7 +47,7 @@ export const adminRoutes: Routes = [
     data: {
       component: "EntityDetails",
       config: {
-        entity: "SiteSettings",
+        entityType: "SiteSettings",
         id: "global",
         panels: [
           {

src/app/core/admin/admin.routing.ts

@@ -23,6 +23,14 @@ export class DisplayConfigurableEnumComponent
   iterableValue: ConfigurableEnumValue[] = [];
 
   ngOnInit() {
+    this.initValue();
+  }
+
+  private initValue() {
+    if (!this.value) {
+      return;
+    }
+
     if (Array.isArray(this.value)) {
       this.iterableValue = this.value;
     } else if (this.value) {

src/app/core/basic-datatypes/configurable-enum/display-configurable-enum/display-configurable-enum.component.ts

@@ -41,7 +41,7 @@ export class EnumDropdownComponent implements OnChanges {
 
   enumEntity: ConfigurableEnum;
   invalidOptions: ConfigurableEnumValue[] = [];
-  options: ConfigurableEnumValue[];
+  options: ConfigurableEnumValue[] = [];
   canEdit = false;
   enumValueToString = (v: ConfigurableEnumValue) => v?.label;
   createNewOption: (input: string) => Promise<ConfigurableEnumValue>;
@@ -65,7 +65,7 @@ export class EnumDropdownComponent implements OnChanges {
     if (changes.hasOwnProperty("enumId") || changes.hasOwnProperty("form")) {
       this.invalidOptions = this.prepareInvalidOptions();
     }
-    this.options = [...this.enumEntity?.values, ...this.invalidOptions];
+    this.options = [...(this.enumEntity?.values ?? []), ...this.invalidOptions];
   }
 
   private prepareInvalidOptions(): ConfigurableEnumValue[] {
@@ -114,6 +114,6 @@ export class EnumDropdownComponent implements OnChanges {
       this.form.setValue(undefined);
     }
 
-    this.options = [...this.enumEntity.values, ...this.invalidOptions];
+    this.options = [...(this.enumEntity?.values ?? []), ...this.invalidOptions];
   }
 }

src/app/core/basic-datatypes/configurable-enum/enum-dropdown/enum-dropdown.component.ts

@@ -85,7 +85,9 @@ describe("DisplayEntityComponent", () => {
     await component.ngOnInit();
 
     expect(logSpy).toHaveBeenCalledWith(
-      jasmine.stringContaining(child.getId()),
+      jasmine.stringContaining("Could not find entity"),
+      child.getId(),
+      jasmine.anything(),
     );
     expect(component.entityToDisplay).toBeUndefined();
   });

src/app/core/basic-datatypes/entity/entity-block/entity-block.component.spec.ts

@@ -57,7 +57,9 @@ export class EntityBlockComponent implements OnInit {
     } catch (e) {
       // this may be caused by restrictive permissions and therefore shouldn't be treated as a technical issue
       this.logger.debug(
-        `[DISPLAY_ENTITY] Could not find entity with ID: ${this.entityId}: ${e}`,
+        "[DISPLAY_ENTITY] Could not find entity.",
+        this.entityId,
+        e,
       );
     }
   }

src/app/core/basic-datatypes/entity/entity-block/entity-block.component.ts

@@ -110,7 +110,9 @@ describe("EntitySelectComponent", () => {
     fixture.detectChanges();
 
     expect(warnSpy).toHaveBeenCalledWith(
-      jasmine.stringContaining("missing_user"),
+      jasmine.stringContaining("ENTITY_SELECT"),
+      "missing_user",
+      jasmine.anything(),
     );
     expect(component.form.value).toEqual([testUsers[0].getId()]);
   }));

src/app/core/common-components/entity-select/entity-select.component.spec.ts

@@ -201,7 +201,9 @@ export class EntitySelectComponent<
       .load<E>(type, selectedId)
       .catch((err: Error) => {
         this.logger.warn(
-          `[ENTITY_SELECT] Error loading selected entity "${selectedId}": ${err.message}`,
+          "[ENTITY_SELECT] Error loading selected entity.",
+          selectedId,
+          err.message,
         );
         return undefined;
       });