Angular 6 (#151)

* update libs and add package lock * add misssing gitignore files * upgrade ACS blueprint to Angular 6 * update test * update travis config * remove rxjs-compat * fix lint error * upgrade ACS+APS blueprint * update test * upgrade APS template * remove rxjs-compat * remove unused import * disable faulty tests * update tests
Alfresco · Oct 4, 2018 · 2fcc49a · 2fcc49a
1 parent 5bcb9dd
commit 2fcc49a
Show file tree

Hide file tree

Showing 22 changed files with 190 additions and 172 deletions.
diff --git a/app/templates/adf-cli-acs-aps-template/package.json b/app/templates/adf-cli-acs-aps-template/package.json
@@ -9,54 +9,57 @@
     "start": "npm run validate-config && ng serve --open",
     "build": "ng build",
     "build:dist": "ng build --prod",
-    "test": "ng test -sm=false --single-run",
+    "test": "ng test",
     "lint": "ng lint",
     "validate-config": "ajv validate -s node_modules/@alfresco/adf-core/app.config.schema.json -d ./src/app.config.json --errors=text --verbose",
     "e2e": "ng e2e"
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "2.4.0",
-    "@alfresco/adf-core": "2.4.0",
-    "@alfresco/adf-insights": "2.4.0",
-    "@alfresco/adf-process-services": "2.4.0",
-    "@angular/animations": "5.1.1",
-    "@angular/cdk": "5.0.1",
-    "@angular/common": "5.1.1",
-    "@angular/compiler": "5.1.1",
-    "@angular/core": "5.1.1",
-    "@angular/flex-layout": "2.0.0-beta.12",
-    "@angular/forms": "5.1.1",
-    "@angular/http": "5.1.1",
-    "@angular/material": "5.0.1",
-    "@angular/platform-browser": "5.1.1",
-    "@angular/platform-browser-dynamic": "5.1.1",
-    "@angular/router": "5.1.1",
-    "@mat-datetimepicker/core": "^1.0.1",
-    "@mat-datetimepicker/moment": "^1.0.1",
-    "@ngx-translate/core": "9.1.1",
-    "alfresco-js-api": "2.4.0",
+    "@alfresco/adf-content-services": "2.5.0-6e49e266ceedd5ac7f05dc0762de87e686f84a11",
+    "@alfresco/adf-core": "2.5.0-6e49e266ceedd5ac7f05dc0762de87e686f84a11",
+    "@alfresco/adf-insights": "2.5.0-6e49e266ceedd5ac7f05dc0762de87e686f84a11",
+    "@alfresco/adf-process-services": "2.5.0-6e49e266ceedd5ac7f05dc0762de87e686f84a11",
+    "@angular/animations": "6.1.2",
+    "@angular/cdk": "^6.4.3",
+    "@angular/common": "6.1.2",
+    "@angular/compiler": "6.1.2",
+    "@angular/core": "6.1.2",
+    "@angular/flex-layout": "^6.0.0-beta.17",
+    "@angular/forms": "6.1.2",
+    "@angular/http": "6.1.2",
+    "@angular/material": "^6.4.3",
+    "@angular/material-moment-adapter": "^6.4.3",
+    "@angular/platform-browser": "6.1.2",
+    "@angular/platform-browser-dynamic": "6.1.2",
+    "@angular/router": "6.1.2",
+    "@mat-datetimepicker/core": "^2.0.0",
+    "@mat-datetimepicker/moment": "^2.0.1",
+    "@ngx-translate/core": "10.0.2",
+    "alfresco-js-api": "2.5.0-b048ff2aad00611aac1c02af531549b60acc0e66",
     "chart.js": "2.5.0",
     "classlist.js": "1.1.20150312",
     "core-js": "2.4.1",
     "custom-event-polyfill": "0.3.0",
     "hammerjs": "2.0.8",
     "intl": "1.2.5",
     "minimatch": "3.0.4",
-    "moment": "2.20.1",
+    "minimatch-browser": "^1.0.0",
+    "moment": "2.22.2",
     "moment-es6": "^1.0.0",
     "ng2-charts": "1.6.0",
-    "pdfjs-dist": "1.5.404",
+    "pdfjs-dist": "2.0.303",
     "raphael": "2.2.7",
     "reflect-metadata": "0.1.10",
-    "rxjs": "5.5.2",
+    "rxjs": "6.2.2",
     "web-animations-js": "2.3.1",
-    "zone.js": "0.8.14"
+    "zone.js": "0.8.26"
   },
   "devDependencies": {
-    "@angular/cli": "1.7.4",
-    "@angular/compiler-cli": "^5.2.0",
-    "@angular/language-service": "^5.2.0",
+    "@angular-devkit/build-angular": "~0.7.0",
+    "@angular/cli": "^6.1.2",
+    "@angular/compiler-cli": "^6.1.2",
+    "@angular/language-service": "^6.1.2",
     "@types/jasmine": "~2.8.3",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
@@ -73,6 +76,6 @@
     "protractor": "~5.1.2",
     "ts-node": "~4.1.0",
     "tslint": "~5.9.1",
-    "typescript": "~2.5.3"
+    "typescript": "~2.9.2"
   }
 }
