diff --git a/demo-shell/src/app/components/process-service/process-attachments.component.ts b/demo-shell/src/app/components/process-service/process-attachments.component.ts index ce7e890709..135da94e85 100644 --- a/demo-shell/src/app/components/process-service/process-attachments.component.ts +++ b/demo-shell/src/app/components/process-service/process-attachments.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, Input, OnChanges, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; +import { Component, inject, Input, OnChanges, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { ProcessAttachmentListComponent, ProcessService, ProcessUploadService } from '@alfresco/adf-process-services'; import { UploadService } from '@alfresco/adf-content-services'; import { PreviewService } from '../../services/preview.service'; @@ -27,12 +27,7 @@ import { ProcessInstanceRepresentation } from '@alfresco/js-api'; selector: 'app-process-attachments', templateUrl: './process-attachments.component.html', styleUrls: ['./process-attachments.component.css'], - providers: [ - { - provide: UploadService, - useClass: ProcessUploadService - } - ], + providers: [{ provide: UploadService, useClass: ProcessUploadService }], encapsulation: ViewEncapsulation.None }) export class ProcessAttachmentsComponent implements OnInit, OnChanges, OnDestroy { @@ -44,9 +39,11 @@ export class ProcessAttachmentsComponent implements OnInit, OnChanges, OnDestroy processInstance: ProcessInstanceRepresentation; - private onDestroy$ = new Subject(); + private uploadService = inject(UploadService); + private processService = inject(ProcessService); + private preview = inject(PreviewService); - constructor(private uploadService: UploadService, private processService: ProcessService, private preview: PreviewService) {} + private onDestroy$ = new Subject(); ngOnInit() { this.uploadService.fileUploadComplete.pipe(takeUntil(this.onDestroy$)).subscribe((value) => this.onFileUploadComplete(value.data)); diff --git a/demo-shell/src/app/components/process-service/task-attachments.component.ts b/demo-shell/src/app/components/process-service/task-attachments.component.ts index 9152c5d415..22a58f96b4 100644 --- a/demo-shell/src/app/components/process-service/task-attachments.component.ts +++ b/demo-shell/src/app/components/process-service/task-attachments.component.ts @@ -15,39 +15,20 @@ * limitations under the License. */ -import { Component, Input, OnChanges, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; +import { Component, inject, Input, OnChanges, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { TaskAttachmentListComponent, TaskListService, TaskUploadService } from '@alfresco/adf-process-services'; -import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core'; -import { DiscoveryApiService, UploadService } from '@alfresco/adf-content-services'; +import { UploadService } from '@alfresco/adf-content-services'; import { PreviewService } from '../../services/preview.service'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { TaskRepresentation } from '@alfresco/js-api'; -/** - * Provide a task upload service factory - * - * @param api api client - * @param config config service - * @param discoveryApiService discovery service - * @returns factory function - */ -export function taskUploadServiceFactory(api: AlfrescoApiService, config: AppConfigService, discoveryApiService: DiscoveryApiService) { - return new TaskUploadService(api, config, discoveryApiService); -} - @Component({ selector: 'app-task-attachments', templateUrl: './task-attachments.component.html', styleUrls: ['./task-attachments.component.css'], encapsulation: ViewEncapsulation.None, - providers: [ - { - provide: UploadService, - useFactory: taskUploadServiceFactory, - deps: [AlfrescoApiService, AppConfigService, DiscoveryApiService] - } - ] + providers: [{ provide: UploadService, useClass: TaskUploadService }] }) export class TaskAttachmentsComponent implements OnInit, OnChanges, OnDestroy { @ViewChild('taskAttachList') @@ -58,9 +39,11 @@ export class TaskAttachmentsComponent implements OnInit, OnChanges, OnDestroy { taskDetails: TaskRepresentation; - private onDestroy$ = new Subject(); + private uploadService = inject(UploadService); + private taskListService = inject(TaskListService); + private previewService = inject(PreviewService); - constructor(private uploadService: UploadService, private taskListService: TaskListService, private previewService: PreviewService) {} + private onDestroy$ = new Subject(); ngOnInit() { this.uploadService.fileUploadComplete.pipe(takeUntil(this.onDestroy$)).subscribe((event) => this.onFileUploadComplete(event.data)); diff --git a/docs/README.md b/docs/README.md index cd50ab7ef3..5c5650b979 100644 --- a/docs/README.md +++ b/docs/README.md @@ -229,7 +229,7 @@ The model to update the DataTable require the ID of the row you want change and | [Notification Service](core/services/notification.service.md) | Shows a notification message with optional feedback. | [Source](../lib/core/src/lib/notifications/services/notification.service.ts) | | [Page Title service](core/services/page-title.service.md) | Sets the page title. | [Source](../lib/core/src/lib/common/services/page-title.service.ts) | | [People Content service](core/services/people-content.service.md) | Gets information about a Content Services user. | [Source](../lib/content-services/src/lib/common/services/people-content.service.ts) | -| [People Process service](core/services/people-process.service.md) | Gets information about Process Services users. | [Source](../lib/process-services/src/lib/common/services/people-process.service.ts) | +| [People Process service](core/services/people-process.service.md) | Gets information about Process Services users. | [Source](../lib/process-services/src/lib/services/people-process.service.ts) | | [Process Content Service](core/services/process-content.service.md) | Manipulates content related to a Process Instance or Task Instance in APS. | [Source](../lib/process-services/src/lib/form/services/process-content.service.ts) | | [Renditions service](core/services/renditions.service.md) | Manages prearranged conversions of content to different formats. | [Source](../lib/core/src/lib/services/renditions.service.ts) | | [Search Configuration service](core/services/search-configuration.service.md) | Provides fine control of parameters to a search. | [Source](../lib/content-services/src/lib/search/services/search-configuration.service.ts) | @@ -394,7 +394,7 @@ for more information about installing and using the source code. | [Security Controls service](content-services/services/security-controls.service.md) | Manages security groups & marks in Content Services. | [Source](../lib/content-services/src/lib/security/services/security-controls-groups-marks-security.service.ts) | | [Sites service](content-services/services/sites.service.md) | Accesses and manipulates sites from a Content Services repository. | [Source](../lib/content-services/src/lib/common/services/sites.service.ts) | | [Tag service](content-services/services/tag.service.md) | Manages tags in Content Services. | [Source](../lib/content-services/src/lib/tag/services/tag.service.ts) | -| [Task Comments service](content-services/services/task-comments.service.md) | Adds and retrieves comments for task and process instances in Process Services. | [Source](../lib/process-services/src/lib/task-comments/task-comments.service.ts) | +| [Task Comments service](content-services/services/task-comments.service.md) | Adds and retrieves comments for task and process instances in Process Services. | [Source](../lib/process-services/src/lib/services/task-comments.service.ts) | diff --git a/lib/content-services/src/lib/common/services/upload.service.ts b/lib/content-services/src/lib/common/services/upload.service.ts index 490deaa279..e31729568f 100644 --- a/lib/content-services/src/lib/common/services/upload.service.ts +++ b/lib/content-services/src/lib/common/services/upload.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { EventEmitter, Injectable } from '@angular/core'; +import { EventEmitter, inject, Injectable } from '@angular/core'; import { Minimatch } from 'minimatch'; import { Subject } from 'rxjs'; import { FileUploadCompleteEvent, FileUploadDeleteEvent, FileUploadErrorEvent, FileUploadEvent } from '../events/file.event'; @@ -73,11 +73,11 @@ export class UploadService { return this._versionsApi; } - constructor( - protected apiService: AlfrescoApiService, - private appConfigService: AppConfigService, - private discoveryApiService: DiscoveryApiService - ) { + protected apiService = inject(AlfrescoApiService); + protected appConfigService = inject(AppConfigService); + protected discoveryApiService = inject(DiscoveryApiService); + + constructor() { this.discoveryApiService.ecmProductInfo$.pipe(filter((info) => !!info)).subscribe(({ status }) => { this.isThumbnailGenerationEnabled = status.isThumbnailGenerationEnabled; }); diff --git a/lib/process-services/src/lib/app-list/apps-list.component.spec.ts b/lib/process-services/src/lib/app-list/apps-list.component.spec.ts index c39be2875b..c520a31ce2 100644 --- a/lib/process-services/src/lib/app-list/apps-list.component.spec.ts +++ b/lib/process-services/src/lib/app-list/apps-list.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { AppsProcessService } from '../services/apps-process.service'; import { of, throwError } from 'rxjs'; -import { defaultApp, deployedApps, nonDeployedApps } from '../mock/apps-list.mock'; +import { defaultApp, deployedApps, nonDeployedApps } from '../testing/mock/apps-list.mock'; import { AppsListComponent, APP_LIST_LAYOUT_GRID, APP_LIST_LAYOUT_LIST } from './apps-list.component'; import { ProcessTestingModule } from '../testing/process.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; diff --git a/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.spec.ts b/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.spec.ts index f8d2d0a57f..9c900e4110 100644 --- a/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.spec.ts +++ b/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.spec.ts @@ -20,7 +20,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { OverlayContainer } from '@angular/cdk/overlay'; import { AppsProcessService } from '../../services/apps-process.service'; -import { deployedApps } from '../../mock/apps-list.mock'; +import { deployedApps } from '../../testing/mock/apps-list.mock'; import { of } from 'rxjs'; import { SelectAppsDialogComponent } from './select-apps-dialog.component'; import { ProcessTestingModule } from '../../testing/process.testing.module'; diff --git a/lib/process-services/src/lib/attachment/process-attachment-list/process-attachment-list.component.spec.ts b/lib/process-services/src/lib/attachment/process-attachment-list/process-attachment-list.component.spec.ts index 1374109980..f526168665 100644 --- a/lib/process-services/src/lib/attachment/process-attachment-list/process-attachment-list.component.spec.ts +++ b/lib/process-services/src/lib/attachment/process-attachment-list/process-attachment-list.component.spec.ts @@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser'; import { of, throwError } from 'rxjs'; import { ProcessAttachmentListComponent } from './process-attachment-list.component'; import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { mockEmittedProcessAttachments, mockProcessAttachments } from '../../mock/process/process-attachments.mock'; +import { mockEmittedProcessAttachments, mockProcessAttachments } from '../../testing/mock/process/process-attachments.mock'; import { ProcessContentService } from '../../form/services/process-content.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; diff --git a/lib/process-services/src/lib/attachment/task-attachment-list/task-attachment-list.component.spec.ts b/lib/process-services/src/lib/attachment/task-attachment-list/task-attachment-list.component.spec.ts index 1d7cc9a8ae..1fff9fd891 100644 --- a/lib/process-services/src/lib/attachment/task-attachment-list/task-attachment-list.component.spec.ts +++ b/lib/process-services/src/lib/attachment/task-attachment-list/task-attachment-list.component.spec.ts @@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser'; import { of, throwError } from 'rxjs'; import { TaskAttachmentListComponent } from './task-attachment-list.component'; import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { mockEmittedTaskAttachments, mockTaskAttachments } from '../../mock/task/task-attachments.mock'; +import { mockEmittedTaskAttachments, mockTaskAttachments } from '../../testing/mock/task/task-attachments.mock'; import { ProcessContentService } from '../../form/services/process-content.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; diff --git a/lib/process-services/src/lib/common/public-api.ts b/lib/process-services/src/lib/common/public-api.ts deleted file mode 100644 index 555fa7eee3..0000000000 --- a/lib/process-services/src/lib/common/public-api.ts +++ /dev/null @@ -1,18 +0,0 @@ -/*! - * @license - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * 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 './services/people-process.service'; diff --git a/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.spec.ts b/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.spec.ts index 67cd9b844a..94608d865a 100644 --- a/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.spec.ts @@ -19,7 +19,7 @@ import { of, timer } from 'rxjs'; import { FormFieldModel, FormModel, GroupModel, CoreTestingModule, FormFieldTypes } from '@alfresco/adf-core'; import { FunctionalGroupWidgetComponent } from './functional-group.widget'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; describe('FunctionalGroupWidgetComponent', () => { let fixture: ComponentFixture; diff --git a/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.ts b/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.ts index 8d2f006b27..51639e7f6d 100644 --- a/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.ts +++ b/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.ts @@ -22,7 +22,7 @@ import { ErrorWidgetComponent, FormService, GroupModel, WidgetComponent } from ' import { catchError, debounceTime, filter, switchMap, tap } from 'rxjs/operators'; import { merge, of } from 'rxjs'; import { ReactiveFormsModule, UntypedFormControl } from '@angular/forms'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { CommonModule } from '@angular/common'; import { MatFormFieldModule } from '@angular/material/form-field'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/process-services/src/lib/form/widgets/people/people.widget.spec.ts b/lib/process-services/src/lib/form/widgets/people/people.widget.spec.ts index e46adeed27..b9af51212d 100644 --- a/lib/process-services/src/lib/form/widgets/people/people.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/people/people.widget.spec.ts @@ -21,7 +21,7 @@ import { FormFieldTypes, FormFieldModel, FormModel, CoreTestingModule } from '@a import { Observable, of } from 'rxjs'; import { PeopleWidgetComponent } from './people.widget'; import { TranslateService } from '@ngx-translate/core'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { LightUserRepresentation } from '@alfresco/js-api'; describe('PeopleWidgetComponent', () => { diff --git a/lib/process-services/src/lib/form/widgets/people/people.widget.ts b/lib/process-services/src/lib/form/widgets/people/people.widget.ts index 5bc9802ed2..20fccd18ef 100644 --- a/lib/process-services/src/lib/form/widgets/people/people.widget.ts +++ b/lib/process-services/src/lib/form/widgets/people/people.widget.ts @@ -22,7 +22,7 @@ import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild, ViewEnc import { ReactiveFormsModule, UntypedFormControl } from '@angular/forms'; import { Observable, of } from 'rxjs'; import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { LightUserRepresentation } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/process-services/src/lib/mock/index.ts b/lib/process-services/src/lib/mock/index.ts deleted file mode 100644 index 54beb1a252..0000000000 --- a/lib/process-services/src/lib/mock/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -/*! - * @license - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * 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/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts index 19daf72cd9..9f0dae305c 100644 --- a/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts +++ b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts @@ -22,7 +22,7 @@ import { debounceTime, switchMap } from 'rxjs/operators'; import { Observable, of } from 'rxjs'; import { PerformSearchCallback } from '../../interfaces/perform-search-callback.interface'; import { getDisplayUser } from '../../helpers/get-display-user'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { LightUserRepresentation } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/lib/process-services/src/lib/people/components/people-selector/people-selector.component.spec.ts b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.spec.ts index 2703d02081..0d7fa4c700 100644 --- a/lib/process-services/src/lib/people/components/people-selector/people-selector.component.spec.ts +++ b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.spec.ts @@ -20,7 +20,7 @@ import { PeopleSelectorComponent } from './people-selector.component'; import { of } from 'rxjs'; import { By } from '@angular/platform-browser'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; describe('PeopleSelectorComponent', () => { let component: PeopleSelectorComponent; diff --git a/lib/process-services/src/lib/people/components/people-selector/people-selector.component.ts b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.ts index 39f3dbd602..76545909d9 100644 --- a/lib/process-services/src/lib/people/components/people-selector/people-selector.component.ts +++ b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.ts @@ -22,7 +22,7 @@ import { PeopleSearchFieldComponent } from '../people-search-field/people-search import { getDisplayUser } from '../../helpers/get-display-user'; import { Observable, of } from 'rxjs'; import { catchError } from 'rxjs/operators'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { LightUserRepresentation } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; import { MatButtonModule } from '@angular/material/button'; diff --git a/lib/process-services/src/lib/people/components/people/people.component.ts b/lib/process-services/src/lib/people/components/people/people.component.ts index 7a9088c0bf..745375e8aa 100644 --- a/lib/process-services/src/lib/people/components/people/people.component.ts +++ b/lib/process-services/src/lib/people/components/people/people.component.ts @@ -20,7 +20,7 @@ import { Observable, Observer } from 'rxjs'; import { UserEventModel } from '../../../task-list/models/user-event.model'; import { PeopleSearchComponent } from '../people-search/people-search.component'; import { share } from 'rxjs/operators'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { LightUserRepresentation } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; import { MatCardModule } from '@angular/material/card'; 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 b2a8c0ea24..b535f3000d 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 @@ -21,7 +21,7 @@ import { of, throwError } from 'rxjs'; import { CommentProcessService } from './services/comment-process.service'; import { ProcessCommentsComponent } from './process-comments.component'; import { ProcessTestingModule } from '../testing/process.testing.module'; -import { mockProcessInstanceComments } from '../mock/process/process-comments.mock'; +import { mockProcessInstanceComments } from '../testing/mock/process/process-comments.mock'; describe('ProcessCommentsComponent', () => { let component: ProcessCommentsComponent; 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 a5ca2d5bf7..6e91270041 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 @@ -20,7 +20,7 @@ import { Observable, from } from 'rxjs'; import { CommentModel, AlfrescoApiService, CommentsService, User } from '@alfresco/adf-core'; import { map } from 'rxjs/operators'; import { ActivitiCommentsApi } from '@alfresco/js-api'; -import { PeopleProcessService } from '../../common/services/people-process.service'; +import { PeopleProcessService } from '../../services/people-process.service'; @Injectable({ providedIn: 'root' diff --git a/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.spec.ts index 5564ea46b9..7a4957c148 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.spec.ts @@ -20,8 +20,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; import { CommentProcessService } from '../../../process-comments/services/comment-process.service'; -import { exampleProcess, exampleProcessNoName, mockRunningProcess, processEnded } from '../../../mock'; -import { mockProcessInstanceComments } from '../../../mock/process/process-comments.mock'; +import { exampleProcess, exampleProcessNoName, mockRunningProcess, processEnded } from '../../../testing/mock'; +import { mockProcessInstanceComments } from '../../../testing/mock/process/process-comments.mock'; import { ProcessService } from '../../services/process.service'; import { ProcessInstanceDetailsComponent } from './process-instance-details.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; diff --git a/lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.spec.ts index 29df4d3b0a..7cc58a4d82 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AppConfigService } from '@alfresco/adf-core'; -import { exampleProcess } from '../../../mock'; +import { exampleProcess } from '../../../testing/mock'; import { ProcessInstanceHeaderComponent } from './process-instance-header.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; diff --git a/lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.spec.ts index cc644ff6d7..175da8527f 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.spec.ts @@ -19,7 +19,7 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; -import { taskDetailsMock } from '../../../mock'; +import { taskDetailsMock } from '../../../testing/mock'; import { ProcessService } from '../../services/process.service'; import { ProcessInstanceTasksComponent } from './process-instance-tasks.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; diff --git a/lib/process-services/src/lib/process-list/components/process-list/process-list.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-list/process-list.component.spec.ts index fcd810cb01..7bef9342d1 100644 --- a/lib/process-services/src/lib/process-list/components/process-list/process-list.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-list/process-list.component.spec.ts @@ -30,7 +30,7 @@ import { DataCellEvent, ObjectDataColumn } from '@alfresco/adf-core'; -import { fakeProcessInstance, fakeProcessInstancesWithNoName, fakeProcessInstancesEmpty, fakeProcessColumnSchema } from '../../../mock'; +import { fakeProcessInstance, fakeProcessInstancesWithNoName, fakeProcessInstancesEmpty, fakeProcessColumnSchema } from '../../../testing/mock'; import { ProcessService } from '../../services/process.service'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; diff --git a/lib/process-services/src/lib/process-list/components/start-process/start-process.component.spec.ts b/lib/process-services/src/lib/process-list/components/start-process/start-process.component.spec.ts index b95ba8502a..c6f8d9e62f 100644 --- a/lib/process-services/src/lib/process-list/components/start-process/start-process.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/start-process/start-process.component.spec.ts @@ -22,10 +22,17 @@ import { AppsProcessService } from '../../../services/apps-process.service'; import { of, throwError } from 'rxjs'; import { MatSelectChange } from '@angular/material/select'; import { ProcessService } from '../../services/process.service'; -import { newProcess, taskFormMock, testProcessDef, testMultipleProcessDefs, testProcessDefWithForm, testProcessDefinitions } from '../../../mock'; +import { + newProcess, + taskFormMock, + testProcessDef, + testMultipleProcessDefs, + testProcessDefWithForm, + testProcessDefinitions +} from '../../../testing/mock'; import { StartProcessInstanceComponent } from './start-process.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; -import { deployedApps } from '../../../mock/apps-list.mock'; +import { deployedApps } from '../../../testing/mock/apps-list.mock'; import { ActivitiContentService } from '../../../form/services/activiti-alfresco.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { MatFormFieldHarness } from '@angular/material/form-field/testing'; diff --git a/lib/process-services/src/lib/process-list/services/process.service.spec.ts b/lib/process-services/src/lib/process-list/services/process.service.spec.ts index d062cb610c..968b8a9f9c 100644 --- a/lib/process-services/src/lib/process-list/services/process.service.spec.ts +++ b/lib/process-services/src/lib/process-list/services/process.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { exampleProcess } from '../../mock'; +import { exampleProcess } from '../../testing/mock'; import { ProcessService } from './process.service'; import { CoreModule, DateFnsUtils } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../testing/process.testing.module'; 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 index 43a07a909d..2d0c87f346 100644 --- 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 @@ -20,7 +20,7 @@ import { EcmUserModel, PeopleContentService } from '@alfresco/adf-content-servic import { Component, Input, OnDestroy, ViewChild, ViewEncapsulation } from '@angular/core'; import { MatMenuModule, MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu'; import { Subject } from 'rxjs'; -import { PeopleProcessService } from '../common/services/people-process.service'; +import { PeopleProcessService } from '../services/people-process.service'; import { UserRepresentation } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; import { MatButtonModule } from '@angular/material/button'; diff --git a/lib/process-services/src/lib/common/services/people-process.service.spec.ts b/lib/process-services/src/lib/services/people-process.service.spec.ts similarity index 100% rename from lib/process-services/src/lib/common/services/people-process.service.spec.ts rename to lib/process-services/src/lib/services/people-process.service.spec.ts diff --git a/lib/process-services/src/lib/common/services/people-process.service.ts b/lib/process-services/src/lib/services/people-process.service.ts similarity index 100% rename from lib/process-services/src/lib/common/services/people-process.service.ts rename to lib/process-services/src/lib/services/people-process.service.ts diff --git a/lib/process-services/src/lib/task-comments/task-comments.service.ts b/lib/process-services/src/lib/services/task-comments.service.ts similarity index 89% rename from lib/process-services/src/lib/task-comments/task-comments.service.ts rename to lib/process-services/src/lib/services/task-comments.service.ts index e663028cbf..39779b80e9 100644 --- a/lib/process-services/src/lib/task-comments/task-comments.service.ts +++ b/lib/process-services/src/lib/services/task-comments.service.ts @@ -17,10 +17,10 @@ import { AlfrescoApiService, CommentModel, CommentsService } from '@alfresco/adf-core'; import { ActivitiCommentsApi } from '@alfresco/js-api'; -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { from, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { PeopleProcessService } from '../common/services/people-process.service'; +import { PeopleProcessService } from './people-process.service'; @Injectable({ providedIn: 'root' @@ -32,7 +32,8 @@ export class TaskCommentsService implements CommentsService { return this._commentsApi; } - constructor(private apiService: AlfrescoApiService, private peopleProcessService: PeopleProcessService) {} + protected apiService = inject(AlfrescoApiService); + protected peopleProcessService = inject(PeopleProcessService); /** * Gets all comments that have been added to a task. diff --git a/lib/process-services/src/lib/task-comments/index.ts b/lib/process-services/src/lib/task-comments/index.ts index 45a9b63fb1..957d1fe428 100644 --- a/lib/process-services/src/lib/task-comments/index.ts +++ b/lib/process-services/src/lib/task-comments/index.ts @@ -18,6 +18,6 @@ import { TaskCommentsComponent } from './task-comments.component'; export * from './task-comments.component'; -export * from './task-comments.service'; +export * from '../services/task-comments.service'; export const TASK_COMMENTS_DIRECTIVES = [TaskCommentsComponent] as const; diff --git a/lib/process-services/src/lib/task-comments/task-comments.component.ts b/lib/process-services/src/lib/task-comments/task-comments.component.ts index 848df8e855..2dffeeb5f6 100644 --- a/lib/process-services/src/lib/task-comments/task-comments.component.ts +++ b/lib/process-services/src/lib/task-comments/task-comments.component.ts @@ -17,7 +17,7 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { ADF_COMMENTS_SERVICE, CommentsModule } from '@alfresco/adf-core'; -import { TaskCommentsService } from './task-comments.service'; +import { TaskCommentsService } from '../services/task-comments.service'; import { CommonModule } from '@angular/common'; @Component({ diff --git a/lib/process-services/src/lib/task-list/components/start-task/start-task.component.spec.ts b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.spec.ts index cf820d873d..c4319d22c3 100644 --- a/lib/process-services/src/lib/task-list/components/start-task/start-task.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.spec.ts @@ -20,7 +20,7 @@ import { of, throwError } from 'rxjs'; import { TaskListService } from '../../services/tasklist.service'; import { StartTaskComponent } from './start-task.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; -import { taskDetailsMock } from '../../../mock/task/task-details.mock'; +import { taskDetailsMock } from '../../../testing/mock/task/task-details.mock'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatButtonHarness } from '@angular/material/button/testing'; diff --git a/lib/process-services/src/lib/task-list/components/task-details/task-details.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.spec.ts index 02fc2821e1..85830cd773 100644 --- a/lib/process-services/src/lib/task-list/components/task-details/task-details.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.spec.ts @@ -20,14 +20,14 @@ import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of, throwError } from 'rxjs'; import { FormModel, FormOutcomeEvent, FormOutcomeModel, CommentModel, User } from '@alfresco/adf-core'; -import { noDataMock, taskDetailsMock, taskFormMock, tasksMock, taskDetailsWithOutAssigneeMock } from '../../../mock'; +import { noDataMock, taskDetailsMock, taskFormMock, tasksMock, taskDetailsWithOutAssigneeMock } from '../../../testing/mock'; import { TaskListService } from '../../services/tasklist.service'; import { TaskDetailsComponent } from './task-details.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { TaskService } from '../../../form/services/task.service'; import { TaskFormService } from '../../../form/services/task-form.service'; -import { TaskCommentsService } from '../../../task-comments/task-comments.service'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { TaskCommentsService } from '../../../services/task-comments.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { HarnessLoader } from '@angular/cdk/testing'; import { MatDialogHarness } from '@angular/material/dialog/testing'; diff --git a/lib/process-services/src/lib/task-list/components/task-details/task-details.component.ts b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.ts index dfe9877c2f..17d73bc382 100644 --- a/lib/process-services/src/lib/task-list/components/task-details/task-details.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.ts @@ -43,7 +43,7 @@ import { Observable, Observer, of, Subject } from 'rxjs'; import { TaskListService } from '../../services/tasklist.service'; import { catchError, share, takeUntil } from 'rxjs/operators'; import { TaskFormComponent } from '../task-form/task-form.component'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { LightUserRepresentation, TaskQueryRepresentation, TaskRepresentation } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts index b04f9b2997..717b409f14 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts @@ -40,12 +40,12 @@ import { taskDetailsWithOutCandidateGroup, taskDetailsWithOutFormMock, taskFormMock -} from '../../../mock/task/task-details.mock'; +} from '../../../testing/mock/task/task-details.mock'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { By } from '@angular/platform-browser'; import { TaskFormService } from '../../../form/services/task-form.service'; import { TaskService } from '../../../form/services/task.service'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { TaskRepresentation } from '@alfresco/js-api'; describe('TaskFormComponent', () => { 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 index ad70586105..000e241ff0 100644 --- 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 @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, OnInit, Input, Output, EventEmitter, SimpleChanges, ViewEncapsulation, OnChanges } from '@angular/core'; +import { Component, OnInit, Input, Output, EventEmitter, SimpleChanges, ViewEncapsulation, OnChanges, inject } from '@angular/core'; import { FormModel, ContentLinkModel, @@ -28,7 +28,7 @@ import { import { TaskListService } from '../../services/tasklist.service'; import { TaskRepresentation, UserRepresentation } from '@alfresco/js-api'; import { Observable } from 'rxjs'; -import { PeopleProcessService } from '../../../common'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { CommonModule } from '@angular/common'; import { MatCardModule } from '@angular/material/card'; import { MatButtonModule } from '@angular/material/button'; @@ -154,11 +154,9 @@ export class TaskFormComponent implements OnInit, OnChanges { loading: boolean = false; internalReadOnlyForm: boolean = false; - constructor( - private taskListService: TaskListService, - private peopleProcessService: PeopleProcessService, - private translationService: TranslationService - ) {} + private taskListService = inject(TaskListService); + private peopleProcessService = inject(PeopleProcessService); + private translationService = inject(TranslationService); ngOnInit() { this.peopleProcessService.getCurrentUserInfo().subscribe((user) => { diff --git a/lib/process-services/src/lib/task-list/components/task-header/task-header.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-header/task-header.component.spec.ts index a634babab5..89328f52fd 100644 --- a/lib/process-services/src/lib/task-list/components/task-header/task-header.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-header/task-header.component.spec.ts @@ -26,11 +26,11 @@ import { claimedTaskDetailsMock, claimedByGroupMemberMock, taskDetailsWithOutCandidateGroup -} from '../../../mock'; +} from '../../../testing/mock'; import { TaskListService } from '../../services/tasklist.service'; import { TaskHeaderComponent } from './task-header.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { TaskRepresentation } from '@alfresco/js-api'; describe('TaskHeaderComponent', () => { diff --git a/lib/process-services/src/lib/task-list/components/task-header/task-header.component.ts b/lib/process-services/src/lib/task-list/components/task-header/task-header.component.ts index cbbede0216..e7f83c9d6e 100644 --- a/lib/process-services/src/lib/task-list/components/task-header/task-header.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-header/task-header.component.ts @@ -27,7 +27,7 @@ import { CardViewItemLengthValidator, CardViewModule } from '@alfresco/adf-core'; -import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { PeopleProcessService } from '../../../services/people-process.service'; import { TaskDescriptionValidator } from '../../validators/task-description.validator'; import { TaskRepresentation } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; diff --git a/lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts index 3dce1f76a0..46e77e18ec 100644 --- a/lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts @@ -22,7 +22,7 @@ import { AppConfigService, DataRowEvent, ObjectDataRow, DataCellEvent, ObjectDat import { TaskListService } from '../../services/tasklist.service'; import { TaskListComponent } from './task-list.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; -import { fakeGlobalTask, fakeEmptyTask, paginatedTask, fakeColumnSchema, fakeCustomSchema } from '../../../mock'; +import { fakeGlobalTask, fakeEmptyTask, paginatedTask, fakeColumnSchema, fakeCustomSchema } from '../../../testing/mock'; import { TranslateService } from '@ngx-translate/core'; import { of, Subject } from 'rxjs'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; diff --git a/lib/process-services/src/lib/task-list/services/process-upload.service.ts b/lib/process-services/src/lib/task-list/services/process-upload.service.ts index a5ce4a8113..80ceee3e5d 100644 --- a/lib/process-services/src/lib/task-list/services/process-upload.service.ts +++ b/lib/process-services/src/lib/task-list/services/process-upload.service.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core'; -import { DiscoveryApiService, UploadService } from '@alfresco/adf-content-services'; +import { UploadService } from '@alfresco/adf-content-services'; import { ActivitiContentApi, RelatedContentRepresentation } from '@alfresco/js-api'; import { Injectable } from '@angular/core'; @@ -30,10 +29,6 @@ export class ProcessUploadService extends UploadService { return this._contentApi; } - constructor(protected apiService: AlfrescoApiService, appConfigService: AppConfigService, discoveryApiService: DiscoveryApiService) { - super(apiService, appConfigService, discoveryApiService); - } - getUploadPromise(file: any): Promise { const opts = { isRelatedContent: true diff --git a/lib/process-services/src/lib/task-list/services/task-filter.service.ts b/lib/process-services/src/lib/task-list/services/task-filter.service.ts index 7f1f0a4273..c7ac5f780a 100644 --- a/lib/process-services/src/lib/task-list/services/task-filter.service.ts +++ b/lib/process-services/src/lib/task-list/services/task-filter.service.ts @@ -25,7 +25,7 @@ import { UserFiltersApi, UserTaskFilterRepresentation } from '@alfresco/js-api'; providedIn: 'root' }) export class TaskFilterService { - private apiService = inject(AlfrescoApiService); + protected apiService = inject(AlfrescoApiService); private _userFiltersApi: UserFiltersApi; get userFiltersApi(): UserFiltersApi { diff --git a/lib/process-services/src/lib/task-list/services/task-upload.service.ts b/lib/process-services/src/lib/task-list/services/task-upload.service.ts index 738b86e593..d141b3b387 100644 --- a/lib/process-services/src/lib/task-list/services/task-upload.service.ts +++ b/lib/process-services/src/lib/task-list/services/task-upload.service.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core'; -import { DiscoveryApiService, UploadService } from '@alfresco/adf-content-services'; +import { UploadService } from '@alfresco/adf-content-services'; import { Injectable } from '@angular/core'; import { ActivitiContentApi, RelatedContentRepresentation } from '@alfresco/js-api'; @@ -30,10 +29,6 @@ export class TaskUploadService extends UploadService { return this._contentApi; } - constructor(protected apiService: AlfrescoApiService, appConfigService: AppConfigService, discoveryApiService: DiscoveryApiService) { - super(apiService, appConfigService, discoveryApiService); - } - getUploadPromise(file: any): Promise { const opts = { isRelatedContent: true diff --git a/lib/process-services/src/lib/task-list/services/tasklist.service.ts b/lib/process-services/src/lib/task-list/services/tasklist.service.ts index 61393838db..a0146f9d60 100644 --- a/lib/process-services/src/lib/task-list/services/tasklist.service.ts +++ b/lib/process-services/src/lib/task-list/services/tasklist.service.ts @@ -16,7 +16,7 @@ */ import { AlfrescoApiService } from '@alfresco/adf-core'; -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { Observable, from, of } from 'rxjs'; import { map, catchError, flatMap, filter } from 'rxjs/operators'; import { Form } from '../models/form.model'; @@ -36,6 +36,8 @@ import { providedIn: 'root' }) export class TaskListService { + protected apiService = inject(AlfrescoApiService); + private _modelsApi: ModelsApi; get modelsApi(): ModelsApi { this._modelsApi = this._modelsApi ?? new ModelsApi(this.apiService.getInstance()); @@ -60,8 +62,6 @@ export class TaskListService { return this._checklistsApi; } - constructor(private apiService: AlfrescoApiService) {} - /** * Gets all the filters in the list that belong to a task. * diff --git a/lib/process-services/src/lib/mock/apps-list.mock.ts b/lib/process-services/src/lib/testing/mock/apps-list.mock.ts similarity index 100% rename from lib/process-services/src/lib/mock/apps-list.mock.ts rename to lib/process-services/src/lib/testing/mock/apps-list.mock.ts diff --git a/lib/process-services/src/lib/common/index.ts b/lib/process-services/src/lib/testing/mock/index.ts similarity index 100% rename from lib/process-services/src/lib/common/index.ts rename to lib/process-services/src/lib/testing/mock/index.ts diff --git a/lib/process-services/src/lib/mock/process/process-attachments.mock.ts b/lib/process-services/src/lib/testing/mock/process/process-attachments.mock.ts similarity index 100% rename from lib/process-services/src/lib/mock/process/process-attachments.mock.ts rename to lib/process-services/src/lib/testing/mock/process/process-attachments.mock.ts diff --git a/lib/process-services/src/lib/mock/process/process-comments.mock.ts b/lib/process-services/src/lib/testing/mock/process/process-comments.mock.ts similarity index 100% rename from lib/process-services/src/lib/mock/process/process-comments.mock.ts rename to lib/process-services/src/lib/testing/mock/process/process-comments.mock.ts diff --git a/lib/process-services/src/lib/mock/process/process-instances-list.mock.ts b/lib/process-services/src/lib/testing/mock/process/process-instances-list.mock.ts similarity index 100% rename from lib/process-services/src/lib/mock/process/process-instances-list.mock.ts rename to lib/process-services/src/lib/testing/mock/process/process-instances-list.mock.ts diff --git a/lib/process-services/src/lib/mock/process/process.model.mock.ts b/lib/process-services/src/lib/testing/mock/process/process.model.mock.ts similarity index 100% rename from lib/process-services/src/lib/mock/process/process.model.mock.ts rename to lib/process-services/src/lib/testing/mock/process/process.model.mock.ts diff --git a/lib/process-services/src/lib/mock/process/start-process.component.mock.ts b/lib/process-services/src/lib/testing/mock/process/start-process.component.mock.ts similarity index 100% rename from lib/process-services/src/lib/mock/process/start-process.component.mock.ts rename to lib/process-services/src/lib/testing/mock/process/start-process.component.mock.ts diff --git a/lib/process-services/src/lib/mock/public-api.ts b/lib/process-services/src/lib/testing/mock/public-api.ts similarity index 100% rename from lib/process-services/src/lib/mock/public-api.ts rename to lib/process-services/src/lib/testing/mock/public-api.ts diff --git a/lib/process-services/src/lib/mock/task/task-attachments.mock.ts b/lib/process-services/src/lib/testing/mock/task/task-attachments.mock.ts similarity index 100% rename from lib/process-services/src/lib/mock/task/task-attachments.mock.ts rename to lib/process-services/src/lib/testing/mock/task/task-attachments.mock.ts diff --git a/lib/process-services/src/lib/mock/task/task-details.mock.ts b/lib/process-services/src/lib/testing/mock/task/task-details.mock.ts similarity index 100% rename from lib/process-services/src/lib/mock/task/task-details.mock.ts rename to lib/process-services/src/lib/testing/mock/task/task-details.mock.ts diff --git a/lib/process-services/src/lib/mock/task/task-list.mock.ts b/lib/process-services/src/lib/testing/mock/task/task-list.mock.ts similarity index 100% rename from lib/process-services/src/lib/mock/task/task-list.mock.ts rename to lib/process-services/src/lib/testing/mock/task/task-list.mock.ts diff --git a/lib/process-services/src/public-api.ts b/lib/process-services/src/public-api.ts index 6ce6e7eef4..e954c9ceab 100644 --- a/lib/process-services/src/public-api.ts +++ b/lib/process-services/src/public-api.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -export * from './lib/common/index'; export * from './lib/process-list/index'; export * from './lib/task-list/index'; export * from './lib/app-list/index'; @@ -27,3 +26,6 @@ export * from './lib/form/index'; export * from './lib/task-comments/index'; export * from './lib/process.module'; export * from './lib/compat/types'; +export * from './lib/services/apps-process.service'; +export * from './lib/services/people-process.service'; +export * from './lib/services/task-comments.service';