[ACA-3251] Move InfoDrawer and Toolbar components to aca-shared (#1466)

* moved tool bar

* moved info drawer

* moved appextension service

* moved pagination service

* Fix imports

* * fixed lints

* * fixed space

* added travis configuration

* * comments fixed

* * comments fixed

* * lint fixed

Co-authored-by: dhrn <dharan.g@muraai.com>

.travis.yml

@@ -57,6 +57,11 @@ jobs:
       script: npm ci && ng test adf-office-services-ext --watch=false
       cache: false
 
+    - stage: Quality and Unit tests
+      name: 'Unit tests shared'
+      script: npm ci && ng test aca-shared --watch=false
+      cache: false
+
     - stage: Quality and Unit tests
       name: 'Unit tests ACA'
       script:

projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.spec.ts

@@ -30,9 +30,9 @@ import {
   SetInfoDrawerStateAction,
   ToggleInfoDrawerAction
 } from '@alfresco/aca-shared/store';
-import { AppTestingModule } from '../../testing/app-testing.module';
-import { AppExtensionService } from '../../extensions/extension.service';
-import { ContentApiService } from '@alfresco/aca-shared';
+import { LibTestingModule } from '../../testing/lib-testing-module';
+import { AppExtensionService } from '../../services/app.extension.service';
+import { ContentApiService } from '../../services/content-api.service';
 import { of } from 'rxjs';
 
 describe('InfoDrawerComponent', () => {
@@ -50,7 +50,7 @@ describe('InfoDrawerComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule],
+      imports: [LibTestingModule],
       declarations: [InfoDrawerComponent],
       providers: [
         ContentApiService,

projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts

@@ -36,14 +36,14 @@ import {
   MinimalNodeEntryEntity,
   SiteEntry
 } from '@alfresco/js-api';
-import { ContentApiService } from '@alfresco/aca-shared';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { SidebarTabRef } from '@alfresco/adf-extensions';
 import { Store } from '@ngrx/store';
 import {
   SetInfoDrawerStateAction,
   ToggleInfoDrawerAction
 } from '@alfresco/aca-shared/store';
+import { AppExtensionService } from '../../services/app.extension.service';
+import { ContentApiService } from '../../services/content-api.service';
 
 @Component({
   selector: 'aca-info-drawer',

projects/aca-shared/src/lib/components/info-drawer/shared-info-drawer.module.ts

@@ -0,0 +1,43 @@
+/*!
+ * @license
+ * Alfresco Example Content Application
+ *
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { InfoDrawerComponent } from './info-drawer.component';
+import { InfoDrawerModule } from '@alfresco/adf-core';
+import { ExtensionsModule } from '@alfresco/adf-extensions';
+import { MatProgressBarModule } from '@angular/material';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    InfoDrawerModule,
+    MatProgressBarModule,
+    ExtensionsModule
+  ],
+  declarations: [InfoDrawerComponent],
+  exports: [InfoDrawerComponent]
+})
+export class SharedInfoDrawerModule {}

projects/aca-shared/src/lib/components/tool-bar/shared-toolbar.module.ts

@@ -0,0 +1,50 @@
+/*!
+ * @license
+ * Alfresco Example Content Application
+ *
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ToolbarMenuItemComponent } from './toolbar-menu-item/toolbar-menu-item.component';
+import { ToolbarMenuComponent } from './toolbar-menu/toolbar-menu.component';
+import { ToolbarActionComponent } from './toolbar-action/toolbar-action.component';
+import { ToolbarButtonComponent } from './toolbar-button/toolbar-button.component';
+import { CoreModule } from '@alfresco/adf-core';
+import { ExtensionsModule } from '@alfresco/adf-extensions';
+
+@NgModule({
+  imports: [CommonModule, CoreModule, ExtensionsModule],
+  declarations: [
+    ToolbarButtonComponent,
+    ToolbarActionComponent,
+    ToolbarMenuItemComponent,
+    ToolbarMenuComponent
+  ],
+  exports: [
+    ToolbarButtonComponent,
+    ToolbarActionComponent,
+    ToolbarMenuItemComponent,
+    ToolbarMenuComponent
+  ]
+})
+export class SharedToolbarModule {}

projects/aca-shared/src/lib/components/tool-bar/toolbar-button/toolbar-button.component.ts

@@ -25,7 +25,7 @@
 
 import { Component, Input, ViewEncapsulation } from '@angular/core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
-import { AppExtensionService } from '../../../extensions/extension.service';
+import { AppExtensionService } from '../../../services/app.extension.service';
 
 export enum ToolbarButtonType {
   ICON_BUTTON = 'icon-button',

projects/aca-shared/src/lib/components/tool-bar/toolbar-menu-item/toolbar-menu-item.component.ts

@@ -25,7 +25,7 @@
 
 import { Component, Input, ViewEncapsulation } from '@angular/core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
-import { AppExtensionService } from '../../../extensions/extension.service';
+import { AppExtensionService } from '../../../services/app.extension.service';
 
 @Component({
   selector: 'app-toolbar-menu-item',

projects/aca-shared/src/lib/directives/contextmenu/contextmenu.module.ts

@@ -26,6 +26,9 @@
 import { NgModule } from '@angular/core';
 import { ContextActionsDirective } from './contextmenu.directive';
 
+/**
+ * @deprecated in 1.11.0, use SharedDirectivesModule instead.
+ */
 @NgModule({
   declarations: [ContextActionsDirective],
   exports: [ContextActionsDirective]

projects/aca-shared/src/lib/directives/pagination.directive.spec.ts

@@ -25,8 +25,6 @@
 
 import { PaginationDirective } from './pagination.directive';
 import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { AppTestingModule } from '../testing/app-testing.module';
-import { DirectivesModule } from './directives.module';
 import {
   UserPreferencesService,
   AppConfigService,
@@ -34,6 +32,8 @@ import {
   CoreModule,
   PaginationModel
 } from '@alfresco/adf-core';
+import { LibTestingModule } from '../testing/lib-testing-module';
+import { SharedDirectivesModule } from './shared.directives.module';
 
 describe('PaginationDirective', () => {
   let preferences: UserPreferencesService;
@@ -44,7 +44,7 @@ describe('PaginationDirective', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, DirectivesModule, CoreModule.forRoot()]
+      imports: [LibTestingModule, SharedDirectivesModule, CoreModule.forRoot()]
     });
 
     preferences = TestBed.get(UserPreferencesService);

projects/aca-shared/src/lib/directives/shared.directives.module.ts

@@ -0,0 +1,35 @@
+/*!
+ * @license
+ * Alfresco Example Content Application
+ *
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { NgModule } from '@angular/core';
+import { PaginationDirective } from './pagination.directive';
+import { ContextActionsModule } from './contextmenu/contextmenu.module';
+
+@NgModule({
+  imports: [ContextActionsModule],
+  declarations: [PaginationDirective],
+  exports: [PaginationDirective, ContextActionsModule]
+})
+export class SharedDirectivesModule {}

projects/aca-shared/src/lib/services/app.extension.service.spec.ts

@@ -24,8 +24,8 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { AppTestingModule } from '../testing/app-testing.module';
-import { AppExtensionService } from './extension.service';
+import { LibTestingModule } from '../testing/lib-testing-module';
+import { AppExtensionService } from './app.extension.service';
 import { Store, Action } from '@ngrx/store';
 import { AppStore } from '@alfresco/aca-shared/store';
 import {
@@ -51,7 +51,7 @@ describe('AppExtensionService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule]
+      imports: [LibTestingModule]
     });
 
     appConfigService = TestBed.get(AppConfigService);

projects/aca-shared/src/lib/services/app.extension.service.ts

@@ -32,7 +32,6 @@ import {
   getRuleContext,
   getLanguagePickerState
 } from '@alfresco/aca-shared/store';
-import { NodePermissionService } from '@alfresco/aca-shared';
 import {
   SelectionState,
   NavigationState,
@@ -61,8 +60,9 @@ import {
 } from '@alfresco/adf-core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { RepositoryInfo, NodeEntry } from '@alfresco/js-api';
-import { ViewerRules } from './viewer.rules';
-import { SettingsGroupRef, ExtensionRoute } from '../types';
+import { ViewerRules } from '../models/viewer.rules';
+import { SettingsGroupRef, ExtensionRoute } from '../models/types';
+import { NodePermissionService } from '../services/node-permission.service';
 
 @Injectable({
   providedIn: 'root'

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

@@ -23,11 +23,12 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { NgModule, ModuleWithProviders } from '@angular/core';
+import { ModuleWithProviders, NgModule } from '@angular/core';
 import { ContentApiService } from './services/content-api.service';
 import { NodePermissionService } from './services/node-permission.service';
 import { AppService } from './services/app.service';
 import { ContextActionsModule } from './directives/contextmenu/contextmenu.module';
+
 @NgModule({
   imports: [ContextActionsModule],
   exports: [ContextActionsModule]

projects/aca-shared/src/lib/testing/lib-testing-module.ts

@@ -0,0 +1,98 @@
+/*!
+ * @license
+ * Alfresco Example Content Application
+ *
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { NgModule } from '@angular/core';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  AlfrescoApiService,
+  AlfrescoApiServiceMock,
+  PipeModule,
+  TranslateLoaderService,
+  TranslationMock,
+  TranslationService
+} from '@alfresco/adf-core';
+import { HttpClientModule } from '@angular/common/http';
+import { RouterTestingModule } from '@angular/router/testing';
+import { EffectsModule } from '@ngrx/effects';
+import { StoreModule } from '@ngrx/store';
+
+export const initialState = {
+  app: {
+    appName: 'Alfresco Content Application',
+    headerColor: '#ffffff',
+    logoPath: 'assets/images/alfresco-logo-white.svg',
+    headerImagePath: 'assets/images/mastHead-bg-shapesPattern.svg',
+    languagePicker: false,
+    sharedUrl: '',
+    user: {
+      isAdmin: null,
+      id: null,
+      firstName: '',
+      lastName: ''
+    },
+    selection: {
+      nodes: [],
+      libraries: [],
+      isEmpty: true,
+      count: 0
+    },
+    navigation: {
+      currentFolder: null
+    },
+    infoDrawerOpened: false,
+    infoDrawerMetadataAspect: '',
+    showFacetFilter: true,
+    documentDisplayMode: 'list',
+    repository: {
+      status: {
+        isQuickShareEnabled: true
+      }
+    } as any
+  }
+};
+
+@NgModule({
+  imports: [
+    NoopAnimationsModule,
+    HttpClientModule,
+    RouterTestingModule,
+    StoreModule.forRoot({ app: param => param }, { initialState }),
+    EffectsModule.forRoot([]),
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useClass: TranslateLoaderService
+      }
+    }),
+    PipeModule
+  ],
+  providers: [
+    { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
+    { provide: TranslationService, useClass: TranslationMock },
+    AlfrescoApiService
+  ]
+})
+export class LibTestingModule {}

projects/aca-shared/src/public-api.ts

@@ -31,6 +31,11 @@ export * from './lib/components/page-layout/page-layout.component';
 export * from './lib/components/page-layout/page-layout.module';
 export * from './lib/components/locked-by/locked-by.component';
 export * from './lib/components/locked-by/locked-by.module';
+export * from './lib/components/tool-bar/shared-toolbar.module';
+export * from './lib/components/info-drawer/shared-info-drawer.module';
+
+export * from './lib/models/types';
+export * from './lib/models/viewer.rules';
 
 export * from './lib/routing/app.routes.strategy';
 export * from './lib/routing/shared.guard';
@@ -38,12 +43,13 @@ export * from './lib/routing/shared.guard';
 export * from './lib/services/app.service';
 export * from './lib/services/content-api.service';
 export * from './lib/services/node-permission.service';
+export * from './lib/services/app.extension.service';
 
 export * from './lib/components/generic-error/generic-error.component';
 export * from './lib/components/generic-error/generic-error.module';
 
-export * from './lib/directives/contextmenu/contextmenu.directive';
 export * from './lib/directives/contextmenu/contextmenu.module';
+export * from './lib/directives/shared.directives.module';
 
 export * from './lib/utils/node.utils';
 

projects/aca-shared/tslint.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tslint.json",
   "rules": {
-    "directive-selector": [true, "attribute", "aca", "camelCase"],
-    "component-selector": [true, "element", "aca", "kebab-case"]
+    "directive-selector": [true, "attribute", "aca", "app", "camelCase"],
+    "component-selector": [true, "element", "aca", "app", "kebab-case"]
   }
 }

src/app/app.component.ts

@@ -36,7 +36,6 @@ import {
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { ActivatedRoute, Router, ActivationEnd } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { AppExtensionService } from './extensions/extension.service';
 import {
   AppStore,
   AppState,
@@ -48,11 +47,15 @@ import {
   SetRepositoryInfoAction
 } from '@alfresco/aca-shared/store';
 import { filter, takeUntil } from 'rxjs/operators';
-import { AppService, ContentApiService } from '@alfresco/aca-shared';
+import {
+  AppExtensionService,
+  AppService,
+  ContentApiService,
+  ExtensionRoute
+} from '@alfresco/aca-shared';
 import { DiscoveryEntry, GroupsApi, Group } from '@alfresco/js-api';
 import { Subject } from 'rxjs';
 import { INITIAL_APP_STATE } from './store/initial-state';
-import { ExtensionRoute } from './types';
 
 @Component({
   selector: 'app-root',

src/app/components/about/about.component.ts

@@ -28,8 +28,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { RepositoryInfo } from '@alfresco/js-api';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { AppExtensionService } from '../../extensions/extension.service';
-import { ContentApiService } from '@alfresco/aca-shared';
+import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
 import { dependencies } from '../../../../package.json';
 @Component({
   selector: 'app-about',

src/app/components/context-menu/context-menu-item.component.spec.ts

@@ -25,7 +25,6 @@
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { AppTestingModule } from '../../testing/app-testing.module';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { ContextMenuItemComponent } from './context-menu-item.component';
 import { ContextMenuModule } from './context-menu.module';
 import {
@@ -33,6 +32,7 @@ import {
   TranslateLoader,
   TranslateFakeLoader
 } from '@ngx-translate/core';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 describe('ContextMenuComponent', () => {
   let fixture: ComponentFixture<ContextMenuItemComponent>;

src/app/components/context-menu/context-menu-item.component.ts

@@ -25,7 +25,7 @@
 
 import { Component, Input, ViewEncapsulation } from '@angular/core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
-import { AppExtensionService } from '../../extensions/extension.service';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'app-context-menu-item',

src/app/components/context-menu/context-menu.component.spec.ts

@@ -30,7 +30,6 @@ import {
   tick
 } from '@angular/core/testing';
 import { AppTestingModule } from '../../testing/app-testing.module';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { ContextMenuComponent } from './context-menu.component';
 import { ContextMenuModule } from './context-menu.module';
 import { ContextMenuOverlayRef } from './context-menu-overlay';
@@ -42,6 +41,7 @@ import {
 
 import { of } from 'rxjs';
 import { Store } from '@ngrx/store';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 describe('ContextMenuComponent', () => {
   let fixture: ComponentFixture<ContextMenuComponent>;

src/app/components/context-menu/context-menu.component.ts

@@ -34,7 +34,6 @@ import {
   Inject
 } from '@angular/core';
 import { MatMenuTrigger } from '@angular/material/menu';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { AppStore, getAppSelection } from '@alfresco/aca-shared/store';
 import { Store } from '@ngrx/store';
 import { Subject } from 'rxjs';
@@ -43,6 +42,7 @@ import { ContentActionRef } from '@alfresco/adf-extensions';
 import { ContextMenuOverlayRef } from './context-menu-overlay';
 import { CONTEXT_MENU_DIRECTION } from './direction.token';
 import { Directionality } from '@angular/cdk/bidi';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'aca-context-menu',

src/app/components/create-menu/create-menu.component.ts

@@ -32,10 +32,10 @@ import {
 } from '@angular/core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
 import { AppStore, getCurrentFolder } from '@alfresco/aca-shared/store';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { Store } from '@ngrx/store';
 import { takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'app-create-menu',

src/app/components/current-user/current-user.component.spec.ts

@@ -26,7 +26,6 @@
 import { CurrentUserComponent } from './current-user.component';
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { AppTestingModule } from '../../testing/app-testing.module';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { Store } from '@ngrx/store';
 import {
@@ -34,6 +33,7 @@ import {
   SetUserProfileAction,
   SetSettingsParameterAction
 } from '@alfresco/aca-shared/store';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 describe('CurrentUserComponent', () => {
   let fixture: ComponentFixture<CurrentUserComponent>;

src/app/components/current-user/current-user.component.ts

@@ -32,7 +32,7 @@ import {
   getUserProfile,
   getLanguagePickerState
 } from '@alfresco/aca-shared/store';
-import { AppExtensionService } from '../../extensions/extension.service';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'aca-current-user',

src/app/components/current-user/user-menu-item.component.spec.ts

@@ -25,7 +25,6 @@
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { AppTestingModule } from '../../testing/app-testing.module';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { UserMenuItemComponent } from './user-menu-item.component';
 import {
   TranslateModule,
@@ -34,6 +33,7 @@ import {
 } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 describe('UserMenuItemComponent', () => {
   let fixture: ComponentFixture<UserMenuItemComponent>;

src/app/components/current-user/user-menu-item.component.ts

@@ -25,7 +25,7 @@
 
 import { Component, Input, ViewEncapsulation } from '@angular/core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
-import { AppExtensionService } from '../../extensions/extension.service';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'app-user-menu-item',

src/app/components/favorite-libraries/favorite-libraries.component.ts

@@ -27,9 +27,8 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { SiteEntry, FavoritePaging, Pagination } from '@alfresco/js-api';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { ContentManagementService } from '../../services/content-management.service';
-import { ContentApiService } from '@alfresco/aca-shared';
+import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
 import { NavigateLibraryAction } from '@alfresco/aca-shared/store';
 import { PageComponent } from '../page.component';
 import { UserPreferencesService } from '@alfresco/adf-core';

src/app/components/favorites/favorites.component.ts

@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ContentApiService } from '@alfresco/aca-shared';
+import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
 import { AppStore } from '@alfresco/aca-shared/store';
 import { UploadService } from '@alfresco/adf-core';
 import {
@@ -37,7 +37,6 @@ import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { debounceTime, map } from 'rxjs/operators';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { ContentManagementService } from '../../services/content-management.service';
 import { PageComponent } from '../page.component';
 

src/app/components/files/files.component.ts

@@ -36,8 +36,7 @@ import {
 import { ContentManagementService } from '../../services/content-management.service';
 import { NodeActionsService } from '../../services/node-actions.service';
 import { PageComponent } from '../page.component';
-import { ContentApiService } from '@alfresco/aca-shared';
-import { AppExtensionService } from '../../extensions/extension.service';
+import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
 import {
   SetCurrentFolderAction,
   isAdmin,

src/app/components/header/header.component.ts

@@ -34,7 +34,6 @@ import {
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { ContentActionRef } from '@alfresco/adf-extensions';
-import { AppExtensionService } from '../../extensions/extension.service';
 import {
   AppStore,
   getHeaderColor,
@@ -42,6 +41,7 @@ import {
   getLogoPath,
   getHeaderImagePath
 } from '@alfresco/aca-shared/store';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'app-header',

src/app/components/info-drawer/info.drawer.module.ts

@@ -34,16 +34,15 @@ import { NgModule } from '@angular/core';
 import { DirectivesModule } from '../../directives/directives.module';
 import { MaterialModule } from '../../material.module';
 import { CommentsTabComponent } from './comments-tab/comments-tab.component';
-import { InfoDrawerComponent } from './info-drawer.component';
 import { MetadataTabComponent } from './metadata-tab/metadata-tab.component';
 import { LibraryMetadataTabComponent } from './library-metadata-tab/library-metadata-tab.component';
 import { LibraryMetadataFormComponent } from './library-metadata-tab/library-metadata-form.component';
 import { VersionsTabComponent } from './versions-tab/versions-tab.component';
 import { A11yModule } from '@angular/cdk/a11y';
+import { SharedInfoDrawerModule } from '@alfresco/aca-shared';
 
 export function components() {
   return [
-    InfoDrawerComponent,
     MetadataTabComponent,
     CommentsTabComponent,
     VersionsTabComponent,
@@ -61,10 +60,11 @@ export function components() {
     ContentMetadataModule,
     VersionManagerModule,
     DirectivesModule,
-    A11yModule
+    A11yModule,
+    SharedInfoDrawerModule
   ],
   declarations: [...components()],
-  exports: [...components()],
+  exports: [...components(), SharedInfoDrawerModule],
   entryComponents: [...components()]
 })
 export class AppInfoDrawerModule {}

src/app/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts

@@ -35,7 +35,7 @@ import {
   AppState
 } from '@alfresco/aca-shared/store';
 import { By } from '@angular/platform-browser';
-import { AppExtensionService } from '../../../extensions/extension.service';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 describe('MetadataTabComponent', () => {
   let fixture: ComponentFixture<MetadataTabComponent>;

src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts

@@ -31,9 +31,12 @@ import {
   OnDestroy
 } from '@angular/core';
 import { MinimalNodeEntryEntity } from '@alfresco/js-api';
-import { NodePermissionService, isLocked } from '@alfresco/aca-shared';
+import {
+  NodePermissionService,
+  isLocked,
+  AppExtensionService
+} from '@alfresco/aca-shared';
 import { AppStore, infoDrawerMetadataAspect } from '@alfresco/aca-shared/store';
-import { AppExtensionService } from '../../../extensions/extension.service';
 import { AppConfigService, NotificationService } from '@alfresco/adf-core';
 import { Observable, Subject } from 'rxjs';
 import { Store } from '@ngrx/store';

src/app/components/libraries/libraries.component.ts

@@ -28,9 +28,9 @@ import { SiteEntry } from '@alfresco/js-api';
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Component, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { ContentManagementService } from '../../services/content-management.service';
 import { PageComponent } from '../page.component';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   templateUrl: './libraries.component.html'

src/app/components/page.component.spec.ts

@@ -32,12 +32,12 @@ import {
   AppState,
   AppStore
 } from '@alfresco/aca-shared/store';
+import { AppExtensionService } from '@alfresco/aca-shared';
 import { MinimalNodeEntity } from '@alfresco/js-api';
 import { ContentManagementService } from '../services/content-management.service';
 import { EffectsModule } from '@ngrx/effects';
 import { ViewerEffects } from '../store/effects';
 import { Store } from '@ngrx/store';
-import { AppExtensionService } from '../extensions/extension.service';
 import { AppTestingModule } from '../testing/app-testing.module';
 import { Component } from '@angular/core';
 

src/app/components/page.component.ts

@@ -33,7 +33,6 @@ import { Store } from '@ngrx/store';
 import { MinimalNodeEntity, MinimalNodeEntryEntity } from '@alfresco/js-api';
 import { Observable, Subject, Subscription } from 'rxjs';
 import { takeUntil, map } from 'rxjs/operators';
-import { AppExtensionService } from '../extensions/extension.service';
 import { ContentManagementService } from '../services/content-management.service';
 import {
   AppStore,
@@ -47,7 +46,7 @@ import {
   ViewNodeExtras,
   SetSelectedNodesAction
 } from '@alfresco/aca-shared/store';
-import { isLocked, isLibrary } from '@alfresco/aca-shared';
+import { isLocked, isLibrary, AppExtensionService } from '@alfresco/aca-shared';
 
 export abstract class PageComponent implements OnInit, OnDestroy {
   onDestroy$: Subject<boolean> = new Subject<boolean>();

src/app/components/preview/preview.component.ts

@@ -53,8 +53,7 @@ import {
   SetSelectedNodesAction
 } from '@alfresco/aca-shared/store';
 import { PageComponent } from '../page.component';
-import { ContentApiService } from '@alfresco/aca-shared';
-import { AppExtensionService } from '../../extensions/extension.service';
+import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
 import { ContentManagementService } from '../../services/content-management.service';
 import { ContentActionRef, ViewerExtensionRef } from '@alfresco/adf-extensions';
 import { SearchRequest } from '@alfresco/js-api';

src/app/components/recent-files/recent-files.component.ts

@@ -30,10 +30,10 @@ import { ContentManagementService } from '../../services/content-management.serv
 import { PageComponent } from '../page.component';
 import { Store } from '@ngrx/store';
 import { AppStore } from '@alfresco/aca-shared/store';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { UploadService } from '@alfresco/adf-core';
 import { debounceTime } from 'rxjs/operators';
 import { Router } from '@angular/router';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   templateUrl: './recent-files.component.html'

src/app/components/search/search-libraries-results/search-libraries-results.component.ts

@@ -29,10 +29,10 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { AppExtensionService } from '../../../extensions/extension.service';
 import { ContentManagementService } from '../../../services/content-management.service';
 import { PageComponent } from '../../page.component';
 import { SearchLibrariesQueryBuilderService } from './search-libraries-query-builder.service';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'aca-search-results',

src/app/components/search/search-results/search-results.component.ts

@@ -42,10 +42,10 @@ import {
   SnackbarErrorAction,
   showFacetFilter
 } from '@alfresco/aca-shared/store';
-import { AppExtensionService } from '../../../extensions/extension.service';
 import { ContentManagementService } from '../../../services/content-management.service';
 import { AppConfigService, TranslationService } from '@alfresco/adf-core';
 import { Observable } from 'rxjs';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'aca-search-results',

src/app/components/settings/settings.component.spec.ts

@@ -28,14 +28,16 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { setupTestBed, StorageService } from '@alfresco/adf-core';
 import { AppSettingsModule } from './settings.module';
 import { AppTestingModule } from '../../testing/app-testing.module';
-import { SettingsParameterRef } from '../../types';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { By } from '@angular/platform-browser';
 import {
   TranslateModule,
   TranslateLoader,
   TranslateFakeLoader
 } from '@ngx-translate/core';
+import {
+  AppExtensionService,
+  SettingsParameterRef
+} from '@alfresco/aca-shared';
 
 describe('SettingsComponent', () => {
   let fixture: ComponentFixture<SettingsComponent>;

src/app/components/settings/settings.component.ts

@@ -40,8 +40,11 @@ import {
   SetSettingsParameterAction
 } from '@alfresco/aca-shared/store';
 import { ProfileState } from '@alfresco/adf-extensions';
-import { AppExtensionService } from '../../extensions/extension.service';
-import { SettingsGroupRef, SettingsParameterRef } from '../../types';
+import {
+  AppExtensionService,
+  SettingsGroupRef,
+  SettingsParameterRef
+} from '@alfresco/aca-shared';
 
 interface RepositoryConfig {
   ecmHost: string;

src/app/components/shared-files/shared-files.component.ts

@@ -28,11 +28,11 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { ContentManagementService } from '../../services/content-management.service';
 import { PageComponent } from '../page.component';
 import { Store } from '@ngrx/store';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { debounceTime } from 'rxjs/operators';
 import { UploadService } from '@alfresco/adf-core';
 import { Router } from '@angular/router';
 import { MinimalNodeEntity } from '@alfresco/js-api';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   templateUrl: './shared-files.component.html'

src/app/components/shared-link-view/shared-link-view.component.spec.ts

@@ -37,7 +37,7 @@ import { of } from 'rxjs';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { AlfrescoApiService } from '@alfresco/adf-core';
 import { SetSelectedNodesAction } from '@alfresco/aca-shared/store';
-import { AppExtensionService } from '../../extensions/extension.service';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 describe('SharedLinkViewComponent', () => {
   let component: SharedLinkViewComponent;

src/app/components/shared-link-view/shared-link-view.component.ts

@@ -36,7 +36,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { forkJoin, from, of } from 'rxjs';
 import { catchError, flatMap } from 'rxjs/operators';
-import { AppExtensionService } from '../../extensions/extension.service';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'app-shared-link-view',

src/app/components/sidenav/sidenav.component.spec.ts

@@ -27,7 +27,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed, async, ComponentFixture } from '@angular/core/testing';
 import { SidenavComponent } from './sidenav.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
-import { AppExtensionService } from '../../extensions/extension.service';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 describe('SidenavComponent', () => {
   let fixture: ComponentFixture<SidenavComponent>;

src/app/components/sidenav/sidenav.component.ts

@@ -34,13 +34,13 @@ import {
 } from '@angular/core';
 import { CollapsedTemplateDirective } from './directives/collapsed-template.directive';
 import { ExpandedTemplateDirective } from './directives/expanded-template.directive';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { NavBarGroupRef } from '@alfresco/adf-extensions';
 import { AuthenticationService } from '@alfresco/adf-core';
 import { Store } from '@ngrx/store';
 import { AppStore, getSideNavState } from '@alfresco/aca-shared/store';
 import { Subject } from 'rxjs';
 import { takeUntil, distinctUntilChanged, debounceTime } from 'rxjs/operators';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'app-sidenav',

src/app/components/toolbar/toolbar.module.ts

@@ -29,11 +29,7 @@ import { ToggleFavoriteComponent } from './toggle-favorite/toggle-favorite.compo
 import { ToggleInfoDrawerComponent } from './toggle-info-drawer/toggle-info-drawer.component';
 import { CommonModule } from '@angular/common';
 import { CoreModule } from '@alfresco/adf-core';
-import { ToolbarButtonComponent } from './toolbar-button/toolbar-button.component';
-import { ToolbarActionComponent } from './toolbar-action/toolbar-action.component';
 import { ExtensionsModule } from '@alfresco/adf-extensions';
-import { ToolbarMenuItemComponent } from './toolbar-menu-item/toolbar-menu-item.component';
-import { ToolbarMenuComponent } from './toolbar-menu/toolbar-menu.component';
 import { ToggleJoinLibraryButtonComponent } from './toggle-join-library/toggle-join-library-button.component';
 import { ToggleJoinLibraryMenuComponent } from './toggle-join-library/toggle-join-library-menu.component';
 import { DirectivesModule } from '../../directives/directives.module';
@@ -41,16 +37,13 @@ import { ToggleFavoriteLibraryComponent } from './toggle-favorite-library/toggle
 import { ToggleEditOfflineComponent } from './toggle-edit-offline/toggle-edit-offline.component';
 import { ViewNodeComponent } from './view-node/view-node.component';
 import { AppCommonModule } from '../common/common.module';
+import { SharedToolbarModule } from '@alfresco/aca-shared';
 
 export function components() {
   return [
     DocumentDisplayModeComponent,
     ToggleFavoriteComponent,
     ToggleInfoDrawerComponent,
-    ToolbarButtonComponent,
-    ToolbarActionComponent,
-    ToolbarMenuItemComponent,
-    ToolbarMenuComponent,
     ToggleJoinLibraryButtonComponent,
     ToggleJoinLibraryMenuComponent,
     ToggleFavoriteLibraryComponent,
@@ -65,10 +58,11 @@ export function components() {
     CoreModule.forChild(),
     AppCommonModule,
     ExtensionsModule,
+    SharedToolbarModule,
     DirectivesModule
   ],
   declarations: components(),
-  exports: components(),
+  exports: [components(), SharedToolbarModule],
   entryComponents: components()
 })
 export class AppToolbarModule {}

src/app/components/trashcan/trashcan.component.ts

@@ -29,9 +29,9 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Component, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { ContentManagementService } from '../../services/content-management.service';
 import { PageComponent } from '../page.component';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 @Component({
   templateUrl: './trashcan.component.html'

src/app/components/viewer/viewer.component.ts

@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ContentApiService } from '@alfresco/aca-shared';
+import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
 import {
   AppStore,
   getAppSelection,
@@ -54,7 +54,6 @@ import { ContentManagementService } from '../../services/content-management.serv
 import { Store } from '@ngrx/store';
 import { from, Observable, Subject } from 'rxjs';
 import { takeUntil, debounceTime } from 'rxjs/operators';
-import { AppExtensionService } from '../../extensions/extension.service';
 import { Actions, ofType } from '@ngrx/effects';
 
 @Component({

src/app/directives/directives.module.ts

@@ -25,15 +25,14 @@
 
 import { NgModule } from '@angular/core';
 import { DocumentListDirective } from './document-list.directive';
-import { PaginationDirective } from './pagination.directive';
 import { LibraryMembershipDirective } from './library-membership.directive';
 import { LibraryFavoriteDirective } from './library-favorite.directive';
 import { LockNodeDirective } from './lock-node.directive';
+import { SharedDirectivesModule } from '@alfresco/aca-shared';
 
 export function directives() {
   return [
     DocumentListDirective,
-    PaginationDirective,
     LibraryMembershipDirective,
     LibraryFavoriteDirective,
     LockNodeDirective
@@ -41,7 +40,8 @@ export function directives() {
 }
 
 @NgModule({
+  imports: [SharedDirectivesModule],
   declarations: directives(),
-  exports: directives()
+  exports: [directives(), SharedDirectivesModule]
 })
 export class DirectivesModule {}

src/app/extensions/core.extensions.module.ts

@@ -28,7 +28,6 @@ import { CommonModule } from '@angular/common';
 import { APP_INITIALIZER, ModuleWithProviders, NgModule } from '@angular/core';
 import { AppLayoutComponent } from '../components/layout/app-layout/app-layout.component';
 import * as rules from '@alfresco/aca-shared/rules';
-import { AppExtensionService } from './extension.service';
 import { ToggleInfoDrawerComponent } from '../components/toolbar/toggle-info-drawer/toggle-info-drawer.component';
 import { ToggleFavoriteComponent } from '../components/toolbar/toggle-favorite/toggle-favorite.component';
 import { ToggleFavoriteLibraryComponent } from '../components/toolbar/toggle-favorite-library/toggle-favorite-library.component';
@@ -53,6 +52,7 @@ import { ToggleSharedComponent } from '../components/common/toggle-shared/toggle
 import { ViewNodeComponent } from '../components/toolbar/view-node/view-node.component';
 import { LanguagePickerComponent } from '../components/common/language-picker/language-picker.component';
 import { LogoutComponent } from '../components/common/logout/logout.component';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 export function setupExtensions(service: AppExtensionService): Function {
   return () => service.load();

src/app/mock/extension-routes.mock.ts

@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ExtensionRoute } from '../types';
+import { ExtensionRoute } from '@alfresco/aca-shared';
 
 export const mockRoutesWithoutParentRoute: Array<ExtensionRoute> = [
   {

src/app/store/effects/viewer.effects.ts

@@ -43,7 +43,7 @@ import {
   UrlSegment
 } from '@angular/router';
 import { Store, createSelector } from '@ngrx/store';
-import { AppExtensionService } from '../../extensions/extension.service';
+import { AppExtensionService } from '@alfresco/aca-shared';
 
 export const fileToPreview = createSelector(
   getAppSelection,

src/app/testing/app-testing.module.ts

@@ -25,7 +25,6 @@
 
 import { NgModule } from '@angular/core';
 import { TranslateService, TranslatePipe } from '@ngx-translate/core';
-import { TranslatePipeMock } from './translate-pipe.directive';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import {
   TranslationService,
@@ -45,7 +44,6 @@ import {
   PipeModule
 } from '@alfresco/adf-core';
 import { HttpClientModule } from '@angular/common/http';
-import { TranslateServiceMock } from './translation.service';
 import { StoreModule } from '@ngrx/store';
 import { appReducer } from '../store/reducers/app.reducer';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -56,6 +54,8 @@ import {
 } from '@alfresco/adf-content-services';
 import { MaterialModule } from '../material.module';
 import { INITIAL_STATE } from '../store/initial-state';
+import { TranslatePipeMock } from './translate-pipe.directive';
+import { TranslateServiceMock } from './translation.service';
 
 @NgModule({
   imports: [