[ADF-5426] Remove compatibility layer from Lib (#7110)

* remove compatibility step 1 * remove compatibility step 2 * remove compatibility step 3 * remove compatibility step 4 * remove compatibility step 5
2025-07-31 17:38:48 +00:00 · 2021-08-04 17:31:35 +02:00
parent 5d5b582e32
commit f30b20cc46
113 changed files with 1375 additions and 2348 deletions
--- a/lib/core/directives/library-favorite.directive.spec.ts
+++ b/lib/core/directives/library-favorite.directive.spec.ts
@@ -36,7 +36,6 @@ class TestComponent {

 describe('LibraryFavoriteDirective', () => {
    let fixture: ComponentFixture<TestComponent>;
-    let api: AlfrescoApiService;
    let component: TestComponent;
    let selection: LibraryEntity;

@@ -50,45 +49,44 @@ describe('LibraryFavoriteDirective', () => {
        });
        fixture = TestBed.createComponent(TestComponent);
        component = fixture.componentInstance;
-        api = TestBed.inject(AlfrescoApiService);
        selection = { entry: { guid: 'guid', id: 'id', title: 'Site', visibility: 'PUBLIC' }, isLibrary: true, isFavorite: false };
        component.selection = selection;
    });

    it('should not check for favorite if no selection exists', () => {
-        spyOn(api.peopleApi, 'getFavoriteSite');
+        spyOn(component.directive['favoritesApi'], 'getFavoriteSite');
        fixture.detectChanges();

-        expect(api.peopleApi.getFavoriteSite).not.toHaveBeenCalled();
+        expect(component.directive['favoritesApi'].getFavoriteSite).not.toHaveBeenCalled();
    });

    it('should mark selection as favorite', async () => {
-        spyOn(api.peopleApi, 'getFavoriteSite').and.returnValue(Promise.resolve(null));
+        spyOn(component.directive['favoritesApi'], 'getFavoriteSite').and.returnValue(Promise.resolve(null));

        delete selection.isFavorite;

        fixture.detectChanges();
        await fixture.whenStable();

-        expect(api.peopleApi.getFavoriteSite).toHaveBeenCalled();
+        expect(component.directive['favoritesApi'].getFavoriteSite).toHaveBeenCalled();
        expect(component.directive.isFavorite()).toBe(true);
    });

    it('should mark selection not favorite', async () => {
-        spyOn(api.peopleApi, 'getFavoriteSite').and.returnValue(Promise.reject());
+        spyOn(component.directive['favoritesApi'], 'getFavoriteSite').and.returnValue(Promise.reject());

        delete selection.isFavorite;

        fixture.detectChanges();
        await fixture.whenStable();

-        expect(api.peopleApi.getFavoriteSite).toHaveBeenCalled();
+        expect(component.directive['favoritesApi'].getFavoriteSite).toHaveBeenCalled();
        expect(component.directive.isFavorite()).toBe(false);
    });

    it('should call addFavorite() on click event when selection is not a favorite', async () => {
-        spyOn(api.peopleApi, 'getFavoriteSite').and.returnValue(Promise.reject());
-        spyOn(api.peopleApi, 'addFavorite').and.returnValue(Promise.resolve(null));
+        spyOn(component.directive['favoritesApi'], 'getFavoriteSite').and.returnValue(Promise.reject());
+        spyOn(component.directive['favoritesApi'], 'createFavorite').and.returnValue(Promise.resolve(null));

        fixture.detectChanges();
        await fixture.whenStable();
@@ -97,12 +95,12 @@ describe('LibraryFavoriteDirective', () => {

        fixture.nativeElement.querySelector('button').dispatchEvent(new MouseEvent('click'));
        fixture.detectChanges();
-        expect(api.peopleApi.addFavorite).toHaveBeenCalled();
+        expect(component.directive['favoritesApi'].createFavorite).toHaveBeenCalled();
    });

    it('should call removeFavoriteSite() on click event when selection is favorite', async () => {
-        spyOn(api.peopleApi, 'getFavoriteSite').and.returnValue(Promise.resolve(null));
-        spyOn(api.favoritesApi, 'removeFavoriteSite').and.returnValue(Promise.resolve());
+        spyOn(component.directive['favoritesApi'], 'getFavoriteSite').and.returnValue(Promise.resolve(null));
+        spyOn(component.directive['favoritesApi'], 'deleteFavorite').and.returnValue(Promise.resolve());

        selection.isFavorite = true;

@@ -116,6 +114,6 @@ describe('LibraryFavoriteDirective', () => {
        fixture.detectChanges();
        await fixture.whenStable();

-        expect(api.favoritesApi.removeFavoriteSite).toHaveBeenCalled();
+        expect(component.directive['favoritesApi'].deleteFavorite).toHaveBeenCalled();
    });
 });
--- a/lib/core/directives/library-favorite.directive.ts
+++ b/lib/core/directives/library-favorite.directive.ts
@@ -16,7 +16,7 @@
 */

 import { Directive, HostListener, Input, OnChanges, Output, EventEmitter } from '@angular/core';
-import { SiteBody, FavoriteBody, FavoriteEntry, Site } from '@alfresco/js-api';
+import { SiteBody, FavoriteBody, FavoriteEntry, Site, FavoritesApi } from '@alfresco/js-api';
 import { AlfrescoApiService } from '../services/alfresco-api.service';

 export interface LibraryEntity {
@@ -38,6 +38,7 @@ export class LibraryFavoriteDirective implements OnChanges {
    @Output() error = new EventEmitter<any>();

    private targetLibrary = null;
+    private favoritesApi: FavoritesApi;

    @HostListener('click')
    onClick() {
@@ -56,7 +57,9 @@ export class LibraryFavoriteDirective implements OnChanges {
        }
    }

-    constructor(private alfrescoApiService: AlfrescoApiService) {}
+    constructor(private alfrescoApiService: AlfrescoApiService) {
+        this.favoritesApi = new FavoritesApi(this.alfrescoApiService.getInstance());
+    }

    ngOnChanges(changes) {
        if (!changes.library.currentValue) {
@@ -75,7 +78,7 @@ export class LibraryFavoriteDirective implements OnChanges {
    private async markFavoriteLibrary(library: LibraryEntity) {
        if (this.targetLibrary.isFavorite === undefined) {
            try {
-                await this.alfrescoApiService.peopleApi.getFavoriteSite('-me-', library.entry.id);
+                await this.favoritesApi.getFavoriteSite('-me-', library.entry.id);
                this.targetLibrary.isFavorite = true;
            } catch {
                this.targetLibrary.isFavorite = false;
@@ -86,8 +89,8 @@ export class LibraryFavoriteDirective implements OnChanges {
    }

    private addFavorite(favoriteBody: FavoriteBody) {
-        this.alfrescoApiService.peopleApi
-            .addFavorite('-me-', favoriteBody)
+        this.favoritesApi
+            .createFavorite('-me-', favoriteBody)
            .then((libraryEntry: FavoriteEntry) => {
                this.targetLibrary.isFavorite = true;
                this.toggle.emit(libraryEntry);
@@ -96,8 +99,8 @@ export class LibraryFavoriteDirective implements OnChanges {
    }

    private removeFavorite(favoriteId: string) {
-        this.alfrescoApiService.favoritesApi
-            .removeFavoriteSite('-me-', favoriteId)
+        this.favoritesApi
+            .deleteFavorite('-me-', favoriteId)
            .then((libraryBody: SiteBody) => {
                this.targetLibrary.isFavorite = false;
                this.toggle.emit(libraryBody);
--- a/lib/core/directives/library-membership.directive.spec.ts
+++ b/lib/core/directives/library-membership.directive.spec.ts
@@ -28,7 +28,6 @@ import { CoreTestingModule } from '../testing/core.testing.module';
 describe('LibraryMembershipDirective', () => {
    let alfrescoApiService: AlfrescoApiService;
    let directive: LibraryMembershipDirective;
-    let peopleApi: any;
    let sitesService: SitesService;
    let addMembershipSpy: jasmine.Spy;
    let getMembershipSpy: jasmine.Spy;
@@ -64,7 +63,6 @@ describe('LibraryMembershipDirective', () => {

        alfrescoApiService = TestBed.inject(AlfrescoApiService);
        sitesService = TestBed.inject(SitesService);
-        peopleApi = alfrescoApiService.getInstance().core.peopleApi;
        directive = new LibraryMembershipDirective(alfrescoApiService, sitesService, {
            ecmProductInfo$: new Subject(),
            isVersionSupported: () => mockSupportedVersion
@@ -73,7 +71,7 @@ describe('LibraryMembershipDirective', () => {

    describe('markMembershipRequest', () => {
        beforeEach(() => {
-            getMembershipSpy = spyOn(peopleApi, 'getSiteMembershipRequest').and.returnValue(Promise.resolve({ entry: requestedMembershipResponse }));
+            getMembershipSpy = spyOn(directive['sitesApi'], 'getSiteMembershipRequestForPerson').and.returnValue(Promise.resolve({ entry: requestedMembershipResponse }));
        });

        it('should not check membership requests if no entry is selected', fakeAsync(() => {
@@ -114,9 +112,9 @@ describe('LibraryMembershipDirective', () => {
    describe('toggleMembershipRequest', () => {
        beforeEach(() => {
            mockSupportedVersion = false;
-            getMembershipSpy = spyOn(peopleApi, 'getSiteMembershipRequest').and.returnValue(Promise.resolve({ entry: requestedMembershipResponse }));
-            addMembershipSpy = spyOn(peopleApi, 'addSiteMembershipRequest').and.returnValue(Promise.resolve({ entry: requestedMembershipResponse }));
-            deleteMembershipSpy = spyOn(peopleApi, 'removeSiteMembershipRequest').and.returnValue(Promise.resolve({}));
+            getMembershipSpy = spyOn(directive['sitesApi'], 'getSiteMembershipRequestForPerson').and.returnValue(Promise.resolve({ entry: requestedMembershipResponse }));
+            addMembershipSpy = spyOn(directive['sitesApi'], 'createSiteMembershipRequestForPerson').and.returnValue(Promise.resolve({ entry: requestedMembershipResponse }));
+            deleteMembershipSpy = spyOn(directive['sitesApi'], 'deleteSiteMembershipRequestForPerson').and.returnValue(Promise.resolve({}));
        });

        it('should do nothing if there is no selected library ', fakeAsync(() => {
--- a/lib/core/directives/library-membership.directive.ts
+++ b/lib/core/directives/library-membership.directive.ts
@@ -16,7 +16,13 @@
 */

 import { Directive, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { SiteEntry, SiteMembershipRequestBody, SiteMemberEntry, SiteMembershipRequestEntry } from '@alfresco/js-api';
+import {
+    SiteEntry,
+    SiteMembershipRequestBody,
+    SiteMemberEntry,
+    SiteMembershipRequestEntry,
+    SitesApi
+} from '@alfresco/js-api';
 import { BehaviorSubject, from, Observable } from 'rxjs';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { SitesService } from '../services/sites.service';
@@ -42,6 +48,8 @@ export class LibraryMembershipDirective implements OnChanges {

    isJoinRequested: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);

+    private sitesApi: SitesApi;
+
    /** Site for which to toggle the membership request. */
    @Input('adf-library-membership')
    selection: SiteEntry = null;
@@ -66,7 +74,9 @@ export class LibraryMembershipDirective implements OnChanges {
        private alfrescoApiService: AlfrescoApiService,
        private sitesService: SitesService,
        private versionCompatibilityService: VersionCompatibilityService
-    ) {}
+    ) {
+        this.sitesApi = new SitesApi(this.alfrescoApiService.getInstance());
+    }

    ngOnChanges(changes: SimpleChanges) {
        if (!changes.selection.currentValue || !changes.selection.currentValue.entry) {
@@ -209,7 +219,7 @@ export class LibraryMembershipDirective implements OnChanges {
        if (this.versionCompatibilityService.isVersionSupported('7.0.0')) {
            memberBody.client = 'workspace';
        }
-        return from(this.alfrescoApiService.peopleApi.addSiteMembershipRequest('-me-', memberBody));
+        return from(this.sitesApi.createSiteMembershipRequestForPerson('-me-', memberBody));
    }

    private joinLibrary() {
@@ -220,10 +230,10 @@ export class LibraryMembershipDirective implements OnChanges {
    }

    private cancelJoinRequest() {
-        return from(this.alfrescoApiService.peopleApi.removeSiteMembershipRequest('-me-', this.targetSite.id));
+        return from(this.sitesApi.deleteSiteMembershipRequestForPerson('-me-', this.targetSite.id));
    }

    private getMembershipRequest() {
-        return from(this.alfrescoApiService.peopleApi.getSiteMembershipRequest('-me-', this.targetSite.id));
+        return from(this.sitesApi.getSiteMembershipRequestForPerson('-me-', this.targetSite.id));
    }
 }
--- a/lib/core/directives/node-delete.directive.spec.ts
+++ b/lib/core/directives/node-delete.directive.spec.ts
@@ -18,7 +18,6 @@
 import { Component, DebugElement, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { NodeDeleteDirective } from './node-delete.directive';
 import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';
@@ -84,11 +83,10 @@ describe('NodeDeleteDirective', () => {
    let elementWithPermanentDelete: DebugElement;
    let component: TestComponent;
    let componentWithPermanentDelete: TestDeletePermanentComponent;
-    let alfrescoApi: AlfrescoApiService;
-    let nodeApi;
    let deleteNodeSpy: any;
-    let purgeDeletedNodeSpy: any;
    let disposableDelete: any;
+    let deleteNodePermanentSpy: any;
+    let purgeDeletedNodePermanentSpy: any;

    setupTestBed({
        imports: [
@@ -103,11 +101,6 @@ describe('NodeDeleteDirective', () => {
    });

    beforeEach(() => {
-        alfrescoApi = TestBed.inject(AlfrescoApiService);
-        nodeApi = alfrescoApi.nodesApi;
-        deleteNodeSpy = spyOn(nodeApi, 'deleteNode').and.returnValue(Promise.resolve());
-        purgeDeletedNodeSpy = spyOn(nodeApi, 'purgeDeletedNode').and.returnValue(Promise.resolve());
-
        fixture = TestBed.createComponent(TestComponent);
        fixtureWithPermissions = TestBed.createComponent(TestWithPermissionsComponent);
        fixtureWithPermanentComponent = TestBed.createComponent(TestDeletePermanentComponent);
@@ -117,6 +110,12 @@ describe('NodeDeleteDirective', () => {

        element = fixture.debugElement.query(By.directive(NodeDeleteDirective));
        elementWithPermanentDelete = fixtureWithPermanentComponent.debugElement.query(By.directive(NodeDeleteDirective));
+
+        deleteNodeSpy = spyOn(component.deleteDirective['nodesApi'], 'deleteNode').and.returnValue(Promise.resolve());
+
+        deleteNodePermanentSpy = spyOn(componentWithPermanentDelete.deleteDirective['nodesApi'], 'deleteNode').and.returnValue(Promise.resolve());
+        purgeDeletedNodePermanentSpy = spyOn(componentWithPermanentDelete.deleteDirective['trashcanApi'], 'deleteDeletedNode').and.returnValue(Promise.resolve());
+
    });

    afterEach(() => {
@@ -357,7 +356,7 @@ describe('NodeDeleteDirective', () => {
                elementWithPermanentDelete.nativeElement.click();

                fixture.whenStable().then(() => {
-                    expect(deleteNodeSpy).toHaveBeenCalledWith('1', { permanent: true });
+                    expect(deleteNodePermanentSpy).toHaveBeenCalledWith('1', { permanent: true });
                    done();
                });
            });
@@ -374,7 +373,7 @@ describe('NodeDeleteDirective', () => {
                elementWithPermanentDelete.nativeElement.click();

                fixture.whenStable().then(() => {
-                    expect(purgeDeletedNodeSpy).toHaveBeenCalledWith('1');
+                    expect(purgeDeletedNodePermanentSpy).toHaveBeenCalledWith('1');
                    done();
                });
            });
--- a/lib/core/directives/node-delete.directive.ts
+++ b/lib/core/directives/node-delete.directive.ts
@@ -18,7 +18,7 @@
 /* tslint:disable:no-input-rename  */

 import { Directive, ElementRef, EventEmitter, HostListener, Input, OnChanges, Output } from '@angular/core';
-import { NodeEntry, Node, DeletedNodeEntity, DeletedNode } from '@alfresco/js-api';
+import { NodeEntry, Node, DeletedNodeEntity, DeletedNode, TrashcanApi, NodesApi } from '@alfresco/js-api';
 import { Observable, forkJoin, from, of } from 'rxjs';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { TranslationService } from '../services/translation.service';
@@ -62,6 +62,9 @@ export class NodeDeleteDirective implements OnChanges {
    @Output()
    delete: EventEmitter<any> = new EventEmitter();

+    private trashcanApi: TrashcanApi;
+    private nodesApi: NodesApi;
+
    @HostListener('click')
    onClick() {
        this.process(this.selection);
@@ -70,6 +73,8 @@ 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() {
@@ -113,9 +118,9 @@ export class NodeDeleteDirective implements OnChanges {
        let promise: Promise<any>;

        if (node.entry.hasOwnProperty('archivedAt') && node.entry['archivedAt']) {
-            promise = this.alfrescoApiService.nodesApi.purgeDeletedNode(id);
+            promise = this.trashcanApi.deleteDeletedNode(id);
        } else {
-            promise = this.alfrescoApiService.nodesApi.deleteNode(id, { permanent: this.permanent });
+            promise = this.nodesApi.deleteNode(id, { permanent: this.permanent });
        }

        return from(promise).pipe(
--- a/lib/core/directives/node-download.directive.spec.ts
+++ b/lib/core/directives/node-download.directive.spec.ts
@@ -18,7 +18,7 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { MatDialog } from '@angular/material/dialog';
-import { Component, DebugElement } from '@angular/core';
+import { Component, DebugElement, ViewChild } from '@angular/core';
 import { setupTestBed } from '../testing/setup-test-bed';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { NodeDownloadDirective } from './node-download.directive';
@@ -29,6 +29,9 @@ import { TranslateModule } from '@ngx-translate/core';
    template: '<div [adfNodeDownload]="selection" [version]="version"></div>'
 })
 class TestComponent {
+    @ViewChild(NodeDownloadDirective, { static: true })
+    downloadDirective: NodeDownloadDirective;
+
    selection;
    version;
 }
@@ -65,7 +68,7 @@ describe('NodeDownloadDirective', () => {
        element = fixture.debugElement.query(By.directive(NodeDownloadDirective));
        dialog = TestBed.inject(MatDialog);
        apiService = TestBed.inject(AlfrescoApiService);
-        contentService = apiService.getInstance().content;
+        contentService = component.downloadDirective['contentApi'];
        dialogSpy = spyOn(dialog, 'open');
    });

--- a/lib/core/directives/node-download.directive.ts
+++ b/lib/core/directives/node-download.directive.ts
@@ -19,7 +19,7 @@ import { Directive, Input, HostListener } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { DownloadZipDialogComponent } from '../dialogs/download-zip/download-zip.dialog';
-import { NodeEntry, VersionEntry } from '@alfresco/js-api';
+import { ContentApi, NodeEntry, VersionEntry } from '@alfresco/js-api';
 import { DownloadService } from '../services/download.service';

 /**
@@ -31,6 +31,8 @@ import { DownloadService } from '../services/download.service';
 })
 export class NodeDownloadDirective {

+    private contentApi: ContentApi;
+
    /** Nodes to download. */
    @Input('adfNodeDownload')
    nodes: NodeEntry | NodeEntry[];
@@ -48,6 +50,7 @@ export class NodeDownloadDirective {
        private apiService: AlfrescoApiService,
        private downloadService: DownloadService,
        private dialog: MatDialog) {
+        this.contentApi = new ContentApi(this.apiService.getInstance());
    }

    /**
@@ -101,16 +104,15 @@ export class NodeDownloadDirective {

    private downloadFile(node: NodeEntry) {
        if (node && node.entry) {
-            const contentApi = this.apiService.getInstance().content;
            // nodeId for Shared node
            const id = (<any> node.entry).nodeId || node.entry.id;

            let url, fileName;
            if (this.version) {
-                url = contentApi.getVersionContentUrl(id, this.version.entry.id, true);
+                url = this.contentApi.getVersionContentUrl(id, this.version.entry.id, true);
                fileName = this.version.entry.name;
            } else {
-                url = contentApi.getContentUrl(id, true);
+                url = this.contentApi.getContentUrl(id, true);
                fileName = node.entry.name;
            }

--- a/lib/core/directives/node-favorite.directive.spec.ts
+++ b/lib/core/directives/node-favorite.directive.spec.ts
@@ -72,7 +72,7 @@ describe('NodeFavoriteDirective', () => {
        });

        it('should reset favorites if selection is empty', fakeAsync(() => {
-            spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'getFavorite').and.returnValue(Promise.resolve(null));
+            spyOn(directive['favoritesApi'], 'getFavorite').and.returnValue(Promise.resolve(null));

            const selection = [
                { entry: { id: '1', name: 'name1' } }
@@ -96,7 +96,7 @@ describe('NodeFavoriteDirective', () => {
        let favoritesApiSpy;

        beforeEach(() => {
-            favoritesApiSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'getFavorite')
+            favoritesApiSpy = spyOn(directive['favoritesApi'], 'getFavorite')
                .and.returnValue(Promise.resolve(null));
        });

@@ -177,8 +177,8 @@ describe('NodeFavoriteDirective', () => {
        let addFavoriteSpy;

        beforeEach(() => {
-            removeFavoriteSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'removeFavoriteSite').and.callThrough();
-            addFavoriteSpy = spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'addFavorite').and.callThrough();
+            removeFavoriteSpy = spyOn(directive['favoritesApi'], 'deleteFavorite').and.callThrough();
+            addFavoriteSpy = spyOn(directive['favoritesApi'], 'createFavorite').and.callThrough();
        });

        afterEach(() => {
@@ -326,7 +326,7 @@ describe('NodeFavoriteDirective', () => {
    describe('getFavorite()', () => {

        it('should not hit server when using 6.x api', fakeAsync(() => {
-            spyOn(alfrescoApiService.favoritesApi, 'getFavorite').and.callThrough();
+            spyOn(directive['favoritesApi'], 'getFavorite').and.callThrough();

            const selection = [
                { entry: { id: '1', name: 'name1', isFavorite: true } }
@@ -337,11 +337,11 @@ describe('NodeFavoriteDirective', () => {
            tick();

            expect(directive.favorites[0].entry.isFavorite).toBe(true);
-            expect(alfrescoApiService.favoritesApi.getFavorite).not.toHaveBeenCalled();
+            expect(directive['favoritesApi'].getFavorite).not.toHaveBeenCalled();
        }));

        it('should process node as favorite', fakeAsync(() => {
-            spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'getFavorite').and.returnValue(Promise.resolve(null));
+            spyOn(directive['favoritesApi'], 'getFavorite').and.returnValue(Promise.resolve(null));

            const selection = [
                { entry: { id: '1', name: 'name1' } }
@@ -355,7 +355,7 @@ describe('NodeFavoriteDirective', () => {
        }));

        it('should not process node as favorite', fakeAsync(() => {
-            spyOn(alfrescoApiService.getInstance().core.favoritesApi, 'getFavorite').and.returnValue(Promise.reject({}));
+            spyOn(directive['favoritesApi'], 'getFavorite').and.returnValue(Promise.reject({}));

            const selection = [
                { entry: { id: '1', name: 'name1' } }
--- a/lib/core/directives/node-favorite.directive.ts
+++ b/lib/core/directives/node-favorite.directive.ts
@@ -18,7 +18,7 @@
 /* tslint:disable:no-input-rename  */

 import { Directive, EventEmitter, HostListener, Input, OnChanges, Output } from '@angular/core';
-import { FavoriteBody, NodeEntry, SharedLinkEntry, Node, SharedLink } from '@alfresco/js-api';
+import { FavoriteBody, NodeEntry, SharedLinkEntry, Node, SharedLink, FavoritesApi } from '@alfresco/js-api';
 import { Observable, from, forkJoin, of } from 'rxjs';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { catchError, map } from 'rxjs/operators';
@@ -30,6 +30,8 @@ import { catchError, map } from 'rxjs/operators';
 export class NodeFavoriteDirective implements OnChanges {
    favorites: any[] = [];

+    private favoritesApi: FavoritesApi;
+
    /** Array of nodes to toggle as favorites. */
    @Input('adf-node-favorite')
    selection: NodeEntry[] = [];
@@ -46,6 +48,7 @@ export class NodeFavoriteDirective implements OnChanges {
    }

    constructor(private alfrescoApiService: AlfrescoApiService) {
+        this.favoritesApi = new FavoritesApi(this.alfrescoApiService.getInstance());
    }

    ngOnChanges(changes) {
@@ -70,7 +73,7 @@ export class NodeFavoriteDirective implements OnChanges {
                // shared files have nodeId
                const id = (<SharedLinkEntry> selected).entry.nodeId || selected.entry.id;

-                return from(this.alfrescoApiService.favoritesApi.removeFavoriteSite('-me-', id));
+                return from(this.favoritesApi.deleteFavorite('-me-', id));
            });

            forkJoin(batch).subscribe(
@@ -86,7 +89,7 @@ export class NodeFavoriteDirective implements OnChanges {
            const notFavorite = this.favorites.filter((node) => !node.entry.isFavorite);
            const body: FavoriteBody[] = notFavorite.map((node) => this.createFavoriteBody(node));

-            from(this.alfrescoApiService.favoritesApi.addFavorite('-me-', <any> body))
+            from(this.favoritesApi.createFavorite('-me-', <any> body))
                .subscribe(
                    () => {
                        notFavorite.map((selected) => selected.entry.isFavorite = true);
@@ -133,9 +136,9 @@ export class NodeFavoriteDirective implements OnChanges {

        // ACS 5.x and 6.x without 'isFavorite' include
        const { name, isFile, isFolder } = <Node> node;
-        const id =  (<SharedLink> node).nodeId || node.id;
+        const id = (<SharedLink> node).nodeId || node.id;

-        const promise = this.alfrescoApiService.favoritesApi.getFavorite('-me-', id);
+        const promise = this.favoritesApi.getFavorite('-me-', id);

        return from(promise).pipe(
            map(() => ({
--- a/lib/core/directives/node-restore.directive.spec.ts
+++ b/lib/core/directives/node-restore.directive.spec.ts
@@ -18,7 +18,6 @@
 import { Component, DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { NodeRestoreDirective } from './node-restore.directive';
 import { setupTestBed } from '../testing/setup-test-bed';
 import { TranslationService } from '../services/translation.service';
@@ -41,9 +40,7 @@ describe('NodeRestoreDirective', () => {
    let fixture: ComponentFixture<TestComponent>;
    let element: DebugElement;
    let component: TestComponent;
-    let alfrescoService: AlfrescoApiService;
-    let nodesService;
-    let coreApi;
+    let trashcanApi;
    let directiveInstance;
    let restoreNodeSpy: any;
    let translationService: TranslationService;
@@ -64,12 +61,10 @@ describe('NodeRestoreDirective', () => {
        element = fixture.debugElement.query(By.directive(NodeRestoreDirective));
        directiveInstance = element.injector.get(NodeRestoreDirective);

-        alfrescoService = TestBed.inject(AlfrescoApiService);
-        nodesService = alfrescoService.getInstance().nodes;
-        coreApi = alfrescoService.getInstance().core;
+        trashcanApi = directiveInstance['trashcanApi'];

-        restoreNodeSpy = spyOn(nodesService, 'restoreNode').and.returnValue(Promise.resolve());
-        spyOn(coreApi.nodesApi, 'getDeletedNodes').and.returnValue(Promise.resolve({
+        restoreNodeSpy = spyOn(trashcanApi, 'restoreDeletedNode').and.returnValue(Promise.resolve());
+        spyOn(trashcanApi, 'listDeletedNodes').and.returnValue(Promise.resolve({
            list: { entries: [] }
        }));

@@ -83,7 +78,7 @@ describe('NodeRestoreDirective', () => {
        fixture.detectChanges();
        element.triggerEventHandler('click', null);

-        expect(nodesService.restoreNode).not.toHaveBeenCalled();
+        expect(trashcanApi.restoreDeletedNode).not.toHaveBeenCalled();
    });

    it('should not restore nodes when selection has nodes without path', (done) => {
@@ -93,7 +88,7 @@ describe('NodeRestoreDirective', () => {
        fixture.whenStable().then(() => {
            element.triggerEventHandler('click', null);

-            expect(nodesService.restoreNode).not.toHaveBeenCalled();
+            expect(trashcanApi.restoreDeletedNode).not.toHaveBeenCalled();
            done();
        });
    });
@@ -104,7 +99,7 @@ describe('NodeRestoreDirective', () => {
        fixture.detectChanges();
        element.triggerEventHandler('click', null);
        fixture.whenStable().then(() => {
-            expect(nodesService.restoreNode).toHaveBeenCalled();
+            expect(trashcanApi.restoreDeletedNode).toHaveBeenCalled();
            done();
        });
    });
--- a/lib/core/directives/node-restore.directive.ts
+++ b/lib/core/directives/node-restore.directive.ts
@@ -18,7 +18,7 @@
 /* tslint:disable:component-selector no-input-rename */

 import { Directive, EventEmitter, HostListener, Input, Output } from '@angular/core';
-import { DeletedNodeEntry, DeletedNodesPaging, PathInfoEntity } from '@alfresco/js-api';
+import { TrashcanApi, DeletedNodeEntry, DeletedNodesPaging, PathInfoEntity } from '@alfresco/js-api';
 import { Observable, forkJoin, from, of } from 'rxjs';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { TranslationService } from '../services/translation.service';
@@ -35,6 +35,7 @@ export class RestoreMessageModel {
 })
 export class NodeRestoreDirective {
    private readonly restoreProcessStatus;
+    private trashcanApi: TrashcanApi;

    /** Array of deleted nodes to restore. */
    @Input('adf-restore')
@@ -52,6 +53,7 @@ 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) {
@@ -100,8 +102,7 @@ export class NodeRestoreDirective {
    }

    private getDeletedNodes(): Observable<DeletedNodesPaging> {
-        const promise = this.alfrescoApiService.getInstance()
-            .core.nodesApi.getDeletedNodes({ include: ['path'] });
+        const promise = this.trashcanApi.listDeletedNodes({ include: ['path'] });

        return from(promise);
    }
@@ -109,7 +110,7 @@ export class NodeRestoreDirective {
    private restoreNode(node): Observable<any> {
        const { entry } = node;

-        const promise = this.alfrescoApiService.getInstance().nodes.restoreNode(entry.id);
+        const promise = this.trashcanApi.restoreDeletedNode(entry.id);

        return from(promise).pipe(
            map(() => ({