Ng17 migration

.eslintignore

@@ -10,3 +10,4 @@ scripts
 docs/**/*.md
 lib/js-api/docs/**/*.md
 .storybook
+webpack.config.js

.github/workflows/pull-request.yml

@@ -234,7 +234,7 @@ jobs:
       - uses: ./.github/actions/setup
       - uses: ./.github/actions/download-node-modules-and-artifacts
       - run: NX_REJECT_UNKNOWN_LOCAL_CACHE=0 npx nx affected:build $NX_CALCULATION_FLAGS --prod
-      - run: NX_REJECT_UNKNOWN_LOCAL_CACHE=0 npx nx affected --target=build-storybook $NX_CALCULATION_FLAGS --configuration=ci --parallel=1
+      - run: NX_REJECT_UNKNOWN_LOCAL_CACHE=0 npx nx affected --target=build-storybook $NX_CALCULATION_FLAGS --configuration=ci
       - uses: ./.github/actions/upload-node-modules-and-artifacts
 
   PR-forbidden-labels:

jest.preset.js

@@ -0,0 +1,4 @@
+// eslint-disable
+const nxPreset = require('@nx/jest/preset').default;
+
+module.exports = {...nxPreset };

lib/cli/project.json

@@ -50,7 +50,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["lib/cli/**/*.ts", "lib/cli/**/*.html"]
       }

lib/content-services/project.json

@@ -33,7 +33,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["lib/content-services/**/*.ts", "lib/content-services/**/*.html"]
       }
@@ -45,10 +45,7 @@
         "browserTarget": "content-services:storybook",
         "configDir": "lib/content-services/.storybook",
         "compodoc": false,
-        "styles": [
-          "node_modules/cropperjs/dist/cropper.min.css",
-          "node_modules/pdfjs-dist/web/pdf_viewer.css"
-        ],
+        "styles": ["node_modules/cropperjs/dist/cropper.min.css", "node_modules/pdfjs-dist/web/pdf_viewer.css"],
         "stylePreprocessorOptions": {
           "includePaths": ["lib", "lib/core/src/lib"]
         }
@@ -66,10 +63,7 @@
         "configDir": "lib/content-services/.storybook",
         "outputDir": "dist/storybook/content-services",
         "compodoc": false,
-        "styles": [
-          "node_modules/cropperjs/dist/cropper.min.css",
-          "node_modules/pdfjs-dist/web/pdf_viewer.css"
-        ],
+        "styles": ["node_modules/cropperjs/dist/cropper.min.css", "node_modules/pdfjs-dist/web/pdf_viewer.css"],
         "stylePreprocessorOptions": {
           "includePaths": ["lib", "lib/core/src/lib"]
         }

lib/content-services/src/lib/api-factories/alfresco-api-no-auth.service.ts

