[front] upgrade to 4.2.4

client/angular-cli.json

@@ -23,8 +23,8 @@
         "../node_modules/angular2-toaster/lib/toaster.css"
       ],
       "scripts": [],
+      "environmentSource": "environments/environment.ts",
       "environments": {
-        "source": "environments/environment.ts",
         "dev": "environments/environment.ts",
         "prod": "environments/environment.prod.ts"
       }

client/package.json

@@ -11,15 +11,16 @@
     "build": "ng build --prod"
   },
   "dependencies": {
-    "@angular/common": "^2.3.1",
-    "@angular/compiler": "^2.3.1",
-    "@angular/core": "^2.3.1",
-    "@angular/forms": "^2.3.1",
-    "@angular/http": "^2.3.1",
+    "@angular/animations": "^4.2.4",
+    "@angular/common": "^4.2.4",
+    "@angular/compiler": "^4.2.4",
+    "@angular/core": "^4.2.4",
+    "@angular/forms": "^4.2.4",
+    "@angular/http": "^4.2.4",
     "@angular/material": "2.0.0-beta.1",
-    "@angular/platform-browser": "^2.3.1",
-    "@angular/platform-browser-dynamic": "^2.3.1",
-    "@angular/router": "^3.3.1",
+    "@angular/platform-browser": "^4.2.4",
+    "@angular/platform-browser-dynamic": "^4.2.4",
+    "@angular/router": "^4.2.4",
     "angular2-text-mask": "^4.1.0",
     "angular2-toaster": "~1.0.2",
     "core-js": "^2.4.1",
@@ -29,28 +30,32 @@
     "ng2-translate": "^4.0.0",
     "node-sass": "^4.5.3",
     "papaparse": "^4.1.2",
-    "rxjs": "^5.0.1",
+    "rxjs": "^5.4.2",
     "talisman": "^0.16.0",
     "ts-helpers": "^1.1.1",
-    "zone.js": "^0.7.2"
+    "webpack-sources": "^1.0.1",
+    "zone.js": "^0.8.14"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^2.3.1",
-    "@types/jasmine": "2.5.38",
-    "@types/node": "^6.0.42",
-    "angular-cli": "1.0.0-beta.24",
-    "codelyzer": "~2.0.0-beta.1",
-    "jasmine-core": "2.5.2",
-    "jasmine-spec-reporter": "2.5.0",
-    "karma": "1.2.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-cli": "^1.0.1",
-    "karma-jasmine": "^1.0.2",
-    "karma-remap-istanbul": "^0.2.1",
-    "protractor": "~4.0.13",
-    "ts-node": "1.2.1",
-    "tslint": "^4.0.2",
-    "typescript": "~2.0.3"
+    "@angular/cli": "1.4.0-beta.2",
+    "@angular/compiler-cli": "^4.2.4",
+    "@angular/language-service": "^4.2.4",
+    "@types/jasmine": "~2.5.53",
+    "@types/jasminewd2": "~2.0.2",
+    "@types/node": "~6.0.60",
+    "codelyzer": "~3.1.1",
+    "jasmine-core": "~2.6.2",
+    "jasmine-spec-reporter": "~4.1.0",
+    "karma": "~1.7.0",
+    "karma-chrome-launcher": "~2.1.1",
+    "karma-cli": "~1.0.1",
+    "karma-coverage-istanbul-reporter": "^1.2.1",
+    "karma-jasmine": "~1.1.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "protractor": "~5.1.2",
+    "ts-node": "~3.2.0",
+    "tslint": "~5.3.2",
+    "typescript": "~2.3.3"
   },
   "private": true,
   "license": "AGPL-3",

client/src/app/app.module.ts

@@ -47,6 +47,7 @@ import { FocusMeDirective } from './fields/focus-me.directive';
 import { ConfirmDialog } from './fields/confirm.component';
 import { IsariCreationModal } from './isari-creation-modal/isari-creation-modal.component';
 import { StorageService } from './storage.service';
+import { LogTableComponent } from './log-table/log-table.component';
 
 export function createTranslateLoader(http: Http) {
     return new TranslateStaticLoader(http, './assets/i18n', '.json');
@@ -83,6 +84,7 @@ export function createTranslateLoader(http: Http) {
     FocusMeDirective,
     ConfirmDialog,
     IsariCreationModal,
+    LogTableComponent
   ],
   imports: [
     BrowserModule,

client/src/app/data-table/data-table.component.html

@@ -10,7 +10,7 @@
     </tr>
   </thead>
   <tbody>
-    <tr *ngFor="let row of page" [routerLink]="[{outlets: {editor: row['id']} }]" preserveQueryParams (click)="edit(row.id)" [class.active]="row['id'] === editedId">
+    <tr *ngFor="let row of page" [routerLink]="[{outlets: {editor: row['id']} }]" queryParamsHandling="preserve" (click)="edit(row.id)" [class.active]="row['id'] === editedId">
       <td *ngFor="let col of cols">{{ cellContent(row[col.key]) }}</td>
     </tr>
   </tbody>

client/src/app/fields/disabled.directive.ts

@@ -16,7 +16,8 @@ export class DisabledDirective implements OnInit {
   constructor(private view: ViewContainerRef) {}
 
   ngOnInit() {
-    const component = (<any>this.view)._element.component;
+    //const component = (<any>this.view)._element.component;
+    const component = (<any>this.view)._data.componentView.component;
     if (component) {
       component.disabled = this.isariDisabled;
     }

client/src/app/fields/isari-multi-select/isari-multi-select.component.html

@@ -34,7 +34,7 @@
     <div style="flex-grow: 2">
       <div *ngFor="let item of _values" class="multiselect-tag" [class.edit]="item.id" style="display:inline-block">
         {{ item.label }}
-        <a *ngIf="item.id && !disabled" routerLink="/{{ api }}/{{ item.id }}" target="_blank" preserveQueryParams><md-icon>open_in_new</md-icon></a>
+        <a *ngIf="item.id && !disabled" routerLink="/{{ api }}/{{ item.id }}" target="_blank" queryParamsHandling="preserve"><md-icon>open_in_new</md-icon></a>
         <md-icon *ngIf="!disabled" (click)="removeValue(item, $event)" style="vertical-align: middle;">delete</md-icon>
       </div>
     </div>

client/src/app/fields/isari-select/isari-select.component.html

@@ -20,7 +20,7 @@
           <div *ngIf="requirement === 'recommended'" class="recommended-field">{{ 'recommended' | translate }}</div>
           <md-icon *ngIf="description" [md-tooltip]="description">info_outline
           </md-icon>
-            <a *ngIf="id" routerLink="/{{ api }}/{{ id }}" target="_blank" preserveQueryParams>
+            <a *ngIf="id" routerLink="/{{ api }}/{{ id }}" target="_blank" queryParamsHandling="preserve">
               <md-icon>open_in_new</md-icon>
             </a>
         </div>