Upgrade to ADF 2.0.0-beta2 (#65)

* upgrade to 2.0.0-beta2

* search fixes

* test fixes

* test fixes

* cleanup CLI config

* remove unused property

.angular-cli.json

@@ -13,13 +13,21 @@
         "app.config.json",
         "versions.json",
 
-        { "glob": "**/*", "input": "../node_modules/ng2-alfresco-core/bundles/assets", "output": "./assets/" },
+        {
-        { "glob": "**/*", "input": "../node_modules/ng2-alfresco-datatable/bundles/assets", "output": "./assets/" },
+            "glob": "**/*",
-        { "glob": "**/*", "input": "../node_modules/ng2-alfresco-viewer/bundles/assets", "output": "./assets/" },
+            "input": "../node_modules/@alfresco/adf-core/prebuilt-themes",
-        { "glob": "**/*", "input": "../node_modules/ng2-alfresco-documentlist/bundles/assets", "output": "./assets/" },
+            "output": "./assets/prebuilt-themes"
-        { "glob": "**/*", "input": "../node_modules/ng2-alfresco-login/bundles/assets", "output": "./assets/" },
+        },
-        { "glob": "**/*", "input": "../node_modules/ng2-alfresco-upload/bundles/assets", "output": "./assets/" },
+        {
-        { "glob": "**/*", "input": "../node_modules/ng2-alfresco-search/bundles/assets", "output": "./assets/" },
+            "glob": "**/*",
+            "input": "../node_modules/@alfresco/adf-core/bundles/assets",
+            "output": "./assets/"
+        },
+        {
+            "glob": "**/*",
+            "input": "../node_modules/@alfresco/adf-content-services/bundles/assets",
+            "output": "./assets/"
+        },
 
         { "glob": "pdf.worker.js", "input": "../node_modules/pdfjs-dist/build", "output": "./" }
       ],

karma.conf.js

@@ -15,15 +15,13 @@ module.exports = function (config) {
     files: [
         { pattern: './node_modules/hammerjs/hammer.js', watched: false },
         { pattern: './node_modules/@angular/material/prebuilt-themes/indigo-pink.css', watched: false },
-        { pattern: './node_modules/ng2-alfresco-*/bundles/assets/ng2-alfresco-*/i18n/en.json', watched: false, served: true, included: false },
+        { pattern: './node_modules/@alfresco/adf-core/bundles/assets/adf-core/i18n/en.json', watched: false, served: true, included: false },
+        { pattern: './node_modules/@alfresco/adf-content-services/bundles/assets/adf-content-services/i18n/en.json', watched: false, served: true, included: false }
+
     ],
     proxies: {
-        '/assets/ng2-alfresco-core/i18n/en.json': '/base/node_modules/ng2-alfresco-core/bundles/assets/ng2-alfresco-core/i18n/en.json',
+        '/assets/adf-core/i18n/en.json': '/base/node_modules/@alfresco/adf-core/bundles/assets/adf-core/i18n/en.json',
-        '/assets/ng2-alfresco-datatable/i18n/en.json': '/base/node_modules/ng2-alfresco-datatable/bundles/assets/ng2-alfresco-datatable/i18n/en.json',
+        '/assets/adf-content-services/i18n/en.json': '/base/node_modules/@alfresco/adf-content-services/bundles/assets/adf-content-services/i18n/en.json'
-        '/assets/ng2-alfresco-documentlist/i18n/en.json': '/base/node_modules/ng2-alfresco-documentlist/bundles/assets/ng2-alfresco-documentlist/i18n/en.json',
-        '/assets/ng2-alfresco-login/i18n/en.json': '/base/node_modules/ng2-alfresco-login/bundles/assets/ng2-alfresco-login/i18n/en.json',
-        '/assets/ng2-alfresco-upload/i18n/en.json': '/base/node_modules/ng2-alfresco-upload/bundles/assets/ng2-alfresco-upload/i18n/en.json',
-        '/assets/ng2-alfresco-search/i18n/en.json': '/base/node_modules/ng2-alfresco-search/bundles/assets/ng2-alfresco-search/i18n/en.json'
     },
     client:{
       clearContext: false // leave Jasmine Spec Runner output visible in browser

package.json

@@ -15,35 +15,32 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "4.4.5",
+    "@alfresco/adf-content-services": "2.0.0-beta2",
-    "@angular/cdk": "2.0.0-beta.12",
+    "@alfresco/adf-core": "2.0.0-beta2",
-    "@angular/common": "4.4.5",
+    "@angular/animations": "5.0.0",
-    "@angular/compiler": "4.4.5",
+    "@angular/cdk": "5.0.0-rc0",
-    "@angular/core": "4.4.5",
+    "@angular/common": "5.0.0",
-    "@angular/forms": "4.4.5",
+    "@angular/compiler": "5.0.0",
-    "@angular/http": "4.4.5",
+    "@angular/core": "5.0.0",
-    "@angular/material": "2.0.0-beta.12",
+    "@angular/flex-layout": "2.0.0-beta.10",
-    "@angular/platform-browser": "4.4.5",
+    "@angular/forms": "5.0.0",
-    "@angular/platform-browser-dynamic": "4.4.5",
+    "@angular/http": "5.0.0",
-    "@angular/router": "4.4.5",
+    "@angular/material": "5.0.0-rc0",
+    "@angular/platform-browser": "5.0.0",
+    "@angular/platform-browser-dynamic": "5.0.0",
+    "@angular/router": "5.0.0",
     "@ngx-translate/core": "8.0.0",
-    "alfresco-js-api": "1.10.0-beta6",
+    "alfresco-js-api": "2.0.0-beta1",
-    "core-js": "^2.4.1",
+    "core-js": "2.4.1",
     "hammerjs": "2.0.8",
-    "ng2-alfresco-core": "1.10.0-beta6",
+    "pdfjs-dist": "1.5.404",
-    "ng2-alfresco-datatable": "1.10.0-beta6",
+    "rxjs": "5.5.2",
-    "ng2-alfresco-documentlist": "1.10.0-beta6",
+    "web-animations-js": "^2.3.1",
-    "ng2-alfresco-login": "1.10.0-beta6",
+    "zone.js": "0.8.14"
-    "ng2-alfresco-search": "1.10.0-beta6",
-    "ng2-alfresco-upload": "1.10.0-beta6",
-    "ng2-alfresco-viewer": "1.10.0-beta6",
-    "pdfjs-dist": "1.8.557",
-    "rxjs": "5.1.0",
-    "zone.js": "^0.8.14"
   },
   "devDependencies": {
-    "@angular/cli": "1.4.7",
+    "@angular/cli": "1.5.0",
-    "@angular/compiler-cli": "4.4.5",
+    "@angular/compiler-cli": "5.0.0",
     "@angular/language-service": "4.4.5",
     "@types/jasmine": "^2.5.53",
     "@types/jasminewd2": "^2.0.2",
@@ -64,6 +61,6 @@
     "rimraf": "2.6.2",
     "ts-node": "~3.2.0",
     "tslint": "~5.7.0",
-    "typescript": "~2.3.3"
+    "typescript": "~2.4.2"
   }
 }