diff --git a/app/templates/adf-cli-acs-aps-template/src/app/app-layout/app-layout.component.spec.ts b/app/templates/adf-cli-acs-aps-template/src/app/app-layout/app-layout.component.spec.ts
@@ -1,8 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { ContentModule } from '@alfresco/adf-content-services';
+import { ProcessModule } from '@alfresco/adf-process-services';
+import { CoreModule } from '@alfresco/adf-core';
 
-import { AdfModule } from '../adf.module';
 import { AppLayoutComponent } from './app-layout.component';
 import { AlfrescoApiServiceMock, AlfrescoApiService } from '@alfresco/adf-core';
 
@@ -14,8 +16,10 @@ describe('AppLayoutComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         RouterTestingModule,
-        AdfModule,
-        BrowserAnimationsModule
+        BrowserAnimationsModule,
+        CoreModule.forRoot(),
+        ContentModule.forRoot(),
+        ProcessModule.forRoot()
       ],
       declarations: [AppLayoutComponent],
       providers: [
@@ -34,4 +38,4 @@ describe('AppLayoutComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
-});
+});
diff --git a/app/templates/adf-cli-acs-aps-template/src/app/app-layout/app-layout.component.ts b/app/templates/adf-cli-acs-aps-template/src/app/app-layout/app-layout.component.ts
@@ -1,15 +1,8 @@
 import { Component } from '@angular/core';
-import { TranslationService, AuthenticationService } from '@alfresco/adf-core';
-import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app-layout.component.html',
   styleUrls: ['./app-layout.component.css']
 })
-export class AppLayoutComponent {
-
-  constructor() {
-  }
-
-}
+export class AppLayoutComponent {}
diff --git a/app/templates/adf-cli-acs-aps-template/src/app/app.module.ts b/app/templates/adf-cli-acs-aps-template/src/app/app.module.ts
@@ -2,13 +2,13 @@ import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+import { ContentModule } from '@alfresco/adf-content-services';
+import { ProcessModule } from '@alfresco/adf-process-services';
+import { CoreModule } from '@alfresco/adf-core';
 import { FileViewComponent } from './file-view/file-view.component';
 import { BlobViewComponent } from './file-view/blob-view.component';
 import { PreviewService } from './services/preview.service';
 
-// ADF modules
-import { AdfModule } from './adf.module';
-
 // Custom stencils
 import { StencilsModule } from './stencils.module';
 
@@ -34,7 +34,9 @@ import { AppLayoutComponent } from './app-layout/app-layout.component';
     ),
 
     // ADF modules
-    AdfModule,
+    CoreModule.forRoot(),
+    ContentModule.forRoot(),
+    ProcessModule.forRoot(),
 
     StencilsModule
   ],

diff --git a/app/templates/adf-cli-acs-aps-template/src/app/documentlist/documentlist.component.spec.ts b/app/templates/adf-cli-acs-aps-template/src/app/documentlist/documentlist.component.spec.ts
@@ -1,7 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Location } from '@angular/common';
 import { SpyLocation } from '@angular/common/testing';
