Skip to content

Commit ef096a4

Browse files
fix(deps): update to angular 8 (T-Systems-MMS#32)
* chore(deps): update angular paclages to angular 8 * chore(deps): update angular material to angular 8 * chore(deps): update other dependencies * chore(deps): fix build errors * chore(deps): remove unecessary dependencies Resolves: T-Systems-MMS#30 * Update add-filter.component.spec.ts
1 parent 46a55ad commit ef096a4

File tree

67 files changed

+5898
-7301
lines changed

Some content is hidden

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

67 files changed

+5898
-7301
lines changed

Phonebook.Frontend/browserslist

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# You can see what browsers were selected by your queries by running:
6+
# npx browserslist
7+
8+
> 0.5%
9+
last 2 versions
10+
Firefox ESR
11+
not dead
12+
not IE 9-11 # For IE 9-11 support, remove 'not'.

Phonebook.Frontend/package-lock.json

Lines changed: 5618 additions & 7051 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Phonebook.Frontend/package.json

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -38,75 +38,72 @@
3838
},
3939
"private": true,
4040
"dependencies": {
41-
"@angular/animations": "7.1.4",
42-
"@angular/cdk": "7.2.0",
43-
"@angular/common": "7.1.4",
44-
"@angular/compiler": "7.1.4",
45-
"@angular/core": "7.1.4",
46-
"@angular/forms": "7.1.4",
47-
"@angular/http": "7.1.4",
48-
"@angular/material": "7.2.0",
49-
"@angular/platform-browser": "7.1.4",
50-
"@angular/platform-browser-dynamic": "7.1.4",
51-
"@angular/pwa": "0.11.4",
52-
"@angular/router": "7.1.4",
53-
"@angular/service-worker": "7.1.4",
41+
"@angular/animations": "8.0.2",
42+
"@angular/cdk": "8.0.1",
43+
"@angular/common": "8.0.2",
44+
"@angular/compiler": "8.0.2",
45+
"@angular/core": "8.0.2",
46+
"@angular/forms": "8.0.2",
47+
"@angular/material": "8.0.1",
48+
"@angular/platform-browser": "8.0.2",
49+
"@angular/platform-browser-dynamic": "8.0.2",
50+
"@angular/pwa": "0.800.3",
51+
"@angular/router": "8.0.2",
52+
"@angular/service-worker": "8.0.2",
5453
"@ngx-translate/i18n-polyfill": "^1.0.0",
55-
"@ngxs/devtools-plugin": "^3.3.1",
56-
"@ngxs/logger-plugin": "^3.3.1",
57-
"@ngxs/router-plugin": "^3.3.1",
58-
"@ngxs/storage-plugin": "^3.3.1",
59-
"@ngxs/store": "^3.3.1",
54+
"@ngxs/devtools-plugin": "^3.4.3",
55+
"@ngxs/logger-plugin": "^3.4.3",
56+
"@ngxs/router-plugin": "^3.4.3",
57+
"@ngxs/storage-plugin": "^3.4.3",
58+
"@ngxs/store": "^3.4.3",
6059
"classlist.js": "^1.1.20150312",
61-
"core-js": "^2.5.7",
6260
"ng2-rx-componentdestroyed": "^3.0.1",
63-
"ngx-clipboard": "^11.1.9",
64-
"ngx-infinite-scroll": "^7.0.0",
65-
"ngx-propagation-stop": "^1.0.6",
66-
"ngx-vcard": "^1.1.6",
67-
"raven-js": "^3.27.0",
68-
"rxjs": "^6.3.3",
61+
"ngx-clipboard": "^12.1.2",
62+
"ngx-infinite-scroll": "^7.2.0",
63+
"ngx-propagation-stop": "^1.0.7",
64+
"ngx-vcard": "^1.2.3",
65+
"raven-js": "^3.27.2",
66+
"rxjs": "^6.5.2",
6967
"uglify-es": "3.3.9",
70-
"uglifyjs-webpack-plugin": "2.1.1",
71-
"web-animations-js": "^2.3.1",
72-
"zone.js": "~0.8.26"
68+
"uglifyjs-webpack-plugin": "2.1.3",
69+
"zone.js": "~0.9.1"
7370
},
7471
"devDependencies": {
75-
"@angular-devkit/build-angular": "~0.11.0",
76-
"@angular/cli": "7.1.4",
77-
"@angular/compiler-cli": "7.1.4",
78-
"@angular/language-service": "7.1.4",
79-
"@compodoc/compodoc": "^1.1.7",
80-
"@semantic-release/changelog": "^3.0.1",
81-
"@semantic-release/exec": "^3.3.0",
82-
"@types/jasmine": "^3.3.0",
72+
"@angular-devkit/build-angular": "~0.800.3",
73+
"@angular/cli": "^8.0.3",
74+
"@angular/compiler-cli": "8.0.2",
75+
"@angular/language-service": "8.0.2",
76+
"@compodoc/compodoc": "^1.1.9",
77+
"@semantic-release/changelog": "^3.0.4",
78+
"@semantic-release/exec": "^3.3.3",
79+
"@types/jasmine": "^3.3.13",
8380
"@types/jasminewd2": "^2.0.6",
84-
"@types/node": "^10.12.10",
85-
"codelyzer": "^4.5.0",
86-
"commitizen": "^3.0.5",
81+
"@types/node": "^12.0.10",
82+
"codelyzer": "^5.1.0",
83+
"commitizen": "^3.1.1",
8784
"cz-customizable": "^5.3.0",
88-
"jasmine-core": "^3.3.0",
85+
"jasmine-core": "^3.4.0",
8986
"jasmine-spec-reporter": "~4.2.1",
90-
"karma": "~3.1.1",
87+
"karma": "~4.1.0",
9188
"karma-chrome-launcher": "~2.2.0",
9289
"karma-cli": "~2.0.0",
93-
"karma-coverage-istanbul-reporter": "^2.0.4",
90+
"karma-coverage-istanbul-reporter": "^2.0.5",
9491
"karma-jasmine": "~2.0.1",
95-
"karma-jasmine-html-reporter": "^1.4.0",
96-
"license-checker": "^24.0.1",
97-
"ng-mocks": "^7.1.2",
92+
"karma-jasmine-html-reporter": "^1.4.2",
93+
"license-checker": "^25.0.1",
94+
"ng-mocks": "^8.0.0",
9895
"ng2-mock-component": "^0.1.1",
9996
"ngx-i18nsupport": "^0.17.1",
100-
"protractor": "^5.4.1",
97+
"protractor": "^5.4.2",
10198
"protractor-console-plugin": "^0.1.1",
102-
"semantic-release": "^15.12.2",
99+
"semantic-release": "^15.13.16",
103100
"semantic-release-docker-test": "^1.0.2",
104101
"simple-commit-message": "^4.0.3",
105102
"ts-node": "~7.0.1",
106-
"tslint": "~5.12.0",
107-
"typescript": "3.1.6",
108-
"webdriver-manager": "^12.1.0",
109-
"webpack-bundle-analyzer": "^3.0.3"
103+
"tslint": "~5.18.0",
104+
"typescript": "3.4.5",
105+
"webdriver-manager": "^12.1.5",
106+
"webpack-bundle-analyzer": "^3.3.2"
110107
},
111108
"config": {
112109
"pre-git": {
@@ -117,4 +114,4 @@
117114
"path": "Phonebook.Frontend/node_modules/cz-customizable"
118115
}
119116
}
120-
}
117+
}

