From 09c1043d95a22c28c764793bf9378be1eafdb25a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Fu=CC=88rst?= <bernhard.fuerst@fuerstnet.de>
Date: Fri, 20 Dec 2024 17:54:19 +0100
Subject: [PATCH 01/10] OZG-6989 OZG-7394 Fix width if no user icon
---
.../vorgang-list-item/vorgang-list-item.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.html b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.html
index de7460f9be..dad031fa21 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.html
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.html
@@ -96,7 +96,7 @@
</div>
</div>
</div>
- <div class="flex-none">
+ <div class="w-9 flex-none">
<alfa-user-profile-in-vorgang-list-item-container
*ngIf="vorgang | hasLink: vorgangLinkRel.ASSIGN"
data-test-id="vorgang-user-icon"
--
GitLab
From 8ba8facb1a2548aaa5c99652b5fb5b9db63e366a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Fu=CC=88rst?= <bernhard.fuerst@fuerstnet.de>
Date: Fri, 20 Dec 2024 17:56:32 +0100
Subject: [PATCH 02/10] OZG-6989 OZG-7395 Fix visibility of Export menu item
---
.../vorgang-detail-more-menu.component.html | 3 +++
.../vorgang-detail-more-menu.component.ts | 1 +
2 files changed, 4 insertions(+)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
index e2720d7031..802224ba84 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
@@ -47,6 +47,9 @@
></alfa-vorgang-archive-container>
</ozgcloud-menu-item>
<ozgcloud-menu-item
+ *ngIf="
+ vorgangWithEingang.status === vorgangStatus.ABGESCHLOSSEN && vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.ARCHIVE
+ "
data-test-id="vorgang-exportieren-button"
headline="Vorgang exportieren"
text="Alle Informationen und Anhänge des Vorgangs zur Archivierung im DMS."
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
index 222d1de58b..972db2b6f2 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
@@ -51,6 +51,7 @@ export class VorgangDetailMoreMenuComponent implements OnChanges {
buttonEnabled: boolean = false;
readonly vorgangWithEingangLinkRel = VorgangWithEingangLinkRel;
+ readonly vorgangStatus = VorgangStatus;
constructor(private changeDetectorRef: ChangeDetectorRef) {}
--
GitLab
From d61bbf04d781699e97c266f24c2ad27b58dd970c Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Mon, 6 Jan 2025 10:47:49 +0100
Subject: [PATCH 03/10] OZG-6989 add missing import
---
.../vorgang-detail-more-menu.component.ts | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
index 972db2b6f2..f9b7e12c77 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
@@ -21,20 +21,11 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import {
- ChangeDetectorRef,
- Component,
- Input,
- OnChanges,
- QueryList,
- SimpleChanges,
- ViewChild,
- ViewChildren,
-} from '@angular/core';
-import { MatMenuTrigger } from '@angular/material/menu';
import { isNotUndefined } from '@alfa-client/tech-shared';
import { MenuItemComponent } from '@alfa-client/ui';
-import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { VorgangStatus, VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { ChangeDetectorRef, Component, Input, OnChanges, QueryList, SimpleChanges, ViewChild, ViewChildren } from '@angular/core';
+import { MatMenuTrigger } from '@angular/material/menu';
import { has } from 'lodash-es';
@Component({
--
GitLab
From 95d463b36e560d36f4c73b369be7a767bcac5319 Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Mon, 6 Jan 2025 11:15:06 +0100
Subject: [PATCH 04/10] OZG-6989 fix condition
Export menu item for 'Vorgang exportieren' should check for 'EXPORT'
link and not 'ARCHIVE'.
---
.../vorgang-detail-more-menu.component.html | 2 +-
.../vorgang-detail-more-menu.component.spec.ts | 16 ++++++++++------
.../vorgang-detail-more-menu.component.ts | 4 ++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
index 802224ba84..d8d0b205b1 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
@@ -48,7 +48,7 @@
</ozgcloud-menu-item>
<ozgcloud-menu-item
*ngIf="
- vorgangWithEingang.status === vorgangStatus.ABGESCHLOSSEN && vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.ARCHIVE
+ vorgangWithEingang.status === vorgangStatus.ABGESCHLOSSEN && vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.EXPORT
"
data-test-id="vorgang-exportieren-button"
headline="Vorgang exportieren"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts
index fcbf720575..9f4d2200bf 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts
@@ -23,7 +23,7 @@
*/
import { getElementFromDomRoot, getElementFromFixture, getMockComponent, getMockComponents } from '@alfa-client/test-utils';
import { MenuItemComponent, OzgcloudIconComponent, UiModule } from '@alfa-client/ui';
-import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { VorgangStatus, VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { ChangeDetectorRef, SimpleChanges } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -59,6 +59,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
fixture = TestBed.createComponent(VorgangDetailMoreMenuComponent);
component = fixture.componentInstance;
+ component.vorgangWithEingang = createVorgangWithEingangResource();
fixture.detectChanges();
});
@@ -135,7 +136,10 @@ describe('VorgangDetailMoreMenuComponent', () => {
});
describe('export menu item', () => {
- const vorgangWithEingang: VorgangWithEingangResource = createVorgangWithEingangResource([VorgangWithEingangLinkRel.EXPORT]);
+ const vorgangWithEingang: VorgangWithEingangResource = {
+ ...createVorgangWithEingangResource([VorgangWithEingangLinkRel.EXPORT]),
+ status: VorgangStatus.ABGESCHLOSSEN,
+ };
beforeEach(() => {
component.buttonEnabled = true;
@@ -294,7 +298,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
it('should contains headline', () => {
getElementFromFixture(fixture, moreMenuButton).click();
- const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[1];
+ const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[0];
expect(menuItem.headline).toBe('Vorgang automatisiert vorprüfen');
});
@@ -302,7 +306,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
it('should contains text', () => {
getElementFromFixture(fixture, moreMenuButton).click();
- const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[1];
+ const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[0];
expect(menuItem.text).toBe('Eine Vorprüfung wird durchgeführt. Das Ergebnis wird als Kommentar hinzugefügt.');
});
@@ -310,7 +314,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
it('should contains icon', () => {
getElementFromFixture(fixture, moreMenuButton).click();
- const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[1];
+ const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[0];
expect(menuItem.icon).toBe('vorgang_vorpruefen');
});
@@ -318,7 +322,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
it('should contains iconSizeBig', () => {
getElementFromFixture(fixture, moreMenuButton).click();
- const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[1];
+ const menuItem: MenuItemComponent = getMockComponents(fixture, MenuItemComponent)[0];
expect(menuItem.iconSizeBig).toBeTruthy();
});
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
index f9b7e12c77..5c92cb794a 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
@@ -41,8 +41,8 @@ export class VorgangDetailMoreMenuComponent implements OnChanges {
buttonEnabled: boolean = false;
- readonly vorgangWithEingangLinkRel = VorgangWithEingangLinkRel;
- readonly vorgangStatus = VorgangStatus;
+ public readonly vorgangWithEingangLinkRel = VorgangWithEingangLinkRel;
+ public readonly vorgangStatus = VorgangStatus;
constructor(private changeDetectorRef: ChangeDetectorRef) {}
--
GitLab
From b9bcb5b4d1fb2ec63df297fe8d911743bb795582 Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Mon, 6 Jan 2025 12:20:25 +0100
Subject: [PATCH 05/10] OZG-6989 add more to .gitignore
---
alfa-client/.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/alfa-client/.gitignore b/alfa-client/.gitignore
index 0fd5e011fd..c276d84a99 100644
--- a/alfa-client/.gitignore
+++ b/alfa-client/.gitignore
@@ -54,3 +54,4 @@ Thumbs.db
.angular
+.env
\ No newline at end of file
--
GitLab
From 3aabd79fc200663268a7ffefffef0da8e9c2b08d Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Mon, 6 Jan 2025 12:25:05 +0100
Subject: [PATCH 06/10] OZG-6989 read user api pass from env
---
alfa-client/apps/alfa-e2e/docker-compose.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml
index f20faa66c5..a21f0a0ed9 100644
--- a/alfa-client/apps/alfa-e2e/docker-compose.yml
+++ b/alfa-client/apps/alfa-e2e/docker-compose.yml
@@ -143,7 +143,7 @@ services:
soft: 65536
hard: 65536
healthcheck:
- test: ['CMD-SHELL', "curl -s 'http://localhost:9200/_cat/health?h=status' | egrep -q '(green|yellow)'"]
+ test: [ 'CMD-SHELL', "curl -s 'http://localhost:9200/_cat/health?h=status' | egrep -q '(green|yellow)'" ]
interval: 10s
timeout: 10s
retries: 5
@@ -154,9 +154,9 @@ services:
environment:
- KEYCLOAK_URL=https://sso.dev.by.ozg-cloud.de
- OZGCLOUD_KEYCLOAK_API_CLIENT=alfa
- - OZGCLOUD_KEYCLOAK_API_PASSWORD=
- OZGCLOUD_KEYCLOAK_API_REALM=${KEYCLOAK_REALM:-by-e2e-tests-local-dev}
- OZGCLOUD_KEYCLOAK_API_USER=usermanagerapiuser
+ - OZGCLOUD_KEYCLOAK_API_PASSWORD=${OZGCLOUD_KEYCLOAK_API_PASSWORD:-}
- OZGCLOUD_USER_MANAGER_URL=http://localhost:9092
- OZGCLOUD_USERSYNC_PERIOD=disabled
- OZGCLOUD_USERSYNC_ONSTART=false
@@ -213,7 +213,7 @@ services:
- 7080:8080
- 7081:8081
healthcheck:
- test: ['CMD-SHELL', 'wget --spider localhost:8081/version']
+ test: [ 'CMD-SHELL', 'wget --spider localhost:8081/version' ]
interval: 5s
timeout: 5s
retries: 5
--
GitLab
From 0e336c679d48b5825a9e80d2d6f7e32ef9a3ea5d Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Mon, 6 Jan 2025 12:32:34 +0100
Subject: [PATCH 07/10] OZG-6989 remove file and add to .gitignore
---
alfa-client/.gitignore | 3 ++-
.../apps/alfa-e2e/src/fixtures/usermanager/user-ids.json | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json
diff --git a/alfa-client/.gitignore b/alfa-client/.gitignore
index c276d84a99..0255cc242c 100644
--- a/alfa-client/.gitignore
+++ b/alfa-client/.gitignore
@@ -54,4 +54,5 @@ Thumbs.db
.angular
-.env
\ No newline at end of file
+.env
+user-ids.json
\ No newline at end of file
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
--
GitLab
From 59bd5b962c771fb22980f6d228e5f21721d72bea Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Mon, 6 Jan 2025 12:54:33 +0100
Subject: [PATCH 08/10] OZG-6989 always init users in e2e
---
.../src/e2e/main-tests/init-users.cy.ts | 18 +++++++-----------
.../apps/alfa-e2e/src/support/user-util.ts | 5 -----
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts
index 0725ac9ce2..5df41dccaf 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts
@@ -28,7 +28,7 @@ import { HeaderE2EComponent } from '../../page-objects/header.po';
import { MainPage, waitForSpinnerToDisappear } from '../../page-objects/main.po';
import { login, writeUserIdsIntoFile } from '../../support/cypress-helper';
import { exist } from '../../support/cypress.util';
-import { areUsersSynced, DatabaseUser } from '../../support/user-util';
+import { DatabaseUser } from '../../support/user-util';
registerLocaleData(localeDe, 'de', localeDeExtra);
@@ -61,18 +61,14 @@ describe('Init users', () => {
});
it('should write user ids to file', () => {
- if (!areUsersSynced()) {
- writeUserIdsIntoFile();
- }
+ writeUserIdsIntoFile();
});
function syncUser(user: DatabaseUser) {
- if (!areUsersSynced()) {
- login(user);
- waitForSpinnerToDisappear();
- exist(header.getLogo());
- header.getCurrentUserProfile().getUserIconButton().click();
- header.getCurrentUserProfile().getLogoutButton().click();
- }
+ login(user);
+ waitForSpinnerToDisappear();
+ exist(header.getLogo());
+ header.getCurrentUserProfile().getUserIconButton().click();
+ header.getCurrentUserProfile().getLogoutButton().click();
}
});
diff --git a/alfa-client/apps/alfa-e2e/src/support/user-util.ts b/alfa-client/apps/alfa-e2e/src/support/user-util.ts
index 7fedf55dc2..c3fab69f00 100644
--- a/alfa-client/apps/alfa-e2e/src/support/user-util.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/user-util.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { isNotEmpty } from '@alfa-client/tech-shared';
import { isEmpty } from 'lodash-es';
import { UserE2E } from '../model/user';
import { UsermanagerUserE2E } from '../model/usermanager';
@@ -52,10 +51,6 @@ export function getUserId(username: Username) {
return userIds[username];
}
-export function areUsersSynced(): boolean {
- return isNotEmpty(userIds);
-}
-
export function initUsermanagerUsers() {
// initUsermanagerData([
// getUserManagerUserSabine(),
--
GitLab
From 430b511843dc5502ce922226d7ecc99721508e92 Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Mon, 6 Jan 2025 13:12:48 +0100
Subject: [PATCH 09/10] OZG-6989 restore removed file
---
alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json | 1 +
1 file changed, 1 insertion(+)
create mode 100644 alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
--
GitLab
From 38eebe0176f7ae9de5f073daa000214bf4f4eb9f Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Mon, 6 Jan 2025 13:13:19 +0100
Subject: [PATCH 10/10] OZG-6989 remove file from .gitignore
---
alfa-client/.gitignore | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/alfa-client/.gitignore b/alfa-client/.gitignore
index 0255cc242c..c276d84a99 100644
--- a/alfa-client/.gitignore
+++ b/alfa-client/.gitignore
@@ -54,5 +54,4 @@ Thumbs.db
.angular
-.env
-user-ids.json
\ No newline at end of file
+.env
\ No newline at end of file
--
GitLab