From b2119b317be6c0411fc921c8cfc97a6dab2ed0eb Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Mon, 16 Aug 2021 10:06:51 +0200 Subject: [PATCH] fix --- lib/content-services/src/lib/dialogs/node-lock.dialog.ts | 2 +- .../document-list/services/custom-resources.service.ts | 2 +- .../lib/document-list/services/document-list.service.ts | 2 +- .../services/node-permission.service.ts | 2 +- .../src/lib/version-manager/version-list.component.ts | 6 +++--- lib/core/directives/node-delete.directive.ts | 4 ++-- lib/core/directives/node-restore.directive.ts | 2 +- lib/core/form/services/activiti-alfresco.service.ts | 2 +- lib/core/form/services/process-content.service.ts | 8 ++++---- lib/core/form/services/widget-visibility.service.ts | 2 +- lib/core/services/external-alfresco-api.service.ts | 1 - lib/core/services/people-process.service.ts | 2 +- .../lib/form/services/process-cloud-content.service.ts | 2 +- .../src/lib/process-list/services/process.service.ts | 2 +- .../src/lib/task-list/services/task-filter.service.ts | 2 +- .../src/lib/task-list/services/tasklist.service.ts | 2 +- 16 files changed, 21 insertions(+), 22 deletions(-) diff --git a/lib/content-services/src/lib/dialogs/node-lock.dialog.ts b/lib/content-services/src/lib/dialogs/node-lock.dialog.ts index 16acddec0b..17037dc7ba 100644 --- a/lib/content-services/src/lib/dialogs/node-lock.dialog.ts +++ b/lib/content-services/src/lib/dialogs/node-lock.dialog.ts @@ -37,7 +37,7 @@ export class NodeLockDialogComponent implements OnInit { _nodesApi: NodesApi; get nodesApi(): NodesApi { - this._nodesApi = this._nodesApi ?? new NodesApi(this.apiService.getInstance()); + this._nodesApi = this._nodesApi ?? new NodesApi(this.alfrescoApi.getInstance()); return this._nodesApi; } diff --git a/lib/content-services/src/lib/document-list/services/custom-resources.service.ts b/lib/content-services/src/lib/document-list/services/custom-resources.service.ts index b730a94b6e..451969e307 100644 --- a/lib/content-services/src/lib/document-list/services/custom-resources.service.ts +++ b/lib/content-services/src/lib/document-list/services/custom-resources.service.ts @@ -30,7 +30,7 @@ import { FavoritesApi, SharedlinksApi, TrashcanApi, - NodesApi, TypesApi + NodesApi } from '@alfresco/js-api'; import { Injectable } from '@angular/core'; import { Observable, from, of, throwError } from 'rxjs'; diff --git a/lib/content-services/src/lib/document-list/services/document-list.service.ts b/lib/content-services/src/lib/document-list/services/document-list.service.ts index 2812134aeb..2e1f9ba7f1 100644 --- a/lib/content-services/src/lib/document-list/services/document-list.service.ts +++ b/lib/content-services/src/lib/document-list/services/document-list.service.ts @@ -35,7 +35,7 @@ export class DocumentListService implements DocumentListLoader { static ROOT_ID = '-root-'; _nodesApi: NodesApi; - get nodesApi(): NodesApi { + get nodes(): NodesApi { this._nodesApi = this._nodesApi ?? new NodesApi(this.apiService.getInstance()); return this._nodesApi; } diff --git a/lib/content-services/src/lib/permission-manager/services/node-permission.service.ts b/lib/content-services/src/lib/permission-manager/services/node-permission.service.ts index 1ed5b74b40..22d8aa7d73 100644 --- a/lib/content-services/src/lib/permission-manager/services/node-permission.service.ts +++ b/lib/content-services/src/lib/permission-manager/services/node-permission.service.ts @@ -44,7 +44,7 @@ export class NodePermissionService { _groupsApi: GroupsApi; get groupsApi(): GroupsApi { - this._groupsApi = this._groupsApi ?? new GroupsApi(this.alfrescoApiService.getInstance()); + this._groupsApi = this._groupsApi ?? new GroupsApi(this.apiService.getInstance()); return this._groupsApi; } diff --git a/lib/content-services/src/lib/version-manager/version-list.component.ts b/lib/content-services/src/lib/version-manager/version-list.component.ts index 66aa1d2813..af478bff30 100644 --- a/lib/content-services/src/lib/version-manager/version-list.component.ts +++ b/lib/content-services/src/lib/version-manager/version-list.component.ts @@ -34,19 +34,19 @@ export class VersionListComponent implements OnChanges { _contentApi: ContentApi; get contentApi(): ContentApi { - this._contentApi = this._contentApi ?? new ContentApi(this.apiService.getInstance()); + this._contentApi = this._contentApi ?? new ContentApi(this.alfrescoApi.getInstance()); return this._contentApi; } _versionsApi: VersionsApi; get versionsApi(): VersionsApi { - this._versionsApi = this._versionsApi ?? new VersionsApi(this.apiService.getInstance()); + this._versionsApi = this._versionsApi ?? new VersionsApi(this.alfrescoApi.getInstance()); return this._versionsApi; } _nodesApi: NodesApi; get nodesApi(): NodesApi { - this._nodesApi = this._nodesApi ?? new NodesApi(this.apiService.getInstance()); + this._nodesApi = this._nodesApi ?? new NodesApi(this.alfrescoApi.getInstance()); return this._nodesApi; } diff --git a/lib/core/directives/node-delete.directive.ts b/lib/core/directives/node-delete.directive.ts index 6935213fa2..d9f5dc9079 100644 --- a/lib/core/directives/node-delete.directive.ts +++ b/lib/core/directives/node-delete.directive.ts @@ -64,13 +64,13 @@ export class NodeDeleteDirective implements OnChanges { _trashcanApi: TrashcanApi; get trashcanApi(): TrashcanApi { - this._trashcanApi = this._trashcanApi ?? new TrashcanApi(this.apiService.getInstance()); + this._trashcanApi = this._trashcanApi ?? new TrashcanApi(this.alfrescoApiService.getInstance()); return this._trashcanApi; } _nodesApi: NodesApi; get nodesApi(): NodesApi { - this._nodesApi = this._nodesApi ?? new NodesApi(this.apiService.getInstance()); + this._nodesApi = this._nodesApi ?? new NodesApi(this.alfrescoApiService.getInstance()); return this._nodesApi; } diff --git a/lib/core/directives/node-restore.directive.ts b/lib/core/directives/node-restore.directive.ts index e406e07d85..ad0c48b5eb 100644 --- a/lib/core/directives/node-restore.directive.ts +++ b/lib/core/directives/node-restore.directive.ts @@ -38,7 +38,7 @@ export class NodeRestoreDirective { _trashcanApi: TrashcanApi; get trashcanApi(): TrashcanApi { - this._trashcanApi = this._trashcanApi ?? new TrashcanApi(this.apiService.getInstance()); + this._trashcanApi = this._trashcanApi ?? new TrashcanApi(this.alfrescoApiService.getInstance()); return this._trashcanApi; } diff --git a/lib/core/form/services/activiti-alfresco.service.ts b/lib/core/form/services/activiti-alfresco.service.ts index 6911245d21..63621429f9 100644 --- a/lib/core/form/services/activiti-alfresco.service.ts +++ b/lib/core/form/services/activiti-alfresco.service.ts @@ -23,7 +23,7 @@ import { IntegrationAlfrescoOnPremiseApi, MinimalNode, RelatedContentRepresentation, - ActivitiContentApi, UserProfileApi + ActivitiContentApi } from '@alfresco/js-api'; import { Observable, from, throwError } from 'rxjs'; import { ExternalContent } from '../components/widgets/core/external-content'; diff --git a/lib/core/form/services/process-content.service.ts b/lib/core/form/services/process-content.service.ts index c90d7d413b..add5b78353 100644 --- a/lib/core/form/services/process-content.service.ts +++ b/lib/core/form/services/process-content.service.ts @@ -18,7 +18,7 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { LogService } from '../../services/log.service'; import { Injectable } from '@angular/core'; -import { ActivitiContentApi, ContentApi, RelatedContentRepresentation } from '@alfresco/js-api'; +import { ActivitiContentApi, RelatedContentRepresentation } from '@alfresco/js-api'; import { Observable, from, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; @@ -30,9 +30,9 @@ export class ProcessContentService { static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error'; static GENERIC_ERROR_MESSAGE: string = 'Server error'; - _contentApi: ContentApi; - get contentApi(): ContentApi { - this._contentApi = this._contentApi ?? new ContentApi(this.apiService.getInstance()); + _contentApi: ActivitiContentApi; + get contentApi(): ActivitiContentApi { + this._contentApi = this._contentApi ?? new ActivitiContentApi(this.apiService.getInstance()); return this._contentApi; } diff --git a/lib/core/form/services/widget-visibility.service.ts b/lib/core/form/services/widget-visibility.service.ts index 3ddf8275de..33a5f02742 100644 --- a/lib/core/form/services/widget-visibility.service.ts +++ b/lib/core/form/services/widget-visibility.service.ts @@ -30,7 +30,7 @@ import { import { TaskProcessVariableModel } from '../models/task-process-variable.model'; import { WidgetVisibilityModel, WidgetTypeEnum } from '../models/widget-visibility.model'; import { map, catchError } from 'rxjs/operators'; -import { RuntimeAppDefinitionsApi, TaskFormsApi } from '@alfresco/js-api'; +import { TaskFormsApi } from '@alfresco/js-api'; @Injectable({ providedIn: 'root' diff --git a/lib/core/services/external-alfresco-api.service.ts b/lib/core/services/external-alfresco-api.service.ts index b1d90e673b..da933313a4 100644 --- a/lib/core/services/external-alfresco-api.service.ts +++ b/lib/core/services/external-alfresco-api.service.ts @@ -19,7 +19,6 @@ import { Injectable } from '@angular/core'; import { AlfrescoApiCompatibility, ContentApi, - Core, Node, NodesApi } from '@alfresco/js-api'; import { ReplaySubject, Subject } from 'rxjs'; diff --git a/lib/core/services/people-process.service.ts b/lib/core/services/people-process.service.ts index a9fa9b5bd0..92b396cdaf 100644 --- a/lib/core/services/people-process.service.ts +++ b/lib/core/services/people-process.service.ts @@ -24,7 +24,7 @@ import { catchError, map } from 'rxjs/operators'; import { TaskActionsApi, UsersApi, - ResultListDataRepresentationLightUserRepresentation, DownloadsApi + ResultListDataRepresentationLightUserRepresentation } from '@alfresco/js-api'; @Injectable({ diff --git a/lib/process-services-cloud/src/lib/form/services/process-cloud-content.service.ts b/lib/process-services-cloud/src/lib/form/services/process-cloud-content.service.ts index 8bb07b4415..307efd3480 100644 --- a/lib/process-services-cloud/src/lib/form/services/process-cloud-content.service.ts +++ b/lib/process-services-cloud/src/lib/form/services/process-cloud-content.service.ts @@ -38,7 +38,7 @@ export class ProcessCloudContentService { } private _authenticationApi; - get authenticationApi(): UploadApi { + get authenticationApi(): AuthenticationApi { this._authenticationApi = this._authenticationApi ?? new AuthenticationApi(this.apiService.getInstance()); return this._authenticationApi; } diff --git a/lib/process-services/src/lib/process-list/services/process.service.ts b/lib/process-services/src/lib/process-list/services/process.service.ts index 5a788e06fd..194f97c0f5 100644 --- a/lib/process-services/src/lib/process-list/services/process.service.ts +++ b/lib/process-services/src/lib/process-list/services/process.service.ts @@ -23,7 +23,7 @@ import { ProcessInstancesApi, RestVariable, ProcessInstanceRepresentation, - ProcessInstanceVariablesApi, ActivitiContentApi + ProcessInstanceVariablesApi } from '@alfresco/js-api'; import { Observable, from, throwError, of } from 'rxjs'; import { TaskDetailsModel } from '../../task-list'; 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 348d93d478..e80c7f4df7 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 @@ -28,7 +28,7 @@ import { ActivitiContentApi, UserFiltersApi } from '@alfresco/js-api'; export class TaskFilterService { private _userFiltersApi; - get userFiltersApi(): ActivitiContentApi { + get userFiltersApi(): UserFiltersApi { this._userFiltersApi = this._userFiltersApi ?? new UserFiltersApi(this.apiService.getInstance()); return this._userFiltersApi; } 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 92db3574d1..1cee96d1ec 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 @@ -35,7 +35,7 @@ import { export class TaskListService { private _modelsApi; - get modelsApi(): TasksApi { + get modelsApi(): ModelsApi { this._modelsApi = this._modelsApi ?? new ModelsApi(this.apiService.getInstance()); return this._modelsApi; }