Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 9be4231

Browse files
ghillertcppwfs
authored andcommitted
gh-526 Update to Angular 5 (Incl CLI 1.5)
* Update versions to Angular `5.2.3` and Angular CLI `1.6.7` * Compare and update all relevant files from a freshly created angular CLI project * Fix issues around Angular2 Busy and RxJs - Use the latest GitHub version of Angular2 Busy - Polish RxJs imports * Remove StompJS for (Not used and has issues with Angular 5) * Update `ngx-bootstrap` to `2.0.0-beta.8` to fix build error * Update `ngx-clipboard` from `8.1.3` to `9.0.0` * Update `compodoc` from `1.0.3` to `1.0.4` * Update `d3` from `4.11.0` to `4.12.0` * Switch from `template` to `ng-template` to get tooltips working again * Switch from PhantomJS to headless Chrome for test executions * Ensure Maven build passes
1 parent d5ac6e0 commit 9be4231

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+105
-111
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ cache:
33
directories:
44
- $HOME/.m2
55
dist: trusty
6-
language: java
6+
language: java
77
addons:
8-
chrome: stable
8+
chrome: stable
99
jdk:
1010
- oraclejdk8
1111
install: true

ui/karma.conf.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ module.exports = function (config) {
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular/cli/plugins/karma'),
14-
15-
require('karma-phantomjs-launcher')
13+
require('@angular/cli/plugins/karma')
1614
],
1715
client:{
1816
clearContext: false // leave Jasmine Spec Runner output visible in browser

ui/package.json

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,57 +16,56 @@
1616
},
1717
"private": true,
1818
"dependencies": {
19-
"@angular/animations": "4.4.6",
20-
"@angular/common": "4.4.6",
21-
"@angular/compiler": "4.4.6",
22-
"@angular/core": "4.4.6",
23-
"@angular/forms": "4.4.6",
24-
"@angular/http": "4.4.6",
25-
"@angular/platform-browser": "4.4.6",
26-
"@angular/platform-browser-dynamic": "4.4.6",
27-
"@angular/router": "4.4.6",
19+
"@angular/animations": "5.2.3",
20+
"@angular/common": "5.2.3",
21+
"@angular/compiler": "5.2.3",
22+
"@angular/core": "5.2.3",
23+
"@angular/forms": "5.2.3",
24+
"@angular/http": "5.2.3",
25+
"@angular/platform-browser": "5.2.3",
26+
"@angular/platform-browser-dynamic": "5.2.3",
27+
"@angular/router": "5.2.3",
28+
"core-js": "2.5.3",
29+
"rxjs": "5.5.6",
30+
"zone.js": "0.8.20",
2831
"bootstrap-sass": "3.3.7",
29-
"core-js": "^2.5.1",
30-
"d3": "4.11.0",
32+
"d3": "4.12.0",
3133
"dagre": "0.7.4",
3234
"moment": "2.19.3",
3335
"ng2-stomp-service": "1.2.2",
3436
"ng2-toasty": "4.0.3",
35-
"ngx-bootstrap": "1.9.3",
36-
"ngx-clipboard": "8.1.1",
37-
"ngx-pagination": "3.0.1",
38-
"rxjs": "5.5.2",
37+
"ngx-bootstrap": "2.0.0-beta.9",
38+
"ngx-clipboard": "9.0.0",
39+
"ngx-pagination": "3.0.3",
3940
"sockjs-client": "1.1.4",
40-
"spring-flo": "0.7.0",
41-
"tixif-ngx-busy": "0.0.5",
4241
"web-animations-js": "2.3.1",
43-
"zone.js": "0.8.18",
44-
"jshint": "2.9.5"
42+
"stompjs": "2.3.3",
43+
"jshint": "2.9.5",
44+
"spring-flo": "git://github.com/spring-projects/spring-flo.git#angular5",
45+
"angular2-busy": "git://github.com/devyumao/angular2-busy.git"
4546
},
4647
"devDependencies": {
47-
"@angular/cli": "1.3.0",
48-
"@angular/compiler-cli": "4.4.6",
49-
"@angular/language-service": "4.4.6",
50-
"@compodoc/compodoc": "1.0.1",
51-
"@types/d3": "4.11.0",
52-
"@types/jasmine": "2.5.54",
48+
"@angular/cli": "1.6.7",
49+
"@angular/compiler-cli": "5.2.3",
50+
"@angular/language-service": "5.2.3",
51+
"@types/jasmine": "2.8.6",
5352
"@types/jasminewd2": "2.0.3",
54-
"@types/node": "6.0.90",
55-
"codelyzer": "3.1.2",
53+
"@types/node": "6.0.96",
54+
"codelyzer": "4.1.0",
5655
"jasmine-core": "2.8.0",
57-
"jasmine-spec-reporter": "4.1.1",
58-
"karma": "1.7.1",
56+
"jasmine-spec-reporter": "4.2.1",
57+
"karma": "2.0.0",
5958
"karma-chrome-launcher": "2.2.0",
60-
"karma-cli": "1.0.1",
61-
"karma-coverage-istanbul-reporter": "1.3.0",
62-
"karma-jasmine": "1.1.0",
59+
"karma-coverage-istanbul-reporter": "1.4.1",
60+
"karma-jasmine": "1.1.1",
6361
"karma-jasmine-html-reporter": "0.2.2",
64-
"karma-phantomjs-launcher": "1.0.4",
65-
"napa": "2.3.0",
6662
"protractor": "5.1.2",
67-
"ts-node": "3.2.2",
68-
"tslint": "5.3.2",
69-
"typescript": "2.4.2",
63+
"ts-node": "4.1.0",
64+
"tslint": "5.9.1",
65+
"typescript": "2.5.3",
66+
"@compodoc/compodoc": "1.0.4",
67+
"@types/d3": "4.12.0",
68+
"napa": "2.3.0",
7069
"webpack-bundle-analyzer": "2.9.0"
7170
},
7271
"napa-config": {

ui/src/app/about/about-details.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
2-
import {BusyModule} from 'tixif-ngx-busy';
2+
import {BusyModule} from 'angular2-busy';
33
import {ToastyService} from 'ng2-toasty';
44
import {MockToastyService} from '../tests/mocks/toasty';
55
import {MockActivatedRoute} from '../tests/mocks/activated-route';
@@ -10,6 +10,7 @@ import {DebugElement} from '@angular/core';
1010
import {By} from '@angular/platform-browser';
1111
import {RouterTestingModule} from '@angular/router/testing';
1212
import {AboutDetailsComponent} from './about-details.component';
13+
import {KeyValuePipe} from '../shared/pipes/key-value-filter.pipe';
1314
import {ClipboardModule} from 'ngx-clipboard/dist';
1415
import { MapValuesPipe } from '../shared/pipes/map-values-pipe.pipe';
1516

ui/src/app/about/about.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { async, ComponentFixture, TestBed} from '@angular/core/testing';
2-
import {BusyModule} from 'tixif-ngx-busy';
2+
import {BusyModule} from 'angular2-busy';
33
import { AboutComponent } from './about.component';
44
import {ToastyService} from 'ng2-toasty';
55
import {MockToastyService} from '../tests/mocks/toasty';

ui/src/app/about/about.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AboutService } from './about.service';
2-
import { Observable } from 'rxjs/Rx';
2+
import { Observable } from 'rxjs/Observable';
33
import { ErrorHandler } from '../shared/model/error-handler';
44
import { Response, ResponseOptions } from '@angular/http';
55
import { SharedAboutService } from '../shared/services/shared-about.service';

