Skip to content

Commit 484e310

Browse files
committed
mgr/dashboard: upgrade angular to v16
Fixes: https://tracker.ceph.com/issues/68896 Signed-off-by: Ivo Almeida <[email protected]>
1 parent ffb4b94 commit 484e310

27 files changed

+3232
-2497
lines changed

src/pybind/mgr/dashboard/frontend/package-lock.json

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

src/pybind/mgr/dashboard/frontend/package.json

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,19 @@
3939
"fix": "run-p -csl --aggregate-output fix:*",
4040
"compodoc": "compodoc",
4141
"doc-build": "compodoc -p tsconfig.app.json",
42-
"doc-serve": "compodoc --port 8444 -s tsconfig.app.json",
43-
"postinstall": "ngcc --properties es2015 browser module main --async false --first-only --tsconfig 'tsconfig.app.json'"
42+
"doc-serve": "compodoc --port 8444 -s tsconfig.app.json"
4443
},
4544
"private": true,
4645
"dependencies": {
47-
"@angular/animations": "15.2.9",
48-
"@angular/common": "15.2.9",
49-
"@angular/compiler": "15.2.9",
50-
"@angular/core": "15.2.9",
51-
"@angular/forms": "15.2.9",
52-
"@angular/localize": "15.2.9",
53-
"@angular/platform-browser": "15.2.9",
54-
"@angular/platform-browser-dynamic": "15.2.9",
55-
"@angular/router": "15.2.9",
46+
"@angular/animations": "16.2.12",
47+
"@angular/common": "16.2.12",
48+
"@angular/compiler": "16.2.12",
49+
"@angular/core": "16.2.12",
50+
"@angular/forms": "16.2.12",
51+
"@angular/localize": "16.2.12",
52+
"@angular/platform-browser": "16.2.12",
53+
"@angular/platform-browser-dynamic": "16.2.12",
54+
"@angular/router": "16.2.12",
5655
"@carbon/icons": "11.41.0",
5756
"@carbon/styles": "1.57.0",
5857
"@ibm/plex": "6.4.0",
@@ -71,31 +70,30 @@
7170
"fork-awesome": "1.1.7",
7271
"lodash": "4.17.21",
7372
"moment": "2.29.4",
74-
"ng-block-ui": "3.0.2",
75-
"ng-click-outside": "7.0.0",
73+
"ng-block-ui": "4.0.1",
74+
"ng-click-outside": "9.0.1",
7675
"ng2-charts": "4.1.1",
77-
"ngx-cookie-service": "17.1.0",
78-
"ngx-pipe-function": "1.0.0",
76+
"ngx-cookie-service": "18.0.0",
7977
"ngx-toastr": "17.0.2",
8078
"rxjs": "6.6.3",
81-
"simplebar-angular": "2.3.6",
79+
"simplebar-angular": "3.2.6",
8280
"stream-browserify": "3.0.0",
8381
"swagger-ui": "4.12.0",
8482
"timers-browserify": "2.0.12",
8583
"tslib": "2.3.1",
8684
"xml2js": "0.6.2",
87-
"zone.js": "0.11.8"
85+
"zone.js": "0.13.3"
8886
},
8987
"devDependencies": {
90-
"@angular-devkit/build-angular": "15.2.9",
88+
"@angular-devkit/build-angular": "16.2.16",
9189
"@angular-eslint/builder": "13.5.0",
9290
"@angular-eslint/eslint-plugin": "13.5.0",
9391
"@angular-eslint/eslint-plugin-template": "13.5.0",
94-
"@angular-eslint/schematics": "13.5.0",
92+
"@angular-eslint/schematics": "18.3.1",
9593
"@angular-eslint/template-parser": "13.5.0",
96-
"@angular/cli": "15.2.9",
97-
"@angular/compiler-cli": "15.2.9",
98-
"@angular/language-service": "15.2.9",
94+
"@angular/cli": "16.2.16",
95+
"@angular/compiler-cli": "16.2.12",
96+
"@angular/language-service": "16.2.12",
9997
"@applitools/eyes-cypress": "3.22.5",
10098
"@compodoc/compodoc": "1.1.18",
10199
"@cypress/browserify-preprocessor": "3.0.2",

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/block.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
44
import { RouterModule, Routes } from '@angular/router';
55

66
import { NgbNavModule, NgbPopoverModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
7-
import { NgxPipeFunctionModule } from 'ngx-pipe-function';
7+
import { PipesModule } from '~/app/shared/pipes/pipes.module';
88

99
import { ActionLabels, URLVerbs } from '~/app/shared/constants/app.constants';
1010
import { FeatureTogglesGuardService } from '~/app/shared/services/feature-toggles-guard.service';
@@ -82,7 +82,7 @@ import Reset from '@carbon/icons/es/reset/32';
8282
NgbNavModule,
8383
NgbPopoverModule,
8484
NgbTooltipModule,
85-
NgxPipeFunctionModule,
85+
PipesModule,
8686
SharedModule,
8787
RouterModule,
8888
TreeviewModule,

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { RouterTestingModule } from '@angular/router/testing';
66

77
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
88
import moment from 'moment';
9-
import { NgxPipeFunctionModule } from 'ngx-pipe-function';
9+
import { PipesModule } from '~/app/shared/pipes/pipes.module';
1010
import { ToastrModule } from 'ngx-toastr';
1111
import { of } from 'rxjs';
1212

@@ -35,7 +35,7 @@ describe('RbdTrashListComponent', () => {
3535
RouterTestingModule,
3636
SharedModule,
3737
NgbNavModule,
38-
NgxPipeFunctionModule,
38+
PipesModule,
3939
ToastrModule.forRoot()
4040
],
4141
providers: [TaskListService]

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
NgbTooltipModule,
2727
NgbTypeaheadModule
2828
} from '@ng-bootstrap/ng-bootstrap';
29-
import { NgxPipeFunctionModule } from 'ngx-pipe-function';
29+
import { PipesModule } from '~/app/shared/pipes/pipes.module';
3030

3131
import { SharedModule } from '~/app/shared/shared.module';
3232
import { PerformanceCounterModule } from '../performance-counter/performance-counter.module';
@@ -96,7 +96,7 @@ import { MultiClusterDetailsComponent } from './multi-cluster/multi-cluster-deta
9696
NgbDatepickerModule,
9797
NgbPopoverModule,
9898
NgbDropdownModule,
99-
NgxPipeFunctionModule,
99+
PipesModule,
100100
NgbProgressbarModule,
101101
DashboardV3Module,
102102
ComboBoxModule,

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
33
import { ComponentFixture, TestBed } from '@angular/core/testing';
44

55
import _ from 'lodash';
6-
import { NgxPipeFunctionModule } from 'ngx-pipe-function';
6+
import { PipesModule } from '~/app/shared/pipes/pipes.module';
77
import { ToastrModule } from 'ngx-toastr';
88
import { of } from 'rxjs';
99

@@ -135,7 +135,7 @@ describe('ServiceDaemonListComponent', () => {
135135
HttpClientTestingModule,
136136
CephModule,
137137
CoreModule,
138-
NgxPipeFunctionModule,
138+
PipesModule,
139139
SharedModule,
140140
ToastrModule.forRoot()
141141
]

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-details/service-details.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
33
import { RouterTestingModule } from '@angular/router/testing';
44

55
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
6-
import { NgxPipeFunctionModule } from 'ngx-pipe-function';
6+
import { PipesModule } from '~/app/shared/pipes/pipes.module';
77
import { ToastrModule } from 'ngx-toastr';
88

99
import { CdTableSelection } from '~/app/shared/models/cd-table-selection';
@@ -23,7 +23,7 @@ describe('ServiceDetailsComponent', () => {
2323
RouterTestingModule,
2424
SharedModule,
2525
NgbNavModule,
26-
NgxPipeFunctionModule,
26+
PipesModule,
2727
ToastrModule.forRoot()
2828
],
2929
declarations: [ServiceDetailsComponent, ServiceDaemonListComponent],

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Router } from '@angular/router';
55
import { RouterTestingModule } from '@angular/router/testing';
66

77
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
8-
import { NgxPipeFunctionModule } from 'ngx-pipe-function';
8+
import { PipesModule } from '~/app/shared/pipes/pipes.module';
99
import { ToastrModule } from 'ngx-toastr';
1010
import { of as observableOf, throwError } from 'rxjs';
1111

@@ -35,7 +35,7 @@ describe('RgwUserFormComponent', () => {
3535
SharedModule,
3636
ToastrModule.forRoot(),
3737
NgbTooltipModule,
38-
NgxPipeFunctionModule
38+
PipesModule
3939
]
4040
});
4141

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
NgbTooltipModule,
1111
NgbTypeaheadModule
1212
} from '@ng-bootstrap/ng-bootstrap';
13-
import { NgxPipeFunctionModule } from 'ngx-pipe-function';
13+
import { PipesModule } from '~/app/shared/pipes/pipes.module';
1414

1515
import { ActionLabels, URLVerbs } from '~/app/shared/constants/app.constants';
1616
import { CRUDTableComponent } from '~/app/shared/datatable/crud-table/crud-table.component';
@@ -94,7 +94,7 @@ import { RgwUserAccountsDetailsComponent } from './rgw-user-accounts-details/rgw
9494
RouterModule,
9595
NgbTooltipModule,
9696
NgbPopoverModule,
97-
NgxPipeFunctionModule,
97+
PipesModule,
9898
TreeviewModule,
9999
DataTableModule,
100100
DashboardV3Module,

src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/ceph-shared.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
22
import { NgModule } from '@angular/core';
33

44
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
5-
import { NgxPipeFunctionModule } from 'ngx-pipe-function';
5+
import { PipesModule } from '~/app/shared/pipes/pipes.module';
66

77
import { DataTableModule } from '~/app/shared/datatable/datatable.module';
88
import { SharedModule } from '~/app/shared/shared.module';
@@ -11,7 +11,7 @@ import { SmartListComponent } from './smart-list/smart-list.component';
1111
import { HealthChecksComponent } from './health-checks/health-checks.component';
1212

1313
@NgModule({
14-
imports: [CommonModule, DataTableModule, SharedModule, NgbNavModule, NgxPipeFunctionModule],
14+
imports: [CommonModule, DataTableModule, SharedModule, NgbNavModule, PipesModule],
1515
exports: [DeviceListComponent, SmartListComponent, HealthChecksComponent],
1616
declarations: [DeviceListComponent, SmartListComponent, HealthChecksComponent]
1717
})

0 commit comments

Comments
 (0)