diff --git a/e2e/core/pages/comments.page.ts b/e2e/core/pages/comments.page.ts index c2e4ecaf01..fc1e6db10a 100644 --- a/e2e/core/pages/comments.page.ts +++ b/e2e/core/pages/comments.page.ts @@ -22,10 +22,10 @@ export class CommentsPage { tabsPage = new TabsPage(); numberOfComments = $('#comment-header'); - commentUserIcon = $$('#comment-user-icon'); - commentUserName = $$('#comment-user'); - commentMessage = $$('#comment-message'); - commentTime = $$('#comment-time'); + commentUserIcon = $$('.adf-comment-img-container'); + commentUserName = $$('.adf-comment-user-name'); + commentMessage = $$('.adf-comment-message'); + commentTime = $$('.adf-comment-message-time'); commentInput = $('#comment-input'); addCommentButton = $("[data-automation-id='comments-input-add']"); diff --git a/e2e/process-services/pages/process-details.page.ts b/e2e/process-services/pages/process-details.page.ts index 7cef69e699..57096c2ed7 100644 --- a/e2e/process-services/pages/process-details.page.ts +++ b/e2e/process-services/pages/process-details.page.ts @@ -92,6 +92,6 @@ export class ProcessDetailsPage { } checkCommentIsDisplayed(comment: string): Promise { - return TestElement.byText('div[id="comment-message"]', comment).waitVisible(); + return TestElement.byText('div.adf-comment-message', comment).waitVisible(); } } diff --git a/e2e/process-services/pages/task-details.page.ts b/e2e/process-services/pages/task-details.page.ts index 8106f9ed42..f2983df7ae 100644 --- a/e2e/process-services/pages/task-details.page.ts +++ b/e2e/process-services/pages/task-details.page.ts @@ -268,12 +268,12 @@ export class TaskDetailsPage { } async checkCommentIsDisplayed(comment: string): Promise { - const row = element(by.cssContainingText('div[id="comment-message"]', comment)); + const row = element(by.cssContainingText('div.adf-comment-message', comment)); await BrowserVisibility.waitUntilElementIsVisible(row); } async checkIsEmptyCommentListDisplayed(): Promise { - const emptyList = element(by.cssContainingText('div[id="comment-header"]', '(0)')); + const emptyList = element(by.cssContainingText('h1[id="comment-header"]', '(0)')); await BrowserVisibility.waitUntilElementIsVisible(emptyList); } diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html index 9d4bb24f05..20a10afa3b 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html @@ -5,8 +5,8 @@ [expanded]="canExpandProperties()" [attr.data-automation-id]="'adf-metadata-group-properties'"> - - {{ 'CORE.METADATA.BASIC.HEADER' | translate }} + +