ui/src/app/analytics/analytics.service.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { Observable } from 'rxjs/Observable';
44
import { Subscription } from 'rxjs/Subscription';
55
import 'rxjs/add/operator/catch';
66
import 'rxjs/add/operator/map';
7+
import 'rxjs/add/observable/interval';
8+
9+
import 'rxjs/add/operator/switchMap';
10+
711
import { ErrorHandler, Page } from '../shared/model';
812
import { AggregateCounter, BaseCounter, Counter, DashboardItem, FieldValueCounter, MetricType } from './model';
913
import { HttpUtils } from '../shared/support/http.utils';

ui/src/app/analytics/dashboard/dashboard.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { DashboardComponent } from './dashboard.component';
3-
import {BusyModule} from 'tixif-ngx-busy';
3+
import {BusyModule} from 'angular2-busy';
44
import {AnalyticsModule} from '../analytics.module';
55

66
describe('DashboardComponent', () => {

ui/src/app/apps/apps.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { URLSearchParams } from '@angular/http';
2-
import { Observable } from 'rxjs/Rx';
2+
import { Observable } from 'rxjs/Observable';
33

44
import { AppsService } from './apps.service';
55
import { HttpUtils } from '../shared/support/http.utils';

ui/src/app/auth/auth.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { URLSearchParams } from '@angular/http';
2-
import { Observable } from 'rxjs/Rx';
2+
import { Observable } from 'rxjs/Observable';
33

44
import { HttpUtils } from '../shared/support/http.utils';
55
import { ErrorHandler } from '../shared/model';

0 commit comments

Comments
 (0)