Improve compatibility (#7214)

* refactor content * refactor core * refactor rest * fix lint * fix * lint * lint * fix * fix * fix
2025-07-24 17:32:15 +00:00 · 2021-08-16 11:42:29 +02:00
parent 8c8e388fa0
commit a25923d1f2
62 changed files with 595 additions and 235 deletions
--- a/lib/content-services/src/lib/aspect-list/aspect-list.service.ts
+++ b/lib/content-services/src/lib/aspect-list/aspect-list.service.ts
@@ -29,13 +29,16 @@ import { AspectEntry, AspectPaging, AspectsApi } from '@alfresco/js-api';
 })
 export class AspectListService {

-    private aspectsApi: AspectsApi;
+    _aspectsApi: AspectsApi;
+    get aspectsApi(): AspectsApi {
+        this._aspectsApi = this._aspectsApi ?? new AspectsApi(this.alfrescoApiService.getInstance());
+        return this._aspectsApi;
+    }

    constructor(private alfrescoApiService: AlfrescoApiService,
                private appConfigService: AppConfigService,
                private dialog: MatDialog,
                private logService: LogService) {
-        this.aspectsApi = new AspectsApi(this.alfrescoApiService.getInstance());
    }

    getAspects(): Observable<AspectEntry[]> {
--- a/lib/content-services/src/lib/audit/audit.service.ts
+++ b/lib/content-services/src/lib/audit/audit.service.ts
@@ -18,7 +18,15 @@
 import { Injectable } from '@angular/core';
 import { Observable, from, throwError } from 'rxjs';
 import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
-import { AuditApi, AuditAppPaging, AuditAppEntry, AuditApp, AuditBodyUpdate, AuditEntryPaging, AuditEntryEntry } from '@alfresco/js-api';
+import {
+    AuditApi,
+    AuditAppPaging,
+    AuditAppEntry,
+    AuditApp,
+    AuditBodyUpdate,
+    AuditEntryPaging,
+    AuditEntryEntry
+} from '@alfresco/js-api';
 import { catchError } from 'rxjs/operators';

@Injectable({
@@ -26,10 +34,13 @@ import { catchError } from 'rxjs/operators';
 })
 export class AuditService {

-    auditApi: AuditApi;
+    _auditApi: AuditApi;
+    get auditApi(): AuditApi {
+        this._auditApi = this._auditApi ?? new AuditApi(this.apiService.getInstance());
+        return this._auditApi;
+    }

    constructor(private apiService: AlfrescoApiService, private logService: LogService) {
-        this.auditApi = new AuditApi(this.apiService.getInstance());
    }

    getAuditApps(opts?: any): Observable<AuditAppPaging> {
@@ -57,7 +68,7 @@ export class AuditService {
    updateAuditApp(auditApplicationId: string, auditAppBodyUpdate: boolean, opts?: any): Observable<AuditApp | {}> {
        const defaultOptions = {};
        const queryOptions = Object.assign({}, defaultOptions, opts);
-        return from(this.auditApi.updateAuditApp(auditApplicationId, new AuditBodyUpdate({ isEnabled: auditAppBodyUpdate}), queryOptions))
+        return from(this.auditApi.updateAuditApp(auditApplicationId, new AuditBodyUpdate({ isEnabled: auditAppBodyUpdate }), queryOptions))
            .pipe(
                catchError((err: any) => this.handleError(err))
            );
--- a/lib/content-services/src/lib/content-metadata/services/property-descriptors.service.ts
+++ b/lib/content-services/src/lib/content-metadata/services/property-descriptors.service.ts
@@ -26,10 +26,14 @@ import { ClassesApi } from '@alfresco/js-api';
    providedIn: 'root'
 })
 export class PropertyDescriptorsService {
-    private classesApi: ClassesApi;
+
+    private _classesApi;
+    get classesApi(): ClassesApi {
+        this._classesApi = this._classesApi ?? new ClassesApi(this.alfrescoApiService.getInstance());
+        return this._classesApi;
+    }

    constructor(private alfrescoApiService: AlfrescoApiService) {
-        this.classesApi = new ClassesApi(this.alfrescoApiService.getInstance());
    }

    load(groupNames: string[]): Observable<PropertyGroupContainer> {
--- a/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts
@@ -43,13 +43,17 @@ export class NodeSharedDirective implements OnChanges, OnDestroy {
    baseShareUrl: string;

    private onDestroy$ = new Subject<boolean>();
-    private nodesApi = new NodesApi();
+
+    _nodesApi: NodesApi;
+    get nodesApi(): NodesApi {
+        this._nodesApi = this._nodesApi ?? new NodesApi(this.alfrescoApiService.getInstance());
+        return this._nodesApi;
+    }

    constructor(
        private dialog: MatDialog,
        private zone: NgZone,
        private alfrescoApiService: AlfrescoApiService) {
-        this.nodesApi = new NodesApi(this.alfrescoApiService.getInstance());
    }

    ngOnDestroy() {
--- a/lib/content-services/src/lib/content-type/content-type.service.ts
+++ b/lib/content-services/src/lib/content-type/content-type.service.ts
@@ -25,10 +25,13 @@ import { map } from 'rxjs/operators';
 })
 export class ContentTypeService {

-    private typesApi: TypesApi;
+    _typesApi: TypesApi;
+    get typesApi(): TypesApi {
+        this._typesApi = this._typesApi ?? new TypesApi(this.alfrescoApiService.getInstance());
+        return this._typesApi;
+    }

    constructor(private alfrescoApiService: AlfrescoApiService) {
-        this.typesApi = new TypesApi(this.alfrescoApiService.getInstance());
    }

    getContentTypeByPrefix(prefixedType: string): Observable<TypeEntry> {
--- a/lib/content-services/src/lib/dialogs/library/library.dialog.ts
+++ b/lib/content-services/src/lib/dialogs/library/library.dialog.ts
@@ -72,7 +72,11 @@ export class LibraryDialogComponent implements OnInit, OnDestroy {
    ];
    disableCreateButton = false;

-    queriesApi: QueriesApi;
+    _queriesApi: QueriesApi;
+    get queriesApi(): QueriesApi {
+        this._queriesApi = this._queriesApi ?? new QueriesApi(this.alfrescoApiService.getInstance());
+        return this._queriesApi;
+    }

    constructor(
        private alfrescoApiService: AlfrescoApiService,
@@ -80,7 +84,6 @@ export class LibraryDialogComponent implements OnInit, OnDestroy {
        private formBuilder: FormBuilder,
        private dialog: MatDialogRef<LibraryDialogComponent>
    ) {
-        this.queriesApi = new QueriesApi(this.alfrescoApiService.getInstance());
    }

    ngOnInit() {
--- a/lib/content-services/src/lib/dialogs/node-lock.dialog.ts
+++ b/lib/content-services/src/lib/dialogs/node-lock.dialog.ts
@@ -35,7 +35,11 @@ export class NodeLockDialogComponent implements OnInit {
    node: Node = null;
    nodeName: string;

-    private nodesApi: NodesApi;
+    _nodesApi: NodesApi;
+    get nodesApi(): NodesApi {
+        this._nodesApi = this._nodesApi ?? new NodesApi(this.alfrescoApi.getInstance());
+        return this._nodesApi;
+    }

    constructor(
        private formBuilder: FormBuilder,
@@ -45,7 +49,6 @@ export class NodeLockDialogComponent implements OnInit {
        @Inject(MAT_DIALOG_DATA)
        public data: any
    ) {
-        this.nodesApi = new NodesApi(this.alfrescoApi.getInstance());
    }

    ngOnInit() {
--- a/lib/content-services/src/lib/document-list/components/document-list.component.ts
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.ts
@@ -342,7 +342,12 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
    private rowMenuCache: { [key: string]: ContentActionModel[] } = {};
    private loadingTimeout;
    private onDestroy$ = new Subject<boolean>();
-    private nodesApi: NodesApi;
+
+    _nodesApi: NodesApi;
+    get nodesApi(): NodesApi {
+        this._nodesApi = this._nodesApi ?? new NodesApi(this.alfrescoApiService.getInstance());
+        return this._nodesApi;
+    }

    constructor(private documentListService: DocumentListService,
                private ngZone: NgZone,
@@ -353,7 +358,6 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
                private thumbnailService: ThumbnailService,
                private alfrescoApiService: AlfrescoApiService,
                private lockService: LockService) {
-        this.nodesApi = new NodesApi(this.alfrescoApiService.getInstance());
        this.userPreferencesService
            .select(UserPreferenceValues.PaginationSize)
            .pipe(takeUntil(this.onDestroy$))
--- 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
@@ -41,22 +41,49 @@ export class CustomResourcesService {

    private CREATE_PERMISSION = 'create';

-     peopleApi: PeopleApi;
-     sitesApi: SitesApi;
-     trashcanApi: TrashcanApi;
-     searchApi: SearchApi;
-     sharedLinksApi: SharedlinksApi;
-     favoritesApi: FavoritesApi;
-     nodesApi: NodesApi;
+    _peopleApi: PeopleApi;
+    get peopleApi(): PeopleApi {
+        this._peopleApi = this._peopleApi ?? new PeopleApi(this.apiService.getInstance());
+        return this._peopleApi;
+    }
+
+    _sitesApi: SitesApi;
+    get sitesApi(): SitesApi {
+        this._sitesApi = this._sitesApi ?? new SitesApi(this.apiService.getInstance());
+        return this._sitesApi;
+    }
+
+    _trashcanApi: TrashcanApi;
+    get trashcanApi(): TrashcanApi {
+        this._trashcanApi = this._trashcanApi ?? new TrashcanApi(this.apiService.getInstance());
+        return this._trashcanApi;
+    }
+
+    _searchApi: SearchApi;
+    get searchApi(): SearchApi {
+        this._searchApi = this._searchApi ?? new SearchApi(this.apiService.getInstance());
+        return this._searchApi;
+    }
+
+    _sharedLinksApi: SharedlinksApi;
+    get sharedLinksApi(): SharedlinksApi {
+        this._sharedLinksApi = this._sharedLinksApi ?? new SharedlinksApi(this.apiService.getInstance());
+        return this._sharedLinksApi;
+    }
+
+    _favoritesApi: FavoritesApi;
+    get favoritesApi(): FavoritesApi {
+        this._favoritesApi = this._favoritesApi ?? new FavoritesApi(this.apiService.getInstance());
+        return this._favoritesApi;
+    }
+
+    _nodesApi: NodesApi;
+    get nodesApi(): NodesApi {
+        this._nodesApi = this._nodesApi ?? new NodesApi(this.apiService.getInstance());
+        return this._nodesApi;
+    }

    constructor(private apiService: AlfrescoApiService, private logService: LogService) {
-        this.peopleApi = new PeopleApi(this.apiService.getInstance());
-        this.sitesApi = new SitesApi(this.apiService.getInstance());
-        this.favoritesApi = new FavoritesApi(this.apiService.getInstance());
-        this.searchApi = new SearchApi(this.apiService.getInstance());
-        this.sharedLinksApi = new SharedlinksApi(this.apiService.getInstance());
-        this.trashcanApi = new TrashcanApi(this.apiService.getInstance());
-        this.nodesApi = new NodesApi(this.apiService.getInstance());
    }

    /**
@@ -154,7 +181,7 @@ export class CustomResourcesService {
        const options = {
            maxItems: pagination.maxItems,
            skipCount: pagination.skipCount,
-            where: where ? `${where} AND ${defaultPredicate}` : defaultPredicate ,
+            where: where ? `${where} AND ${defaultPredicate}` : defaultPredicate,
            include: includeFieldsRequest
        };

@@ -165,18 +192,18 @@ export class CustomResourcesService {
                            list: {
                                entries: result.list.entries
                                    .map(({ entry }: any) => {
-                                            const target = entry.target.file || entry.target.folder;
-                                            target.properties = {
-                                                ...(target.properties || {
-                                                        'cm:title': entry.title || target.title,
-                                                        'cm:description': entry.description || target.description
-                                                    }),
-                                                ...(entry.properties || {})
-                                            };
+                                        const target = entry.target.file || entry.target.folder;
+                                        target.properties = {
+                                            ...(target.properties || {
+                                                'cm:title': entry.title || target.title,
+                                                'cm:description': entry.description || target.description
+                                            }),
+                                            ...(entry.properties || {})
+                                        };

-                                            return {
-                                                entry: target
-                                            };
+                                        return {
+                                            entry: target
+                                        };
                                    }),
                                pagination: result.list.pagination
                            }
@@ -209,7 +236,7 @@ export class CustomResourcesService {
        return new Observable((observer) => {
            this.sitesApi.listSiteMembershipsForPerson('-me-', options)
                .then((result: SiteRolePaging) => {
-                        const page: SiteMemberPaging = new SiteMemberPaging( {
+                        const page: SiteMemberPaging = new SiteMemberPaging({
                            list: {
                                entries: result.list.entries
                                    .map(({ entry: { site } }: any) => {
--- 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
@@ -34,13 +34,16 @@ export class DocumentListService implements DocumentListLoader {

    static ROOT_ID = '-root-';

-    nodes: NodesApi;
+    _nodesApi: NodesApi;
+    get nodes(): NodesApi {
+        this._nodesApi = this._nodesApi ?? new NodesApi(this.apiService.getInstance());
+        return this._nodesApi;
+    }

    constructor(private contentService: ContentService,
                private apiService: AlfrescoApiService,
                private logService: LogService,
                private customResourcesService: CustomResourcesService) {
-        this.nodes = new NodesApi(this.apiService.getInstance());
    }

    /**
--- a/lib/content-services/src/lib/group/services/group.service.ts
+++ b/lib/content-services/src/lib/group/services/group.service.ts
@@ -24,12 +24,15 @@ import { AlfrescoApiService } from '@alfresco/adf-core';
 })
 export class GroupService {

-    groupsApi: GroupsApi;
+    _groupsApi: GroupsApi;
+    get groupsApi(): GroupsApi {
+        this._groupsApi = this._groupsApi ?? new GroupsApi(this.alfrescoApiService.getInstance());
+        return this._groupsApi;
+    }

    constructor(
        private alfrescoApiService: AlfrescoApiService
    ) {
-        this.groupsApi = new GroupsApi(this.alfrescoApiService.getInstance());
    }

    async listAllGroupMembershipsForPerson(personId: string, opts?: any, accumulator = []): Promise<GroupEntry[]> {
--- 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
@@ -42,13 +42,16 @@ import { RoleModel } from '../models/role.model';
 })
 export class NodePermissionService {

-    groupsApi: GroupsApi;
+    _groupsApi: GroupsApi;
+    get groupsApi(): GroupsApi {
+        this._groupsApi = this._groupsApi ?? new GroupsApi(this.apiService.getInstance());
+        return this._groupsApi;
+    }

    constructor(private apiService: AlfrescoApiService,
                private searchApiService: SearchService,
                private nodeService: NodesApiService,
                private translation: TranslationService) {
-        this.groupsApi = new GroupsApi(this.apiService.getInstance());
    }

    /**
--- a/lib/content-services/src/lib/search/services/base-query-builder.service.ts
+++ b/lib/content-services/src/lib/search/services/base-query-builder.service.ts
@@ -42,7 +42,12 @@ import { SearchForm } from '../models/search-form.interface';
    providedIn: 'root'
 })
 export abstract class BaseQueryBuilderService {
-    private searchApi: SearchApi;
+
+    _searchApi: SearchApi;
+    get searchApi(): SearchApi {
+        this._searchApi = this._searchApi ?? new SearchApi(this.alfrescoApiService.getInstance());
+        return this._searchApi;
+    }

    /*  Stream that emits the search configuration whenever the user change the search forms */
    configUpdated = new Subject<SearchConfiguration>();
@@ -88,7 +93,6 @@ export abstract class BaseQueryBuilderService {
    ranges: { [id: string]: SearchRange } = {};

    constructor(protected appConfig: AppConfigService, protected alfrescoApiService: AlfrescoApiService) {
-        this.searchApi = new SearchApi(this.alfrescoApiService.getInstance());
        this.resetToDefaults();
    }

--- a/lib/content-services/src/lib/social/services/rating.service.ts
+++ b/lib/content-services/src/lib/social/services/rating.service.ts
@@ -26,10 +26,13 @@ import { catchError } from 'rxjs/operators';
 })
 export class RatingService {

-    ratingsApi: RatingsApi;
+    _ratingsApi: RatingsApi;
+    get ratingsApi(): RatingsApi {
+        this._ratingsApi = this._ratingsApi ?? new RatingsApi(this.apiService.getInstance());
+        return this._ratingsApi;
+    }

    constructor(private apiService: AlfrescoApiService, private logService: LogService) {
-        this.ratingsApi = new RatingsApi(this.apiService.getInstance());
    }

    /**
--- a/lib/content-services/src/lib/tag/services/tag.service.ts
+++ b/lib/content-services/src/lib/tag/services/tag.service.ts
@@ -27,7 +27,11 @@ import { TagBody, TagPaging, TagEntry, TagsApi } from '@alfresco/js-api';
 // tslint:disable-next-line: directive-class-suffix
 export class TagService {

-    private tagsApi: TagsApi;
+    _tagsApi: TagsApi;
+    get tagsApi(): TagsApi {
+        this._tagsApi = this._tagsApi ?? new TagsApi(this.apiService.getInstance());
+        return this._tagsApi;
+    }

    /** Emitted when tag information is updated. */
    @Output()
@@ -35,7 +39,6 @@ export class TagService {

    constructor(private apiService: AlfrescoApiService,
                private logService: LogService) {
-        this.tagsApi = new TagsApi(this.apiService.getInstance());
    }

    /**
--- a/lib/content-services/src/lib/version-manager/version-list.component.ts
+++ b/lib/content-services/src/lib/version-manager/version-list.component.ts
@@ -32,9 +32,24 @@ import { ConfirmDialogComponent } from '../dialogs/confirm.dialog';
 })
 export class VersionListComponent implements OnChanges {

-    private versionsApi: VersionsApi;
-    private nodesApi: NodesApi;
-    private contentApi: ContentApi;
+    _contentApi: ContentApi;
+    get contentApi(): ContentApi {
+        this._contentApi = this._contentApi ?? new ContentApi(this.alfrescoApi.getInstance());
+        return this._contentApi;
+    }
+
+    _versionsApi: VersionsApi;
+    get versionsApi(): VersionsApi {
+        this._versionsApi = this._versionsApi ?? new VersionsApi(this.alfrescoApi.getInstance());
+        return this._versionsApi;
+    }
+
+    _nodesApi: NodesApi;
+    get nodesApi(): NodesApi {
+        this._nodesApi = this._nodesApi ?? new NodesApi(this.alfrescoApi.getInstance());
+        return this._nodesApi;
+    }
+
    versions: VersionEntry[] = [];
    isLoading = true;

@@ -73,9 +88,6 @@ export class VersionListComponent implements OnChanges {
    constructor(private alfrescoApi: AlfrescoApiService,
                private contentService: ContentService,
                private dialog: MatDialog) {
-        this.versionsApi = new VersionsApi(this.alfrescoApi.getInstance());
-        this.nodesApi = new NodesApi(this.alfrescoApi.getInstance());
-        this.contentApi = new ContentApi(this.alfrescoApi.getInstance());
    }

    ngOnChanges() {
--- a/lib/content-services/src/lib/webscript/webscript.component.ts
+++ b/lib/content-services/src/lib/webscript/webscript.component.ts
@@ -45,6 +45,12 @@ import { WebscriptApi } from '@alfresco/js-api';
 })
 export class WebscriptComponent implements OnChanges {

+    _webscriptApi: WebscriptApi;
+    get webscriptApi(): WebscriptApi {
+        this._webscriptApi = this._webscriptApi ?? new WebscriptApi(this.apiService.getInstance());
+        return this._webscriptApi;
+    }
+
    /** (required) Path to the webscript (as defined by webscript). */
    @Input()
    scriptPath: string;
@@ -81,11 +87,8 @@ export class WebscriptComponent implements OnChanges {
    data: any = undefined;
    showError: boolean = false;

-    webscriptApi: WebscriptApi;
-
    constructor(private apiService: AlfrescoApiService,
                private logService: LogService) {
-        this.webscriptApi = new WebscriptApi(this.apiService.getInstance());
    }

    ngOnChanges() {