{{ 'CORE.METADATA.BASIC.HEADER' | translate }}

 - + + diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss index a1b32c623e..238b48e4a9 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss @@ -7,6 +7,11 @@ mat-expansion-panel-header { height: 64px; + + .adf-metadata-properties-title { + font-weight: normal; + font-size: 15px; + } } .mat-expansion-panel:not([class*='mat-elevation-z']) { diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.html b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.html index 17f5a302f5..8399d648a9 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.html +++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.html @@ -1,9 +1,9 @@ -
+ *ngIf="showProperty() || isEditable()" + [attr.for]="'card-view-dateitem-' + property.key"> {{ property.label | translate }} -
- +
@@ -43,7 +43,9 @@ [attr.tabIndex]="-1" [matDatetimepicker]="datetimePicker" [value]="valueDate" - (dateChange)="onDateChanged($event)"> + (dateChange)="onDateChanged($event)" + [attr.id]="'card-view-dateitem-' + property.key" + > + (dateChange)="addDateToList($event)" + [attr.id]="'card-view-dateitem-' + property.key" + > + data-automation-class="select-box" + [aria-label]="property.label | translate"> diff --git a/lib/core/src/lib/comments/comment-list.component.html b/lib/core/src/lib/comments/comment-list.component.html index 5128af5947..89b2f566e0 100644 --- a/lib/core/src/lib/comments/comment-list.component.html +++ b/lib/core/src/lib/comments/comment-list.component.html @@ -4,7 +4,7 @@ class="adf-comment-list-item" [class.adf-is-selected]="comment.isSelected" id="adf-comment-{{comment?.id}}"> -
+
@@ -17,11 +17,12 @@
-
+
{{comment.createdBy?.firstName}} {{comment.createdBy?.lastName}}
-
-
+
+
+
{{ comment.created | adfTimeAgo: currentLocale }}
diff --git a/lib/core/src/lib/comments/comment-list.component.spec.ts b/lib/core/src/lib/comments/comment-list.component.spec.ts index 11693dfdd7..c3d7f60f2e 100644 --- a/lib/core/src/lib/comments/comment-list.component.spec.ts +++ b/lib/core/src/lib/comments/comment-list.component.spec.ts @@ -187,10 +187,10 @@ describe('CommentListComponent', () => { fixture.detectChanges(); await fixture.whenStable(); - const elements = fixture.nativeElement.querySelectorAll('#comment-message'); + const elements = fixture.nativeElement.querySelectorAll('.adf-comment-message'); expect(elements.length).toBe(1); expect(elements[0].innerText).toBe(processCommentOne.message); - expect(fixture.nativeElement.querySelector('#comment-message:empty')).toBeNull(); + expect(fixture.nativeElement.querySelector('.adf-comment-message:empty')).toBeNull(); }); it('should show comment user when input is given', async () => { @@ -199,10 +199,10 @@ describe('CommentListComponent', () => { fixture.detectChanges(); await fixture.whenStable(); - const elements = fixture.nativeElement.querySelectorAll('#comment-user'); + const elements = fixture.nativeElement.querySelectorAll('.adf-comment-user-name'); expect(elements.length).toBe(1); expect(elements[0].innerText).toBe(processCommentOne.createdBy.firstName + ' ' + processCommentOne.createdBy.lastName); - expect(fixture.nativeElement.querySelector('#comment-user:empty')).toBeNull(); + expect(fixture.nativeElement.querySelector('.adf-comment-user-name:empty')).toBeNull(); }); it('comment date time should start with few seconds ago when comment date is few seconds ago', async () => { @@ -214,7 +214,7 @@ describe('CommentListComponent', () => { fixture.detectChanges(); await fixture.whenStable(); - element = fixture.nativeElement.querySelector('#comment-time'); + element = fixture.nativeElement.querySelector('.adf-comment-message-time'); expect(element.innerText).toContain('a few seconds ago'); }); @@ -226,7 +226,7 @@ describe('CommentListComponent', () => { fixture.detectChanges(); await fixture.whenStable(); - element = fixture.nativeElement.querySelector('#comment-time'); + element = fixture.nativeElement.querySelector('.adf-comment-message-time'); expect(element.innerText).toContain('a day ago'); }); @@ -238,7 +238,7 @@ describe('CommentListComponent', () => { fixture.detectChanges(); await fixture.whenStable(); - element = fixture.nativeElement.querySelector('#comment-time'); + element = fixture.nativeElement.querySelector('.adf-comment-message-time'); expect(element.innerText).not.toContain('Today'); expect(element.innerText).not.toContain('Yesterday'); }); @@ -249,10 +249,10 @@ describe('CommentListComponent', () => { fixture.detectChanges(); await fixture.whenStable(); - const elements = fixture.nativeElement.querySelectorAll('#comment-user-icon'); + const elements = fixture.nativeElement.querySelectorAll('.adf-comment-img-container'); expect(elements.length).toBe(1); expect(elements[0].innerText).toContain(commentList.getUserShortName(processCommentOne.createdBy)); - expect(fixture.nativeElement.querySelector('#comment-user-icon:empty')).toBeNull(); + expect(fixture.nativeElement.querySelector('.adf-comment-img-container:empty')).toBeNull(); }); it('should return content picture when is a content user with a picture', async () => { diff --git a/lib/core/src/lib/comments/comments.component.html b/lib/core/src/lib/comments/comments.component.html index bff9919073..7749aedb04 100644 --- a/lib/core/src/lib/comments/comments.component.html +++ b/lib/core/src/lib/comments/comments.component.html @@ -1,7 +1,7 @@
-
+

{{'COMMENTS.HEADER' | translate: { count: comments?.length} }} -

+