From e70c512287156315e866a5e22ae354b3e2f12888 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 23 Jul 2024 11:22:50 +0200
Subject: [PATCH] OZG-6255: use ozgcloud-svgicon only
---
.../vorgang/vorgang-views.e2e.component.ts | 10 ----------
.../wiedervorlage/wiedervorlage.erledigen.cy.ts | 13 ++-----------
alfa-client/libs/ui/src/lib/assets/update.svg | 1 +
alfa-client/libs/ui/src/lib/icon/icon.model.ts | 1 +
.../wiedervorlage-icon.component.html | 5 ++++-
5 files changed, 8 insertions(+), 22 deletions(-)
create mode 100644 alfa-client/libs/ui/src/lib/assets/update.svg
diff --git a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-views.e2e.component.ts b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-views.e2e.component.ts
index 5563aebb65..446c287de7 100644
--- a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-views.e2e.component.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-views.e2e.component.ts
@@ -71,8 +71,6 @@ export class VorgangViewE2EComponent {
private readonly count: string = 'views-menu-item-count-';
private readonly root: string = 'views-menu-item-';
private readonly button: string = 'routing-button';
- private readonly iconTag: string = 'ozgcloud-icon';
- private readonly svgIconTag: string = 'ozgcloud-svgicon';
private rootId: string;
@@ -91,12 +89,4 @@ export class VorgangViewE2EComponent {
public getButton() {
return this.getRoot().findTestElementWithClass(this.button);
}
-
- public getIcon() {
- return this.getRoot().findElement(this.iconTag);
- }
-
- public getSvgIcon() {
- return this.getRoot().findElement(this.svgIconTag);
- }
}
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage/wiedervorlage.erledigen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage/wiedervorlage.erledigen.cy.ts
index bab52e3651..18f70ef0d3 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage/wiedervorlage.erledigen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/wiedervorlage/wiedervorlage.erledigen.cy.ts
@@ -49,7 +49,6 @@ import {
exist,
notContainClass,
notExist,
- shouldHaveAttribute,
} from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
import { createVorgang, initVorgang, objectIds } from '../../../support/vorgang-util';
@@ -321,11 +320,7 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
});
it('should show red icon', () => {
- wait(2000, 'Flaky - wahrscheinlich wegen asynchroner Verarbeitung im BE');
-
- const svgIcon = wiedervorlagenView.getSvgIcon();
-
- shouldHaveAttribute(svgIcon, 'data-test-class', locatorIconIsOverdue);
+ exist(wiedervorlagenView.getRoot().findTestElementWithClass(locatorIconIsOverdue));
});
it('Open Vorgang-Detail-Page', () => {
@@ -350,11 +345,7 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
});
it('should show default icon', () => {
- wait(2000, 'Flaky - wahrscheinlich wegen asynchroner Verarbeitung im BE');
-
- const icon = wiedervorlagenView.getIcon();
-
- shouldHaveAttribute(icon, 'data-test-class', locatorIconDefault);
+ exist(wiedervorlagenView.getRoot().findTestElementWithClass(locatorIconDefault));
});
});
});
diff --git a/alfa-client/libs/ui/src/lib/assets/update.svg b/alfa-client/libs/ui/src/lib/assets/update.svg
new file mode 100644
index 0000000000..1eb6a0751c
--- /dev/null
+++ b/alfa-client/libs/ui/src/lib/assets/update.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M480-120q-75 0-140.5-28.5t-114-77q-48.5-48.5-77-114T120-480q0-75 28.5-140.5t77-114q48.5-48.5 114-77T480-840q82 0 155.5 35T760-706v-94h80v240H600v-80h110q-41-56-101-88t-129-32q-117 0-198.5 81.5T200-480q0 117 81.5 198.5T480-200q105 0 183.5-68T756-440h82q-15 137-117.5 228.5T480-120Zm112-192L440-464v-216h80v184l128 128-56 56Z"/></svg>
\ No newline at end of file
diff --git a/alfa-client/libs/ui/src/lib/icon/icon.model.ts b/alfa-client/libs/ui/src/lib/icon/icon.model.ts
index a7b7d26ba8..a7fa9937a6 100644
--- a/alfa-client/libs/ui/src/lib/icon/icon.model.ts
+++ b/alfa-client/libs/ui/src/lib/icon/icon.model.ts
@@ -43,4 +43,5 @@ export enum Icons {
VORGANG_VORPRUEFEN = 'vorgang_vorpruefen',
XDOMEA = 'xdomea_file',
PASTE_FROM_CLIPBOARD = 'paste_from_clipboard',
+ UPDATE = 'update',
}
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html b/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html
index 5e95367c03..9bf2265a27 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html
@@ -6,6 +6,9 @@
></ozgcloud-svgicon>
</ng-container>
<ng-template #defaultFrist>
- <ozgcloud-icon icon="update" data-test-class="wiedervorlage-icon-default"></ozgcloud-icon>
+ <ozgcloud-svgicon
+ svgIcon="update"
+ data-test-class="wiedervorlage-icon-default"
+ ></ozgcloud-svgicon>
</ng-template>
</div>
--
GitLab