@@ -23,18 +23,17 @@ import { AlfrescoApiService } from '../services/alfresco-api.service';
 
 @Injectable()
 export class AlfrescoApiNoAuthService extends AlfrescoApiService {
-    constructor(
-        storage: StorageService,
-        appConfig: AppConfigService,
-        private readonly adfHttpClient: AdfHttpClient
-    ) {
+    constructor(storage: StorageService, appConfig: AppConfigService, private readonly adfHttpClient: AdfHttpClient) {
         super(appConfig, storage);
     }
 
     override createInstance(config: AlfrescoApiConfig) {
-        return new AlfrescoApi({
-            ...config,
-            oauthInit: false
-        }, this.adfHttpClient);
+        return new AlfrescoApi(
+            {
+                ...config,
+                oauthInit: false
+            },
+            this.adfHttpClient
+        );
     }
 }

lib/content-services/src/lib/api-factories/alfresco-api-v2-loader.service.ts

@@ -18,7 +18,7 @@
 import { AlfrescoApiConfig } from '@alfresco/js-api';
 import { Injectable } from '@angular/core';
 import { AppConfigService, AppConfigValues, StorageService } from '@alfresco/adf-core';
-import {  AlfrescoApiService } from '../services/alfresco-api.service';
+import { AlfrescoApiService } from '../services/alfresco-api.service';
 
 /**
  * Create a factory to resolve an api service instance
@@ -34,10 +34,11 @@ export function createAlfrescoApiInstance(angularAlfrescoApiService: AlfrescoApi
     providedIn: 'root'
 })
 export class AlfrescoApiLoaderService {
-    constructor(private readonly appConfig: AppConfigService,
-                private readonly apiService: AlfrescoApiService,
-                private storageService: StorageService) {
-    }
+    constructor(
+        private readonly appConfig: AppConfigService,
+        private readonly apiService: AlfrescoApiService,
+        private storageService: StorageService
+    ) {}
 
     async init(): Promise<any> {
         await this.appConfig.load();

lib/content-services/src/lib/aspect-list/services/aspect-list.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService  } from '../../services/alfresco-api.service';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { AppConfigService } from '@alfresco/adf-core';
 import { from, Observable, of, zip } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';

lib/content-services/src/lib/aspect-list/services/node-aspect.service.ts

@@ -25,12 +25,12 @@ import { TagService } from '../../tag/services/tag.service';
     providedIn: 'root'
 })
 export class NodeAspectService {
-
-    constructor(private nodesApiService: NodesApiService,
-                private dialogAspectListService: DialogAspectListService,
-                private cardViewContentUpdateService: CardViewContentUpdateService,
-                private tagService: TagService) {
-    }
+    constructor(
+        private nodesApiService: NodesApiService,
+        private dialogAspectListService: DialogAspectListService,
+        private cardViewContentUpdateService: CardViewContentUpdateService,
+        private tagService: TagService
+    ) {}
 
     updateNodeAspects(nodeId: string, selectorAutoFocusedOnClose?: string) {
         this.dialogAspectListService.openAspectListDialog(nodeId, selectorAutoFocusedOnClose).subscribe((aspectList) => {

lib/content-services/src/lib/auth-loader/content-auth-loader.service.spec.ts

@@ -54,7 +54,6 @@ describe('ContentAuthLoaderService', () => {
         basicAlfrescoAuthService = TestBed.inject(BasicAlfrescoAuthService);
     });
 
-
     it('should require Alf ticket on login if OAuth and provider is ALL or ECM', fakeAsync(() => {
         spyOn(authService, 'isOauth').and.returnValue(true);
         spyOn(authService, 'isALLProvider').and.returnValue(true);

lib/content-services/src/lib/auth-loader/content-auth-loader.service.ts

@@ -21,22 +21,15 @@ import { take } from 'rxjs/operators';
 
 @Injectable()
 export class ContentAuthLoaderService {
-
-    constructor(
-        private readonly basicAlfrescoAuthService: BasicAlfrescoAuthService,
-        private readonly authService: AuthenticationService
-    ) {
-    }
+    constructor(private readonly basicAlfrescoAuthService: BasicAlfrescoAuthService, private readonly authService: AuthenticationService) {}
 
     init(): void {
-        this.authService.onLogin
-            .pipe(take(1))
-            .subscribe({
-                next: async () => {
-                    if (this.authService.isOauth() && (this.authService.isALLProvider() || this.authService.isECMProvider())) {
-                        await this.basicAlfrescoAuthService.requireAlfTicket();
-                    }
+        this.authService.onLogin.pipe(take(1)).subscribe({
+            next: async () => {
+                if (this.authService.isOauth() && (this.authService.isALLProvider() || this.authService.isECMProvider())) {
+                    await this.basicAlfrescoAuthService.requireAlfTicket();
                 }
-            });
+            }
+        });
     }
 }

lib/content-services/src/lib/breadcrumb/breadcrumb.component.spec.ts

@@ -33,8 +33,7 @@ describe('Breadcrumb', () => {
     });
     let documentListComponent: DocumentListComponent;
 
-    const getBreadcrumbActionText = (): string =>
-        fixture.debugElement.nativeElement.querySelector('.adf-breadcrumb-item-current').textContent.trim();
+    const getBreadcrumbActionText = (): string => fixture.debugElement.nativeElement.querySelector('.adf-breadcrumb-item-current').textContent.trim();
 
     beforeEach(() => {
         TestBed.configureTestingModule({

lib/content-services/src/lib/category/mock/category-mock.service.ts

@@ -18,7 +18,10 @@
 import { Injectable } from '@angular/core';
 import {
     CategoryEntry,
-    CategoryPaging, Pagination, PathInfo, ResultNode,
+    CategoryPaging,
+    Pagination,
+    PathInfo,
+    ResultNode,
     ResultSetPaging,
     ResultSetPagingList,
     ResultSetRowEntry
@@ -27,7 +30,6 @@ import { Observable, of } from 'rxjs';
 
 @Injectable({ providedIn: 'root' })
 export class CategoryServiceMock {
-
     public getSubcategories(parentNodeId: string, skipCount?: number, maxItems?: number): Observable<CategoryPaging> {
         return parentNodeId ? of(this.getChildrenLevelResponse(skipCount, maxItems)) : of(this.getRootLevelResponse(skipCount, maxItems));
     }
@@ -66,12 +68,12 @@ export class CategoryServiceMock {
     }
 
     private getRootLevelResponse(skipCount?: number, maxItems?: number): CategoryPaging {
-        const rootCategoryEntry: CategoryEntry = {entry: {id: 'testId', name: 'testNode', parentId: '-root-', hasChildren: true}};
-        return {list: {pagination: {skipCount, maxItems, hasMoreItems: false}, entries: [rootCategoryEntry]}};
+        const rootCategoryEntry: CategoryEntry = { entry: { id: 'testId', name: 'testNode', parentId: '-root-', hasChildren: true } };
+        return { list: { pagination: { skipCount, maxItems, hasMoreItems: false }, entries: [rootCategoryEntry] } };
     }
 
     private getChildrenLevelResponse(skipCount?: number, maxItems?: number): CategoryPaging {
-        const childCategoryEntry: CategoryEntry = {entry: {id: 'childId', name: 'childNode', parentId: 'testId', hasChildren: false}};
-        return {list: {pagination: {skipCount, maxItems, hasMoreItems: true}, entries: [childCategoryEntry]}};
+        const childCategoryEntry: CategoryEntry = { entry: { id: 'childId', name: 'childNode', parentId: 'testId', hasChildren: false } };
+        return { list: { pagination: { skipCount, maxItems, hasMoreItems: true }, entries: [childCategoryEntry] } };
     }
 }

lib/content-services/src/lib/category/services/category-tree-datasource.service.ts

@@ -24,59 +24,65 @@ import { from, Observable } from 'rxjs';
 import { map, mergeMap, toArray } from 'rxjs/operators';
 
 @Injectable({ providedIn: 'root' })
-export class CategoryTreeDatasourceService extends TreeService<CategoryNode>  {
-
+export class CategoryTreeDatasourceService extends TreeService<CategoryNode> {
     constructor(private categoryService: CategoryService) {
         super();
     }
 
     public getSubNodes(parentNodeId: string, skipCount?: number, maxItems?: number, name?: string): Observable<TreeResponse<CategoryNode>> {
-        return !name ? this.categoryService.getSubcategories(parentNodeId, skipCount, maxItems).pipe(map((response: CategoryPaging) => {
-            const parentNode: CategoryNode = this.getParentNode(parentNodeId);
-            const nodesList: CategoryNode[] = response.list.entries.map((entry: CategoryEntry) => ({
-                    id: entry.entry.id,
-                    nodeName: entry.entry.name,
-                    parentId: entry.entry.parentId,
-                    hasChildren: entry.entry.hasChildren,
-                    level: parentNode ? parentNode.level + 1 : 0,
-                    isLoading: false,
-                    nodeType: TreeNodeType.RegularNode
-                }));
-            if (response.list.pagination.hasMoreItems && parentNode) {
-                const loadMoreNode: CategoryNode = {
-                    id: 'loadMore',
-                    nodeName: '',
-                    parentId: parentNode.id,
-                    hasChildren: false,
-                    level: parentNode.level + 1,
-                    isLoading: false,
-                    nodeType: TreeNodeType.LoadMoreNode
-                };
-                nodesList.push(loadMoreNode);
-            }
-            const treeResponse: TreeResponse<CategoryNode> = {entries: nodesList, pagination: response.list.pagination};
-            return treeResponse;
-        })) : this.categoryService.searchCategories(name, skipCount, maxItems).pipe(mergeMap((pagingResult) => {
-            const nextAfterGeneralPathPartIndex = 3;
-            const pathSeparator = '/';
-            return from(pagingResult.list.entries).pipe(mergeMap((category) => {
-                const path = category.entry.path.name.split(pathSeparator).slice(nextAfterGeneralPathPartIndex)
-                    .join(pathSeparator);
+        return !name
+            ? this.categoryService.getSubcategories(parentNodeId, skipCount, maxItems).pipe(
+                  map((response: CategoryPaging) => {
+                      const parentNode: CategoryNode = this.getParentNode(parentNodeId);
+                      const nodesList: CategoryNode[] = response.list.entries.map((entry: CategoryEntry) => ({
+                          id: entry.entry.id,
+                          nodeName: entry.entry.name,
+                          parentId: entry.entry.parentId,
+                          hasChildren: entry.entry.hasChildren,
+                          level: parentNode ? parentNode.level + 1 : 0,
+                          isLoading: false,
+                          nodeType: TreeNodeType.RegularNode
+                      }));
+                      if (response.list.pagination.hasMoreItems && parentNode) {
+                          const loadMoreNode: CategoryNode = {
+                              id: 'loadMore',
+                              nodeName: '',
+                              parentId: parentNode.id,
+                              hasChildren: false,
+                              level: parentNode.level + 1,
+                              isLoading: false,
+                              nodeType: TreeNodeType.LoadMoreNode
+                          };
+                          nodesList.push(loadMoreNode);
+                      }
+                      const treeResponse: TreeResponse<CategoryNode> = { entries: nodesList, pagination: response.list.pagination };
+                      return treeResponse;
+                  })
+              )
+            : this.categoryService.searchCategories(name, skipCount, maxItems).pipe(
+                  mergeMap((pagingResult) => {
+                      const nextAfterGeneralPathPartIndex = 3;
+                      const pathSeparator = '/';
+                      return from(pagingResult.list.entries).pipe(
+                          mergeMap((category) => {
+                              const path = category.entry.path.name.split(pathSeparator).slice(nextAfterGeneralPathPartIndex).join(pathSeparator);
 
-                return this.categoryService.getCategory(category.entry.id).pipe(
-                    map((res) => ({
-                        id: category.entry.id,
-                        nodeName: path ? `${path}/${category.entry.name}` : category.entry.name,
-                        parentId: category.entry.parentId,
-                        level: 0,
-                        nodeType: TreeNodeType.RegularNode,
-                        hasChildren: res.entry.hasChildren,
-                        isLoading: false
-                    }))
-                );
-            }),
-                toArray(),
-                map(res =>  ({entries: res, pagination: pagingResult.list.pagination})));
-        }));
+                              return this.categoryService.getCategory(category.entry.id).pipe(
+                                  map((res) => ({
+                                      id: category.entry.id,
+                                      nodeName: path ? `${path}/${category.entry.name}` : category.entry.name,
+                                      parentId: category.entry.parentId,
+                                      level: 0,
+                                      nodeType: TreeNodeType.RegularNode,
+                                      hasChildren: res.entry.hasChildren,
+                                      isLoading: false
+                                  }))
+                              );
+                          }),
+                          toArray(),
+                          map((res) => ({ entries: res, pagination: pagingResult.list.pagination }))
+                      );
+                  })
+              );
     }
 }

lib/content-services/src/lib/common/events/file.event.ts

@@ -18,35 +18,27 @@
 import { FileModel, FileUploadStatus } from '../models/file.model';
 
 export class FileUploadEvent {
-
     constructor(
         public readonly file: FileModel,
         public readonly status: FileUploadStatus = FileUploadStatus.Pending,
-        public readonly error: any = null) {
-    }
-
+        public readonly error: any = null
+    ) {}
 }
 
 export class FileUploadCompleteEvent extends FileUploadEvent {
-
     constructor(file: FileModel, public totalComplete: number = 0, public data?: any, public totalAborted: number = 0) {
         super(file, FileUploadStatus.Complete);
     }
-
 }
 
 export class FileUploadDeleteEvent extends FileUploadEvent {
-
     constructor(file: FileModel, public totalComplete: number = 0) {
         super(file, FileUploadStatus.Deleted);
     }
-
 }
 
 export class FileUploadErrorEvent extends FileUploadEvent {
-
     constructor(file: FileModel, public error: any, public totalError: number = 0) {
         super(file, FileUploadStatus.Error);
     }
-
 }

lib/content-services/src/lib/common/models/file.model.spec.ts

@@ -18,9 +18,7 @@
 import { FileModel } from './file.model';
 
 describe('FileModel', () => {
-
     describe('extension', () => {
-
         it('should return the extension if file has it', () => {
             const file = new FileModel({ name: 'tyrion-lannister.doc' } as File);
 
@@ -33,7 +31,7 @@ describe('FileModel', () => {
             expect(file.extension).toBe('');
         });
 
-        it('should return the empty string if file is starting with . and doesn\'t have extension', () => {
+        it("should return the empty string if file is starting with . and doesn't have extension", () => {
             const file = new FileModel({ name: '.white-walkers' } as File);
 
             expect(file.extension).toBe('');