Phonebook.Frontend/src/app/app-routing.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import { UserDetailPageComponent } from 'src/app/pages/user-detail-page/user-det
77

88
const routes: Routes = [
99
{ path: '', component: DashboardComponent, pathMatch: 'full' },
10-
{ path: 'search', loadChildren: 'src/app/modules/table/table.module#TableModule' },
10+
{ path: 'search', loadChildren: () => import('src/app/modules/table/table.module').then(m => m.TableModule) },
1111
{ path: 'user/:id', component: UserDetailPageComponent },
12-
{ path: 'rooms', loadChildren: 'src/app/modules/rooms/rooms.module#RoomsModule' },
13-
{ path: 'organigram', loadChildren: 'src/app/modules/organigram/organigram.module#OrganigramModule' },
12+
{ path: 'rooms', loadChildren: () => import('src/app/modules/rooms/rooms.module').then(m => m.RoomsModule) },
13+
{ path: 'organigram', loadChildren: () => import('src/app/modules/organigram/organigram.module').then(m => m.OrganigramModule) },
1414
{
1515
path: 'further-information',
16-
loadChildren: 'src/app/pages/page-information/page-information.module#PageInformationModule'
16+
loadChildren: () => import('src/app/pages/page-information/page-information.module').then(m => m.PageInformationModule)
1717
},
1818
{ path: 'settings', component: SettingsComponent }
1919
];

Phonebook.Frontend/src/app/app.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import { SwUpdate } from '@angular/service-worker';
77
import { MailService } from 'src/app/services/mail.service';
88
import { NgxsModule } from '@ngxs/store';
99
import { AppState } from 'src/app/shared/states';
10-
import { MatSnackBar, MatDialog } from '@angular/material';
10+
import { MatDialog } from '@angular/material/dialog';
11+
import { MatSnackBar } from '@angular/material/snack-bar';
1112
import { FeatureFlagService } from './modules/feature-flag/feature-flag.service';
1213
import { AppComponent } from './app.component';
1314
import { MockDirective } from 'ng-mocks';

Phonebook.Frontend/src/app/app.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { MatSnackBar, MatDialog } from '@angular/material';
2+
import { MatDialog } from '@angular/material/dialog';
3+
import { MatSnackBar } from '@angular/material/snack-bar';
34
import { ReleaseInfoService } from './services/release-info.service';
45
import { Store } from '@ngxs/store';
56
import { ServiceWorkerNotificationDisplayed, AppState, SetSendFeedback } from 'src/app/shared/states/App.state';