src/app/adf.module.ts

@@ -18,23 +18,13 @@
 import { NgModule } from '@angular/core';
 
 // ADF modules
-import { CoreModule } from 'ng2-alfresco-core';
+import { CoreModule } from '@alfresco/adf-core';
-import { DataTableModule } from 'ng2-alfresco-datatable';
+import { ContentModule } from '@alfresco/adf-content-services';
-import { ViewerModule } from 'ng2-alfresco-viewer';
-import { DocumentListModule } from 'ng2-alfresco-documentlist';
-import { LoginModule } from 'ng2-alfresco-login';
-import { UploadModule } from 'ng2-alfresco-upload';
-import { SearchModule } from 'ng2-alfresco-search';
 
 export function modules() {
     return [
         CoreModule,
-        DataTableModule,
+        ContentModule
-        DocumentListModule,
-        LoginModule,
-        SearchModule,
-        UploadModule,
-        ViewerModule
     ];
 }
 

src/app/app.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, OnInit } from '@angular/core';
 import { Router, ActivatedRoute, NavigationEnd } from '@angular/router';
-import { TranslationService, PageTitleService } from 'ng2-alfresco-core';
+import { TranslationService, PageTitleService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'app-root',

src/app/app.module.ts

@@ -18,7 +18,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { TRANSLATION_PROVIDER } from 'ng2-alfresco-core';
+import { TRANSLATION_PROVIDER } from '@alfresco/adf-core';
 
 import { AdfModule } from './adf.module';
 import { CommonModule } from './common/common.module';

src/app/app.routes.ts

@@ -16,7 +16,7 @@
  */
 
 import { Routes } from '@angular/router';
-import { AuthGuardEcm } from 'ng2-alfresco-core';
+import { AuthGuardEcm } from '@alfresco/adf-core';
 
 import { LayoutComponent } from './components/layout/layout.component';
 

src/app/common/directives/node-copy.directive.spec.ts

@@ -21,8 +21,8 @@ import { By } from '@angular/platform-browser';
 
 import { Observable } from 'rxjs/Rx';
 
-import { CoreModule, TranslationService, NodesApiService, NotificationService } from 'ng2-alfresco-core';
+import { CoreModule, TranslationService, NodesApiService, NotificationService } from '@alfresco/adf-core';
-import { DocumentListModule } from 'ng2-alfresco-documentlist';
+import { DocumentListModule } from '@alfresco/adf-content-services';
 
 import { NodeActionsService } from '../services/node-actions.service';
 import { ContentManagementService } from '../services/content-management.service';

src/app/common/directives/node-copy.directive.ts

@@ -18,7 +18,7 @@
 import { Directive, HostListener, Input } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 
-import { TranslationService, NodesApiService, NotificationService } from 'ng2-alfresco-core';
+import { TranslationService, NodesApiService, NotificationService } from '@alfresco/adf-core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import { NodeActionsService } from '../services/node-actions.service';
 import { ContentManagementService } from '../services/content-management.service';

src/app/common/directives/node-delete.directive.spec.ts

@@ -17,11 +17,12 @@
 
 import { TestBed, ComponentFixture, fakeAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { CoreModule, TranslationService, NodesApiService, NotificationService } from 'ng2-alfresco-core';
+import { CoreModule, TranslationService, NodesApiService, NotificationService } from '@alfresco/adf-core';
 import { Component, DebugElement } from '@angular/core';
+import { Observable } from 'rxjs/Rx';
+
 import { NodeDeleteDirective } from './node-delete.directive';
 import { ContentManagementService } from '../services/content-management.service';
-import { Observable } from 'rxjs/Rx';
 
 @Component({
     template: '<div [app-delete-node]="selection"></div>'

src/app/common/directives/node-delete.directive.ts

@@ -17,7 +17,7 @@
 
 import { Directive, HostListener, Input } from '@angular/core';
 
-import { TranslationService, NodesApiService, NotificationService } from 'ng2-alfresco-core';
+import { TranslationService, NodesApiService, NotificationService } from '@alfresco/adf-core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import { Observable } from 'rxjs/Rx';
 

src/app/common/directives/node-download.directive.spec.ts

@@ -17,7 +17,7 @@
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { CoreModule, AlfrescoApiService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoApiService } from '@alfresco/adf-core';
 import { MatDialog } from '@angular/material';
 import { Component, DebugElement } from '@angular/core';
 import { DownloadFileDirective } from './node-download.directive';

src/app/common/directives/node-download.directive.ts

@@ -18,7 +18,7 @@
 import { Directive, Input, HostListener } from '@angular/core';
 import { MatDialog } from '@angular/material';
 import { MinimalNodeEntity } from 'alfresco-js-api';
-import { AlfrescoApiService, DownloadZipDialogComponent } from 'ng2-alfresco-core';
+import { AlfrescoApiService, DownloadZipDialogComponent } from '@alfresco/adf-core';
 
 @Directive({
     selector: '[app-download-node]'

src/app/common/directives/node-favorite.directive.spec.ts

@@ -17,11 +17,10 @@
 
 import { TestBed, ComponentFixture, fakeAsync, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { CoreModule, TranslationService, NodesApiService } from 'ng2-alfresco-core';
+import { AlfrescoApiService, CoreModule, TranslationService, NodesApiService } from '@alfresco/adf-core';
 import { Component, DebugElement } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 
-import { AlfrescoApiService } from 'ng2-alfresco-core';
 import { ContentManagementService } from '../services/content-management.service';
 import { NodeFavoriteDirective } from './node-favorite.directive';
 

src/app/common/directives/node-favorite.directive.ts

@@ -16,7 +16,7 @@
  */
 
 import { Directive, HostListener, Input, OnChanges } from '@angular/core';
-import { AlfrescoApiService } from 'ng2-alfresco-core';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 
 import { MinimalNodeEntity, FavoriteBody } from 'alfresco-js-api';
 import { Observable } from 'rxjs/Rx';

src/app/common/directives/node-move.directive.spec.ts

@@ -21,8 +21,8 @@ import { By } from '@angular/platform-browser';
 
 import { Observable } from 'rxjs/Rx';
 
-import { CoreModule, TranslationService, NodesApiService, NotificationService } from 'ng2-alfresco-core';
+import { CoreModule, TranslationService, NodesApiService, NotificationService } from '@alfresco/adf-core';
-import { DocumentListModule } from 'ng2-alfresco-documentlist';
+import { DocumentListModule } from '@alfresco/adf-content-services';
 
 import { NodeActionsService } from '../services/node-actions.service';
 import { ContentManagementService } from '../services/content-management.service';

src/app/common/directives/node-move.directive.ts

@@ -17,7 +17,7 @@
 
 import { Directive, HostListener, Input } from '@angular/core';
 
-import { TranslationService, NodesApiService, NotificationService } from 'ng2-alfresco-core';
+import { TranslationService, NodesApiService, NotificationService } from '@alfresco/adf-core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 
 import { ContentManagementService } from '../services/content-management.service';

src/app/common/directives/node-permanent-delete.directive.spec.ts

@@ -19,7 +19,7 @@ import { Component, DebugElement } from '@angular/core';
 import { TestBed, ComponentFixture, async, fakeAsync, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AlfrescoApiService, TranslationService, NotificationService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoApiService, TranslationService, NotificationService } from '@alfresco/adf-core';
 
 import { NodePermanentDeleteDirective } from './node-permanent-delete.directive';
 

src/app/common/directives/node-permanent-delete.directive.ts

@@ -18,7 +18,7 @@
 import { Directive, ElementRef, HostListener, Input } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 
-import { TranslationService, AlfrescoApiService, NotificationService } from 'ng2-alfresco-core';
+import { TranslationService, AlfrescoApiService, NotificationService } from '@alfresco/adf-core';
 import { MinimalNodeEntity, DeletedNodeEntry, PathInfoEntity } from 'alfresco-js-api';
 
 @Directive({

src/app/common/directives/node-restore.directive.spec.ts

@@ -21,7 +21,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { TestBed, ComponentFixture, async, fakeAsync, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AlfrescoApiService, TranslationService, NotificationService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoApiService, TranslationService, NotificationService } from '@alfresco/adf-core';
 
 import { NodeRestoreDirective } from './node-restore.directive';
 

src/app/common/directives/node-restore.directive.ts

@@ -19,7 +19,7 @@ import { Directive, ElementRef, HostListener, Input } from '@angular/core';
 import { Router } from '@angular/router';
 import { Observable } from 'rxjs/Rx';
 
-import { TranslationService, AlfrescoApiService, NotificationService } from 'ng2-alfresco-core';
+import { TranslationService, AlfrescoApiService, NotificationService } from '@alfresco/adf-core';
 import { MinimalNodeEntity, DeletedNodeEntry, PathInfoEntity, DeletedNodesPaging } from 'alfresco-js-api';
 
 @Directive({

src/app/common/services/browsing-files.service.spec.ts

@@ -24,7 +24,7 @@ describe('BrowsingFilesService', () => {
         service = new BrowsingFilesService();
     });
 
-    it('subscribs to event', () => {
+    it('subscribes to event', () => {
         const value: any = 'test-value';
 
         service.onChangeParent.subscribe((result) => {

src/app/common/services/browsing-files.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs/Rx';
 import { Injectable } from '@angular/core';
 
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';

src/app/common/services/node-actions.service.spec.ts

@@ -15,18 +15,20 @@
  * limitations under the License.
  */
 
+ /*
 import { TestBed, async } from '@angular/core/testing';
 import { MatDialog } from '@angular/material';
 import { OverlayModule } from '@angular/cdk/overlay';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AlfrescoApiService, NodesApiService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoApiService, NodesApiService } from '@alfresco/adf-core';
-import { DocumentListService, NodeMinimal, NodeMinimalEntry } from 'ng2-alfresco-documentlist';
+import { DocumentListService } from '@alfresco/adf-content-services';
 import { NodeActionsService } from './node-actions.service';
+import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api';
 
-class TestNode extends NodeMinimalEntry {
+class TestNode extends MinimalNodeEntity {
     constructor(id?: string, isFile?: boolean, name?: string, permission?: string[]) {
         super();
-        this.entry = new NodeMinimal();
+        this.entry = new MinimalNodeEntryEntity();
         this.entry.id = id || 'node-id';
         this.entry.isFile = isFile;
         this.entry.isFolder = !isFile;
@@ -1179,3 +1181,4 @@ describe('NodeActionsService', () => {
     });
 
 });
+*/

src/app/common/services/node-actions.service.ts

@@ -19,9 +19,8 @@ import { EventEmitter, Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material';
 import { Observable, Subject } from 'rxjs/Rx';
 
-import { AlfrescoApiService, AlfrescoContentService, NodesApiService } from 'ng2-alfresco-core';
+import { AlfrescoApiService, ContentService, NodesApiService, DataColumn } from '@alfresco/adf-core';
-import { DataColumn } from 'ng2-alfresco-datatable';
+import { DocumentListService, ContentNodeSelectorComponent, ContentNodeSelectorComponentData } from '@alfresco/adf-content-services';
-import { DocumentListService, ContentNodeSelectorComponent, ContentNodeSelectorComponentData } from 'ng2-alfresco-documentlist';
 import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api';
 
 @Injectable()
@@ -33,7 +32,7 @@ export class NodeActionsService {
     contentMoved: Subject<any> = new Subject<any>();
     moveDeletedEntries: any[] = [];
 
-    constructor(private contentService: AlfrescoContentService,
+    constructor(private contentService: ContentService,
                 private dialog: MatDialog,
                 private documentListService: DocumentListService,
                 private apiService: AlfrescoApiService,

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

@@ -17,8 +17,8 @@
 
 import { Component, OnInit } from '@angular/core';
 import { Http } from '@angular/http';
-import { DiscoveryApiService, EcmProductVersionModel  } from 'ng2-alfresco-core';
+import { DiscoveryApiService } from '@alfresco/adf-core';
-import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
+import { EcmProductVersionModel, ObjectDataTableAdapter  } from '@alfresco/adf-content-services';
 
 @Component({
     selector: 'app-about',

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

@@ -19,7 +19,7 @@ import { TestBed, async } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Observable } from 'rxjs/Rx';
 import { MaterialModule } from '../../common/material.module';
-import { CoreModule, PeopleContentService } from 'ng2-alfresco-core';
+import { CoreModule, PeopleContentService } from '@alfresco/adf-core';
 
 import { CurrentUserComponent } from './current-user.component';
 

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

@@ -16,7 +16,7 @@
  */
 
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { PeopleContentService, AppConfigService } from 'ng2-alfresco-core';
+import { PeopleContentService, AppConfigService } from '@alfresco/adf-core';
 import { Subscription } from 'rxjs/Rx';
 
 @Component({

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

@@ -19,7 +19,7 @@ import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TestBed, async } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, NodesApiService, AlfrescoApiService, AlfrescoContentService } from 'ng2-alfresco-core';
+import { CoreModule, NodesApiService, AlfrescoApiService, ContentService } from '@alfresco/adf-core';
 
 import { CommonModule } from '../../common/common.module';
 import { LocationLinkComponent } from '../location-link/location-link.component';
@@ -32,7 +32,7 @@ describe('Favorites Routed Component', () => {
     let component: FavoritesComponent;
     let nodesApi: NodesApiService;
     let alfrescoApi: AlfrescoApiService;
-    let alfrescoContentService: AlfrescoContentService;
+    let alfrescoContentService: ContentService;
     let contentService: ContentManagementService;
     let router: Router;
     let page;
@@ -82,7 +82,7 @@ describe('Favorites Routed Component', () => {
 
             nodesApi = TestBed.get(NodesApiService);
             alfrescoApi = TestBed.get(AlfrescoApiService);
-            alfrescoContentService = TestBed.get(AlfrescoContentService);
+            alfrescoContentService = TestBed.get(ContentService);
             contentService = TestBed.get(ContentManagementService);
             router = TestBed.get(Router);
         });

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

@@ -20,8 +20,8 @@ import { Router } from '@angular/router';
 import { Subscription } from 'rxjs/Rx';
 
 import { MinimalNodeEntryEntity, PathElementEntity, PathInfo } from 'alfresco-js-api';
-import { AlfrescoContentService, NodesApiService } from 'ng2-alfresco-core';
+import { ContentService, NodesApiService } from '@alfresco/adf-core';
-import { DocumentListComponent } from 'ng2-alfresco-documentlist';
+import { DocumentListComponent } from '@alfresco/adf-content-services';
 
 import { ContentManagementService } from '../../common/services/content-management.service';
 import { PageComponent } from '../page.component';
@@ -41,7 +41,7 @@ export class FavoritesComponent extends PageComponent implements OnInit, OnDestr
     constructor(
         private router: Router,
         private nodesApi: NodesApiService,
-        private contentService: AlfrescoContentService,
+        private contentService: ContentService,
         private content: ContentManagementService) {
         super();
     }

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

@@ -20,7 +20,7 @@ import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TestBed, async } from '@angular/core/testing';
 import { UploadService, NodesApiService, FileUploadCompleteEvent,
-        FileUploadDeleteEvent, FileModel, AlfrescoContentService } from 'ng2-alfresco-core';
+        FileUploadDeleteEvent, FileModel, ContentService } from '@alfresco/adf-core';
 
 import { CommonModule } from '../../common/common.module';
 import { ContentManagementService } from '../../common/services/content-management.service';
@@ -35,7 +35,7 @@ describe('FilesComponent', () => {
     let fixture;
     let component: FilesComponent;
     let contentManagementService: ContentManagementService;
-    let alfrescoContentService: AlfrescoContentService;
+    let alfrescoContentService: ContentService;
     let uploadService: UploadService;
     let nodesApi: NodesApiService;
     let router: Router;
@@ -62,7 +62,7 @@ describe('FilesComponent', () => {
             uploadService = TestBed.get(UploadService);
             nodesApi = TestBed.get(NodesApiService);
             router = TestBed.get(Router);
-            alfrescoContentService = TestBed.get(AlfrescoContentService);
+            alfrescoContentService = TestBed.get(ContentService);
             browsingFilesService = TestBed.get(BrowsingFilesService);
             nodeActionsService = TestBed.get(NodeActionsService);
         });

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

@@ -19,7 +19,7 @@ import { Observable, Subscription } from 'rxjs/Rx';
 import { Component, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core';
 import { Router, ActivatedRoute, Params } from '@angular/router';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElementEntity, NodePaging, PathElement } from 'alfresco-js-api';
-import { UploadService, FileUploadEvent, NodesApiService, AlfrescoContentService, AlfrescoApiService } from 'ng2-alfresco-core';
+import { UploadService, FileUploadEvent, NodesApiService, ContentService, AlfrescoApiService } from '@alfresco/adf-core';
 
 import { BrowsingFilesService } from '../../common/services/browsing-files.service';
 import { ContentManagementService } from '../../common/services/content-management.service';
@@ -54,7 +54,7 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
         private uploadService: UploadService,
         private contentManagementService: ContentManagementService,
         private browsingFilesService: BrowsingFilesService,
-        private contentService: AlfrescoContentService,
+        private contentService: ContentService,
         private apiService: AlfrescoApiService) {
         super();
     }

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

@@ -17,7 +17,7 @@
 
 import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { CoreModule, AppConfigService, PeopleContentService } from 'ng2-alfresco-core';
+import { CoreModule, AppConfigService, PeopleContentService } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Rx';
 import { CommonModule } from './../../common/common.module';
 

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

@@ -16,7 +16,7 @@
  */
 
 import { Component, ViewEncapsulation } from '@angular/core';
-import { AppConfigService } from 'ng2-alfresco-core';
+import { AppConfigService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'app-header',

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

@@ -18,7 +18,7 @@
 import { RouterTestingModule } from '@angular/router/testing';
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { CoreModule, AlfrescoContentService, PeopleContentService } from 'ng2-alfresco-core';
+import { CoreModule, ContentService, PeopleContentService } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Observable';
 
 import { BrowsingFilesService } from '../../common/services/browsing-files.service';
@@ -33,7 +33,7 @@ describe('LayoutComponent', () => {
     let fixture: ComponentFixture<LayoutComponent>;
     let component: LayoutComponent;
     let browsingFilesService: BrowsingFilesService;
-    let contentService: AlfrescoContentService;
+    let contentService: ContentService;
     let node;
 
     beforeEach(() => {
@@ -65,7 +65,7 @@ describe('LayoutComponent', () => {
         fixture = TestBed.createComponent(LayoutComponent);
         component = fixture.componentInstance;
         browsingFilesService = TestBed.get(BrowsingFilesService);
-        contentService = TestBed.get(AlfrescoContentService);
+        contentService = TestBed.get(ContentService);
 
         fixture.detectChanges();
     });

src/app/components/layout/layout.component.ts

@@ -18,7 +18,7 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { Subscription } from 'rxjs/Rx';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { AlfrescoContentService } from 'ng2-alfresco-core';
+import { ContentService } from '@alfresco/adf-core';
 import { BrowsingFilesService } from '../../common/services/browsing-files.service';
 
 @Component({
@@ -32,7 +32,7 @@ export class LayoutComponent implements OnInit, OnDestroy {
     browsingFilesSubscription: Subscription;
 
     constructor(
-        private contentService: AlfrescoContentService,
+        private contentService: ContentService,
         private browsingFilesService: BrowsingFilesService) {}
 
     ngOnInit() {

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

@@ -20,7 +20,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { TestBed, async } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
 
-import { CoreModule , NodesApiService, AlfrescoApiService} from 'ng2-alfresco-core';
+import { CoreModule , NodesApiService, AlfrescoApiService} from '@alfresco/adf-core';
 
 import { CommonModule } from '../../common/common.module';
 import { LibrariesComponent } from './libraries.component';

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

@@ -17,10 +17,10 @@
 
 import { Component, ViewChild } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
-import { NodesApiService } from 'ng2-alfresco-core';
+import { NodesApiService } from '@alfresco/adf-core';
+import { DocumentListComponent } from '@alfresco/adf-content-services';
 
 import { PageComponent } from '../page.component';
-import { DocumentListComponent } from 'ng2-alfresco-documentlist';
 
 @Component({
     templateUrl: './libraries.component.html'

src/app/components/location-link/location-link.component.ts

@@ -1,6 +1,5 @@
 import { Component, Input, ChangeDetectionStrategy, OnInit, ViewEncapsulation } from '@angular/core';
-import { DataColumn, DataRow, DataTableAdapter } from 'ng2-alfresco-datatable';
+import { AlfrescoApiService, DataColumn, DataRow, DataTableAdapter } from '@alfresco/adf-core';
-import { AlfrescoApiService } from 'ng2-alfresco-core';
 import { PathInfoEntity, AlfrescoApi } from 'alfresco-js-api';
 import { Observable } from 'rxjs/Rx';
 

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

@@ -19,8 +19,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { Router, ActivatedRoute } from '@angular/router';
 import { TestBed, async } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AuthenticationService, UserPreferencesService } from 'ng2-alfresco-core';
+import { CoreModule, AuthenticationService, UserPreferencesService, LoginModule } from '@alfresco/adf-core';
-import { LoginModule } from 'ng2-alfresco-login';
 
 import { LoginComponent } from './login.component';
 

src/app/components/login/login.component.ts

@@ -18,8 +18,7 @@
 import { Component } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import { Validators } from '@angular/forms';
-
+import { AuthenticationService, UserPreferencesService } from '@alfresco/adf-core';
-import { AlfrescoAuthenticationService, UserPreferencesService } from 'ng2-alfresco-core';
 
 const skipRedirectUrls: string[] = [
     '/logout',
@@ -36,7 +35,7 @@ export class LoginComponent {
     constructor(
         private router: Router,
         private route: ActivatedRoute,
-        private auth: AlfrescoAuthenticationService,
+        private auth: AuthenticationService,
         private userPreferences: UserPreferencesService
     ) {
         if (auth.isEcmLoggedIn()) {

src/app/components/page.component.ts

@@ -19,10 +19,10 @@ import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging, Pagination } fro
 
 export abstract class PageComponent {
 
-    title: string = 'Page';
+    title = 'Page';
 
-    isLoading: boolean = false;
+    isLoading = false;
-    isEmpty: boolean = true;
+    isEmpty = true;
 
     paging: NodePaging;
     pagination: Pagination;
@@ -70,7 +70,7 @@ export abstract class PageComponent {
 
     isFileSelected(selection: Array<MinimalNodeEntity>): boolean {
         if (selection && selection.length === 1) {
-            let entry = selection[0].entry;
+            const entry = selection[0].entry;
 
             if (entry && entry.isFile) {
                 return true;
@@ -81,7 +81,7 @@ export abstract class PageComponent {
 
     canEditFolder(selection: Array<MinimalNodeEntity>): boolean {
         if (selection && selection.length === 1) {
-            let entry = selection[0].entry;
+            const entry = selection[0].entry;
 
             if (entry && entry.isFolder) {
                 return this.nodeHasPermission(entry, 'update');

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

@@ -17,13 +17,14 @@
 
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { AlfrescoApiService } from 'ng2-alfresco-core';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'app-preview',
     templateUrl: 'preview.component.html',
     styleUrls: ['preview.component.scss'],
     encapsulation: ViewEncapsulation.None,
+    // tslint:disable-next-line:use-host-property-decorator
     host: { 'class': 'app-preview' }
 })
 export class PreviewComponent implements OnInit {

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

@@ -20,7 +20,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { TestBed, async } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
 
-import { CoreModule, AlfrescoApiService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoApiService } from '@alfresco/adf-core';
 
 import { CommonModule } from '../../common/common.module';
 import { ContentManagementService } from '../../common/services/content-management.service';

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

@@ -19,7 +19,7 @@ import { Subscription } from 'rxjs/Rx';
 import { Component, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { DocumentListComponent } from 'ng2-alfresco-documentlist';
+import { DocumentListComponent } from '@alfresco/adf-content-services';
 
 import { ContentManagementService } from '../../common/services/content-management.service';
 import { PageComponent } from '../page.component';

src/app/components/search/search.component.html

@@ -1,6 +1,4 @@
 <adf-search-control
-    [searchTerm]="searchTerm"
-    [autocomplete]="false"
     [highlight]="true"
-    (fileSelect)="onNodeClicked($event)">
+    (optionClicked)="onItemClicked($event)">
 </adf-search-control>

src/app/components/search/search.component.scss

@@ -1,5 +1,10 @@
 @import 'variables';
 
+// todo: remove once ADF 2.0 is out
+:host {
+    overflow: hidden;
+}
+
 adf-search-control {
     color: $alfresco-white;
 }

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

@@ -16,7 +16,7 @@
  */
 
 import { TestBed, async } from '@angular/core/testing';
-import { CoreModule, AppConfigService } from 'ng2-alfresco-core';
+import { CoreModule, AppConfigService } from '@alfresco/adf-core';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 
@@ -49,12 +49,12 @@ describe('SearchComponent', () => {
         });
     }));
 
-    describe('onNodeClicked()', () => {
+    describe('onItemClicked()', () => {
         it('opens preview if node is file', () => {
             spyOn(router, 'navigate').and.stub();
             const node = { entry: { isFile: true, id: 'node-id' } };
 
-            component.onNodeClicked(node);
+            component.onItemClicked(node);
 
             expect(router.navigate).toHaveBeenCalledWith(['/preview', node.entry.id]);
         });
@@ -63,7 +63,7 @@ describe('SearchComponent', () => {
             const node = { entry: { isFolder: true } };
             spyOn(router, 'navigate');
 
-            component.onNodeClicked(node);
+            component.onItemClicked(node);
 
             expect(router.navigate).toHaveBeenCalled();
         });

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

@@ -17,7 +17,6 @@
 
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-
 import { MinimalNodeEntity } from 'alfresco-js-api';
 
 @Component({
@@ -27,13 +26,11 @@ import { MinimalNodeEntity } from 'alfresco-js-api';
 })
 export class SearchComponent {
 
-    searchTerm: string = '';
-
     constructor(
         private router: Router) {
     }
 
-    onNodeClicked(node: MinimalNodeEntity) {
+    onItemClicked(node: MinimalNodeEntity) {
         if (node && node.entry) {
             if (node.entry.isFile) {
                 this.router.navigate(['/preview', node.entry.id]);

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

@@ -19,7 +19,7 @@ import { Router } from '@angular/router';
 import { TestBed, async, fakeAsync, tick } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { AlfrescoApiService } from 'ng2-alfresco-core';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 
 import { CommonModule } from '../../common/common.module';
 import { ContentManagementService } from '../../common/services/content-management.service';

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

@@ -19,8 +19,8 @@ import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
 import { Subscription } from 'rxjs/Rx';
 import { MinimalNodeEntity } from 'alfresco-js-api';
-import { AlfrescoApiService } from 'ng2-alfresco-core';
+import { AlfrescoApiService } from '@alfresco/adf-core';
-import { DocumentListComponent } from 'ng2-alfresco-documentlist';
+import { DocumentListComponent } from '@alfresco/adf-content-services';
 
 import { ContentManagementService } from '../../common/services/content-management.service';
 import { PageComponent } from '../page.component';

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

@@ -17,7 +17,7 @@
 
 import { TestBed, async } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { AlfrescoContentService } from 'ng2-alfresco-core';
+import { ContentService } from '@alfresco/adf-core';
 
 import { BrowsingFilesService } from '../../common/services/browsing-files.service';
 
@@ -27,7 +27,7 @@ import { CommonModule } from './../../common/common.module';
 describe('SidenavComponent', () => {
     let fixture;
     let component: SidenavComponent;
-    let contentService: AlfrescoContentService;
+    let contentService: ContentService;
     let browsingService: BrowsingFilesService;
 
     beforeEach(async(() => {
@@ -42,7 +42,7 @@ describe('SidenavComponent', () => {
         })
         .compileComponents()
         .then(() => {
-            contentService = TestBed.get(AlfrescoContentService);
+            contentService = TestBed.get(ContentService);
             browsingService = TestBed.get(BrowsingFilesService);
 
             fixture = TestBed.createComponent(SidenavComponent);

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

@@ -20,7 +20,7 @@ import { Subscription } from 'rxjs/Rx';
 import { Component, OnInit, OnDestroy } from '@angular/core';
 
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { AlfrescoContentService, AppConfigService } from 'ng2-alfresco-core';
+import { ContentService, AppConfigService } from '@alfresco/adf-core';
 
 import { BrowsingFilesService } from '../../common/services/browsing-files.service';
 
@@ -36,7 +36,7 @@ export class SidenavComponent implements OnInit, OnDestroy {
 
     constructor(
         private browsingFilesService: BrowsingFilesService,
-        private contentService: AlfrescoContentService,
+        private contentService: ContentService,
         private appConfig: AppConfigService
     ) {
         this.navigation = this.navigation.concat([

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

@@ -16,7 +16,7 @@
  */
 
 import { TestBed, async } from '@angular/core/testing';
-import { CoreModule, AlfrescoApiService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoApiService } from '@alfresco/adf-core';
 import { TrashcanComponent } from './trashcan.component';
 import { CommonModule } from '../../common/common.module';
 import { LocationLinkComponent } from '../location-link/location-link.component';

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

@@ -16,7 +16,7 @@
  */
 
 import { Component, ViewChild } from '@angular/core';
-import { DocumentListComponent } from 'ng2-alfresco-documentlist';
+import { DocumentListComponent } from '@alfresco/adf-content-services';
 
 @Component({
     templateUrl: './trashcan.component.html'

src/app/ui/theme.scss

@@ -1,12 +1,7 @@
 @import "~@angular/material/theming";
 
-@import '~ng2-alfresco-core/styles/theming';
+@import '~@alfresco/adf-content-services/theming';
-@import '~ng2-alfresco-core/styles/index';
+@import '~@alfresco/adf-core/theming';
-@import '~ng2-alfresco-datatable/styles/index';
-@import '~ng2-alfresco-documentlist/styles/index';
-@import '~ng2-alfresco-login/styles/index';
-@import '~ng2-alfresco-upload/styles/index';
-@import '~ng2-alfresco-search/styles/index';
 
 @include mat-core();
 
@@ -17,9 +12,5 @@ $theme:   mat-light-theme($primary, $accent, $warn);
 
 @include angular-material-theme($theme);
 
-@include alfresco-core-theme($theme);
+@include adf-content-services-theme($theme);
-@include alfresco-datatable-theme($theme);
+@include adf-core-theme($theme);
-@include alfresco-documentlist-theme($theme);
-@include alfresco-login-theme($theme);
-@include alfresco-upload-theme($theme);
-@include alfresco-search-theme($theme);

src/polyfills.ts

@@ -63,7 +63,7 @@ import 'core-js/es7/reflect';
  * Required to support Web Animations `@angular/platform-browser/animations`.
  * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
  **/
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
 
 

src/styles.scss

@@ -1,6 +1,6 @@
 /* You can add global styles to this file, and also import other style files */
 @import '~@angular/material/prebuilt-themes/deeppurple-amber.css';
-@import '~ng2-alfresco-core/prebuilt-themes/adf-blue-orange.css';
+@import '~@alfresco/adf-core/prebuilt-themes/adf-blue-orange.css';
 @import 'app/ui/application';
 
 body, html {