diff --git a/docs/content-services/services/content-comment-list.service.md b/docs/content-services/services/content-comment-list.service.md
new file mode 100644
index 0000000000..c44e9d8ec0
--- /dev/null
+++ b/docs/content-services/services/content-comment-list.service.md
@@ -0,0 +1,23 @@
+---
+Title: Content Comment List Service
+Added: v6.0.0
+Status: Active
+Last reviewed: 2023-01-17
+---
+
+# [Content Comment List service](../../../lib/content-services/src/lib/node-comments/services/content-comment-list.service.ts "Defined in content-comment-list.service.ts")
+
+Gets user image for comments in Content Services.
+
+## Class members
+
+### Methods
+
+- **getUserImage**(user: `string`): `string`<br/>
+ Gets user image
+ - _user:_ `string` - The user id;
+ - **Returns** `string` - The user image path
+
+## See also
+
+- [Node comments component](../../../lib/content-services/src/lib/node-comments/node-comments.component.ts)
diff --git a/docs/core/components/comment-list.component.md b/docs/core/components/comment-list.component.md
index 52383c6d5c..41e33c7b25 100644
--- a/docs/core/components/comment-list.component.md
+++ b/docs/core/components/comment-list.component.md
@@ -2,10 +2,10 @@
Title: Comment list component
Added: v2.0.0
Status: Active
-Last reviewed: 2018-11-14
+Last reviewed: 2023-01-10
---
-# [Comment list component](../../../lib/core/src/lib/comments/comment-list.component.ts "Defined in comment-list.component.ts")
+# [Comment list component](../../../lib/core/src/lib/comments/comment-list/comment-list.component.ts "Defined in comment-list.component.ts")
Shows a list of comments.
diff --git a/lib/content-services/src/lib/node-comments/node-comments.module.ts b/lib/content-services/src/lib/node-comments/node-comments.module.ts
index 8cfd9e8f23..7f25be85db 100644
--- a/lib/content-services/src/lib/node-comments/node-comments.module.ts
+++ b/lib/content-services/src/lib/node-comments/node-comments.module.ts
@@ -21,10 +21,7 @@ import { NodeCommentsComponent } from './node-comments.component';
import { CoreModule } from '@alfresco/adf-core';
@NgModule({
- imports: [
- CommonModule,
- CoreModule
- ],
+ imports: [CommonModule, CoreModule],
declarations: [NodeCommentsComponent],
exports: [NodeCommentsComponent]
})
diff --git a/lib/content-services/src/lib/node-comments/services/node-comments.service.ts b/lib/content-services/src/lib/node-comments/services/node-comments.service.ts
index 804384726a..fdd0a4b59b 100644
--- a/lib/content-services/src/lib/node-comments/services/node-comments.service.ts
+++ b/lib/content-services/src/lib/node-comments/services/node-comments.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { AlfrescoApiService, LogService, CommentModel } from '@alfresco/adf-core';
+import { AlfrescoApiService, LogService, CommentModel, CommentsService, PeopleContentService } from '@alfresco/adf-core';
import { CommentEntry, CommentsApi, Comment } from '@alfresco/js-api';
import { Injectable } from '@angular/core';
import { Observable, from, throwError } from 'rxjs';
@@ -24,7 +24,7 @@ import { map, catchError } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
})
-export class NodeCommentsService {
+export class NodeCommentsService implements CommentsService {
private _commentsApi: CommentsApi;
get commentsApi(): CommentsApi {
@@ -34,7 +34,8 @@ export class NodeCommentsService {
constructor(
private apiService: AlfrescoApiService,
- private logService: LogService
+ private logService: LogService,
+ private peopleContentService: PeopleContentService
) {}
/**
@@ -99,4 +100,8 @@ export class NodeCommentsService {
this.logService.error(error);
return throwError(error || 'Server error');
}
+
+ getUserImage(user: string): string {
+ return this.peopleContentService.getUserProfileImage(user);
+ }
}
diff --git a/lib/core/src/lib/comments/comment-list.component.html b/lib/core/src/lib/comments/comment-list/comment-list.component.html
similarity index 100%
rename from lib/core/src/lib/comments/comment-list.component.html
rename to lib/core/src/lib/comments/comment-list/comment-list.component.html
diff --git a/lib/core/src/lib/comments/comment-list.component.scss b/lib/core/src/lib/comments/comment-list/comment-list.component.scss
similarity index 100%
rename from lib/core/src/lib/comments/comment-list.component.scss
rename to lib/core/src/lib/comments/comment-list/comment-list.component.scss
diff --git a/lib/core/src/lib/comments/comment-list.component.spec.ts b/lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts
similarity index 56%
rename from lib/core/src/lib/comments/comment-list.component.spec.ts
rename to lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts
index c3d7f60f2e..acd0f129cf 100644
--- a/lib/core/src/lib/comments/comment-list.component.spec.ts
+++ b/lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts
@@ -17,117 +17,46 @@
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
-import { CommentModel, UserProcessModel } from '../models';
+import { CommentModel } from '../../models/comment.model';
import { CommentListComponent } from './comment-list.component';
import { By } from '@angular/platform-browser';
-import { EcmUserService } from '../services/ecm-user.service';
-import { PeopleProcessService } from '../services/people-process.service';
-import { setupTestBed } from '../testing/setup-test-bed';
-import { CoreTestingModule } from '../testing/core.testing.module';
+import { setupTestBed } from '../../testing/setup-test-bed';
+import { CoreTestingModule } from '../../testing/core.testing.module';
import { TranslateModule } from '@ngx-translate/core';
-
-const testUser = new UserProcessModel({
- id: '1',
- firstName: 'Test',
- lastName: 'User',
- email: 'tu@domain.com'
-});
-
-const processCommentOne = new CommentModel({
- id: 1,
- message: 'Test Comment',
- created: new Date(),
- createdBy: testUser
-});
-
-const processCommentTwo = new CommentModel({
- id: 2,
- message: '2nd Test Comment',
- created: new Date(),
- createdBy: testUser
-});
-
-const contentCommentUserPictureDefined = new CommentModel({
- id: 2,
- message: '2nd Test Comment',
- created: new Date(),
- createdBy: {
- enabled: true,
- firstName: 'some',
- lastName: 'one',
- email: 'some-one@somegroup.com',
- emailNotificationsEnabled: true,
- company: {},
- id: 'fake-email@dom.com',
- avatarId: '001-001-001'
- }
-});
-
-const processCommentUserPictureDefined = new CommentModel({
- id: 2,
- message: '2nd Test Comment',
- created: new Date(),
- createdBy: {
- id: '1',
- firstName: 'Test',
- lastName: 'User',
- email: 'tu@domain.com',
- pictureId: '001-001-001'
- }
-});
-
-const contentCommentUserNoPictureDefined = new CommentModel({
- id: 2,
- message: '2nd Test Comment',
- created: new Date(),
- createdBy: {
- enabled: true,
- firstName: 'some',
- lastName: 'one',
- email: 'some-one@somegroup.com',
- emailNotificationsEnabled: true,
- company: {},
- id: 'fake-email@dom.com'
- }
-});
-
-const processCommentUserNoPictureDefined = new CommentModel({
- id: 2,
- message: '2nd Test Comment',
- created: new Date(),
- createdBy: {
- id: '1',
- firstName: 'Test',
- lastName: 'User',
- email: 'tu@domain.com'
- }
-});
+import {
+ commentUserNoPictureDefined,
+ commentUserPictureDefined,
+ mockCommentOne,
+ mockCommentTwo,
+ testUser
+} from './mocks/comment-list.mock';
+import { CommentListServiceMock } from './mocks/comment-list.service.mock';
+import { ADF_COMMENTS_SERVICE } from '../interfaces/comments.token';
describe('CommentListComponent', () => {
let commentList: CommentListComponent;
let fixture: ComponentFixture<CommentListComponent>;
let element: HTMLElement;
- let ecmUserService: EcmUserService;
- let peopleProcessService: PeopleProcessService;
setupTestBed({
imports: [
TranslateModule.forRoot(),
CoreTestingModule
],
- schemas: [CUSTOM_ELEMENTS_SCHEMA]
+ schemas: [CUSTOM_ELEMENTS_SCHEMA],
+ providers: [
+ {
+ provide: ADF_COMMENTS_SERVICE,
+ useClass: CommentListServiceMock
+ }
+ ]
});
beforeEach(() => {
- ecmUserService = TestBed.inject(EcmUserService);
- spyOn(ecmUserService, 'getUserProfileImage').and.returnValue('alfresco-logo.svg');
-
- peopleProcessService = TestBed.inject(PeopleProcessService);
- spyOn(peopleProcessService, 'getUserImage').and.returnValue('alfresco-logo.svg');
-
fixture = TestBed.createComponent(CommentListComponent);
commentList = fixture.componentInstance;
+
element = fixture.nativeElement;
fixture.detectChanges();
});
@@ -137,7 +66,7 @@ describe('CommentListComponent', () => {
});
it('should emit row click event', fakeAsync(() => {
- commentList.comments = [Object.assign({}, processCommentOne)];
+ commentList.comments = [Object.assign({}, mockCommentOne)];
commentList.clickRow.subscribe((selectedComment: CommentModel) => {
expect(selectedComment.id).toEqual(1);
@@ -154,9 +83,9 @@ describe('CommentListComponent', () => {
}));
it('should deselect the previous selected comment when a new one is clicked', fakeAsync(() => {
- processCommentOne.isSelected = true;
- const commentOne = Object.assign({}, processCommentOne);
- const commentTwo = Object.assign({}, processCommentTwo);
+ mockCommentOne.isSelected = true;
+ const commentOne = Object.assign({}, mockCommentOne);
+ const commentTwo = Object.assign({}, mockCommentTwo);
commentList.selectedComment = commentOne;
commentList.comments = [commentOne, commentTwo];
@@ -182,31 +111,31 @@ describe('CommentListComponent', () => {
});
it('should show comment message when input is given', async () => {
- commentList.comments = [Object.assign({}, processCommentOne)];
+ commentList.comments = [Object.assign({}, mockCommentOne)];
fixture.detectChanges();
await fixture.whenStable();
const elements = fixture.nativeElement.querySelectorAll('.adf-comment-message');
expect(elements.length).toBe(1);
- expect(elements[0].innerText).toBe(processCommentOne.message);
+ expect(elements[0].innerText).toBe(mockCommentOne.message);
expect(fixture.nativeElement.querySelector('.adf-comment-message:empty')).toBeNull();
});
it('should show comment user when input is given', async () => {
- commentList.comments = [Object.assign({}, processCommentOne)];
+ commentList.comments = [Object.assign({}, mockCommentOne)];
fixture.detectChanges();
await fixture.whenStable();
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(elements[0].innerText).toBe(mockCommentOne.createdBy.firstName + ' ' + mockCommentOne.createdBy.lastName);
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 () => {
- const commentFewSecond = Object.assign({}, processCommentOne);
+ const commentFewSecond = Object.assign({}, mockCommentOne);
commentFewSecond.created = new Date();
commentList.comments = [commentFewSecond];
@@ -219,7 +148,7 @@ describe('CommentListComponent', () => {
});
it('comment date time should start with Yesterday when comment date is yesterday', async () => {
- const commentOld = Object.assign({}, processCommentOne);
+ const commentOld = Object.assign({}, mockCommentOne);
commentOld.created = new Date((Date.now() - 24 * 3600 * 1000));
commentList.comments = [commentOld];
@@ -231,7 +160,7 @@ describe('CommentListComponent', () => {
});
it('comment date time should not start with Today/Yesterday when comment date is before yesterday', async () => {
- const commentOld = Object.assign({}, processCommentOne);
+ const commentOld = Object.assign({}, mockCommentOne);
commentOld.created = new Date((Date.now() - 24 * 3600 * 1000 * 2));
commentList.comments = [commentOld];
@@ -244,51 +173,29 @@ describe('CommentListComponent', () => {
});
it('should show user icon when input is given', async () => {
- commentList.comments = [Object.assign({}, processCommentOne)];
+ commentList.comments = [Object.assign({}, mockCommentOne)];
fixture.detectChanges();
await fixture.whenStable();
const elements = fixture.nativeElement.querySelectorAll('.adf-comment-img-container');
expect(elements.length).toBe(1);
- expect(elements[0].innerText).toContain(commentList.getUserShortName(processCommentOne.createdBy));
+ expect(elements[0].innerText).toContain(commentList.getUserShortName(mockCommentOne.createdBy));
expect(fixture.nativeElement.querySelector('.adf-comment-img-container:empty')).toBeNull();
});
- it('should return content picture when is a content user with a picture', async () => {
- commentList.comments = [contentCommentUserPictureDefined];
+ it('should return picture when is a user with a picture', async () => {
+ commentList.comments = [commentUserPictureDefined];
fixture.detectChanges();
await fixture.whenStable();
const elements = fixture.nativeElement.querySelectorAll('.adf-people-img');
expect(elements.length).toBe(1);
- expect(fixture.nativeElement.getElementsByClassName('adf-people-img')[0].src).toContain('alfresco-logo.svg');
});
- it('should return process picture when is a process user with a picture', async () => {
- commentList.comments = [processCommentUserPictureDefined];
-
- fixture.detectChanges();
- await fixture.whenStable();
-
- const elements = fixture.nativeElement.querySelectorAll('.adf-people-img');
- expect(elements.length).toBe(1);
- expect(fixture.nativeElement.getElementsByClassName('adf-people-img')[0].src).toContain('alfresco-logo.svg');
- });
-
- it('should return content short name when is a content user without a picture', async () => {
- commentList.comments = [contentCommentUserNoPictureDefined];
-
- fixture.detectChanges();
- await fixture.whenStable();
-
- const elements = fixture.nativeElement.querySelectorAll('.adf-comment-user-icon');
- expect(elements.length).toBe(1);
- });
-
- it('should return process short name when is a process user without a picture', async () => {
- commentList.comments = [processCommentUserNoPictureDefined];
+ it('should return short name when is a user without a picture', async () => {
+ commentList.comments = [commentUserNoPictureDefined];
fixture.detectChanges();
await fixture.whenStable();
diff --git a/lib/core/src/lib/comments/comment-list.component.stories.ts b/lib/core/src/lib/comments/comment-list/comment-list.component.stories.ts
similarity index 89%
rename from lib/core/src/lib/comments/comment-list.component.stories.ts
rename to lib/core/src/lib/comments/comment-list/comment-list.component.stories.ts
index 79cb2a029e..bac59a2b22 100644
--- a/lib/core/src/lib/comments/comment-list.component.stories.ts
+++ b/lib/core/src/lib/comments/comment-list/comment-list.component.stories.ts
@@ -16,11 +16,11 @@
*/
import { Meta, moduleMetadata, Story } from '@storybook/angular';
-import { CoreStoryModule } from '../testing/core.story.module';
+import { CoreStoryModule } from '../../testing/core.story.module';
import { CommentListComponent } from './comment-list.component';
-import { CommentsModule } from './comments.module';
-import { commentsTaskData, commentsNodeData } from './mocks/comments.stories.mock';
-import { EcmUserService } from '../services';
+import { CommentsModule } from '../comments.module';
+import { commentsTaskData, commentsNodeData } from '../mocks/comments.stories.mock';
+import { EcmUserService } from '../../services';
export default {
component: CommentListComponent,
diff --git a/lib/core/src/lib/comments/comment-list.component.ts b/lib/core/src/lib/comments/comment-list/comment-list.component.ts
similarity index 78%
rename from lib/core/src/lib/comments/comment-list.component.ts
rename to lib/core/src/lib/comments/comment-list/comment-list.component.ts
index cb71891a78..fcc2071011 100644
--- a/lib/core/src/lib/comments/comment-list.component.ts
+++ b/lib/core/src/lib/comments/comment-list/comment-list.component.ts
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output, ViewEncapsulation, OnInit, OnDestroy } from '@angular/core';
-import { CommentModel } from '../models/comment.model';
-import { EcmUserService } from '../services/ecm-user.service';
-import { PeopleProcessService } from '../services/people-process.service';
-import { UserPreferencesService, UserPreferenceValues } from '../common/services/user-preferences.service';
+import { Component, EventEmitter, Input, Output, ViewEncapsulation, OnInit, OnDestroy, Inject } from '@angular/core';
+import { CommentModel } from '../../models/comment.model';
+import { UserPreferencesService, UserPreferenceValues } from '../../common/services/user-preferences.service';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
+import { CommentsService } from '../interfaces/comments-service.interface';
+import { ADF_COMMENTS_SERVICE } from '../interfaces/comments.token';
@Component({
selector: 'adf-comment-list',
@@ -44,9 +44,10 @@ export class CommentListComponent implements OnInit, OnDestroy {
currentLocale;
private onDestroy$ = new Subject<boolean>();
- constructor(public peopleProcessService: PeopleProcessService,
- public ecmUserService: EcmUserService,
- public userPreferenceService: UserPreferencesService) {
+ constructor(
+ @Inject(ADF_COMMENTS_SERVICE) private commentsService: Partial<CommentsService>,
+ public userPreferenceService: UserPreferencesService
+ ) {
}
ngOnInit() {
@@ -88,14 +89,6 @@ export class CommentListComponent implements OnInit, OnDestroy {
}
getUserImage(user: any): string {
- if (this.isAContentUsers(user)) {
- return this.ecmUserService.getUserProfileImage(user.avatarId);
- } else {
- return this.peopleProcessService.getUserImage(user);
- }
- }
-
- private isAContentUsers(user: any): boolean {
- return user.avatarId;
+ return this.commentsService.getUserImage(user);
}
}
diff --git a/lib/core/src/lib/comments/comment-list/comment-list.module.ts b/lib/core/src/lib/comments/comment-list/comment-list.module.ts
new file mode 100644
index 0000000000..e4aa6e4619
--- /dev/null
+++ b/lib/core/src/lib/comments/comment-list/comment-list.module.ts
@@ -0,0 +1,51 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatListModule } from '@angular/material/list';
+import { MatLineModule } from '@angular/material/core';
+import { FormsModule } from '@angular/forms';
+import { PipeModule } from '../../pipes/pipe.module';
+
+import { CommentListComponent } from './comment-list.component';
+
+@NgModule({
+ imports: [
+ PipeModule,
+ FormsModule,
+ CommonModule,
+ TranslateModule,
+ MatButtonModule,
+ MatFormFieldModule,
+ MatInputModule,
+ MatListModule,
+ MatLineModule
+ ],
+ declarations: [
+ CommentListComponent
+ ],
+ exports: [
+ CommentListComponent
+ ]
+})
+export class CommentListModule {
+}
diff --git a/lib/core/src/lib/comments/comment-list/index.ts b/lib/core/src/lib/comments/comment-list/index.ts
new file mode 100644
index 0000000000..a7e30cc675
--- /dev/null
+++ b/lib/core/src/lib/comments/comment-list/index.ts
@@ -0,0 +1,18 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './public-api';
diff --git a/lib/core/src/lib/comments/comment-list/mocks/comment-list.mock.ts b/lib/core/src/lib/comments/comment-list/mocks/comment-list.mock.ts
new file mode 100644
index 0000000000..18317c40f4
--- /dev/null
+++ b/lib/core/src/lib/comments/comment-list/mocks/comment-list.mock.ts
@@ -0,0 +1,71 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CommentModel } from '../../../models/comment.model';
+import { UserProcessModel } from '../../../models/user-process.model';
+
+export const testUser = new UserProcessModel({
+ id: '1',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'tu@domain.com'
+});
+
+export const mockCommentOne = new CommentModel({
+ id: 1,
+ message: 'Test Comment',
+ created: new Date(),
+ createdBy: testUser
+});
+
+export const mockCommentTwo = new CommentModel({
+ id: 2,
+ message: '2nd Test Comment',
+ created: new Date(),
+ createdBy: testUser
+});
+
+export const commentUserPictureDefined = new CommentModel({
+ id: 2,
+ message: '2nd Test Comment',
+ created: new Date(),
+ createdBy: {
+ enabled: true,
+ firstName: 'some',
+ lastName: 'one',
+ email: 'some-one@somegroup.com',
+ emailNotificationsEnabled: true,
+ company: {},
+ id: 'fake-email@dom.com',
+ avatarId: '001-001-001'
+ }
+});
+
+export const commentUserNoPictureDefined = new CommentModel({
+ id: 2,
+ message: '2nd Test Comment',
+ created: new Date(),
+ createdBy: {
+ enabled: true,
+ firstName: 'some',
+ lastName: 'one',
+ email: 'some-one@somegroup.com',
+ emailNotificationsEnabled: true,
+ company: {},
+ id: 'fake-email@dom.com'
+ }
+});
diff --git a/lib/process-services/src/lib/process-comments/interfaces/comment-process.service.interface.ts b/lib/core/src/lib/comments/comment-list/mocks/comment-list.service.mock.ts
similarity index 57%
rename from lib/process-services/src/lib/process-comments/interfaces/comment-process.service.interface.ts
rename to lib/core/src/lib/comments/comment-list/mocks/comment-list.service.mock.ts
index f9e40b6111..ad72d01f18 100644
--- a/lib/process-services/src/lib/process-comments/interfaces/comment-process.service.interface.ts
+++ b/lib/core/src/lib/comments/comment-list/mocks/comment-list.service.mock.ts
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-import { Observable } from 'rxjs';
-import { CommentModel } from '@alfresco/adf-core';
+import { CommentsService } from '../../interfaces/comments-service.interface';
-export interface CommentProcessServiceInterface {
- addTaskComment(taskId: string, message: string): Observable<CommentModel>;
- getTaskComments(taskId: string): Observable<CommentModel[]>;
- getProcessInstanceComments(processInstanceId: string): Observable<CommentModel[]>;
- addProcessInstanceComment(processInstanceId: string, message: string): Observable<CommentModel>;
+export class CommentListServiceMock implements Partial<CommentsService> {
+
+ constructor() {}
+
+ getUserImage(_user: any): string {
+ return 'mock-user-image-path';
+ }
}
diff --git a/lib/core/src/lib/comments/comment-list/public-api.ts b/lib/core/src/lib/comments/comment-list/public-api.ts
new file mode 100644
index 0000000000..9f5c132d91
--- /dev/null
+++ b/lib/core/src/lib/comments/comment-list/public-api.ts
@@ -0,0 +1,20 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './comment-list.component';
+
+export * from './comment-list.module';
diff --git a/lib/core/src/lib/comments/comments.module.ts b/lib/core/src/lib/comments/comments.module.ts
index f6f261585d..cc856ba6d3 100644
--- a/lib/core/src/lib/comments/comments.module.ts
+++ b/lib/core/src/lib/comments/comments.module.ts
@@ -25,8 +25,8 @@ import { MatListModule } from '@angular/material/list';
import { MatLineModule } from '@angular/material/core';
import { FormsModule } from '@angular/forms';
import { PipeModule } from '../pipes/pipe.module';
+import { CommentListModule } from './comment-list/comment-list.module';
-import { CommentListComponent } from './comment-list.component';
import { CommentsComponent } from './comments.component';
@NgModule({
@@ -39,14 +39,13 @@ import { CommentsComponent } from './comments.component';
MatFormFieldModule,
MatInputModule,
MatListModule,
- MatLineModule
+ MatLineModule,
+ CommentListModule
],
declarations: [
- CommentListComponent,
CommentsComponent
],
exports: [
- CommentListComponent,
CommentsComponent
]
})
diff --git a/lib/core/src/lib/comments/interfaces/comments-service.interface.ts b/lib/core/src/lib/comments/interfaces/comments-service.interface.ts
index 617208f5fa..61748f491f 100644
--- a/lib/core/src/lib/comments/interfaces/comments-service.interface.ts
+++ b/lib/core/src/lib/comments/interfaces/comments-service.interface.ts
@@ -21,4 +21,5 @@ import { CommentModel } from '../../models/comment.model';
export interface CommentsService {
get(id: string): Observable<CommentModel[]>;
add(id: string, message: string): Observable<CommentModel>;
+ getUserImage(user: any): string;
}
diff --git a/lib/core/src/lib/comments/mocks/comments.service.mock.ts b/lib/core/src/lib/comments/mocks/comments.service.mock.ts
index 5704f48412..01a5332277 100644
--- a/lib/core/src/lib/comments/mocks/comments.service.mock.ts
+++ b/lib/core/src/lib/comments/mocks/comments.service.mock.ts
@@ -19,7 +19,7 @@ import { CommentModel, EcmUserModel } from '../../models';
import { Observable, of } from 'rxjs';
import { CommentsService } from '../interfaces';
-export class CommentsServiceMock implements CommentsService {
+export class CommentsServiceMock implements Partial<CommentsService> {
constructor() {}
diff --git a/lib/core/src/lib/comments/mocks/comments.service.stories.mock.ts b/lib/core/src/lib/comments/mocks/comments.service.stories.mock.ts
index 26aa8d1878..3f636c21f8 100644
--- a/lib/core/src/lib/comments/mocks/comments.service.stories.mock.ts
+++ b/lib/core/src/lib/comments/mocks/comments.service.stories.mock.ts
@@ -20,7 +20,7 @@ import { Observable, of } from 'rxjs';
import { CommentsService } from '../interfaces';
import { testUser } from './comments.stories.mock';
-export class CommentsServiceStoriesMock implements CommentsService {
+export class CommentsServiceStoriesMock implements Partial<CommentsService> {
constructor() {}
diff --git a/lib/core/src/lib/comments/public-api.ts b/lib/core/src/lib/comments/public-api.ts
index f29a0b67e0..1ba62352fc 100644
--- a/lib/core/src/lib/comments/public-api.ts
+++ b/lib/core/src/lib/comments/public-api.ts
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-export * from './comment-list.component';
export * from './comments.component';
export * from './interfaces/index';
export * from './comments.module';
+
+export * from './comment-list/index';
diff --git a/lib/core/src/lib/core.module.ts b/lib/core/src/lib/core.module.ts
index 3055301188..18110b430b 100644
--- a/lib/core/src/lib/core.module.ts
+++ b/lib/core/src/lib/core.module.ts
@@ -36,6 +36,7 @@ import { ViewerModule } from './viewer/viewer.module';
import { FormBaseModule } from './form/form-base.module';
import { SidenavLayoutModule } from './layout/layout.module';
import { CommentsModule } from './comments/comments.module';
+import { CommentListModule } from './comments/comment-list/comment-list.module';
import { ButtonsMenuModule } from './buttons-menu/buttons-menu.module';
import { TemplateModule } from './templates/template.module';
import { ClipboardModule } from './clipboard/clipboard.module';
@@ -85,6 +86,7 @@ import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar';
CardViewModule,
FormBaseModule,
CommentsModule,
+ CommentListModule,
LoginModule,
LanguageMenuModule,
InfoDrawerModule,
@@ -124,6 +126,7 @@ import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar';
CardViewModule,
FormBaseModule,
CommentsModule,
+ CommentListModule,
LoginModule,
LanguageMenuModule,
InfoDrawerModule,
diff --git a/lib/process-services/src/lib/process-comments/mock/comment-process-service.mock.ts b/lib/process-services/src/lib/process-comments/mock/comment-process-service.mock.ts
index 4464ee86b8..ae0590c801 100644
--- a/lib/process-services/src/lib/process-comments/mock/comment-process-service.mock.ts
+++ b/lib/process-services/src/lib/process-comments/mock/comment-process-service.mock.ts
@@ -18,32 +18,14 @@
import { Injectable } from '@angular/core';
import { Observable, from, of } from 'rxjs';
import { map } from 'rxjs/operators';
-import { CommentModel, UserProcessModel } from '@alfresco/adf-core';
-import { CommentProcessServiceInterface } from '../interfaces/comment-process.service.interface';
-import { testUser, fakeUser1 } from '../mock/comment-process.mock';
+import { CommentModel, UserProcessModel, CommentsService } from '@alfresco/adf-core';
+import { fakeUser1 } from '../mock/comment-process.mock';
@Injectable()
-export class CommentProcessServiceMock implements CommentProcessServiceInterface {
+export class CommentProcessServiceMock implements Partial<CommentsService> {
private comments: CommentModel [] = [];
- addTaskComment(taskId: string, message: string): Observable<CommentModel> {
- const comment = new CommentModel({
- id: taskId,
- message: message,
- created: new Date(),
- createdBy: testUser,
- isSelected: false
- });
- this.comments.push(comment);
-
- return of(comment);
- }
-
- getTaskComments(_taskId: string): Observable<CommentModel[]> {
- return of(this.comments);
- }
-
- getProcessInstanceComments(_processInstanceId: string): Observable<CommentModel[]> {
+ get(_id: string): Observable<CommentModel[]> {
const user = new UserProcessModel(fakeUser1);
this.comments.push(new CommentModel({
@@ -56,7 +38,7 @@ export class CommentProcessServiceMock implements CommentProcessServiceInterface
return of(this.comments);
}
- addProcessInstanceComment(_processInstanceId: string, _message: string): Observable<CommentModel> {
+ add(_id: string, _message: string): Observable<CommentModel> {
return from(this.comments).pipe(
map((response) => new CommentModel({
id: response.id,
diff --git a/lib/process-services/src/lib/process-comments/process-comments.component.spec.ts b/lib/process-services/src/lib/process-comments/process-comments.component.spec.ts
index a2c43408ab..2de5f07f98 100644
--- a/lib/process-services/src/lib/process-comments/process-comments.component.spec.ts
+++ b/lib/process-services/src/lib/process-comments/process-comments.component.spec.ts
@@ -47,7 +47,7 @@ describe('ProcessCommentsComponent', () => {
component = fixture.componentInstance;
commentProcessService = TestBed.inject(CommentProcessService);
- getCommentsSpy = spyOn(commentProcessService, 'getProcessInstanceComments').and.returnValue(of(mockProcessInstanceComments));
+ getCommentsSpy = spyOn(commentProcessService, 'get').and.returnValue(of(mockProcessInstanceComments));
});
it('should load comments when processInstanceId specified', () => {
diff --git a/lib/process-services/src/lib/process-comments/process-comments.component.ts b/lib/process-services/src/lib/process-comments/process-comments.component.ts
index 2a25b79f55..6e300c94f7 100644
--- a/lib/process-services/src/lib/process-comments/process-comments.component.ts
+++ b/lib/process-services/src/lib/process-comments/process-comments.component.ts
@@ -76,7 +76,7 @@ export class ProcessCommentsComponent implements OnChanges, OnDestroy {
add(): void {
if (this.message && this.message.trim() && !this.beingAdded) {
this.beingAdded = true;
- this.commentProcessService.addProcessInstanceComment(this.processInstanceId, this.message)
+ this.commentProcessService.add(this.processInstanceId, this.message)
.subscribe(
(res: CommentModel) => {
this.comments.unshift(res);
@@ -107,7 +107,7 @@ export class ProcessCommentsComponent implements OnChanges, OnDestroy {
private getProcessInstanceComments(processInstanceId: string): void {
this.resetComments();
if (processInstanceId) {
- this.commentProcessService.getProcessInstanceComments(processInstanceId).subscribe(
+ this.commentProcessService.get(processInstanceId).subscribe(
(res: CommentModel[]) => {
res = res.sort((comment1: CommentModel, comment2: CommentModel) => {
const date1 = new Date(comment1.created);
diff --git a/lib/process-services/src/lib/process-comments/process-comments.module.ts b/lib/process-services/src/lib/process-comments/process-comments.module.ts
index 7d2f9bc2dd..bdfed73c02 100644
--- a/lib/process-services/src/lib/process-comments/process-comments.module.ts
+++ b/lib/process-services/src/lib/process-comments/process-comments.module.ts
@@ -19,9 +19,10 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MaterialModule } from '../material.module';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { CoreModule } from '@alfresco/adf-core';
+import { ADF_COMMENTS_SERVICE, CoreModule } from '@alfresco/adf-core';
import { ProcessCommentsComponent } from './process-comments.component';
+import { CommentProcessService } from './services/comment-process.service';
@NgModule({
imports: [
@@ -36,6 +37,12 @@ import { ProcessCommentsComponent } from './process-comments.component';
],
exports: [
ProcessCommentsComponent
+ ],
+ providers: [
+ {
+ provide: ADF_COMMENTS_SERVICE,
+ useClass: CommentProcessService
+ }
]
})
export class ProcessCommentsModule {
diff --git a/lib/process-services/src/lib/process-comments/services/comment-process.service.ts b/lib/process-services/src/lib/process-comments/services/comment-process.service.ts
index 02cc90b4db..e3c207f199 100644
--- a/lib/process-services/src/lib/process-comments/services/comment-process.service.ts
+++ b/lib/process-services/src/lib/process-comments/services/comment-process.service.ts
@@ -17,15 +17,14 @@
import { Injectable } from '@angular/core';
import { Observable, from, throwError } from 'rxjs';
-import { CommentModel, UserProcessModel, AlfrescoApiService, LogService } from '@alfresco/adf-core';
+import { CommentModel, UserProcessModel, AlfrescoApiService, LogService, CommentsService, PeopleProcessService } from '@alfresco/adf-core';
import { map, catchError } from 'rxjs/operators';
import { ActivitiCommentsApi } from '@alfresco/js-api';
-import { CommentProcessServiceInterface } from '../interfaces/comment-process.service.interface';
@Injectable({
providedIn: 'root'
})
-export class CommentProcessService implements CommentProcessServiceInterface {
+export class CommentProcessService implements CommentsService {
private _commentsApi: ActivitiCommentsApi;
get commentsApi(): ActivitiCommentsApi {
@@ -34,53 +33,9 @@ export class CommentProcessService implements CommentProcessServiceInterface {
}
constructor(private apiService: AlfrescoApiService,
- private logService: LogService) {
- }
-
- /**
- * Adds a comment to a task.
- *
- * @param taskId ID of the target task
- * @param message Text for the comment
- * @returns Details about the comment
- */
- addTaskComment(taskId: string, message: string): Observable<CommentModel> {
- return from(this.commentsApi.addTaskComment({ message }, taskId))
- .pipe(
- map((response) => new CommentModel({
- id: response.id,
- message: response.message,
- created: response.created,
- createdBy: response.createdBy
- })),
- catchError((err: any) => this.handleError(err))
- );
- }
-
- /**
- * Gets all comments that have been added to a task.
- *
- * @param taskId ID of the target task
- * @returns Details for each comment
- */
- getTaskComments(taskId: string): Observable<CommentModel[]> {
- return from(this.commentsApi.getTaskComments(taskId))
- .pipe(
- map((response) => {
- const comments: CommentModel[] = [];
- response.data.forEach((comment) => {
- const user = new UserProcessModel(comment.createdBy);
- comments.push(new CommentModel({
- id: comment.id,
- message: comment.message,
- created: comment.created,
- createdBy: user
- }));
- });
- return comments;
- }),
- catchError((err: any) => this.handleError(err))
- );
+ private logService: LogService,
+ private peopleProcessService: PeopleProcessService
+ ) {
}
/**
@@ -89,8 +44,8 @@ export class CommentProcessService implements CommentProcessServiceInterface {
* @param processInstanceId ID of the target process instance
* @returns Details for each comment
*/
- getProcessInstanceComments(processInstanceId: string): Observable<CommentModel[]> {
- return from(this.commentsApi.getProcessInstanceComments(processInstanceId))
+ get(id: string): Observable<CommentModel[]> {
+ return from(this.commentsApi.getProcessInstanceComments(id))
.pipe(
map((response) => {
const comments: CommentModel[] = [];
@@ -116,9 +71,9 @@ export class CommentProcessService implements CommentProcessServiceInterface {
* @param message Text for the comment
* @returns Details of the comment added
*/
- addProcessInstanceComment(processInstanceId: string, message: string): Observable<CommentModel> {
+ add(id: string, message: string): Observable<CommentModel> {
return from(
- this.commentsApi.addProcessInstanceComment({ message }, processInstanceId)
+ this.commentsApi.addProcessInstanceComment({ message }, id)
).pipe(
map((response) => new CommentModel({
id: response.id,
@@ -135,4 +90,7 @@ export class CommentProcessService implements CommentProcessServiceInterface {
return throwError(error || 'Server error');
}
+ getUserImage(user: any): string {
+ return this.peopleProcessService.getUserImage(user);
+ }
}
diff --git a/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts
index 53437b5e91..4d9ff6fcaa 100644
--- a/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts
+++ b/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts
@@ -57,7 +57,7 @@ describe('ProcessInstanceDetailsComponent', () => {
const commentService = fixture.debugElement.injector.get(CommentProcessService);
getProcessSpy = spyOn(service, 'getProcess').and.returnValue(of(exampleProcess));
- spyOn(commentService, 'getProcessInstanceComments').and.returnValue(of(mockProcessInstanceComments));
+ spyOn(commentService, 'get').and.returnValue(of(mockProcessInstanceComments));
});
afterEach(() => {
diff --git a/lib/process-services/src/lib/task-comments/services/task-comments.service.ts b/lib/process-services/src/lib/task-comments/services/task-comments.service.ts
index aa1687e7ce..528246696f 100644
--- a/lib/process-services/src/lib/task-comments/services/task-comments.service.ts
+++ b/lib/process-services/src/lib/task-comments/services/task-comments.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { AlfrescoApiService, CommentModel, CommentsService, UserProcessModel } from '@alfresco/adf-core';
+import { AlfrescoApiService, CommentModel, CommentsService, PeopleProcessService, UserProcessModel } from '@alfresco/adf-core';
import { ActivitiCommentsApi, CommentRepresentation } from '@alfresco/js-api';
import { Injectable } from '@angular/core';
import { from, Observable, throwError } from 'rxjs';
@@ -33,7 +33,8 @@ export class TaskCommentsService implements CommentsService {
}
constructor(
- private apiService: AlfrescoApiService
+ private apiService: AlfrescoApiService,
+ private peopleProcessService: PeopleProcessService
) {}
/**
@@ -104,4 +105,8 @@ export class TaskCommentsService implements CommentsService {
private handleError(error: any) {
return throwError(error || 'Server error');
}
+
+ getUserImage(user: UserProcessModel): string {
+ return this.peopleProcessService.getUserImage(user);
+ }
}
diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts
index 721e2c5770..f48ceb8070 100644
--- a/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts
+++ b/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts
@@ -30,7 +30,6 @@ import {
PeopleProcessService,
CommentModel
} from '@alfresco/adf-core';
-import { CommentProcessService } from '../../process-comments/services/comment-process.service';
import { TaskDetailsModel } from '../models/task-details.model';
import {
noDataMock,
@@ -45,6 +44,7 @@ import { ProcessTestingModule } from '../../testing/process.testing.module';
import { TranslateModule } from '@ngx-translate/core';
import { TaskService } from '../../form/services/task.service';
import { TaskFormService } from '../../form/services/task-form.service';
+import { TaskCommentsService } from '../../task-comments/services/task-comments.service';
const fakeUser = new UserProcessModel({
id: 'fake-id',
@@ -71,7 +71,7 @@ describe('TaskDetailsComponent', () => {
let getTasksSpy: jasmine.Spy;
let assignTaskSpy: jasmine.Spy;
let logService: LogService;
- let commentProcessService: CommentProcessService;
+ let taskCommentsService: TaskCommentsService;
let peopleProcessService: PeopleProcessService;
let bpmUserService: BpmUserService;
@@ -102,9 +102,9 @@ describe('TaskDetailsComponent', () => {
getTasksSpy = spyOn(taskListService, 'getTasks').and.returnValue(of(tasksMock));
assignTaskSpy = spyOn(taskListService, 'assignTask').and.returnValue(of(fakeTaskAssignResponse));
- commentProcessService = TestBed.inject(CommentProcessService);
+ taskCommentsService = TestBed.inject(TaskCommentsService);
- spyOn(commentProcessService, 'getTaskComments').and.returnValue(of([
+ spyOn(taskCommentsService, 'get').and.returnValue(of([
new CommentModel({ message: 'Test1', created: Date.now(), createdBy: { firstName: 'Admin', lastName: 'User' } }),
new CommentModel({ message: 'Test2', created: Date.now(), createdBy: { firstName: 'Admin', lastName: 'User' } }),
new CommentModel({ message: 'Test3', created: Date.now(), createdBy: { firstName: 'Admin', lastName: 'User' } })