fix: permissions are correctly applied in popup form

src/app/child-dev-project/schools/activities-overview/activities-overview.component.ts

@@ -24,30 +24,31 @@ export class ActivitiesOverviewComponent implements OnInitDynamicComponent {
   entity: Entity;
   records: RecurringActivity[] = [];
   listConfig: EntityListConfig;
-  activityConstructor = RecurringActivity;
 
   constructor(private entityMapper: EntityMapperService) {}
 
-  async onInitFromDynamicConfig(config: any) {
+  onInitFromDynamicConfig(config: any) {
     if (config?.config?.columns) {
       this.columns = config.config.columns;
     }
 
     this.entity = config.entity;
-    this.records = (
-      await this.entityMapper.loadType<RecurringActivity>(RecurringActivity)
-    ).filter((activity) => activity.linkedGroups.includes(this.entity.getId()));
+    this.initializeRelatedActivities();
     this.entityMapper
       .receiveUpdates(RecurringActivity)
       .subscribe((updateEntity) => {
         if (updateEntity.type === "update") {
-          this.records = this.records.filter((activity) =>
-            activity.linkedGroups.includes(this.entity.getId())
-          );
+          this.initializeRelatedActivities();
         }
       });
   }
 
+  private async initializeRelatedActivities() {
+    this.records = (
+      await this.entityMapper.loadType<RecurringActivity>(RecurringActivity)
+    ).filter((activity) => activity.linkedGroups.includes(this.entity.getId()));
+  }
+
   generateNewRecordFactory(): () => RecurringActivity {
     return () => {
       const newRecurringActivity = new RecurringActivity();

src/app/core/entity-components/entity-subrecord/row-details/row-details.component.html

@@ -60,16 +60,14 @@
   <button
     mat-raised-button
     (click)="save()"
-    *appDisabledEntityOperation="{
-      operation: 'update',
-      entity: data.entity
-    }"
+    [disabled]="form.disabled"
     i18n="Save button for forms"
   >
     Save
   </button>
 
   <button
+    *ngIf="editMode === 'update'"
     mat-icon-button
     [matMenuTriggerFor]="additional"
   >

src/app/core/entity-components/entity-subrecord/row-details/row-details.component.spec.ts

@@ -16,6 +16,7 @@ import { EntitySubrecordModule } from "../entity-subrecord.module";
 import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing";
 import { EntityFormService } from "../../entity-form/entity-form.service";
 import { AlertService } from "../../../alerts/alert.service";
+import { EntityAbility } from "../../../permissions/ability/entity-ability";
 
 describe("RowDetailsComponent", () => {
   let component: RowDetailsComponent<any>;
@@ -37,6 +38,7 @@ describe("RowDetailsComponent", () => {
         { provide: MatDialogRef, useValue: {} },
       ],
     }).compileComponents();
+    spyOn(TestBed.inject(EntityAbility), "cannot").and.returnValue(true);
   });
 
   beforeEach(() => {
@@ -77,4 +79,8 @@ describe("RowDetailsComponent", () => {
     expect(alertSpy).toHaveBeenCalledWith(message);
     expect(closeSpy).not.toHaveBeenCalled();
   }));
+
+  it("should not disable the form when creating a new entity", () => {
+    expect(component.form.disabled).toBeFalsy();
+  });
 });

src/app/core/entity-components/entity-subrecord/row-details/row-details.component.ts

@@ -12,6 +12,7 @@ import {
   RemoveResult,
 } from "../../../entity/entity-remove.service";
 import { AlertService } from "../../../alerts/alert.service";
+import { EntityAction } from "../../../permissions/permission-types";
 
 /**
  * Data interface that must be given when opening the dialog
@@ -38,6 +39,7 @@ export class RowDetailsComponent<E extends Entity> {
 
   viewOnlyColumns: FormFieldConfig[];
   tempEntity: Entity;
+  editMode: EntityAction = "update";
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: DetailsComponentData<E>,
@@ -48,7 +50,13 @@ export class RowDetailsComponent<E extends Entity> {
     private alertService: AlertService
   ) {
     this.form = this.formService.createFormGroup(data.columns, data.entity);
-    if (this.ability.cannot("update", data.entity)) {
+    if (!this.data.entity._rev) {
+      this.editMode = "create";
+    }
+    if (
+      this.editMode === "update" &&
+      this.ability.cannot("update", data.entity)
+    ) {
       this.form.disable();
     }
     this.tempEntity = this.data.entity;