-import { AdfModule } from '../adf.module';
+import { ContentModule } from '@alfresco/adf-content-services';
+import { ProcessModule } from '@alfresco/adf-process-services';
+import { CoreModule } from '@alfresco/adf-core';
 import { DocumentlistComponent } from './documentlist.component';
 import { PreviewService } from '../services/preview.service';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -17,7 +19,9 @@ describe('DocumentlistComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         RouterTestingModule,
-        AdfModule
+        CoreModule.forRoot(),
+        ContentModule.forRoot(),
+        ProcessModule.forRoot()
       ],
       declarations: [DocumentlistComponent],
       providers: [

diff --git a/app/templates/adf-cli-acs-aps-template/src/app/start-process/start-process.component.spec.ts b/app/templates/adf-cli-acs-aps-template/src/app/start-process/start-process.component.spec.ts
@@ -1,34 +1,36 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-
-import { AdfModule } from '../adf.module';
+import { ContentModule } from '@alfresco/adf-content-services';
+import { ProcessModule } from '@alfresco/adf-process-services';
+import { CoreModule } from '@alfresco/adf-core';
 import { StartProcessComponent } from './start-process.component';
 import { AlfrescoApiServiceMock, AlfrescoApiService } from '@alfresco/adf-core';
 
 describe('StartProcessComponent', () => {
   let component: StartProcessComponent;
   let fixture: ComponentFixture<StartProcessComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
         BrowserAnimationsModule,
         RouterTestingModule,
-        AdfModule
+        CoreModule.forRoot(),
+        ContentModule.forRoot(),
+        ProcessModule.forRoot()
       ],
       declarations: [StartProcessComponent],
       providers: [
         { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }
       ]
-    })
-      .compileComponents();
-  }));
+    });
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(StartProcessComponent);
     component = fixture.componentInstance;
-    fixture.detectChanges();
+    // fixture.detectChanges();
   });
 
   it('should create', () => {

diff --git a/app/templates/adf-cli-acs-aps-template/src/app/task-details/task-details.component.spec.ts b/app/templates/adf-cli-acs-aps-template/src/app/task-details/task-details.component.spec.ts
@@ -1,36 +1,36 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { PreviewService } from '../services/preview.service';
+import { ProcessModule } from '@alfresco/adf-process-services';
+import { CoreModule } from '@alfresco/adf-core';
 
-import { AdfModule } from '../adf.module';
+import { PreviewService } from '../services/preview.service';
 import { TaskDetailsComponent } from './task-details.component';
 import { AlfrescoApiServiceMock, AlfrescoApiService } from '@alfresco/adf-core';
 
 describe('TaskDetailsComponent', () => {
   let component: TaskDetailsComponent;
   let fixture: ComponentFixture<TaskDetailsComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
         BrowserAnimationsModule,
         RouterTestingModule,
-        AdfModule
+        CoreModule.forRoot(),
+        ProcessModule.forRoot()
       ],
       declarations: [TaskDetailsComponent],
       providers: [
         PreviewService,
         { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }
       ]
-    })
-      .compileComponents();
-  }));
+    });
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(TaskDetailsComponent);
     component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
   it('should be created', () => {

diff --git a/app/templates/adf-cli-acs-aps-template/src/app/task-details/task-details.component.ts b/app/templates/adf-cli-acs-aps-template/src/app/task-details/task-details.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { FormRenderingService } from '@alfresco/adf-core';
 import { CustomEditorComponent } from '../stencils.module';
 import { PreviewService } from '../services/preview.service';
@@ -15,10 +15,9 @@ export class TaskDetailsComponent implements OnInit {
   taskId: string = null;
   fileShowed: any = null;
   content: any = null;
-  contentName: any= null;
+  contentName: any = null;
 
-  constructor(private router: Router,
-              private route: ActivatedRoute,
+  constructor(private route: ActivatedRoute,
               formRenderingService: FormRenderingService,
               private preview: PreviewService) {
     formRenderingService.setComponentTypeResolver('testole_01', () => CustomEditorComponent, true);

diff --git a/app/templates/adf-cli-acs-aps-template/src/app/tasks/tasks.component.spec.ts b/app/templates/adf-cli-acs-aps-template/src/app/tasks/tasks.component.spec.ts
@@ -1,34 +1,34 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { ProcessModule } from '@alfresco/adf-process-services';
+import { CoreModule } from '@alfresco/adf-core';
 
-import { AdfModule } from '../adf.module';
 import { TasksComponent } from './tasks.component';
 import { AlfrescoApiServiceMock, AlfrescoApiService } from '@alfresco/adf-core';
 
 describe('TasksComponent', () => {
   let component: TasksComponent;
   let fixture: ComponentFixture<TasksComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
         BrowserAnimationsModule,
         RouterTestingModule,
-        AdfModule
+        CoreModule.forRoot(),
+        ProcessModule.forRoot()
       ],
       declarations: [TasksComponent],
       providers: [
         { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }
       ]
-    })
-      .compileComponents();
-  }));
+    });
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(TasksComponent);
     component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
   it('should be created', () => {