user info component to standalone

Alfresco · May 16, 2024 · 412bd48 · 412bd48
1 parent 8015a60
commit 412bd48
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 72 deletions.
diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts b/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts
@@ -18,7 +18,6 @@
 import { CoreTestingModule, UserInfoMode } from '@alfresco/adf-core';
 import { fakeEcmUser, fakeEcmUserNoImage } from '@alfresco/adf-content-services';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatMenuModule } from '@angular/material/menu';
 import { By } from '@angular/platform-browser';
 import { ProcessUserInfoComponent } from './process-user-info.component';
 import { HarnessLoader } from '@angular/cdk/testing';
@@ -70,7 +69,7 @@ describe('ProcessUserInfoComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [CoreTestingModule, MatMenuModule]
+            imports: [CoreTestingModule, ProcessUserInfoComponent]
         });
         fixture = TestBed.createComponent(ProcessUserInfoComponent);
         component = fixture.componentInstance;

diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.ts b/lib/process-services/src/lib/process-user-info/process-user-info.component.ts
@@ -15,16 +15,23 @@
  * limitations under the License.
  */
 
-import { UserInfoMode } from '@alfresco/adf-core';
+import { FullNamePipe, InitialUsernamePipe, UserInfoMode } from '@alfresco/adf-core';
 import { EcmUserModel, PeopleContentService } from '@alfresco/adf-content-services';
 import { Component, Input, OnDestroy, ViewChild, ViewEncapsulation } from '@angular/core';
-import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu';
+import { MatMenuModule, MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu';
 import { Subject } from 'rxjs';
 import { PeopleProcessService } from '../common/services/people-process.service';
 import { UserRepresentation } from '@alfresco/js-api';
+import { CommonModule } from '@angular/common';
+import { MatButtonModule } from '@angular/material/button';
+import { MatTabsModule } from '@angular/material/tabs';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatCardModule } from '@angular/material/card';
 
 @Component({
     selector: 'adf-process-user-info',
+    standalone: true,
+    imports: [CommonModule, FullNamePipe, MatButtonModule, MatMenuModule, InitialUsernamePipe, MatTabsModule, TranslateModule, MatCardModule],
     templateUrl: './process-user-info.component.html',
     styleUrls: ['./process-user-info.component.scss'],
     encapsulation: ViewEncapsulation.None

diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.module.ts b/lib/process-services/src/lib/process-user-info/process-user-info.module.ts
@@ -16,28 +16,10 @@
  */
 
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
 import { ProcessUserInfoComponent } from './process-user-info.component';
-import { MatButtonModule } from '@angular/material/button';
-import { MatCardModule } from '@angular/material/card';
-import { MatMenuModule } from '@angular/material/menu';
-import { MatTabsModule } from '@angular/material/tabs';
-import { TranslateModule } from '@ngx-translate/core';
-import { FullNamePipe, InitialUsernamePipe, PipeModule } from '@alfresco/adf-core';
 
 @NgModule({
-    declarations: [ProcessUserInfoComponent],
-    imports: [
-        CommonModule,
-        MatButtonModule,
-        MatMenuModule,
-        MatTabsModule,
-        MatCardModule,
-        TranslateModule,
-        PipeModule,
-        FullNamePipe,
-        InitialUsernamePipe
-    ],
+    imports: [ProcessUserInfoComponent],
     exports: [ProcessUserInfoComponent]
 })
 export class ProcessUserInfoModule {}
diff --git a/lib/process-services/src/lib/task-comments/mocks/task-comments.mock.ts b/lib/process-services/src/lib/task-comments/mocks/task-comments.mock.ts
diff --git a/lib/process-services/src/lib/task-comments/services/task-comments.service.spec.ts b/lib/process-services/src/lib/task-comments/services/task-comments.service.spec.ts
@@ -17,11 +17,32 @@
 
 import { TestBed } from '@angular/core/testing';
 import { CoreTestingModule } from '@alfresco/adf-core';
-import { fakeTasksComment, fakeUser1 } from '../mocks/task-comments.mock';
 import { TaskCommentsService } from './task-comments.service';
 
 declare let jasmine: any;
 
+export const fakeUser1 = { id: 1, email: 'fake-email@dom.com', firstName: 'firstName', lastName: 'lastName' };
+
+export const fakeTasksComment = {
+    size: 2,
+    total: 2,
+    start: 0,
+    data: [
+        {
+            id: 1,
+            message: 'fake-message-1',
+            created: '',
+            createdBy: fakeUser1
+        },
+        {
+            id: 2,
+            message: 'fake-message-2',
+            created: '',
+            createdBy: fakeUser1
+        }
+    ]
+};
+
 describe('TaskCommentsService', () => {
     let service: TaskCommentsService;
 

diff --git a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts
@@ -21,7 +21,7 @@ import { TaskDetailsModel } from '../../models/task-details.model';
 import { TaskListService } from '../../services/tasklist.service';
 import { UserRepresentation } from '@alfresco/js-api';
 import { Observable } from 'rxjs';
-import { PeopleProcessService } from '../../../common/services/people-process.service';
+import { PeopleProcessService } from '../../../common';
 
 @Component({
     selector: 'adf-task-form',
@@ -122,7 +122,6 @@ export class TaskFormComponent implements OnInit, OnChanges {
     taskDetails: TaskDetailsModel;
     currentLoggedUser: UserRepresentation;
     loading: boolean = false;
-    completedTaskMessage: string;
     internalReadOnlyForm: boolean = false;
 
     constructor(
@@ -218,10 +217,6 @@ export class TaskFormComponent implements OnInit, OnChanges {
         return !this.taskDetails?.processDefinitionId;
     }
 
-    isTaskLoaded(): boolean {
-        return !!this.taskDetails;
-    }
-
     isCompletedTask(): boolean {
         return !!this.taskDetails?.endDate;
     }
@@ -314,10 +309,6 @@ export class TaskFormComponent implements OnInit, OnChanges {
         return this.isCandidateMember() && this.isAssignedToMe() && !this.isCompletedTask();
     }
 
-    reloadTask() {
-        this.loadTask(this.taskId);
-    }
-
     onClaimTask(taskId: string) {
         this.taskClaimed.emit(taskId);
     }