2.2.0 (#115)

* add custom event polyfill * enable polyfills by default (#103) * fix overlay viewer in templates (#104) * [ADF-2125] Removed 'ng2-' from generator instructions (#105) * [ADF-2125] Removed 'ng2-' from generator instructions * [ADF-2125] Fixed link that was displayed badly * [ADF-2125] Fixed small grammar and display glitches * [ADF-2125] Fixed generator names * fix style issues * [ADF-2164] Add docker support to the generated app (#107) * Add docker support to the generated app * added the travis configuration for the DOCKER pipeline * docker publish instructions * fix docker target folder * [ADF-2145] Add the app routes files in the generator 2 (#108) * add route file * fix module * travis conf * [hackathon] command line mode support (#106) * command line mode support * code cleanup * update travis settings * Update dependencies 2.1.0 (#109) * update depenccies 2.1.0 * fix import pdfjs * Adding schema validation (#111) * [ADF-2293] loading spinner (#112) * loading spinner * fix install dependencies * ignore file * remove path mapping from tsconfig * 2.2.0 update generator beta4 (#113) 2.2.0 update generator beta5 * bump version
Alfresco · Mar 5, 2018 · 84da50f · 84da50f
1 parent b735fa3
commit 84da50f
Show file tree

Hide file tree

Showing 31 changed files with 548 additions and 97 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,7 @@
 node_modules
 coverage
 /temp/
+.history/
 local.log
 generator-ng2-alfresco-app.iml
+/package-lock.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/app/index.js b/app/index.js
@@ -58,8 +58,7 @@ module.exports = class extends CLIGenerator {
           config: {
             alias: 'i',
             required: false,
-            type: Boolean,
-            default: false
+            type: Boolean
           }
         },
         commonFilter: filters.booleanFilter

diff --git a/app/templates/adf-cli-acs-aps-template/package.json b/app/templates/adf-cli-acs-aps-template/package.json
@@ -1,23 +1,24 @@
 {
   "name": "adf-cli-acs-aps-template",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "blueprint": "Process and Content Services",
   "description": "ACS APS ADF Application with Angular CLI",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --open",
+    "start": "npm run validate-config && ng serve --open",
     "build": "ng build",
     "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.1.0",
-    "@alfresco/adf-core": "2.1.0",
-    "@alfresco/adf-insights": "2.1.0",
-    "@alfresco/adf-process-services": "2.1.0",
+    "@alfresco/adf-content-services": "2.2.0",
+    "@alfresco/adf-core": "2.2.0",
+    "@alfresco/adf-insights": "2.2.0",
+    "@alfresco/adf-process-services": "2.2.0",
     "@angular/animations": "5.1.1",
     "@angular/cdk": "5.0.1",
     "@angular/common": "5.1.1",
@@ -32,8 +33,8 @@
     "@angular/router": "5.1.1",
     "@mat-datetimepicker/core": "^1.0.1",
     "@mat-datetimepicker/moment": "^1.0.1",
-    "@ngx-translate/core": "8.0.0",
-    "alfresco-js-api": "2.0.0",
+    "@ngx-translate/core": "9.1.1",
+    "alfresco-js-api": "2.2.0",
     "chart.js": "2.5.0",
     "classlist.js": "1.1.20150312",
     "core-js": "2.4.1",
@@ -59,6 +60,7 @@
     "@types/jasmine": "~2.8.3",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
+    "ajv-cli": "^3.0.0",
     "codelyzer": "^4.0.1",
     "jasmine-core": "~2.8.0",
     "jasmine-spec-reporter": "~4.2.1",

diff --git a/app/templates/adf-cli-acs-aps-template/src/app.config.json b/app/templates/adf-cli-acs-aps-template/src/app.config.json
@@ -1,4 +1,5 @@
 {
+    "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json",
     "ecmHost": "http://{hostname}{:port}",
     "bpmHost": "http://{hostname}{:port}",
     "application": {

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,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Location } from '@angular/common';
 import { SpyLocation } from '@angular/common/testing';
-
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { AdfModule } from '../adf.module';
 import { DocumentlistComponent } from './documentlist.component';
 
@@ -12,7 +12,8 @@ describe('DocumentlistComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        AdfModule
+        AdfModule,
+        BrowserAnimationsModule
       ],
       declarations: [ DocumentlistComponent ],
       providers: [

diff --git a/app/templates/adf-cli-acs-aps-template/src/app/home/home.component.spec.ts b/app/templates/adf-cli-acs-aps-template/src/app/home/home.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { HomeComponent } from './home.component';
 
 describe('HomeComponent', () => {
@@ -8,6 +8,9 @@ describe('HomeComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
+      imports: [
+        BrowserAnimationsModule
+      ],
       declarations: [ HomeComponent ]
     })
     .compileComponents();

diff --git a/app/templates/adf-cli-acs-aps-template/src/app/login/login.component.spec.ts b/app/templates/adf-cli-acs-aps-template/src/app/login/login.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, 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 { LoginComponent } from './login.component';
 
@@ -12,6 +12,7 @@ describe('LoginComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         RouterTestingModule,
+        BrowserAnimationsModule,
         AdfModule
       ],
       declarations: [ LoginComponent ]

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,5 +1,6 @@
 import { async, 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 { StartProcessComponent } from './start-process.component';
@@ -11,6 +12,7 @@ describe('StartProcessComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
+        BrowserAnimationsModule,
         RouterTestingModule,
         AdfModule
       ],

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,5 +1,6 @@
 import { async, 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 { TaskDetailsComponent } from './task-details.component';
@@ -11,6 +12,7 @@ describe('TaskDetailsComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
+        BrowserAnimationsModule,
         RouterTestingModule,
         AdfModule
       ],

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,5 +1,6 @@
 import { async, 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 { TasksComponent } from './tasks.component';
@@ -11,6 +12,7 @@ describe('TasksComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
+        BrowserAnimationsModule,
         RouterTestingModule,
         AdfModule
       ],

diff --git a/app/templates/adf-cli-acs-aps-template/src/index.html b/app/templates/adf-cli-acs-aps-template/src/index.html
@@ -10,8 +10,107 @@
   <link href="https://fonts.googleapis.com/css?family=Muli" rel="stylesheet">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
+  <style>
+    body, html {
+      height: 100%;
+    }
+
+    .loader-container {
+      display: flex;
+      flex-direction: column;
+      height:100%;
+
+      align-items: center;
+      justify-content: center;
+    }
+
+    .loader-item {
+      max-height:100px;
+      max-width:300px;
+    }
+
+    .loader-spinner {
+      max-height:300px;
+      max-width:300px;
+    }
+
+    .loader-text{
+      white-space: nowrap;
+      text-align: center;
+      position: relative;
+    }
+
+    .loader {
+      position: absolute;
+      width: 100px;
+      height: 100px;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+    }
+
+    .circular {
+      animation: rotate 2s linear infinite;
+      height: 100px;
+      position: relative;
+      width: 100px;
+    }
+
+    .path {
+      stroke-dasharray: 1,200;
+      stroke-dashoffset: 0;
+      stroke: #B6463A;
+      animation: dash 1.5s ease-in-out infinite, color 6s ease-in-out infinite;
+      stroke-linecap: round;
+    }
+
+    @keyframes rotate {
+      100% {
+        transform: rotate(360deg);
+      }
+    }
+    @keyframes dash {
+      0% {
+        stroke-dasharray: 1,200;
+        stroke-dashoffset: 0;
+      }
+      50% {
+        stroke-dasharray: 89,200;
+        stroke-dashoffset: -35;
+      }
+      100% {
+        stroke-dasharray: 89,200;
+        stroke-dashoffset: -124;
+      }
+    }
+    @keyframes color {
+      100%, 0% {
+        stroke: #d62d20;
+      }
+      40% {
+        stroke: #0057e7;
+      }
+      66% {
+        stroke: #008744;
+      }
+      80%, 90% {
+        stroke: #ffa700;
+      }
+    }
+  </style>
 </head>
-<body>
-  <app-root></app-root>
+<body class="adf-background-color">
+<app-root>
+  <div id="loader-container" class="loader-container">
+    <div class="loader-spinner">
+      <svg class="circular">
+        <circle class="path" cx="50" cy="50" r="20" fill="none" stroke-width="5" stroke-miterlimit="10"></circle>
+      </svg>
+    </div>
+    <div class="loader-item">
+      <div id="loader-text" class="loader-text">Loading Demo Shell..</div>
+    </div>
+  </div>
+</app-root>
 </body>
 </html>
diff --git a/app/templates/adf-cli-acs-aps-template/tsconfig.json b/app/templates/adf-cli-acs-aps-template/tsconfig.json
@@ -17,14 +17,6 @@
     "lib": [
       "es2016",
       "dom"
-    ],
-    "paths": {
-      "rxjs/*": [
-        "../node_modules/rxjs/*"
-      ],
-      "@angular/*": [
-        "../node_modules/@angular/*"
-      ]
-    }
+    ]
   }
-}
+}
diff --git a/app/templates/adf-cli-acs-template/package.json b/app/templates/adf-cli-acs-template/package.json
@@ -1,21 +1,22 @@
 {
   "name": "adf-cli-acs-template",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "blueprint": "Content Services",
   "description": "ACS ADF Application with Angular CLI",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --open",
+    "start": "npm run validate-config && ng serve --open",
     "build": "ng build",
     "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.1.0",
-    "@alfresco/adf-core": "2.1.0",
+    "@alfresco/adf-content-services": "2.2.0",
+    "@alfresco/adf-core": "2.2.0",
     "@angular/animations": "5.1.1",
     "@angular/cdk": "5.0.1",
     "@angular/common": "5.1.1",
@@ -30,8 +31,8 @@
     "@angular/router": "5.1.1",
     "@mat-datetimepicker/core": "^1.0.1",
     "@mat-datetimepicker/moment": "^1.0.1",
-    "@ngx-translate/core": "8.0.0",
-    "alfresco-js-api": "2.0.0",
+    "@ngx-translate/core": "9.1.1",
+    "alfresco-js-api": "2.2.0",
     "chart.js": "2.5.0",
     "classlist.js": "1.1.20150312",
     "core-js": "2.4.1",
@@ -57,6 +58,7 @@
     "@types/jasmine": "~2.8.3",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
+    "ajv-cli": "^3.0.0",
     "codelyzer": "^4.0.1",
     "jasmine-core": "~2.8.0",
     "jasmine-spec-reporter": "~4.2.1",

diff --git a/app/templates/adf-cli-acs-template/src/app.config.json b/app/templates/adf-cli-acs-template/src/app.config.json
@@ -1,4 +1,5 @@
 {
+    "$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json",
     "ecmHost": "http://{hostname}{:port}",
     "bpmHost": "http://{hostname}{:port}",
     "application": {

diff --git a/app/templates/adf-cli-acs-template/src/app/documentlist/documentlist.component.spec.ts b/app/templates/adf-cli-acs-template/src/app/documentlist/documentlist.component.spec.ts
@@ -1,4 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Location } from '@angular/common';
 import { SpyLocation } from '@angular/common/testing';
 
@@ -12,7 +13,8 @@ describe('DocumentlistComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        AdfModule
+        AdfModule,
+        BrowserAnimationsModule
       ],
       declarations: [ DocumentlistComponent ],
       providers: [