From b04308deaa4a900d5564261fb8c438ce0288b6a5 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Sun, 15 Aug 2021 20:07:50 +0200 Subject: [PATCH] refactor core --- .../directives/library-favorite.directive.ts | 6 ++- .../library-membership.directive.ts | 5 +- lib/core/directives/node-delete.directive.ts | 11 ++-- .../directives/node-download.directive.ts | 5 +- .../directives/node-favorite.directive.ts | 5 +- lib/core/directives/node-restore.directive.ts | 6 ++- lib/core/form/services/ecm-model.service.ts | 5 +- lib/core/form/services/form.service.ts | 54 ++++++++++++------- .../form/services/process-content.service.ts | 5 +- lib/core/services/apps-process.service.ts | 5 +- lib/core/services/authentication.service.ts | 5 +- lib/core/services/bpm-user.service.ts | 5 +- lib/core/services/comment-content.service.ts | 7 +-- lib/core/services/comment-process.service.ts | 5 +- lib/core/services/content.service.ts | 11 ++-- .../services/deleted-nodes-api.service.ts | 11 ++-- lib/core/services/download-zip.service.ts | 5 +- lib/core/services/favorites-api.service.ts | 5 +- lib/core/services/nodes-api.service.ts | 11 ++-- lib/core/services/people-content.service.ts | 7 +-- lib/core/services/people-process.service.ts | 17 ++++-- lib/core/services/renditions.service.ts | 11 ++-- lib/core/services/search.service.ts | 12 +++-- lib/core/services/shared-links-api.service.ts | 6 ++- lib/core/services/sites.service.ts | 5 +- lib/core/services/thumbnail.service.ts | 5 +- lib/core/services/upload.service.ts | 18 ++++--- 27 files changed, 160 insertions(+), 93 deletions(-) diff --git a/lib/core/directives/library-favorite.directive.ts b/lib/core/directives/library-favorite.directive.ts index 60c7758ee2..c1380dff19 100644 --- a/lib/core/directives/library-favorite.directive.ts +++ b/lib/core/directives/library-favorite.directive.ts @@ -38,7 +38,10 @@ export class LibraryFavoriteDirective implements OnChanges { @Output() error = new EventEmitter(); private targetLibrary = null; - private favoritesApi: FavoritesApi; + + get favoritesApi(): FavoritesApi { + return new FavoritesApi(this.alfrescoApiService.getInstance()); + } @HostListener('click') onClick() { @@ -58,7 +61,6 @@ export class LibraryFavoriteDirective implements OnChanges { } constructor(private alfrescoApiService: AlfrescoApiService) { - this.favoritesApi = new FavoritesApi(this.alfrescoApiService.getInstance()); } ngOnChanges(changes) { diff --git a/lib/core/directives/library-membership.directive.ts b/lib/core/directives/library-membership.directive.ts index 754090fbf6..6eb03cb670 100644 --- a/lib/core/directives/library-membership.directive.ts +++ b/lib/core/directives/library-membership.directive.ts @@ -48,7 +48,9 @@ export class LibraryMembershipDirective implements OnChanges { isJoinRequested: BehaviorSubject = new BehaviorSubject(false); - private sitesApi: SitesApi; + get sitesApi(): SitesApi { + return new SitesApi(this.alfrescoApiService.getInstance()); + } /** Site for which to toggle the membership request. */ @Input('adf-library-membership') @@ -75,7 +77,6 @@ export class LibraryMembershipDirective implements OnChanges { private sitesService: SitesService, private versionCompatibilityService: VersionCompatibilityService ) { - this.sitesApi = new SitesApi(this.alfrescoApiService.getInstance()); } ngOnChanges(changes: SimpleChanges) { diff --git a/lib/core/directives/node-delete.directive.ts b/lib/core/directives/node-delete.directive.ts index ca697fd7a2..b5b1e6fc0b 100644 --- a/lib/core/directives/node-delete.directive.ts +++ b/lib/core/directives/node-delete.directive.ts @@ -62,8 +62,13 @@ export class NodeDeleteDirective implements OnChanges { @Output() delete: EventEmitter = new EventEmitter(); - private trashcanApi: TrashcanApi; - private nodesApi: NodesApi; + get trashcanApi(): TrashcanApi { + return new TrashcanApi(this.alfrescoApiService.getInstance()); + } + + get nodesApi(): NodesApi { + return new NodesApi(this.alfrescoApiService.getInstance()); + } @HostListener('click') onClick() { @@ -73,8 +78,6 @@ export class NodeDeleteDirective implements OnChanges { constructor(private alfrescoApiService: AlfrescoApiService, private translation: TranslationService, private elementRef: ElementRef) { - this.trashcanApi = new TrashcanApi(this.alfrescoApiService.getInstance()); - this.nodesApi = new NodesApi(this.alfrescoApiService.getInstance()); } ngOnChanges() { diff --git a/lib/core/directives/node-download.directive.ts b/lib/core/directives/node-download.directive.ts index 79bb0c4c8b..37e4431aa8 100755 --- a/lib/core/directives/node-download.directive.ts +++ b/lib/core/directives/node-download.directive.ts @@ -31,7 +31,9 @@ import { DownloadService } from '../services/download.service'; }) export class NodeDownloadDirective { - private contentApi: ContentApi; + get contentApi(): ContentApi { + return new ContentApi(this.apiService.getInstance()); + } /** Nodes to download. */ @Input('adfNodeDownload') @@ -50,7 +52,6 @@ export class NodeDownloadDirective { private apiService: AlfrescoApiService, private downloadService: DownloadService, private dialog: MatDialog) { - this.contentApi = new ContentApi(this.apiService.getInstance()); } /** diff --git a/lib/core/directives/node-favorite.directive.ts b/lib/core/directives/node-favorite.directive.ts index 9446a5c10d..cba144a3ed 100644 --- a/lib/core/directives/node-favorite.directive.ts +++ b/lib/core/directives/node-favorite.directive.ts @@ -30,7 +30,9 @@ import { catchError, map } from 'rxjs/operators'; export class NodeFavoriteDirective implements OnChanges { favorites: any[] = []; - private favoritesApi: FavoritesApi; + get favoritesApi(): FavoritesApi { + return new FavoritesApi(this.alfrescoApiService.getInstance()); + } /** Array of nodes to toggle as favorites. */ @Input('adf-node-favorite') @@ -48,7 +50,6 @@ export class NodeFavoriteDirective implements OnChanges { } constructor(private alfrescoApiService: AlfrescoApiService) { - this.favoritesApi = new FavoritesApi(this.alfrescoApiService.getInstance()); } ngOnChanges(changes) { diff --git a/lib/core/directives/node-restore.directive.ts b/lib/core/directives/node-restore.directive.ts index 1f4791ddf4..61c62cb14a 100644 --- a/lib/core/directives/node-restore.directive.ts +++ b/lib/core/directives/node-restore.directive.ts @@ -35,7 +35,10 @@ export class RestoreMessageModel { }) export class NodeRestoreDirective { private readonly restoreProcessStatus; - private trashcanApi: TrashcanApi; + + get trashcanApi(): TrashcanApi { + return new TrashcanApi(this.alfrescoApiService.getInstance()); + } /** Array of deleted nodes to restore. */ @Input('adf-restore') @@ -53,7 +56,6 @@ export class NodeRestoreDirective { constructor(private alfrescoApiService: AlfrescoApiService, private translation: TranslationService) { this.restoreProcessStatus = this.processStatus(); - this.trashcanApi = new TrashcanApi(this.alfrescoApiService.getInstance()); } private recover(selection: any) { diff --git a/lib/core/form/services/ecm-model.service.ts b/lib/core/form/services/ecm-model.service.ts index 35b91f32de..bd5d315c99 100644 --- a/lib/core/form/services/ecm-model.service.ts +++ b/lib/core/form/services/ecm-model.service.ts @@ -32,11 +32,12 @@ export class EcmModelService { public static MODEL_NAME: string = 'activitiFormsModel'; public static TYPE_MODEL: string = 'cm:folder'; - private customModelApi: CustomModelApi; + get customModelApi(): CustomModelApi { + return new CustomModelApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private logService: LogService) { - this.customModelApi = new CustomModelApi(this.apiService.getInstance()); } public createEcmTypeForActivitiForm(formName: string, form: FormModel): Observable { diff --git a/lib/core/form/services/form.service.ts b/lib/core/form/services/form.service.ts index 4a143fda02..7abb4f47f1 100644 --- a/lib/core/form/services/form.service.ts +++ b/lib/core/form/services/form.service.ts @@ -52,15 +52,41 @@ export class FormService { static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error'; static GENERIC_ERROR_MESSAGE: string = 'Server error'; - taskApi: TasksApi; - taskFormsApi: TaskFormsApi; - modelsApi: ModelsApi; - editorApi: FormModelsApi; - processDefinitionsApi: ProcessDefinitionsApi; - processInstancesApi: ProcessInstancesApi; - processInstanceVariablesApi: ProcessInstanceVariablesApi; - groupsApi: ActivitiGroupsApi; - usersApi: UsersApi; + get taskApi(): TasksApi { + return new TasksApi(this.apiService.getInstance()); + } + + get taskFormsApi(): TaskFormsApi { + return new TaskFormsApi(this.apiService.getInstance()); + } + + get modelsApi(): ModelsApi { + return new ModelsApi(this.apiService.getInstance()); + } + + get editorApi(): FormModelsApi { + return new FormModelsApi(this.apiService.getInstance()); + } + + get processDefinitionsApi(): ProcessDefinitionsApi { + return new ProcessDefinitionsApi(this.apiService.getInstance()); + } + + get processInstanceVariablesApi(): ProcessInstanceVariablesApi { + return new ProcessInstanceVariablesApi(this.apiService.getInstance()); + } + + get processInstancesApi(): ProcessInstancesApi { + return new ProcessInstancesApi(this.apiService.getInstance()); + } + + get groupsApi(): ActivitiGroupsApi { + return new ActivitiGroupsApi(this.apiService.getInstance()); + } + + get usersApi(): UsersApi { + return new UsersApi(this.apiService.getInstance()); + } formLoaded = new Subject(); formDataRefreshed = new Subject(); @@ -83,16 +109,6 @@ export class FormService { constructor(private ecmModelService: EcmModelService, private apiService: AlfrescoApiService, protected logService: LogService) { - - this.taskApi = new TasksApi(this.apiService.getInstance()); - this.modelsApi = new ModelsApi(this.apiService.getInstance()); - this.editorApi = new FormModelsApi(this.apiService.getInstance()); - this.processDefinitionsApi = new ProcessDefinitionsApi(this.apiService.getInstance()); - this.processInstanceVariablesApi = new ProcessInstanceVariablesApi(this.apiService.getInstance()); - this.processInstancesApi = new ProcessInstancesApi(this.apiService.getInstance()); - this.usersApi = new UsersApi(this.apiService.getInstance()); - this.groupsApi = new ActivitiGroupsApi(this.apiService.getInstance()); - this.taskFormsApi = new TaskFormsApi(this.apiService.getInstance()); } /** diff --git a/lib/core/form/services/process-content.service.ts b/lib/core/form/services/process-content.service.ts index 8e0f7a9525..f0a3643037 100644 --- a/lib/core/form/services/process-content.service.ts +++ b/lib/core/form/services/process-content.service.ts @@ -30,11 +30,12 @@ export class ProcessContentService { static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error'; static GENERIC_ERROR_MESSAGE: string = 'Server error'; - private contentApi: ActivitiContentApi; + get contentApi(): ActivitiContentApi { + return new ActivitiContentApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private logService: LogService) { - this.contentApi = new ActivitiContentApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/apps-process.service.ts b/lib/core/services/apps-process.service.ts index 0f3c62e55f..6ce7b54d34 100644 --- a/lib/core/services/apps-process.service.ts +++ b/lib/core/services/apps-process.service.ts @@ -27,11 +27,12 @@ import { map, catchError } from 'rxjs/operators'; }) export class AppsProcessService { - appsApi: RuntimeAppDefinitionsApi; + get appsApi(): RuntimeAppDefinitionsApi { + return new RuntimeAppDefinitionsApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private logService: LogService) { - this.appsApi = new RuntimeAppDefinitionsApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/authentication.service.ts b/lib/core/services/authentication.service.ts index 59623b7b07..9adcce427e 100644 --- a/lib/core/services/authentication.service.ts +++ b/lib/core/services/authentication.service.ts @@ -48,7 +48,9 @@ export class AuthenticationService { */ onLogout: ReplaySubject = new ReplaySubject(1); - private profileApi: UserProfileApi; + get profileApi(): UserProfileApi { + return new UserProfileApi(this.alfrescoApi.getInstance()); + } constructor( private appConfig: AppConfigService, @@ -58,7 +60,6 @@ export class AuthenticationService { private logService: LogService) { this.alfrescoApi.alfrescoApiInitialized.subscribe(() => { this.alfrescoApi.getInstance().reply('logged-in', () => { - this.profileApi = new UserProfileApi(alfrescoApi.getInstance()); this.onLogin.next(); }); }); diff --git a/lib/core/services/bpm-user.service.ts b/lib/core/services/bpm-user.service.ts index 5197d08aa7..71b81b68c8 100644 --- a/lib/core/services/bpm-user.service.ts +++ b/lib/core/services/bpm-user.service.ts @@ -33,11 +33,12 @@ import { UserProfileApi, UserRepresentation } from '@alfresco/js-api'; }) export class BpmUserService { - private profileApi: UserProfileApi; + get profileApi(): UserProfileApi { + return new UserProfileApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private logService: LogService) { - this.profileApi = new UserProfileApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/comment-content.service.ts b/lib/core/services/comment-content.service.ts index c74983b2f0..24dbd87ccc 100644 --- a/lib/core/services/comment-content.service.ts +++ b/lib/core/services/comment-content.service.ts @@ -28,11 +28,12 @@ import { CommentEntry, CommentsApi } from '@alfresco/js-api'; }) export class CommentContentService { - private commentsApi: CommentsApi; + get commentsApi(): CommentsApi { + return new CommentsApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private logService: LogService) { - this.commentsApi = new CommentsApi(this.apiService.getInstance()); } /** @@ -42,7 +43,7 @@ export class CommentContentService { * @returns Details of the comment added */ addNodeComment(nodeId: string, message: string): Observable { - return from(this.commentsApi.createComment(nodeId, {content: message})) + return from(this.commentsApi.createComment(nodeId, { content: message })) .pipe( map((response: CommentEntry) => { return new CommentModel({ diff --git a/lib/core/services/comment-process.service.ts b/lib/core/services/comment-process.service.ts index cc65df6701..6a62b2f29d 100644 --- a/lib/core/services/comment-process.service.ts +++ b/lib/core/services/comment-process.service.ts @@ -29,11 +29,12 @@ import { ActivitiCommentsApi } from '@alfresco/js-api'; }) export class CommentProcessService { - private commentsApi: ActivitiCommentsApi; + get commentsApi(): ActivitiCommentsApi { + return new ActivitiCommentsApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private logService: LogService) { - this.commentsApi = new ActivitiCommentsApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/content.service.ts b/lib/core/services/content.service.ts index 5ae5f8c081..1bc8108fc0 100644 --- a/lib/core/services/content.service.ts +++ b/lib/core/services/content.service.ts @@ -38,8 +38,13 @@ export class ContentService { folderCreate: Subject = new Subject(); folderEdit: Subject = new Subject(); - private contentApi: ContentApi; - private nodesApi: NodesApi; + get contentApi(): ContentApi { + return new ContentApi(this.apiService.getInstance()); + } + + get nodesApi(): NodesApi { + return new NodesApi(this.apiService.getInstance()); + } constructor(public authService: AuthenticationService, public apiService: AlfrescoApiService, @@ -47,8 +52,6 @@ export class ContentService { private sanitizer: DomSanitizer, private downloadService: DownloadService, private thumbnailService: ThumbnailService) { - this.contentApi = new ContentApi(apiService.getInstance()); - this.nodesApi = new NodesApi(apiService.getInstance()); } /** diff --git a/lib/core/services/deleted-nodes-api.service.ts b/lib/core/services/deleted-nodes-api.service.ts index ade5e39e58..1784a88a49 100644 --- a/lib/core/services/deleted-nodes-api.service.ts +++ b/lib/core/services/deleted-nodes-api.service.ts @@ -28,15 +28,18 @@ import { catchError } from 'rxjs/operators'; }) export class DeletedNodesApiService { - nodesApi: NodesApi; - trashcanApi: TrashcanApi; + get nodesApi(): NodesApi { + return new NodesApi(this.apiService.getInstance()); + } + + get trashcanApi(): TrashcanApi { + return new TrashcanApi(this.apiService.getInstance()); + } constructor( private apiService: AlfrescoApiService, private preferences: UserPreferencesService ) { - this.nodesApi = new NodesApi(this.apiService.getInstance()); - this.trashcanApi = new TrashcanApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/download-zip.service.ts b/lib/core/services/download-zip.service.ts index 021830507d..bca72e1f32 100755 --- a/lib/core/services/download-zip.service.ts +++ b/lib/core/services/download-zip.service.ts @@ -27,11 +27,12 @@ import { catchError } from 'rxjs/operators'; }) export class DownloadZipService { - downloadsApi: DownloadsApi; + get downloadsApi(): DownloadsApi { + return new DownloadsApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private logService: LogService) { - this.downloadsApi = new DownloadsApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/favorites-api.service.ts b/lib/core/services/favorites-api.service.ts index 803ee3ce31..d18ac3ebd9 100644 --- a/lib/core/services/favorites-api.service.ts +++ b/lib/core/services/favorites-api.service.ts @@ -27,7 +27,9 @@ import { catchError } from 'rxjs/operators'; }) export class FavoritesApiService { - private favoritesApi: FavoritesApi; + get favoritesApi(): FavoritesApi { + return new FavoritesApi(this.apiService.getInstance()); + } static remapEntry({ entry }: any): any { entry.properties = { @@ -42,7 +44,6 @@ export class FavoritesApiService { private apiService: AlfrescoApiService, private preferences: UserPreferencesService ) { - this.favoritesApi = new FavoritesApi(this.apiService.getInstance()); } remapFavoritesData(data: FavoritePaging = {}): NodePaging { diff --git a/lib/core/services/nodes-api.service.ts b/lib/core/services/nodes-api.service.ts index 3a21b4b0f8..98be46bc2a 100644 --- a/lib/core/services/nodes-api.service.ts +++ b/lib/core/services/nodes-api.service.ts @@ -28,13 +28,16 @@ import { NodeMetadata } from '../models/node-metadata.model'; }) export class NodesApiService { - private nodesApi: NodesApi; - private trashcanApi: TrashcanApi; + get trashcanApi(): TrashcanApi { + return new TrashcanApi(this.apiService.getInstance()); + } + + get nodesApi(): NodesApi { + return new NodesApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private preferences: UserPreferencesService) { - this.nodesApi = new NodesApi(this.apiService.getInstance()); - this.trashcanApi = new TrashcanApi(this.apiService.getInstance()); } private getEntryFromEntity(entity: NodeEntry) { diff --git a/lib/core/services/people-content.service.ts b/lib/core/services/people-content.service.ts index 8ed58c74db..aefebe3ba0 100644 --- a/lib/core/services/people-content.service.ts +++ b/lib/core/services/people-content.service.ts @@ -50,10 +50,11 @@ export class PeopleContentService { private hasContentAdminRole: boolean = false; hasCheckedIsContentAdmin: boolean = false; - private peopleApi: PeopleApi; + get peopleApi(): PeopleApi { + return new PeopleApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private logService: LogService) { - this.peopleApi = new PeopleApi(this.apiService.getInstance()); } /** @@ -124,7 +125,7 @@ export class PeopleContentService { } private buildOrderArray(sorting: PeopleContentSortingModel): string[] { - return sorting?.orderBy && sorting?.direction ? [ `${sorting.orderBy} ${sorting.direction.toUpperCase()}` ] : []; + return sorting?.orderBy && sorting?.direction ? [`${sorting.orderBy} ${sorting.direction.toUpperCase()}`] : []; } private handleError(error: any) { diff --git a/lib/core/services/people-process.service.ts b/lib/core/services/people-process.service.ts index ae9bd57711..904c1bf15f 100644 --- a/lib/core/services/people-process.service.ts +++ b/lib/core/services/people-process.service.ts @@ -21,20 +21,27 @@ import { UserProcessModel } from '../models/user-process.model'; import { AlfrescoApiService } from './alfresco-api.service'; import { LogService } from './log.service'; import { catchError, map } from 'rxjs/operators'; -import { TaskActionsApi, UsersApi, ResultListDataRepresentationLightUserRepresentation } from '@alfresco/js-api'; +import { + TaskActionsApi, + UsersApi, + ResultListDataRepresentationLightUserRepresentation +} from '@alfresco/js-api'; @Injectable({ providedIn: 'root' }) export class PeopleProcessService { - private taskActionsApi: TaskActionsApi; - private userApi: UsersApi; + get taskActionsApi(): TaskActionsApi { + return new TaskActionsApi(this.apiService.getInstance()); + } + + get userApi(): UsersApi { + return new UsersApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private logService: LogService) { - this.taskActionsApi = new TaskActionsApi(this.apiService.getInstance()); - this.userApi = new UsersApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/renditions.service.ts b/lib/core/services/renditions.service.ts index fea5a3a482..8988803eb8 100644 --- a/lib/core/services/renditions.service.ts +++ b/lib/core/services/renditions.service.ts @@ -26,12 +26,15 @@ import { concatMap, switchMap, takeWhile, map } from 'rxjs/operators'; }) export class RenditionsService { - private renditionsApi: RenditionsApi; - private contentApi: ContentApi; + get renditionsApi(): RenditionsApi { + return new RenditionsApi(this.apiService.getInstance()); + } + + get contentApi(): ContentApi { + return new ContentApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService) { - this.renditionsApi = new RenditionsApi(this.apiService.getInstance()); - this.contentApi = new ContentApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/search.service.ts b/lib/core/services/search.service.ts index d69c90b877..070a67f266 100644 --- a/lib/core/services/search.service.ts +++ b/lib/core/services/search.service.ts @@ -27,13 +27,17 @@ import { SearchConfigurationService } from './search-configuration.service'; export class SearchService { dataLoaded: Subject = new Subject(); - queriesApi: QueriesApi; - searchApi: SearchApi; + + get queriesApi(): QueriesApi { + return new QueriesApi(this.apiService.getInstance()); + } + + get searchApi(): SearchApi { + return new SearchApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private searchConfigurationService: SearchConfigurationService) { - this.queriesApi = new QueriesApi(this.apiService.getInstance()); - this.searchApi = new SearchApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/shared-links-api.service.ts b/lib/core/services/shared-links-api.service.ts index 7f62c03be1..f17c54e59c 100644 --- a/lib/core/services/shared-links-api.service.ts +++ b/lib/core/services/shared-links-api.service.ts @@ -28,11 +28,13 @@ import { catchError } from 'rxjs/operators'; export class SharedLinksApiService { error = new Subject<{ statusCode: number, message: string }>(); - private sharedLinksApi: SharedlinksApi; + + get sharedLinksApi(): SharedlinksApi { + return new SharedlinksApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private preferences: UserPreferencesService) { - this.sharedLinksApi = new SharedlinksApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/sites.service.ts b/lib/core/services/sites.service.ts index bc94a44b93..4c79c2a179 100644 --- a/lib/core/services/sites.service.ts +++ b/lib/core/services/sites.service.ts @@ -40,10 +40,11 @@ import { LogService } from './log.service'; }) export class SitesService { - private sitesApi: SitesApi; + get sitesApi(): SitesApi { + return new SitesApi(this.apiService.getInstance()); + } constructor(private apiService: AlfrescoApiService, private logService: LogService) { - this.sitesApi = new SitesApi(this.apiService.getInstance()); } /** diff --git a/lib/core/services/thumbnail.service.ts b/lib/core/services/thumbnail.service.ts index a57b04423e..1c7c44afc0 100644 --- a/lib/core/services/thumbnail.service.ts +++ b/lib/core/services/thumbnail.service.ts @@ -164,10 +164,11 @@ export class ThumbnailService { 'task': './assets/images/task.svg' }; - private contentApi: ContentApi; + get contentApi(): ContentApi { + return new ContentApi(this.apiService.getInstance()); + } constructor(protected apiService: AlfrescoApiService, matIconRegistry: MatIconRegistry, sanitizer: DomSanitizer) { - this.contentApi = new ContentApi(apiService.getInstance()); Object.keys(this.mimeTypeIcons).forEach((key) => { const url = sanitizer.bypassSecurityTrustResourceUrl(this.mimeTypeIcons[key]); diff --git a/lib/core/services/upload.service.ts b/lib/core/services/upload.service.ts index d1de1d4664..aedfc58062 100644 --- a/lib/core/services/upload.service.ts +++ b/lib/core/services/upload.service.ts @@ -63,9 +63,17 @@ export class UploadService { fileUploadDeleted: Subject = new Subject(); fileDeleted: Subject = new Subject(); - private uploadApi: UploadApi; - private nodesApi: NodesApi; - private versionsApi: VersionsApi; + get uploadApi(): UploadApi { + return new UploadApi(this.apiService.getInstance()); + } + + get nodesApi(): NodesApi { + return new NodesApi(this.apiService.getInstance()); + } + + get versionsApi(): VersionsApi { + return new VersionsApi(this.apiService.getInstance()); + } constructor( protected apiService: AlfrescoApiService, @@ -76,10 +84,6 @@ export class UploadService { .subscribe(({ status }) => { this.isThumbnailGenerationEnabled = status.isThumbnailGenerationEnabled; }); - - this.uploadApi = new UploadApi(apiService.getInstance()); - this.nodesApi = new NodesApi(apiService.getInstance()); - this.versionsApi = new VersionsApi(apiService.getInstance()); } /**