Phonebook.Frontend/src/app/modules/not-implemented/not-implemented.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Injectable } from '@angular/core';
2-
import { MatSnackBar } from '@angular/material';
2+
import { MatSnackBar } from '@angular/material/snack-bar';
33

44
@Injectable()
55
export class NotImplementedService {

Phonebook.Frontend/src/app/modules/organigram/components/organigram-node/organigram-node.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { OrganigramNodeComponent } from './organigram-node.component';
3-
import { MatTooltipModule, MatSnackBar } from '@angular/material';
3+
import { MatSnackBar } from '@angular/material/snack-bar';
4+
import { MatTooltipModule } from '@angular/material/tooltip';
45
import { WindowRef } from 'src/app/services/windowRef.service';
56
import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
67
import { UnitTreeNode } from 'src/app/services/api/organigram.service';

Phonebook.Frontend/src/app/modules/organigram/components/organigram-node/organigram-node.component.ts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { Component, OnInit, Input, ViewChild, ElementRef, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
1+
import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
2+
import { MatSnackBar } from '@angular/material/snack-bar';
3+
import { I18n } from '@ngx-translate/i18n-polyfill';
4+
import { Navigate, RouterState } from '@ngxs/router-plugin';
5+
import { Store } from '@ngxs/store';
26
import { UnitTreeNode } from 'src/app/services/api/organigram.service';
3-
import { MatSnackBar } from '@angular/material';
47
import { WindowRef } from 'src/app/services/windowRef.service';
5-
import { Store } from '@ngxs/store';
6-
import { Navigate, RouterState } from '@ngxs/router-plugin';
7-
import { I18n } from '@ngx-translate/i18n-polyfill';
88

99
@Component({
1010
selector: 'app-organigram-node',
@@ -17,10 +17,10 @@ export class OrganigramNodeComponent implements OnInit {
1717
public node: UnitTreeNode;
1818
public expand: Expanded = Expanded.isNotExpanded;
1919
public expanded: typeof Expanded = Expanded;
20-
@ViewChild('thisNode')
20+
@ViewChild('thisNode', { static: true })
2121
public thisNode: ElementRef;
2222

23-
constructor(private snackBar: MatSnackBar, private windowRef: WindowRef, private store: Store, private i18n: I18n) { }
23+
constructor(private snackBar: MatSnackBar, private windowRef: WindowRef, private store: Store, private i18n: I18n) {}
2424

2525
public ngOnInit() {
2626
const nodePath = this.getCurrentRouteAsArray();
@@ -67,15 +67,15 @@ export class OrganigramNodeComponent implements OnInit {
6767
id: 'OrganigramNodeComponentCopiedFirstPart',
6868
value: 'Link to'
6969
}) +
70-
' "' +
71-
this.node.name +
72-
'" ' +
73-
this.i18n({
74-
meaning: 'OrganigramNodeComponent',
75-
description: 'Second part of the message displayed when copying a link to the node',
76-
id: 'OrganigramNodeComponentCopiedSecondPart',
77-
value: 'copied to clipboard!'
78-
}),
70+
' "' +
71+
this.node.name +
72+
'" ' +
73+
this.i18n({
74+
meaning: 'OrganigramNodeComponent',
75+
description: 'Second part of the message displayed when copying a link to the node',
76+
id: 'OrganigramNodeComponentCopiedSecondPart',
77+
value: 'copied to clipboard!'
78+
}),
7979
'',
8080
{ duration: 2000 }
8181
);
@@ -97,8 +97,8 @@ export class OrganigramNodeComponent implements OnInit {
9797
public getCurrentRouteAsArray(): string[] {
9898
const navState = this.store.selectSnapshot(RouterState.state);
9999
return [
100-
navState.root.firstChild.url[0].path,
101-
...navState.root.firstChild.firstChild.url.map(obj => {
100+
navState!.root.firstChild!.url[0].path,
101+
...navState!.root.firstChild!.firstChild!.url.map(obj => {
102102
return obj.path;
103103
})
104104
];

Phonebook.Frontend/src/app/modules/organigram/organigram.module.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ import { CommonModule } from '@angular/common';
33
import { OrganigramRoutingModule } from 'src/app/modules/organigram/organigram-routing.module';
44
import { OrganigramComponent } from 'src/app/modules/organigram/pages/organigram/organigram.component';
55
import { OrganigramNodeComponent } from 'src/app/modules/organigram/components/organigram-node/organigram-node.component';
6-
import { MatCardModule, MatDividerModule, MatIconModule, MatButtonModule, MatTooltipModule } from '@angular/material';
6+
import { MatButtonModule } from '@angular/material/button';
7+
import { MatCardModule } from '@angular/material/card';
8+
import { MatDividerModule } from '@angular/material/divider';
9+
import { MatIconModule } from '@angular/material/icon';
10+
import { MatTooltipModule } from '@angular/material/tooltip';
711
import { ClipboardModule } from 'ngx-clipboard';
812

913
@NgModule({

0 commit comments

Comments
 (0)