OZG-6720 CR Kommentare

alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.ts

@@ -18,5 +18,5 @@ export class OrganisationsEinheitContainerComponent implements OnInit {
     this.organisationsEinheitListStateResource$ = this.organisationsEinheitService.getList();
   }
 
-  protected readonly organisationsEinheitListLinkRel = OrganisationsEinheitListLinkRel;
+  public readonly organisationsEinheitListLinkRel = OrganisationsEinheitListLinkRel;
 }

alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.html

 <ods-list *ngIf="organisationsEinheitResources.length > 0" data-test-id="organisations-einheit-list">
   <ods-list-item
     *ngFor="let organisationsEinheitResource of organisationsEinheitResources"
-    [routerLink]="getEncodedSelfLink(organisationsEinheitResource)"
+    [routerLink]="organisationsEinheitResource | toResourceUri: OrganisationsEinheitLinkRel.SELF"
     [class.text-red-500]="
       organisationsEinheitResource.syncResult === AdminOrganisationsEinheitSyncResult.NOT_FOUND_IN_PVOG ||
       organisationsEinheitResource.syncResult === AdminOrganisationsEinheitSyncResult.ORGANISATIONSEINHEIT_ID_NOT_UNIQUE

alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.spec.ts

@@ -10,7 +10,6 @@ import {
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { ActivatedRoute } from '@angular/router';
-import { ResourceUri } from '@ngxp/rest';
 import { ExclamationIconComponent, ListComponent, ListItemComponent } from '@ods/system';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockModule } from 'ng-mocks';
@@ -25,6 +24,7 @@ describe('OrganisationsEinheitListComponent', () => {
   const listItemSelector: string = getDataTestIdOf('organisations-einheit-list-item');
 
   const organisationsEinheitResource: AdminOrganisationsEinheitResource = createAdminOrganisationsEinheitResource();
+  organisationsEinheitResource.syncResult = AdminOrganisationsEinheitSyncResult.NOT_FOUND_IN_PVOG;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -49,8 +49,6 @@ describe('OrganisationsEinheitListComponent', () => {
 
   describe('input', () => {
     describe('organisationsEinheitResources', () => {
-      organisationsEinheitResource.syncResult = AdminOrganisationsEinheitSyncResult.NOT_FOUND_IN_PVOG;
-
       let listItemElement: HTMLElement;
       let nameElement: Element;
       let idElement: Element;
@@ -108,15 +106,6 @@ describe('OrganisationsEinheitListComponent', () => {
         expect(component.organisationsEinheitResources[2].isChild).toBeTruthy();
       });
     });
-
-    describe('getEncodedSelfLink', () => {
-      it('should return encoded self link', () => {
-        const organisationsEinheitResource: AdminOrganisationsEinheitResource = createAdminOrganisationsEinheitResource();
-        const result: ResourceUri = component.getEncodedSelfLink(organisationsEinheitResource);
-
-        expect(result).toBeDefined();
-      });
-    });
   });
 
   describe('template', () => {

alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.ts

 import { AdminOrganisationsEinheitResource, AdminOrganisationsEinheitSyncResult } from '@admin-client/admin-settings';
-import { encodeUrlForEmbedding, toResourceUri } from '@alfa-client/tech-shared';
 import { Component, Input } from '@angular/core';
-import { ResourceUri } from '@ngxp/rest';
 import { OrganisationsEinheitLinkRel } from '../../organisations-einheit.linkrel';
 
 @Component({
@@ -20,10 +18,8 @@ export class OrganisationsEinheitListComponent {
     this.moveChildrenIntoParentLevel(list);
   }
 
-  public readonly AdminOrganisationsEinheitSyncResult = AdminOrganisationsEinheitSyncResult;
-
   moveChildrenIntoParentLevel(list: AdminOrganisationsEinheitResource[]): void {
-    list.forEach((parent) => {
+    list.forEach((parent: AdminOrganisationsEinheitResource) => {
       this._organisationsEinheitResources.push(parent);
 
       if (parent._embedded && Array.isArray(parent._embedded.childList)) {
@@ -35,8 +31,6 @@ export class OrganisationsEinheitListComponent {
     });
   }
 
-  getEncodedSelfLink(organisationsEinheitResource: AdminOrganisationsEinheitResource): ResourceUri {
-    const resourceUri: ResourceUri = toResourceUri(organisationsEinheitResource, OrganisationsEinheitLinkRel.SELF);
-    return encodeUrlForEmbedding(resourceUri);
-  }
+  public readonly AdminOrganisationsEinheitSyncResult = AdminOrganisationsEinheitSyncResult;
+  public readonly OrganisationsEinheitLinkRel = OrganisationsEinheitLinkRel;
 }

alfa-client/libs/tech-shared/src/lib/resource/resource.service.ts

@@ -120,11 +120,11 @@ export abstract class ResourceService<B extends Resource, T extends Resource> {
   }
 
   public save(toSave: unknown): Observable<StateResource<T>> {
-    return this.persist(this.doSave, toSave);
+    return this.persist(this.doSave.bind(this), toSave);
   }
 
   public patch(toPatch: unknown): Observable<StateResource<T>> {
-    return this.persist(this.doPatch, toPatch);
+    return this.persist(this.doPatch.bind(this), toPatch);
   }
 
   private persist(