Update Flo to 0.8.5 + polish Angular 6.1 upgrade

ghillert · oodamien · commit 5a9b961f34c7 · 2018-10-22T16:31:22.000+02:00
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spring-cloud-dataflow-ui",
-  "version": "1.3.0",
+  "version": "1.7.0",
   "license": "Apache-2.0",
   "scripts": {
     "ng": "ng",
@@ -31,10 +31,10 @@
     "@angular/platform-browser": "6.1.10",
     "@angular/platform-browser-dynamic": "6.1.10",
     "@angular/router": "6.1.10",
-    "angular-2-local-storage": "2.0.0",
     "core-js": "2.5.7",
-    "rxjs": "6.2.1",
+    "rxjs": "6.2.2",
     "zone.js": "0.8.26",
+    "angular-2-local-storage": "2.0.0",
     "bootstrap-sass": "3.3.7",
     "d3": "4.12.0",
     "file-saver": "1.3.3",
@@ -49,47 +49,47 @@
     "web-animations-js": "2.3.1",
     "stompjs": "2.3.3",
     "jshint": "2.9.5",
-    "spring-flo": "0.8.4",
+    "spring-flo": "0.8.5",
     "ng-busy": "1.4.4",
     "rxjs-compat": "6.2.1",
     "uuid": "3.3.2"
   },
   "devDependencies": {
+    "@angular-devkit/build-angular": "0.8.5",
+    "@angular/cli": "6.2.5",
     "@angular/compiler-cli": "6.1.10",
-    "@angular-devkit/build-angular": "0.6.8",
-    "typescript": "2.7.2",
-    "@angular/cli": "6.0.8",
     "@angular/language-service": "6.1.10",
-    "@types/jasmine": "2.8.8",
-    "@types/jasminewd2": "2.0.3",
+    "@types/jasmine": "2.8.9",
+    "@types/jasminewd2": "2.0.5",
     "@types/node": "8.9.5",
+    "codelyzer": "4.3.0",
+    "jasmine-core": "2.99.1",
+    "jasmine-spec-reporter": "4.2.1",
+    "karma": "3.0.0",
+    "karma-chrome-launcher": "2.2.0",
+    "karma-coverage-istanbul-reporter": "2.0.4",
+    "karma-jasmine": "1.1.2",
+    "karma-jasmine-html-reporter": "0.2.2",
+    "protractor": "5.4.1",
+    "ts-node": "7.0.1",
+    "tslint": "5.11.0",
+    "typescript": "2.9.2",
     "@types/uuid": "3.4.3",
     "@types/backbone": "1.3.43",
-    "@types/codemirror": "0.0.60",
+    "@types/codemirror": "0.0.65",
     "@types/jquery": "3.3.6",
     "@types/lodash": "4.14.116",
-    "codelyzer": "4.2.1",
-    "jasmine-core": "2.99.1",
-    "jasmine-spec-reporter": "4.2.1",
-    "karma": "2.0.5",
-    "karma-chrome-launcher": "2.2.0",
     "karma-edge-launcher": "0.4.2",
     "karma-firefox-launcher": "1.1.0",
     "karma-safari-launcher": "1.0.0",
     "karma-sauce-launcher": "1.2.0",
     "karma-browserstack-launcher": "1.3.0",
-    "karma-coverage-istanbul-reporter": "2.0.1",
-    "karma-jasmine": "1.1.2",
-    "karma-jasmine-html-reporter": "0.2.2",
-    "protractor": "5.3.2",
-    "ts-node": "5.0.1",
-    "tslint": "5.9.1",
     "@compodoc/compodoc": "1.0.4",
     "@types/d3": "4.12.0",
     "@types/d3-dsv": "1.0.31",
-    "browserstack-local": "1.3.3",
+    "browserstack-local": "1.3.4",
     "napa": "3.0.0",
-    "webpack-bundle-analyzer": "2.13.1",
+    "webpack-bundle-analyzer": "3.0.3",
     "protractor-docker-plugin": "file:protractor-docker-plugin"
   },
   "napa-config": {
diff --git a/ui/src/app/auth/directives/caps-lock.directive.ts b/ui/src/app/auth/directives/caps-lock.directive.ts
@@ -13,11 +13,6 @@ export class CapsLockDirective implements AfterViewInit {
 
   @Output() appCapsLock = new EventEmitter<boolean>();
 
-  /**
-   * '20' is the non-printable key (function key): "CapsLock"
-   */
-  private readonly capsLockKeyCode = 20;
-
   constructor(private elem: ElementRef, private renderer: Renderer2) {
   }
 
@@ -33,33 +28,29 @@ export class CapsLockDirective implements AfterViewInit {
 
   @HostListener('window:keydown', ['$event'])
   onKeyDown(event: KeyboardEvent): void {
-    if (event.which === this.capsLockKeyCode) {
-      const capsOn = this.getCapsLockState(event);
+    const capsOn = this.getCapsLockState(event);
 
-      if (capsOn) {
-        this.renderer.setStyle(this.elem.nativeElement, 'display', 'inherit');
-      } else {
-        this.renderer.setStyle(this.elem.nativeElement, 'display', 'none');
-      }
-
-      this.appCapsLock.emit(capsOn);
+    if (capsOn) {
+      this.renderer.setStyle(this.elem.nativeElement, 'display', 'inherit');
+    } else {
+      this.renderer.setStyle(this.elem.nativeElement, 'display', 'none');
     }
+
+    this.appCapsLock.emit(capsOn);
   }
 
   @HostListener('window:keyup', ['$event'])
   onKeyUp(event: KeyboardEvent): void {
-    if (event.which === this.capsLockKeyCode) {
-      const capsOn = this.getCapsLockState(event);
+    const capsOn = this.getCapsLockState(event);
 
-      if (!capsOn) {
-        this.renderer.setStyle(this.elem.nativeElement, 'display', 'none');
-      }
-      this.appCapsLock.emit(capsOn);
+    if (!capsOn) {
+      this.renderer.setStyle(this.elem.nativeElement, 'display', 'none');
     }
+    this.appCapsLock.emit(capsOn);
   }
 
-  private getCapsLockState(event: KeyboardEvent) {
-    return (event.getModifierState && event.getModifierState('CapsLock'));
+  private getCapsLockState(event: KeyboardEvent): boolean {
+    return (event && event.getModifierState && event.getModifierState('CapsLock'));
   }
 
 }
diff --git a/ui/src/app/shared/directives/layout-type.directive.ts b/ui/src/app/shared/directives/layout-type.directive.ts
@@ -14,7 +14,7 @@ export class LayoutTypeDirective implements AfterViewInit {
 
   currentClass = null;
 
-  @Input('type') type: String;
+  @Input() type: String;
 
   constructor(private _elementRef: ElementRef,
               private loggerService: LoggerService,
diff --git a/ui/src/environments/environment.ts b/ui/src/environments/environment.ts
@@ -1,8 +1,16 @@
-// The file contents for the current environment will overwrite these during build.
-// The build system defaults to the dev environment which uses `environment.ts`, but if you do
-// `ng build --env=prod` then `environment.prod.ts` will be used instead.
-// The list of which env maps to which file can be found in `.angular-cli.json`.
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
 
 export const environment = {
   production: false
 };
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
diff --git a/ui/src/polyfills.ts b/ui/src/polyfills.ts
@@ -47,8 +47,9 @@ 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
+ * Web Animations `@angular/platform-browser/animations`
+ * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
+ * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
  **/
 import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
diff --git a/ui/src/tsconfig.app.json b/ui/src/tsconfig.app.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app",
-    "module": "es2015",
     "types": []
   },
   "exclude": [
diff --git a/ui/src/tslint.json b/ui/src/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "../tslint.json",
+    "rules": {
+
+    }
+}
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
@@ -5,6 +5,7 @@
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
+    "module": "es2015",
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +{
 +    "extends": "../tslint.json",
 +    "rules": {
++
 +    }
 +}