From f3c088af0368ae55195541e3793c44836bb0f481 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Fri, 25 Mar 2022 11:18:11 +0200 Subject: [PATCH] Added multiple ids needed for tests --- src/lib/buttons/circle-button/circle-button.component.html | 1 + src/lib/buttons/circle-button/circle-button.component.ts | 5 +++++ src/lib/buttons/icon-button/icon-button.component.html | 1 + src/lib/buttons/icon-button/icon-button.component.ts | 5 +++++ src/lib/listing/page-header/models/base-config.model.ts | 1 + src/lib/listing/page-header/page-header.component.html | 1 + .../confirmation-dialog/confirmation-dialog.component.html | 3 ++- 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/lib/buttons/circle-button/circle-button.component.html b/src/lib/buttons/circle-button/circle-button.component.html index 8bed1c0..9bc746a 100644 --- a/src/lib/buttons/circle-button/circle-button.component.html +++ b/src/lib/buttons/circle-button/circle-button.component.html @@ -8,6 +8,7 @@ [class.grey-selected]="greySelected" [disabled]="disabled" [type]="isSubmit ? 'submit' : 'button'" + [id]="id ? id : buttonId" mat-icon-button > diff --git a/src/lib/buttons/circle-button/circle-button.component.ts b/src/lib/buttons/circle-button/circle-button.component.ts index dcffd29..e699595 100644 --- a/src/lib/buttons/circle-button/circle-button.component.ts +++ b/src/lib/buttons/circle-button/circle-button.component.ts @@ -12,6 +12,7 @@ import { IqserTooltipPosition, IqserTooltipPositions } from '../../utils'; export class CircleButtonComponent implements OnInit { readonly circleButtonTypes = CircleButtonTypes; + @Input() id!: string; @Input() icon!: string; @Input() tooltip?: string; @Input() tooltipClass?: string; @@ -49,4 +50,8 @@ export class CircleButtonComponent implements OnInit { this.action.emit($event); } } + + get buttonId (): String { + return `${Math.random().toString(36).substring(2, 9)}-button`; + } } diff --git a/src/lib/buttons/icon-button/icon-button.component.html b/src/lib/buttons/icon-button/icon-button.component.html index d6afb9a..56a12c5 100644 --- a/src/lib/buttons/icon-button/icon-button.component.html +++ b/src/lib/buttons/icon-button/icon-button.component.html @@ -7,6 +7,7 @@ [disabled]="disabled" mat-button type="button" + [id]="id ? id : buttonId" > {{ label }} diff --git a/src/lib/buttons/icon-button/icon-button.component.ts b/src/lib/buttons/icon-button/icon-button.component.ts index 3b1ad8c..d48c34c 100644 --- a/src/lib/buttons/icon-button/icon-button.component.ts +++ b/src/lib/buttons/icon-button/icon-button.component.ts @@ -12,9 +12,14 @@ export class IconButtonComponent { readonly iconButtonTypes = IconButtonTypes; @Input() @Required() label!: string; + @Input() id!: string; @Input() icon?: string; @Input() showDot = false; @Input() disabled = false; @Input() type: IconButtonType = IconButtonTypes.default; @Output() readonly action = new EventEmitter(); + + get buttonId (): String { + return `${Math.random().toString(36).substring(2, 9)}-button`; + } } diff --git a/src/lib/listing/page-header/models/base-config.model.ts b/src/lib/listing/page-header/models/base-config.model.ts index 970891c..e88ca69 100644 --- a/src/lib/listing/page-header/models/base-config.model.ts +++ b/src/lib/listing/page-header/models/base-config.model.ts @@ -1,4 +1,5 @@ export interface BaseHeaderConfig { + readonly id?: string; readonly label: string; readonly icon?: string; readonly hide?: boolean; diff --git a/src/lib/listing/page-header/page-header.component.html b/src/lib/listing/page-header/page-header.component.html index 70e1fc0..bbf539a 100644 --- a/src/lib/listing/page-header/page-header.component.html +++ b/src/lib/listing/page-header/page-header.component.html @@ -53,6 +53,7 @@ [icon]="config.icon" [iqserHelpMode]="config.helpModeKey" [tooltip]="config.label" + [id]="config.id" tooltipPosition="below" > diff --git a/src/lib/misc/confirmation-dialog/confirmation-dialog.component.html b/src/lib/misc/confirmation-dialog/confirmation-dialog.component.html index 8082b10..adfea33 100644 --- a/src/lib/misc/confirmation-dialog/confirmation-dialog.component.html +++ b/src/lib/misc/confirmation-dialog/confirmation-dialog.component.html @@ -16,7 +16,7 @@
- +
@@ -35,6 +35,7 @@ [disabled]="(config.requireInput && confirmationDoesNotMatch()) || config.disableConfirm" color="primary" mat-flat-button + id="confirm" > {{ config.confirmationText }}