From b9af414c99876110bc1ce662a26fe10271c6874f Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 28 Mar 2022 17:03:27 +0100 Subject: [PATCH] fix perfomance issues and warnings in app (#2487) --- .eslintignore | 3 ++- .../info-drawer/info.drawer.module.ts | 15 +++++++----- .../app/components/toolbar/toolbar.module.ts | 24 ++++++++++++------- .../app/extensions/core.extensions.module.ts | 1 + package-lock.json | 13 +++------- package.json | 2 +- 6 files changed, 31 insertions(+), 27 deletions(-) diff --git a/.eslintignore b/.eslintignore index b1a85e58c..8086db99d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -6,6 +6,7 @@ coverage .travis .vscode scripts -src/assets/i18n +app/src/assets/i18n +app/src/environments /angular.json docs/**/*.md diff --git a/app/src/app/components/info-drawer/info.drawer.module.ts b/app/src/app/components/info-drawer/info.drawer.module.ts index 8309df1b2..db5e36fb2 100644 --- a/app/src/app/components/info-drawer/info.drawer.module.ts +++ b/app/src/app/components/info-drawer/info.drawer.module.ts @@ -38,10 +38,6 @@ import { VersionsTabComponent } from './versions-tab/versions-tab.component'; import { A11yModule } from '@angular/cdk/a11y'; import { SharedInfoDrawerModule } from '@alfresco/aca-shared'; -export function components() { - return [MetadataTabComponent, CommentsTabComponent, VersionsTabComponent, LibraryMetadataTabComponent, LibraryMetadataFormComponent]; -} - @NgModule({ imports: [ CommonModule, @@ -55,7 +51,14 @@ export function components() { A11yModule, SharedInfoDrawerModule ], - declarations: [...components()], - exports: [...components(), SharedInfoDrawerModule] + declarations: [MetadataTabComponent, CommentsTabComponent, VersionsTabComponent, LibraryMetadataTabComponent, LibraryMetadataFormComponent], + exports: [ + MetadataTabComponent, + CommentsTabComponent, + VersionsTabComponent, + LibraryMetadataTabComponent, + LibraryMetadataFormComponent, + SharedInfoDrawerModule + ] }) export class AppInfoDrawerModule {} diff --git a/app/src/app/components/toolbar/toolbar.module.ts b/app/src/app/components/toolbar/toolbar.module.ts index 5b806c471..b09013b87 100644 --- a/app/src/app/components/toolbar/toolbar.module.ts +++ b/app/src/app/components/toolbar/toolbar.module.ts @@ -39,8 +39,9 @@ import { ViewNodeComponent } from './view-node/view-node.component'; import { AppCommonModule } from '../common/common.module'; import { SharedToolbarModule } from '@alfresco/aca-shared'; -export function components() { - return [ +@NgModule({ + imports: [CommonModule, CoreModule.forChild(), AppCommonModule, ExtensionsModule, SharedToolbarModule, DirectivesModule], + declarations: [ DocumentDisplayModeComponent, ToggleFavoriteComponent, ToggleInfoDrawerComponent, @@ -49,12 +50,17 @@ export function components() { ToggleFavoriteLibraryComponent, ToggleEditOfflineComponent, ViewNodeComponent - ]; -} - -@NgModule({ - imports: [CommonModule, CoreModule.forChild(), AppCommonModule, ExtensionsModule, SharedToolbarModule, DirectivesModule], - declarations: components(), - exports: [components(), SharedToolbarModule] + ], + exports: [ + DocumentDisplayModeComponent, + ToggleFavoriteComponent, + ToggleInfoDrawerComponent, + ToggleJoinLibraryButtonComponent, + ToggleJoinLibraryMenuComponent, + ToggleFavoriteLibraryComponent, + ToggleEditOfflineComponent, + ViewNodeComponent, + SharedToolbarModule + ] }) export class AppToolbarModule {} diff --git a/app/src/app/extensions/core.extensions.module.ts b/app/src/app/extensions/core.extensions.module.ts index 938a8305d..0c1174087 100644 --- a/app/src/app/extensions/core.extensions.module.ts +++ b/app/src/app/extensions/core.extensions.module.ts @@ -55,6 +55,7 @@ import { LogoutComponent } from '../components/common/logout/logout.component'; import { AppExtensionService, ExtensionsDataLoaderGuard } from '@alfresco/aca-shared'; import { PreviewComponent } from '../components/preview/preview.component'; +// eslint-disable-next-line prefer-arrow/prefer-arrow-functions export function setupExtensions(service: AppExtensionService): () => void { return () => service.load(); } diff --git a/package-lock.json b/package-lock.json index aba1d20c0..b135c7919 100644 --- a/package-lock.json +++ b/package-lock.json @@ -658,12 +658,6 @@ "integrity": "sha512-bYIut4edOq/RWyYsi3Z5NW/wEHSGLpjXfQ38zbdRlsX93+N8nAu1hf5ishbnpkEobEyerktoRVmRI8UXPsijjg==", "dev": true }, - "@angular-eslint/bundled-angular-compiler": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-13.0.1.tgz", - "integrity": "sha512-Eih9Kh0hxHO4+3in9mgjksQecym0p+3p+287y3LLihIc7gCkAO4xZeHGVGiC8qUX72PNUXkDlyskI9oHjK9Axw==", - "dev": true - }, "@angular-eslint/eslint-plugin": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-1.2.0.tgz", @@ -715,12 +709,11 @@ } }, "@angular-eslint/template-parser": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-13.0.1.tgz", - "integrity": "sha512-GEJzVLS4Sb4UdurqaPD1/ucGhagGAQCp17CIgjpcXRwzxBZ9OLqbO/rx8diRbADp+1rceVq4BhADsg3VdsOsuw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-1.2.0.tgz", + "integrity": "sha512-EfNJh0nFGJInHa2ccVw8Eb9ujWoUAwaQMCi9GppzYrqhSPc0YZqdQg4eIW2AlZs1giHD2Ko/V1rphzw+9gisCw==", "dev": true, "requires": { - "@angular-eslint/bundled-angular-compiler": "13.0.1", "eslint-scope": "^5.1.0" }, "dependencies": { diff --git a/package.json b/package.json index a1c346d17..258b232db 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@angular-eslint/eslint-plugin": "1.2.0", "@angular-eslint/eslint-plugin-template": "1.2.0", "@angular-eslint/schematics": "1.2.0", - "@angular-eslint/template-parser": "13.0.1", + "@angular-eslint/template-parser": "1.2.0", "@angular/cli": "^10.1.4", "@angular/compiler-cli": "10.0.4", "@angular/language-service": "11.0.8",