Verified Commit f41f561a authored 2 months ago by Sebastian Bergandy

Merge branch 'main' into OZG-7619-E2EAndTextAdjustment

# Conflicts:
#	alfa-client/apps/admin-e2e/src/components/benutzer/benutzer.e2e.component.ts
#	alfa-client/libs/test-utils/src/lib/mocking.ts

parents 83dd535d ced64b94

Branches

Tags

1 merge request!84Ozg 7619 e2 e and text adjustment

Show whitespace changes

Inline Side-by-side

Showing

alfa-client/apps/admin-e2e/src/support/linkrels.ts 4 additions, 1 deletion

alfa-client/apps/admin-e2e/src/support/linkrels.ts
alfa-client/apps/admin/src/app/app.component.html 4 additions, 1 deletion

alfa-client/apps/admin/src/app/app.component.html
alfa-client/apps/admin/src/app/app.component.spec.ts 3 additions, 16 deletions

alfa-client/apps/admin/src/app/app.component.spec.ts
alfa-client/apps/admin/src/app/app.component.ts 1 addition, 1 deletion

alfa-client/apps/admin/src/app/app.component.ts
alfa-client/apps/alfa-e2e/src/components/user-assistance/help-menu.component.e2e.ts 7 additions, 7 deletions

...src/components/user-assistance/help-menu.component.e2e.ts
alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-assistance/help-menu.cy.ts 4 additions, 10 deletions

...fa-e2e/src/e2e/main-tests/user-assistance/help-menu.cy.ts
alfa-client/libs/admin/keycloak-shared/src/lib/keycloak.resource.service.spec.ts 23 additions, 9 deletions

...keycloak-shared/src/lib/keycloak.resource.service.spec.ts
alfa-client/libs/admin/keycloak-shared/src/lib/keycloak.resource.service.ts 6 additions, 8 deletions

...dmin/keycloak-shared/src/lib/keycloak.resource.service.ts
alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.spec.ts 24 additions, 0 deletions

...k-shared/src/lib/organisations-einheit.repository.spec.ts
alfa-client/libs/admin/keycloak-shared/src/lib/organisations-einheit.repository.ts 4 additions, 0 deletions

...ycloak-shared/src/lib/organisations-einheit.repository.ts
alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.model.ts 5 additions, 0 deletions

...ons-einheit-shared/src/lib/organisations-einheit.model.ts
alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.spec.ts 23 additions, 0 deletions

...heit-shared/src/lib/organisations-einheit.service.spec.ts
alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.ts 1 addition, 1 deletion

...s-einheit-shared/src/lib/organisations-einheit.service.ts
alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-delete-dialog-container/organisations-einheit-delete-dialog-container.component.html 7 additions, 0 deletions

...anisations-einheit-delete-dialog-container.component.html
alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-delete-dialog-container/organisations-einheit-delete-dialog-container.component.spec.ts 145 additions, 0 deletions

...sations-einheit-delete-dialog-container.component.spec.ts
alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-delete-dialog-container/organisations-einheit-delete-dialog-container.component.ts 49 additions, 0 deletions

...rganisations-einheit-delete-dialog-container.component.ts
alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-delete-dialog-container/organisations-einheit-delete-dialog/organisations-einheit-delete-dialog.component.html 28 additions, 0 deletions

...dialog/organisations-einheit-delete-dialog.component.html
alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-delete-dialog-container/organisations-einheit-delete-dialog/organisations-einheit-delete-dialog.component.spec.ts 79 additions, 0 deletions

...log/organisations-einheit-delete-dialog.component.spec.ts
alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-delete-dialog-container/organisations-einheit-delete-dialog/organisations-einheit-delete-dialog.component.ts 18 additions, 0 deletions

...e-dialog/organisations-einheit-delete-dialog.component.ts
alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html 16 additions, 4 deletions

...ns-einheit-list/organisations-einheit-list.component.html

with 451 additions and 58 deletions

Please register or to comment