Update branch for ADF 6.0.0-A.2-7992 and JS-API 5.4.0-561 [ci:force] (#2952)

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 6.0.0-A.2-8156 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 37793

* [ci:force][auto-commit] Update @alfresco/adf-core to 6.0.0-A.2-7992 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 37793

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 6.0.0-A.2-8156 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 37793

* [ci:force][auto-commit] Update @alfresco/adf-cli to 6.0.0-A.2-7992 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 37793

* [ci:force][auto-commit] Update @alfresco/adf-testing to 6.0.0-A.2-7992 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 37793

* [AAE-10778] Fix viewer BC: replace adf-viewer with adf-alfresco-viewer

* Update @alfresco/adf-extensions and @alfresco/adf-content-services to 6.0.0-A.2-7992

* [AAE-10778] Fix viewer BC: fix Unit node effects unit tests, replace ViewUtilService with RenditionViewerService since method 'printFileGeneric' has been moved from ViewUtilService to RenditionViewerService

* Fix comments-tab unit test: provide a mock onLogout value

---------

Co-authored-by: Amedeo Lepore <amedeo.lepore@hyland.com>

e2e/suites/actions/share/share-file.test.ts

@@ -181,7 +181,8 @@ describe('Share a file', () => {
         expect(await page.getSnackBarMessage()).toBe('Link copied to the clipboard');
 
         await browser.get(url);
-        expect(await viewer.isViewerOpened()).toBe(true, 'viewer is not open');
+
+        await viewer.waitForViewerToOpen();
         expect(await viewer.getFileTitle()).toEqual(file4);
 
         await page.load();

e2e/suites/actions/share/unshare-file-search-results.test.ts

@@ -163,7 +163,7 @@ describe('Unshare a file from Search Results', () => {
     expect(await apis.user.nodes.isFileShared(file2Id)).toBe(false, `${file2} is shared`);
 
     await browser.get(url);
-    expect(await viewer.isViewerOpened()).toBe(true, 'viewer is not open');
+    await viewer.waitForViewerToOpen();
     expect(await viewer.getFileTitle()).not.toEqual(file2);
 
     await page.load();
@@ -213,7 +213,7 @@ describe('Unshare a file from Search Results', () => {
     expect(await apis.user.nodes.isFileShared(file4Id)).toBe(false, `${file4} is shared`);
 
     await browser.get(url);
-    expect(await viewer.isViewerOpened()).toBe(true, 'viewer is not open');
+    await viewer.waitForViewerToOpen();
     expect(await viewer.getFileTitle()).not.toEqual(file4);
 
     await page.load();

package-lock.json

@@ -11,9 +11,9 @@
       "dev": true
     },
     "@alfresco/adf-cli": {
-      "version": "6.0.0-A.2-4049216756",
+      "version": "6.0.0-A.2-7992",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.0.0-A.2-4049216756.tgz",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.0.0-A.2-7992.tgz",
-      "integrity": "sha512-Y78VgYJ63xu1GLUQ+W1j+ovFQg9rlXF6Wniy45rAxTDOg0Jxs9MO0/LIq3R39tlXwmKOSYc53IHMCzk7aFU7sw==",
+      "integrity": "sha512-/OEkdrT9Xn9cDu758IGzayPefie8tZqjqdsEAB/keB3Oo8b8EbwhL3lxHH0c9NrrAlClv6FJozuwqenUyhgJyw==",
       "dev": true,
       "requires": {
         "@alfresco/js-api": "5.3.0",
@@ -42,17 +42,17 @@
       }
     },
     "@alfresco/adf-content-services": {
-      "version": "6.0.0-A.2-4049216756",
+      "version": "6.0.0-A.2-7992",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.0.0-A.2-4049216756.tgz",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.0.0-A.2-7992.tgz",
-      "integrity": "sha512-JAntutGNRX+2DjeC9WHHAuQ9EKj2duAXt3o0I/m0Bk4GhqLcvRdVIlHciScNmj7Xha3YZLIZvwMxv2OFC/tGrg==",
+      "integrity": "sha512-KJcGBjpFqCkP9OAe3YkVxk2XqVN89ezslSEnYxgOz5us+aJ7UAHSFtAgkF/0kJMXpKjWoLPpDZrDNVky3/qU4Q==",
       "requires": {
         "tslib": "^2.3.0"
       }
     },
     "@alfresco/adf-core": {
-      "version": "6.0.0-A.2-4049216756",
+      "version": "6.0.0-A.2-7992",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.0.0-A.2-4049216756.tgz",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.0.0-A.2-7992.tgz",
-      "integrity": "sha512-POl0fgR1+3afoLOzwRd5xAnJsbOyhojB3sSA817yIWtv0AhutwLWRs498R82fsK2BOC0L+O8GZQeME7G2Iz0VA==",
+      "integrity": "sha512-BbutvDL1TRTBoKXlG8e5r1ray8CE5lccP638wthJWwvKIBMamJvtc2KlpYSCr8jb2UcVjPbeh5/6u2Gg9x0zWg==",
       "requires": {
         "@editorjs/code": "2.7.0",
         "@editorjs/editorjs": "2.26.4",
@@ -70,17 +70,17 @@
       }
     },
     "@alfresco/adf-extensions": {
-      "version": "6.0.0-A.2-4049216756",
+      "version": "6.0.0-A.2-7992",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.0.0-A.2-4049216756.tgz",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.0.0-A.2-7992.tgz",
-      "integrity": "sha512-cAG1cbnD2SVY3AwuVIFXKoSktaTGYWs6IjKwKgK1xDFjFsU/LCGwZVWErzlOwTnNO293MthyH0r6nKnAQSiJxQ==",
+      "integrity": "sha512-HIFawh2zuiHee8/7dxlfaG5xh6KWcCn0NJNZ0bLV/dxLrOk7MYBxlvHthsepVpfWn7lMAtuybQ/0CzGX/KnLEQ==",
       "requires": {
         "tslib": "^2.3.0"
       }
     },
     "@alfresco/adf-testing": {
-      "version": "6.0.0-A.2-4049216756",
+      "version": "6.0.0-A.2-7992",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.0.0-A.2-4049216756.tgz",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.0.0-A.2-7992.tgz",
-      "integrity": "sha512-/gMLbq7XJfIs8lYry6SwsTqsNgUkGmbbDYX3uHhyC8iS2Eni3mNT7o/dD8wKUCUV7hrVC77usp6xRqbKl29rKQ==",
+      "integrity": "sha512-9jXEGTCJ0HqiY1xsAp8yg5kAmqTytWLyCabddBX22RA1++HM4+XETUjoDap3+JVaFmqTRxCbgwdokre63c1wZA==",
       "dev": true,
       "requires": {
         "@alfresco/js-api": "5.4.0-561",

package.json

@@ -27,9 +27,9 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "6.0.0-A.2-4049216756",
+    "@alfresco/adf-content-services": "^6.0.0-A.2-7992",
-    "@alfresco/adf-core": "6.0.0-A.2-4049216756",
+    "@alfresco/adf-core": "6.0.0-A.2-7992",
-    "@alfresco/adf-extensions": "6.0.0-A.2-4049216756",
+    "@alfresco/adf-extensions": "^6.0.0-A.2-7992",
     "@alfresco/js-api": "5.4.0-561",
     "@angular/animations": "14.1.2",
     "@angular/cdk": "14.1.2",
@@ -59,8 +59,8 @@
     "zone.js": "0.11.8"
   },
   "devDependencies": {
-    "@alfresco/adf-cli": "6.0.0-A.2-4049216756",
+    "@alfresco/adf-cli": "6.0.0-A.2-7992",
-    "@alfresco/adf-testing": "6.0.0-A.2-4049216756",
+    "@alfresco/adf-testing": "6.0.0-A.2-7992",
     "@angular-custom-builders/lite-serve": "^0.2.3",
     "@angular-devkit/build-angular": "14.1.2",
     "@angular-eslint/builder": "^14.1.2",

projects/aca-content/src/lib/components/info-drawer/comments-tab/comments-tab.component.spec.ts

@@ -29,6 +29,8 @@ import { AppTestingModule } from '../../../testing/app-testing.module';
 import { NodePermissionService } from '@alfresco/aca-shared';
 import { Node } from '@alfresco/js-api';
 import { NodeCommentsModule } from '@alfresco/adf-content-services';
+import { of } from 'rxjs';
+import { AuthenticationService } from '@alfresco/adf-core';
 
 describe('CommentsTabComponent', () => {
   let component: CommentsTabComponent;
@@ -39,7 +41,8 @@ describe('CommentsTabComponent', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [AppTestingModule, NodeCommentsModule],
-      declarations: [CommentsTabComponent]
+      declarations: [CommentsTabComponent],
+      providers: [{ provide: AuthenticationService, useValue: { onLogout: of({}) } }]
     });
 
     nodePermissionService = TestBed.inject(NodePermissionService);

projects/aca-content/src/lib/components/search/search-results/search-results.component.html

@@ -95,7 +95,7 @@
       "
       *ngIf="infoDrawerOpened$ | async"
     >
-      <adf-viewer
+      <adf-alfresco-viewer
         class="adf-search-results--embedded_viewer"
         [nodeId]="selection.last.entry.id"
         *ngIf="infoDrawerPreview$ | async; else infoDrawerPanel"
@@ -122,7 +122,7 @@
             </div>
           </div>
         </adf-viewer-toolbar>
-      </adf-viewer>
+      </adf-alfresco-viewer>
       <ng-template #infoDrawerPanel>
         <div class="sidebar">
           <aca-info-drawer [node]="selection.last"></aca-info-drawer>

projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.html

@@ -1,9 +1,9 @@
 <ng-container *ngIf="sharedLinkId">
-  <adf-viewer [allowPrint]="false" [allowDownload]="false" [allowFullScreen]="false" [sharedLinkId]="sharedLinkId" [allowGoBack]="false">
+  <adf-alfresco-viewer [allowPrint]="false" [allowDownload]="false" [allowFullScreen]="false" [sharedLinkId]="sharedLinkId" [allowGoBack]="false">
     <adf-viewer-toolbar-actions>
       <ng-container *ngFor="let action of viewerToolbarActions; trackBy: trackByActionId">
         <aca-toolbar-action [actionRef]="action"></aca-toolbar-action>
       </ng-container>
     </adf-viewer-toolbar-actions>
-  </adf-viewer>
+  </adf-alfresco-viewer>
 </ng-container>

projects/aca-content/src/lib/components/shared-link-view/shared-link-view.module.ts

@@ -32,6 +32,7 @@ import { AppCommonModule } from '../common/common.module';
 import { AppToolbarModule } from '../toolbar/toolbar.module';
 import { AppInfoDrawerModule } from '../info-drawer/info.drawer.module';
 import { CoreExtensionsModule } from '../../extensions/core.extensions.module';
+import { ContentModule } from '@alfresco/adf-content-services';
 
 @NgModule({
   imports: [
@@ -41,7 +42,8 @@ import { CoreExtensionsModule } from '../../extensions/core.extensions.module';
     AppCommonModule,
     AppToolbarModule,
     CoreExtensionsModule.forChild(),
-    AppInfoDrawerModule
+    AppInfoDrawerModule,
+    ContentModule
   ],
   declarations: [SharedLinkViewComponent],
   exports: [SharedLinkViewComponent]

projects/aca-content/src/lib/store/effects/node.effects.spec.ts

@@ -50,7 +50,7 @@ import {
   ManagePermissionsAction,
   ShowLoaderAction
 } from '@alfresco/aca-shared/store';
-import { ViewUtilService } from '@alfresco/adf-core';
+import { RenditionViewerService } from '@alfresco/adf-content-services';
 import { ViewerEffects } from './viewer.effects';
 import { Router } from '@angular/router';
 import { of } from 'rxjs';
@@ -58,19 +58,19 @@ import { of } from 'rxjs';
 describe('NodeEffects', () => {
   let store: Store<any>;
   let contentService: ContentManagementService;
-  let viewUtilService: ViewUtilService;
+  let renditionViewerService: RenditionViewerService;
   let viewerEffects: ViewerEffects;
   let router: Router;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [AppTestingModule, SharedStoreModule, EffectsModule.forRoot([NodeEffects, ViewerEffects])],
-      providers: [ViewUtilService]
+      providers: [RenditionViewerService]
     });
 
     store = TestBed.inject(Store);
     contentService = TestBed.inject(ContentManagementService);
-    viewUtilService = TestBed.inject(ViewUtilService);
+    renditionViewerService = TestBed.inject(RenditionViewerService);
     viewerEffects = TestBed.inject(ViewerEffects);
     router = TestBed.inject(Router);
   });
@@ -406,18 +406,18 @@ describe('NodeEffects', () => {
 
   describe('printFile$', () => {
     it('it should print node content from payload', () => {
-      spyOn(viewUtilService, 'printFileGeneric').and.stub();
+      spyOn(renditionViewerService, 'printFileGeneric').and.stub();
       const node: any = {
         entry: { id: 'node-id', content: { mimeType: 'text/json' } }
       };
 
       store.dispatch(new PrintFileAction(node));
 
-      expect(viewUtilService.printFileGeneric).toHaveBeenCalledWith('node-id', 'text/json');
+      expect(renditionViewerService.printFileGeneric).toHaveBeenCalledWith('node-id', 'text/json');
     });
 
     it('it should print node content from store', fakeAsync(() => {
-      spyOn(viewUtilService, 'printFileGeneric').and.stub();
+      spyOn(renditionViewerService, 'printFileGeneric').and.stub();
       const node: any = {
         entry: {
           isFile: true,
@@ -432,7 +432,7 @@ describe('NodeEffects', () => {
 
       store.dispatch(new PrintFileAction(null));
 
-      expect(viewUtilService.printFileGeneric).toHaveBeenCalledWith('node-id', 'text/json');
+      expect(renditionViewerService.printFileGeneric).toHaveBeenCalledWith('node-id', 'text/json');
     }));
   });
 

projects/aca-content/src/lib/store/effects/node.effects.ts

@@ -53,7 +53,7 @@ import {
   ShowLoaderAction
 } from '@alfresco/aca-shared/store';
 import { ContentManagementService } from '../../services/content-management.service';
-import { ViewUtilService } from '@alfresco/adf-core';
+import { RenditionViewerService } from '@alfresco/adf-content-services';
 
 @Injectable()
 export class NodeEffects {
@@ -61,7 +61,7 @@ export class NodeEffects {
     private store: Store<AppStore>,
     private actions$: Actions,
     private contentService: ContentManagementService,
-    private viewUtils: ViewUtilService
+    private renditionViewer: RenditionViewerService
   ) {}
 
   shareNode$ = createEffect(
@@ -419,7 +419,7 @@ export class NodeEffects {
       const mimeType = node.entry.content.mimeType;
 
       if (id) {
-        this.viewUtils.printFileGeneric(id, mimeType);
+        this.renditionViewer.printFileGeneric(id, mimeType);
       }
     }
   }

projects/aca-preview/src/lib/components/preview.component.html

@@ -1,5 +1,5 @@
 <ng-container *ngIf="nodeId">
-  <adf-viewer
+  <adf-alfresco-viewer
     [ngClass]="{
       'right_side--hide': !showRightSide
     }"
@@ -32,5 +32,5 @@
         <aca-toolbar-action [actionRef]="action"></aca-toolbar-action>
       </ng-container>
     </adf-viewer-toolbar-actions>
-  </adf-viewer>
+  </adf-alfresco-viewer>
 </ng-container>

projects/aca-preview/src/lib/components/preview.component.scss

@@ -22,6 +22,6 @@
   display: none;
 }
 
-.adf-viewer.right_side--hide .adf-viewer__sidebar__right {
+.adf-alfresco-viewer.right_side--hide .adf-viewer__sidebar__right {
   width: 0;
 }

projects/aca-preview/src/lib/preview.module.ts

@@ -27,7 +27,7 @@ import { CoreModule } from '@alfresco/adf-core';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-import { ContentDirectiveModule } from '@alfresco/adf-content-services';
+import { ContentDirectiveModule, ContentModule } from '@alfresco/adf-content-services';
 import { SharedDirectivesModule, SharedToolbarModule, SharedInfoDrawerModule } from '@alfresco/aca-shared';
 import { ExtensionsModule } from '@alfresco/adf-extensions';
 import { PreviewComponent } from './components/preview.component';
@@ -49,6 +49,7 @@ const routes: Routes = [
     RouterModule.forChild(routes),
     CoreModule.forChild(),
     ExtensionsModule,
+    ContentModule,
     ContentDirectiveModule,
     SharedDirectivesModule,
     ContentDirectiveModule,

projects/aca-testing-shared/src/components/viewer/viewer.ts

@@ -31,8 +31,8 @@ import { waitForPresence } from '../../utilities/utils';
 
 export class Viewer extends Component {
   root = browser.$('adf-viewer');
-  viewerLayout = this.byCss('.adf-viewer-layout-content');
+  viewerLayout = this.byCss('.adf-viewer-render-layout-content');
-  viewerContainer = this.byCss('.adf-viewer-content-container');
+  viewerContainer = this.byCss('.adf-viewer-render-content-container');
   closeButton = this.byCss('.adf-viewer-close-button');
   fileTitle = this.byCss('.adf-viewer__file-title');
   viewerExtensionContent = this.byCss('adf-preview-extension');

projects/aca-viewer/src/lib/components/viewer/viewer.component.html

@@ -1,9 +1,8 @@
 <ng-container *ngIf="nodeId">
-  <adf-viewer
+  <adf-alfresco-viewer
     [ngClass]="{
       'right_side--hide': !showRightSide
     }"
-    [fileName]="fileName"
     [maxRetries]="'viewer.maxRetries' | adfAppConfig"
     [nodeId]="nodeId"
     [versionId]="versionId"
@@ -35,5 +34,5 @@
         <aca-toolbar-action [actionRef]="action"></aca-toolbar-action>
       </ng-container>
     </adf-viewer-toolbar-actions>
-  </adf-viewer>
+  </adf-alfresco-viewer>
 </ng-container>

projects/aca-viewer/src/lib/components/viewer/viewer.component.scss

@@ -21,7 +21,7 @@
     display: none;
   }
 
-  .adf-viewer.right_side--hide .adf-viewer__sidebar__right {
+  .adf-alfresco-viewer.right_side--hide .adf-viewer__sidebar__right {
     width: 0;
   }
 }

projects/aca-viewer/src/lib/viewer.module.ts

@@ -26,7 +26,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CoreModule } from '@alfresco/adf-core';
-import { ContentDirectiveModule } from '@alfresco/adf-content-services';
+import { ContentDirectiveModule, ContentModule } from '@alfresco/adf-content-services';
 import { SharedDirectivesModule, SharedInfoDrawerModule, SharedToolbarModule } from '@alfresco/aca-shared';
 import { ExtensionsModule } from '@alfresco/adf-extensions';
 import { AcaViewerComponent } from './components/viewer/viewer.component';
@@ -49,6 +49,7 @@ const routes: Routes = [
     CoreModule.forChild(),
     RouterModule.forChild(routes),
     ExtensionsModule.forChild(),
+    ContentModule,
     ContentDirectiveModule,
     SharedDirectivesModule,
     SharedInfoDrawerModule,