diff --git a/package-lock.json b/package-lock.json index 194512726..9d331685e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,9 +21,9 @@ } }, "@alfresco/adf-extensions": { - "version": "2.6.0-84da24c02ff43ca583fea52ad521c89467c05618", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-2.6.0-84da24c02ff43ca583fea52ad521c89467c05618.tgz", - "integrity": "sha512-ySSmh9YWT+d95unBueZrID3DTzkMm9GXGtG4B81X2hossJbT/ix8s8etQQiFGh4Nor0VJW2TfAdApGkmPyvQhg==", + "version": "2.6.0-018b08cce71a46bebdadb9d1ba3c17617de68005", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-2.6.0-018b08cce71a46bebdadb9d1ba3c17617de68005.tgz", + "integrity": "sha512-aWT2BaDmBgeWAxK0o6OWpBdcuRszIicor5sdzd0Pr8OBLLDKE0mhdVAZQGF9llxuJc5e9RoOhLA+zmchcGHEdw==", "requires": { "tslib": "^1.9.0" } diff --git a/package.json b/package.json index a0767ff77..6af10dc57 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "dependencies": { "@alfresco/adf-content-services": "2.6.0-8fee6e217aae1f2de5ff4634c5cd1e699336fd20", "@alfresco/adf-core": "2.6.0-8fee6e217aae1f2de5ff4634c5cd1e699336fd20", - "@alfresco/adf-extensions": "2.6.0-84da24c02ff43ca583fea52ad521c89467c05618", + "@alfresco/adf-extensions": "2.6.0-018b08cce71a46bebdadb9d1ba3c17617de68005", "@angular/animations": "6.1.7", "@angular/cdk": "^6.4.7", "@angular/common": "6.1.7", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 33684c335..a5061d637 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -43,15 +43,9 @@ import { FilesComponent } from './components/files/files.component'; import { LibrariesComponent } from './components/libraries/libraries.component'; import { NodeVersionsDialogComponent } from './dialogs/node-versions/node-versions.dialog'; import { LibraryDialogComponent } from './dialogs/library/library.dialog'; -import { ContentManagementService } from './services/content-management.service'; -import { NodeActionsService } from './services/node-actions.service'; -import { NodePermissionService } from './services/node-permission.service'; -import { ProfileResolver } from './services/profile.resolver'; -import { ExperimentalGuard } from './services/experimental-guard.service'; import { AppStoreModule } from './store/app-store.module'; import { MaterialModule } from './material.module'; -import { ContentApiService } from './services/content-api.service'; import { AppExtensionsModule } from './extensions.module'; import { CoreExtensionsModule } from './extensions/core.extensions.module'; import { AppRouteReuseStrategy } from './app.routes.strategy'; @@ -69,7 +63,6 @@ import { AppCurrentUserModule } from './components/current-user/current-user.mod import { AppSearchInputModule } from './components/search/search-input.module'; import { AppSearchResultsModule } from './components/search/search-results.module'; import { AppLoginModule } from './components/login/login.module'; -import { AppAuthGuard } from './guards/auth.guard'; @NgModule({ imports: [ @@ -86,14 +79,14 @@ import { AppAuthGuard } from './guards/auth.guard'; ContentModule.forRoot(), AppStoreModule, CoreExtensionsModule.forRoot(), - ExtensionsModule.forRoot(), + ExtensionsModule, AppExtensionsModule, AppLoginModule, AppCommonModule, AppLayoutModule, AppCurrentUserModule, DirectivesModule, - ContextMenuModule.forRoot(), + ContextMenuModule, AppInfoDrawerModule, AppToolbarModule, AppSidenavModule, @@ -119,14 +112,7 @@ import { AppAuthGuard } from './guards/auth.guard'; name: 'app', source: 'assets' } - }, - AppAuthGuard, - ContentManagementService, - NodeActionsService, - NodePermissionService, - ProfileResolver, - ExperimentalGuard, - ContentApiService + } ], entryComponents: [LibraryDialogComponent, NodeVersionsDialogComponent], bootstrap: [AppComponent] diff --git a/src/app/components/context-menu/context-menu.module.ts b/src/app/components/context-menu/context-menu.module.ts index 94321bed6..52f3d0be2 100644 --- a/src/app/components/context-menu/context-menu.module.ts +++ b/src/app/components/context-menu/context-menu.module.ts @@ -23,7 +23,7 @@ * along with Alfresco. If not, see . */ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { NgModule } from '@angular/core'; import { MatMenuModule, MatListModule, @@ -34,7 +34,6 @@ import { CoreModule } from '@alfresco/adf-core'; import { CoreExtensionsModule } from '../../extensions/core.extensions.module'; import { ContextActionsDirective } from './context-menu.directive'; -import { ContextMenuService } from './context-menu.service'; import { ContextMenuComponent } from './context-menu.component'; import { ContextMenuItemDirective } from './context-menu-item.directive'; import { ExtensionsModule } from '@alfresco/adf-extensions'; @@ -48,7 +47,7 @@ import { OutsideEventDirective } from './context-menu-outside-event.directive'; MatButtonModule, CoreExtensionsModule.forChild(), CoreModule.forChild(), - ExtensionsModule.forChild() + ExtensionsModule ], declarations: [ ContextActionsDirective, @@ -63,17 +62,4 @@ import { OutsideEventDirective } from './context-menu-outside-event.directive'; ], entryComponents: [ContextMenuComponent] }) -export class ContextMenuModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: ContextMenuModule, - providers: [ContextMenuService] - }; - } - - static forChild(): ModuleWithProviders { - return { - ngModule: ContextMenuModule - }; - } -} +export class ContextMenuModule {} diff --git a/src/app/components/context-menu/context-menu.service.ts b/src/app/components/context-menu/context-menu.service.ts index a57d581a8..ab086eb4f 100644 --- a/src/app/components/context-menu/context-menu.service.ts +++ b/src/app/components/context-menu/context-menu.service.ts @@ -5,7 +5,9 @@ import { ContextMenuOverlayRef } from './context-menu-overlay'; import { ContextMenuComponent } from './context-menu.component'; import { ContextmenuOverlayConfig } from './interfaces'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class ContextMenuService { constructor(private injector: Injector, private overlay: Overlay) {} diff --git a/src/app/components/favorites/favorites.module.ts b/src/app/components/favorites/favorites.module.ts index dc066d2de..cb5393281 100644 --- a/src/app/components/favorites/favorites.module.ts +++ b/src/app/components/favorites/favorites.module.ts @@ -55,7 +55,7 @@ const routes: Routes = [ DirectivesModule, AppCommonModule, AppToolbarModule, - ContextMenuModule.forChild(), + ContextMenuModule, AppInfoDrawerModule ], declarations: [FavoritesComponent], diff --git a/src/app/components/info-drawer/info.drawer.module.ts b/src/app/components/info-drawer/info.drawer.module.ts index f11dabd5c..4511f357d 100644 --- a/src/app/components/info-drawer/info.drawer.module.ts +++ b/src/app/components/info-drawer/info.drawer.module.ts @@ -52,7 +52,7 @@ export function components() { CommonModule, MaterialModule, CoreModule.forChild(), - ExtensionsModule.forChild(), + ExtensionsModule, ContentMetadataModule, VersionManagerModule, DirectivesModule diff --git a/src/app/components/recent-files/recent-files.module.ts b/src/app/components/recent-files/recent-files.module.ts index ae7d9c528..4277928e0 100644 --- a/src/app/components/recent-files/recent-files.module.ts +++ b/src/app/components/recent-files/recent-files.module.ts @@ -54,7 +54,7 @@ const routes: Routes = [ DirectivesModule, AppCommonModule, AppToolbarModule, - ContextMenuModule.forChild(), + ContextMenuModule, AppInfoDrawerModule ], declarations: [RecentFilesComponent], diff --git a/src/app/components/shared-files/shared-files.module.ts b/src/app/components/shared-files/shared-files.module.ts index ff4949696..288ae9199 100644 --- a/src/app/components/shared-files/shared-files.module.ts +++ b/src/app/components/shared-files/shared-files.module.ts @@ -55,7 +55,7 @@ const routes: Routes = [ DirectivesModule, AppCommonModule, AppToolbarModule, - ContextMenuModule.forChild(), + ContextMenuModule, AppInfoDrawerModule ], declarations: [SharedFilesComponent], diff --git a/src/app/components/toolbar/toolbar.module.ts b/src/app/components/toolbar/toolbar.module.ts index 0ff8fb02d..fe1302b36 100644 --- a/src/app/components/toolbar/toolbar.module.ts +++ b/src/app/components/toolbar/toolbar.module.ts @@ -48,7 +48,7 @@ export function components() { } @NgModule({ - imports: [CommonModule, CoreModule.forChild(), ExtensionsModule.forChild()], + imports: [CommonModule, CoreModule.forChild(), ExtensionsModule], declarations: components(), exports: components(), entryComponents: components() diff --git a/src/app/components/trashcan/trashcan.module.ts b/src/app/components/trashcan/trashcan.module.ts index 6abf95db9..ee88ac94b 100644 --- a/src/app/components/trashcan/trashcan.module.ts +++ b/src/app/components/trashcan/trashcan.module.ts @@ -54,7 +54,7 @@ const routes: Routes = [ DirectivesModule, AppCommonModule, AppToolbarModule, - ContextMenuModule.forChild() + ContextMenuModule ], declarations: [TrashcanComponent], exports: [TrashcanComponent] diff --git a/src/app/extensions/core.extensions.module.ts b/src/app/extensions/core.extensions.module.ts index a9711cb77..9248122fb 100644 --- a/src/app/extensions/core.extensions.module.ts +++ b/src/app/extensions/core.extensions.module.ts @@ -43,14 +43,14 @@ export function setupExtensions(service: AppExtensionService): Function { } @NgModule({ - imports: [CommonModule, CoreModule.forChild(), ExtensionsModule.forChild()] + imports: [CommonModule, CoreModule.forChild(), ExtensionsModule] }) export class CoreExtensionsModule { static forRoot(): ModuleWithProviders { return { ngModule: CoreExtensionsModule, providers: [ - AppExtensionService, + // AppExtensionService, { provide: APP_INITIALIZER, useFactory: setupExtensions, diff --git a/src/app/extensions/extension.service.ts b/src/app/extensions/extension.service.ts index 800cef727..185c9eb29 100644 --- a/src/app/extensions/extension.service.ts +++ b/src/app/extensions/extension.service.ts @@ -49,7 +49,9 @@ import { ProfileState } from '@alfresco/adf-extensions'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class AppExtensionService implements RuleContext { defaults = { layout: 'app.layout.main', diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts index 3581f6cb3..e8ac6876f 100644 --- a/src/app/guards/auth.guard.ts +++ b/src/app/guards/auth.guard.ts @@ -31,7 +31,9 @@ import { AuthGuardEcm } from '@alfresco/adf-core'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class AppAuthGuard extends AuthGuardEcm { constructor( private _auth: AuthenticationService, diff --git a/src/app/services/content-api.service.ts b/src/app/services/content-api.service.ts index f323d80af..140e10de4 100644 --- a/src/app/services/content-api.service.ts +++ b/src/app/services/content-api.service.ts @@ -43,7 +43,9 @@ import { FavoriteBody } from 'alfresco-js-api'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class ContentApiService { constructor( private api: AlfrescoApiService, diff --git a/src/app/services/content-management.service.ts b/src/app/services/content-management.service.ts index d48d0d205..66a4ccb58 100644 --- a/src/app/services/content-management.service.ts +++ b/src/app/services/content-management.service.ts @@ -68,7 +68,9 @@ interface RestoredNode { statusCode?: number; } -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class ContentManagementService { nodesMoved = new Subject(); nodesDeleted = new Subject(); diff --git a/src/app/services/node-actions.service.ts b/src/app/services/node-actions.service.ts index 860083ae2..612e0143a 100644 --- a/src/app/services/node-actions.service.ts +++ b/src/app/services/node-actions.service.ts @@ -46,7 +46,9 @@ import { import { ContentApiService } from '../services/content-api.service'; import { catchError, map, mergeMap } from 'rxjs/operators'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class NodeActionsService { static SNACK_MESSAGE_DURATION_WITH_UNDO = 10000; static SNACK_MESSAGE_DURATION = 3000; diff --git a/src/app/services/node-permission.service.ts b/src/app/services/node-permission.service.ts index 30c1dde53..c6e2c09e5 100644 --- a/src/app/services/node-permission.service.ts +++ b/src/app/services/node-permission.service.ts @@ -26,7 +26,9 @@ import { Injectable } from '@angular/core'; import { NodePermissions } from '@alfresco/adf-extensions'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class NodePermissionService implements NodePermissions { static DEFAULT_OPERATION = 'OR'; diff --git a/src/app/services/profile.resolver.ts b/src/app/services/profile.resolver.ts index 3dd0106e2..9f24222da 100644 --- a/src/app/services/profile.resolver.ts +++ b/src/app/services/profile.resolver.ts @@ -32,7 +32,9 @@ import { AppStore } from '../store/states/app.state'; import { SetUserProfileAction } from '../store/actions'; import { ContentApiService } from './content-api.service'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class ProfileResolver implements Resolve { constructor( private store: Store, diff --git a/src/app/testing/app-testing.module.ts b/src/app/testing/app-testing.module.ts index 7cfa81c11..1e36d4ae5 100644 --- a/src/app/testing/app-testing.module.ts +++ b/src/app/testing/app-testing.module.ts @@ -55,15 +55,6 @@ import { DocumentListService } from '@alfresco/adf-content-services'; import { MaterialModule } from '../material.module'; -import { ContentManagementService } from '../services/content-management.service'; -import { NodeActionsService } from '../services/node-actions.service'; -import { NodePermissionService } from '../services/node-permission.service'; -import { ContentApiService } from '../services/content-api.service'; -import { AppExtensionService } from '../extensions/extension.service'; -import { - ExtensionLoaderService, - ExtensionService -} from '@alfresco/adf-extensions'; @NgModule({ imports: [ @@ -103,15 +94,7 @@ import { ThumbnailService, UploadService, CustomResourcesService, - DocumentListService, - - ContentManagementService, - NodeActionsService, - NodePermissionService, - ContentApiService, - AppExtensionService, - ExtensionService, - ExtensionLoaderService + DocumentListService ] }) export class AppTestingModule {}