Merge branch 'master' into OZG-7078-a11y-button-in-alfa

alfa-client/apps/alfa-e2e/docker-compose.yml

@@ -88,6 +88,10 @@ services:
       - GRPC_CLIENT_USER-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
       - GRPC_CLIENT_VORGANG-MANAGER_ADDRESS=static://vorgang-manager:9090
       - GRPC_CLIENT_VORGANG-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
+      - GRPC_CLIENT_COLLABORATION-MANAGER_ADDRESS=static://vorgang-manager:9090
+      - GRPC_CLIENT_COLLABORATION-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
+      - GRPC_CLIENT_ZUFI-MANAGER_ADDRESS=static://zufi-manager-server:9190
+      - GRPC_CLIENT_ZUFI-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
       - KEYCLOAK_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de
       - KEYCLOAK_REALM=${KEYCLOAK_REALM:-by-e2e-tests-local-dev}
       - KEYCLOAK_RESOURCE=${KEYCLOAK_CLIENT:-alfa}
@@ -106,8 +110,6 @@ services:
       - OZGCLOUD_VORGANG_BESCHEID_0_FORM_ENGINE_NAME=FormSolutions
       - OZGCLOUD_VORGANG_BESCHEID_0_FORM_ID=KFAS_STAGE_KI_10_Haltverbot_LANDESHACKATHON
       - OZGCLOUD_FEATURE_COLLABORATION_ENABLED=true
-      - GRPC_CLIENT_ZUFI-MANAGER_ADDRESS=static://zufi-manager-server:9190
-      - GRPC_CLIENT_ZUFI-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
       - OZGCLOUD_BARRIEREFREIHEIT_URL=http://bam.de
     ports:
       - 8080:8080

alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-zusammenarbeit/vorgang-zusammenarbeit-anfragen.cy.ts

@@ -101,31 +101,31 @@ describe('Vorgang Zusammenarbeit anfragen', () => {
       zusammenarbeitContainer.hasSearchText('');
     });
 
