From 31dbe37eee36fc2174e531f0a2e8d3fae86bf5ae Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Fri, 25 Mar 2022 11:19:04 +0200 Subject: [PATCH 1/2] Added multiple ids needed for tests --- .../src/app/modules/dossier-overview/config.service.ts | 1 + .../add-dossier-dialog/add-dossier-dialog.component.html | 2 +- .../edit-dossier-dialog.component.html | 3 ++- .../edit-dossier-team/edit-dossier-team.component.html | 9 +++++---- .../edit-dossier-general-info.component.html | 1 + .../initials-avatar/initials-avatar.component.html | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts index d1e3beb30..1e1f189f4 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts @@ -106,6 +106,7 @@ export class ConfigService { actionConfig(dossierId: string, disabled$: Observable): List { return [ { + id: 'editDossier', label: this._translateService.instant('dossier-overview.header-actions.edit'), action: $event => this._openEditDossierDialog($event, dossierId), icon: 'iqser:edit', diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html index 58111e530..75ef2d64b 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html @@ -104,7 +104,7 @@ [label]="'add-dossier-dialog.actions.save-and-add-members' | translate" [type]="iconButtonTypes.dark" icon="red:assign" - id="createDossierEditTeamButton" + [id]="'createDossierEditTeamButton'" > diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html index 8e477fcbf..b785bfdcc 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html @@ -1,5 +1,5 @@
-
+
{{ 'edit-dossier-dialog.header' | translate: { dossierName: dossier.dossierName } }}
@@ -61,6 +61,7 @@ [disabled]="disabled || !valid || !changed" [label]="'edit-dossier-dialog.actions.save-and-close' | translate" [type]="iconButtonTypes.dark" + id="saveAndClose" > diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html index a098fb74b..64f0494bf 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html @@ -3,7 +3,7 @@ {{ 'assign-dossier-owner.dialog.single-user' | translate }} - + {{ userId | name }} @@ -11,7 +11,7 @@
-
+
-
+
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html index f79cdc91e..f2305bd2a 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html @@ -82,6 +82,7 @@ [label]="'dossier-listing.delete.action' | translate" [type]="iconButtonTypes.dark" icon="iqser:trash" + id="deleteDossier" > {{ _user | name: { showInitials: true } }}
-
+
{{ userName }}
From d9daa41b07ad13fb38a691b54c34a8da60c65df3 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Sun, 27 Mar 2022 13:06:43 +0300 Subject: [PATCH 2/2] added more ids for tests --- .../edit-dossier-dialog/edit-dossier-dialog.component.html | 4 ++-- .../edit-dossier-team/edit-dossier-team.component.html | 6 +++++- libs/common-ui | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html index b785bfdcc..84b40d777 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html @@ -61,11 +61,11 @@ [disabled]="disabled || !valid || !changed" [label]="'edit-dossier-dialog.actions.save-and-close' | translate" [type]="iconButtonTypes.dark" - id="saveAndClose" + [id]="'saveAndClose'" > -
+
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html index 64f0494bf..f5e2ab2ff 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html @@ -61,7 +61,11 @@
- +
diff --git a/libs/common-ui b/libs/common-ui index 9f2cdbe49..f3c088af0 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 9f2cdbe490c6a4bebbc7593895fe8999d79c634f +Subproject commit f3c088af0368ae55195541e3793c44836bb0f481