-    it.skip('TODO: Setup Jenkins --- should find 2 results after entering kiel', () => {
+    it('TODO: Setup Jenkins --- should find 2 results after entering kiel', () => {
       zusammenarbeitContainer.enterSearchInput(stelleSearch2);
 
       zusammenarbeitContainer.expectNumberOfEntriesToBe(2);
     });
 
-    it.skip('should close layer after click on search entry', () => {
+    it('should close layer after click on search entry', () => {
       zusammenarbeitContainer.clickSearchEntry(0);
 
       exist(zusammenarbeitContainer.getSendButton());
       notExist(zusammenarbeitContainer.getSearchText());
     });
 
-    it.skip('should show part of address in Zufi header', () => {
+    it('should show part of address in Zufi header', () => {
       zusammenarbeitContainer.addressContains(stelleSearch2);
     });
 
-    it.skip('should be able to enter title and message, and show scrollbar on long text', () => {
+    it('should be able to enter title and message, and show scrollbar on long text', () => {
       zusammenarbeitContainer.enterTitel(titleText);
       zusammenarbeitContainer.enterMessage(messageText);
 
       zusammenarbeitContainer.messageScrollbarIsPresent();
     });
 
-    it.skip('should show title and message, show snackbar, and remove buttons after sending', () => {
+    it('should show title and message, show snackbar, and remove buttons after sending', () => {
       zusammenarbeitContainer.sendAnfrage();
 
       notExist(zusammenarbeitContainer.getSendButton());

alfa-client/libs/collaboration-shared/src/index.ts

+export * from './lib/collaboration-list-resource.service';
 export * from './lib/collaboration-shared.module';
 export * from './lib/collaboration.linkrel';
 export * from './lib/collaboration.model';

alfa-client/libs/collaboration-shared/src/lib/collaboration.model.ts

@@ -3,9 +3,14 @@ import { Resource, ResourceUri } from '@ngxp/rest';
 
 export interface Collaboration {
   titel: string;
-  anfrage: string;
+  beschreibung: string;
   zustaendigeStelle: ResourceUri;
-  collaborationLevel?: number;
+  collaborationLevel?: (typeof CollaborationLevels)[keyof typeof CollaborationLevels];
+}
+
+export class CollaborationLevels {
+  public static readonly ORGANISATIONS_EINHEIT = 1;
+  public static readonly EXTERNE_FACHSTELLE = 4;
 }
 
 export interface CollaborationResource extends Collaboration, Resource, ListItemResource {}

alfa-client/libs/collaboration-shared/src/lib/collaboration.service.spec.ts

@@ -46,6 +46,14 @@ describe('CollaborationService', () => {
     });
   });
 
+  describe('refresh list', () => {
+    it('should call service', () => {
+      service.refreshList();
+
+      expect(listService.refresh).toHaveBeenCalled();
+    });
+  });
+
   describe('organisationsEinheit', () => {
     describe('is form visible', () => {
       it('should return value', (done) => {

alfa-client/libs/collaboration-shared/src/lib/collaboration.service.ts

@@ -28,6 +28,10 @@ export class CollaborationService {
     return this.listService.getList();
   }
 
+  public refreshList(): void {
+    this.listService.refresh();
+  }
+
   public isOrganisationsEinheitFormVisible(): Observable<boolean> {
     return this.showOrganisationsEinheitForm$.asObservable();
   }

alfa-client/libs/collaboration-shared/test/collaboration.ts

@@ -9,7 +9,7 @@ import { Collaboration, CollaborationListResource, CollaborationResource } from
 export function createCollaboration(): Collaboration {
   return {
     titel: faker.word.sample(2),
-    anfrage: faker.word.sample(10),
+    beschreibung: faker.word.sample(10),
     zustaendigeStelle: faker.internet.url(),
   };
 }

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.html

+<alfa-collaboration-list-container
+  [collaborationStateListResource]="collaborationStateListResource$ | async"
+  class="mb-6 block"
+  data-test-id="collaboration-list"
+></alfa-collaboration-list-container>
 <alfa-collaboration-in-vorgang
   [vorgang]="vorgang"
   [collaborationStateListResource]="collaborationStateListResource$ | async"

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.spec.ts

@@ -10,6 +10,7 @@ import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
 import { CollaborationInVorgangContainerComponent } from './collaboration-in-vorgang-container.component';
 import { CollaborationInVorgangComponent } from './collaboration-in-vorgang/collaboration-in-vorgang.component';
+import { CollaborationListContainerComponent } from './collaboration-list-container/collaboration-list-container.component';
 
 describe('CollaborationInVorgangContainerComponent', () => {
   let component: CollaborationInVorgangContainerComponent;
@@ -22,7 +23,11 @@ describe('CollaborationInVorgangContainerComponent', () => {
   beforeEach(async () => {
     service = mock(CollaborationService);
     await TestBed.configureTestingModule({
-      declarations: [CollaborationInVorgangContainerComponent, MockComponent(CollaborationInVorgangComponent)],
+      declarations: [
+        CollaborationInVorgangContainerComponent,
+        MockComponent(CollaborationListContainerComponent),
+        MockComponent(CollaborationInVorgangComponent),
+      ],
       providers: [
         {
           provide: CollaborationService,

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.html

+<ozgcloud-spinner [stateResource]="collaborationStateListResource">
+  @for(collaboration of collaborations; track collaboration.zustaendigeStelle){
+    @if(collaboration.collaborationLevel === CollaborationLevels.ORGANISATIONS_EINHEIT){
+      <alfa-organisations-einheit-list-item-container
+        [organisationsEinheitResourceUri]="collaboration.zustaendigeStelle"
+        data-test-id="organisations-einheit-list-item"
+      >
+        <alfa-collaboration-request [collaboration]="collaboration"/>
+      </alfa-organisations-einheit-list-item-container>
+    }
+    @if(collaboration.collaborationLevel === CollaborationLevels.EXTERNE_FACHSTELLE){
+      <alfa-externe-fachstelle-list-item-container
+        [externeFachstelleResourceUri] = "collaboration.zustaendigeStelle"
+        data-test-id="externe-fachstelle-list-item"
+      >
+        <alfa-collaboration-request [collaboration]="collaboration"/>
+      </alfa-externe-fachstelle-list-item-container>
+    }
+  }
+</ozgcloud-spinner>
\ No newline at end of file

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.spec.ts

+import {
+  CollaborationLevels,
+  CollaborationListLinkRel,
+  CollaborationListResource,
+  CollaborationResource,
+} from '@alfa-client/collaboration-shared';
+import { createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
+import { SpinnerComponent } from '@alfa-client/ui';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { createCollaboration, createCollaborationListResource } from 'libs/collaboration-shared/test/collaboration';
+import {
+  ExterneFachstelleListItemContainerComponent,
+} from 'libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component';
+import {
+  OrganisationsEinheitListItemContainerComponent,
+} from 'libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component';
+import { MockComponent } from 'ng-mocks';
+import { CollaborationListContainerComponent } from './collaboration-list-container.component';
+import { toResource } from 'libs/tech-shared/test/resource';
+import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { existsAsHtmlElement } from '@alfa-client/test-utils';
+import { CollaborationRequestComponent } from './collaboration-request/collaboration-request.component';
+
+describe('CollaborationListContainerComponent', () => {
+  let component: CollaborationListContainerComponent;
+  let fixture: ComponentFixture<CollaborationListContainerComponent>;
+
+  const organisationsEinheitListItem: string = getDataTestIdOf('organisations-einheit-list-item');
+  const externeFachstelleListItem: string = getDataTestIdOf('externe-fachstelle-list-item');
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        CollaborationListContainerComponent,
+        MockComponent(OrganisationsEinheitListItemContainerComponent),
+        MockComponent(ExterneFachstelleListItemContainerComponent),
+        MockComponent(CollaborationRequestComponent),
+        MockComponent(SpinnerComponent),
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CollaborationListContainerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('template', () => {
+    const collaboration: CollaborationResource = toResource(createCollaboration());
+
+    beforeEach(() => {
+      component.collaborations = [collaboration];
+    })
+
+    describe('alfa-organisations-einheit-list-item-container', () => {
+      it('should be rendered if collaborationLevel is ORGANISATIONS_EINHEIT', () => {
+        collaboration.collaborationLevel = CollaborationLevels.ORGANISATIONS_EINHEIT;
+        fixture.detectChanges();
+
+        existsAsHtmlElement(fixture, organisationsEinheitListItem);
+      });
+    })
+
+    describe('alfa-externe-fachstelle-list-item-container', () => {
+      it('should be rendered if collaborationLevel is EXTERNE_FACHSTELLE', () => {
+        collaboration.collaborationLevel = CollaborationLevels.EXTERNE_FACHSTELLE;
+        fixture.detectChanges();
+
+        existsAsHtmlElement(fixture, externeFachstelleListItem);
+      });
+    })
+  })
+
+  describe('component', () => {
+    describe('getCollaborations', () => {
+      it('should return empty array if state resource is null', () => {
+        component.collaborationStateListResource = null;
+
+        expect(component.getCollaborations()).toEqual([]);
+      });
+
+      it('should return empty array if resource is null', () => {
+        component.collaborationStateListResource = createEmptyStateResource();
+
+        expect(component.getCollaborations()).toEqual([]);
+      });
+
+      it('should return embedded resource', () => {
+        const collaborationListResource: CollaborationListResource = createCollaborationListResource();
+        component.collaborationStateListResource = createStateResource(collaborationListResource);
+
+        expect(component.getCollaborations()).toEqual(
+          collaborationListResource._embedded[CollaborationListLinkRel.COLLABORATION_LIST],
+        );
+      });
+    });
+  });
+});

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component.ts

+import {
+  CollaborationLevels,
+  CollaborationListLinkRel,
+  CollaborationListResource,
+  CollaborationResource,
+} from '@alfa-client/collaboration-shared';
+import { getEmbeddedResources, StateResource } from '@alfa-client/tech-shared';
+import { Component, Input, OnChanges } from '@angular/core';
+
+@Component({
+  selector: 'alfa-collaboration-list-container',
+  templateUrl: './collaboration-list-container.component.html',
+})
+export class CollaborationListContainerComponent implements OnChanges {
+  @Input() public collaborationStateListResource: StateResource<CollaborationListResource>;
+
+  public collaborations: CollaborationResource[];
+
+  ngOnChanges(): void {
+    this.collaborations = this.getCollaborations();
+  }
+
+  getCollaborations(): CollaborationResource[] {
+    return getEmbeddedResources(this.collaborationStateListResource, CollaborationListLinkRel.COLLABORATION_LIST);
+  }
+
+  protected readonly CollaborationLevels = CollaborationLevels;
+}

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.html

+<div class="block bg-white p-4 m-2 mt-4" role="region" aria-labelledby="collaboration-title">
+  <h2 id="collaboration-title" class="mb-4 text-xl text-text">
+    <span class="font-semibold">{{ collaboration.titel }}</span>
+  </h2>
+  <p class="whitespace-pre-line">{{ collaboration.beschreibung }}</p>
+</div>

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.spec.ts

+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CollaborationResource } from '@alfa-client/collaboration-shared';
+import { createCollaboration } from 'libs/collaboration-shared/test/collaboration';
+import { toResource } from 'libs/tech-shared/test/resource';
+import { CollaborationRequestComponent } from './collaboration-request.component';
+
+describe('CollaborationRequestComponent', () => {
+  let component: CollaborationRequestComponent;
+  let fixture: ComponentFixture<CollaborationRequestComponent>;
+
+  const collaboration: CollaborationResource = toResource(createCollaboration());
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [CollaborationRequestComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CollaborationRequestComponent);
+    component = fixture.componentInstance;
+    component.collaboration = collaboration;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.ts

+import { CollaborationResource } from '@alfa-client/collaboration-shared';
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'alfa-collaboration-request',
+  templateUrl: './collaboration-request.component.html',
+})
+export class CollaborationRequestComponent {
+  @Input() public collaboration: CollaborationResource;
+}

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.spec.ts

 import { CollaborationListResource } from '@alfa-client/collaboration-shared';
-import { CommandResource } from '@alfa-client/command-shared';
-import { StateResource, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
-import { Mock, mock } from '@alfa-client/test-utils';
 import { SnackBarService } from '@alfa-client/ui';
 import { TestBed } from '@angular/core/testing';
+import { CommandLinkRel, CommandResource } from '@alfa-client/command-shared';
+import { StateResource, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
+import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
 import { UntypedFormBuilder } from '@angular/forms';
 import { CollaborationService } from 'libs/collaboration-shared/src/lib/collaboration.service';
 import { createCollaborationListResource } from 'libs/collaboration-shared/test/collaboration';
@@ -56,7 +56,9 @@ describe('CollaborationRequestFormService', () => {
   });
 
   describe('do submit', () => {
-    const stateCommandResource: StateResource<CommandResource> = createStateResource(createCommandResource());
+    const stateCommandResource: StateResource<CommandResource> = createStateResource(
+      createCommandResource([CommandLinkRel.EFFECTED_RESOURCE]),
+    );
 
     beforeEach(() => {
       formService.listResource = collaborationListResource;
@@ -69,6 +71,12 @@ describe('CollaborationRequestFormService', () => {
       expect(service.create).toHaveBeenCalledWith(collaborationListResource, formService.form.value);
     });
 
+    it('should call service refresh', () => {
+      formService.submit().subscribe();
+
+      expect(service.refreshList).toHaveBeenCalled();
+    });
+
     it('should call handleCommandError', () => {
       const handleCommanErrorSpy = jest.spyOn(formService as any, 'handleCommandError');
 

alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration.request.formservice.ts

 import { CollaborationListResource } from '@alfa-client/collaboration-shared';
-import { CommandResource, hasCommandError } from '@alfa-client/command-shared';
+import { CommandResource, hasCommandError, tapOnCommandSuccessfullyDone } from '@alfa-client/command-shared';
 import { AbstractFormService, StateResource } from '@alfa-client/tech-shared';
 import { SnackBarService } from '@alfa-client/ui';
 import { Injectable } from '@angular/core';
@@ -39,6 +39,7 @@ export class CollaborationRequestFormService extends AbstractFormService<Command
 
   protected doSubmit(): Observable<StateResource<CommandResource>> {
     return this.service.create(this.listResource, this.getFormValue()).pipe(
+      tapOnCommandSuccessfullyDone(() => this.service.refreshList()),
       tap((commandStateResource: StateResource<CommandResource>) => {
         this.handleCommandError(commandStateResource.resource);
       }),

alfa-client/libs/collaboration/src/lib/collaboration.module.ts

 import { CollaborationSharedModule } from '@alfa-client/collaboration-shared';
 import { TechSharedModule } from '@alfa-client/tech-shared';
+import { UiModule } from '@alfa-client/ui';
 import { ZustaendigeStelleModule } from '@alfa-client/zustaendige-stelle';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
@@ -15,11 +16,15 @@ import {
   SearchIconComponent,
   UsersIconComponent,
 } from '@ods/system';
+import { ExterneFachstelleListItemContainerComponent } from 'libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component';
+import { OrganisationsEinheitListItemContainerComponent } from 'libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component';
 import { CollaborationInVorgangContainerComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang-container.component';
 import { AnfrageErstellenButtonComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang/anfrage-erstellen-button/anfrage-erstellen-button.component';
 import { CollaborationInVorgangComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang/collaboration-in-vorgang.component';
 import { ExterneFachstelleContainerComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component';
 import { OrganisationsEinheitContainerComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang/organisations-einheit-container/organisations-einheit-container.component';
+import { CollaborationListContainerComponent } from './collaboration-in-vorgang-container/collaboration-list-container/collaboration-list-container.component';
+import { CollaborationRequestComponent } from './collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component';
 import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component';
 
 @NgModule({
@@ -41,6 +46,9 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
     OfficeIconComponent,
     ExternalUnitIconComponent,
     PublicAdministrationIconComponent,
+    OrganisationsEinheitListItemContainerComponent,
+    ExterneFachstelleListItemContainerComponent,
+    UiModule,
   ],
   declarations: [
     CollaborationInVorgangContainerComponent,
@@ -49,6 +57,8 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
     AnfrageErstellenButtonComponent,
     OrganisationsEinheitContainerComponent,
     ExterneFachstelleContainerComponent,
+    CollaborationListContainerComponent,
+    CollaborationRequestComponent,
   ],
   exports: [CollaborationInVorgangContainerComponent],
 })

alfa-client/libs/externe-fachstelle-shared/.eslintrc.json

+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
+      "rules": {
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "lib",
+            "style": "camelCase"
+          }
+        ],
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "lib",
+            "style": "kebab-case"
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.html"],
+      "extends": ["plugin:@nx/angular-template"],
+      "rules": {}
+    }
+  ]
+}

alfa-client/libs/externe-fachstelle-shared/README.md

+# externe-fachstelle-shared
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test externe-fachstelle-shared` to execute the unit tests.