Skip to content

Commit 37cb4fe

Browse files
tdonohuetdonohue
authored
Merge pull request DSpace#5011 from tdonohue/port_4898_to_9x
[Port dspace-9_x] Integrate @ng-dynamic-forms in code base and upgrade ng-bootstrap version.
2 parents 0da37f2 + 430df01 commit 37cb4fe

74 files changed

Lines changed: 283 additions & 221 deletions

File tree

Some content is hidden

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

‎package-lock.json‎

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

‎package.json‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,11 @@
6666
"@angular/forms": "^20.3.12",
6767
"@angular/localize": "^20.3.12"
6868
},
69-
"@ng-dynamic-forms/core": {
69+
"@4science_ng-dynamic-forms/core": {
7070
"@angular/common": "^20.3.12",
7171
"@angular/core": "^20.3.12",
7272
"@angular/forms": "^20.3.12"
7373
},
74-
"@ng-dynamic-forms/ui-ng-bootstrap": {
75-
"ngx-mask": "14.2.4",
76-
"@ng-bootstrap/ng-bootstrap": "^12.1.2",
77-
"bootstrap": "^5.3"
78-
},
7974
"@nicky-lenaers/ngx-scroll-to": {
8075
"@angular/common": "^20.3.12",
8176
"@angular/core": "^20.3.12"
@@ -95,9 +90,9 @@
9590
"@angular/router": "^20.3.14",
9691
"@angular/ssr": "^20.3.10",
9792
"@kolkov/ngx-gallery": "^2.0.1",
98-
"@ng-bootstrap/ng-bootstrap": "^12.1.2",
99-
"@ng-dynamic-forms/core": "^16.0.0",
100-
"@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
93+
"@ng-bootstrap/ng-bootstrap": "^15.1.2",
94+
"@4science_ng-dynamic-forms/core": "^19.0.1",
95+
"@4science_ng-dynamic-forms/ui-ng-bootstrap": "^19.0.4",
10196
"@ngrx/effects": "^20.1.0",
10297
"@ngrx/router-store": "^20.1.0",
10398
"@ngrx/store": "^20.1.0",
@@ -217,7 +212,7 @@
217212
"karma-mocha-reporter": "2.2.5",
218213
"md5": "^2.3.0",
219214
"ng-mocks": "^14.14.0",
220-
"ngx-mask": "14.2.4",
215+
"ngx-mask": "^16.0.0",
221216
"postcss": "^8.5",
222217
"postcss-import": "^14.0.0",
223218
"postcss-loader": "^4.0.3",

‎src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ import {
77
} from '@angular/core';
88
import {
99
NgbAccordionModule,
10-
NgbNavModule,
10+
NgbNav,
11+
NgbNavContent,
12+
NgbNavItem,
13+
NgbNavLink,
14+
NgbNavOutlet,
1115
} from '@ng-bootstrap/ng-bootstrap';
1216
import { TranslateModule } from '@ngx-translate/core';
1317
import { NgxPaginationModule } from 'ngx-pagination';
@@ -55,7 +59,11 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
5559
BrowserOnlyPipe,
5660
ListableObjectComponentLoaderComponent,
5761
NgbAccordionModule,
58-
NgbNavModule,
62+
NgbNav,
63+
NgbNavContent,
64+
NgbNavItem,
65+
NgbNavLink,
66+
NgbNavOutlet,
5967
NgxPaginationModule,
6068
PaginationComponent,
6169
SelectableListItemControlComponent,

‎src/app/access-control/group-registry/groups-registry.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import { RouterLink } from '@angular/router';
1212
import {
1313
NgbModal,
14-
NgbTooltipModule,
14+
NgbTooltip,
1515
} from '@ng-bootstrap/ng-bootstrap';
1616
import {
1717
TranslateModule,
@@ -75,7 +75,7 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
7575
imports: [
7676
AsyncPipe,
7777
BtnDisabledDirective,
78-
NgbTooltipModule,
78+
NgbTooltip,
7979
PaginationComponent,
8080
ReactiveFormsModule,
8181
RouterLink,

‎src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
} from '@angular/core';
77
import { FormGroup } from '@angular/forms';
88
import { Router } from '@angular/router';
9-
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
9+
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
1010
import {
1111
TranslateModule,
1212
TranslateService,
@@ -36,7 +36,7 @@ import { QueryPredicate } from '../query-predicate.model';
3636
templateUrl: './filtered-items-export-csv.component.html',
3737
imports: [
3838
AsyncPipe,
39-
NgbTooltipModule,
39+
NgbTooltip,
4040
TranslateModule,
4141
],
4242
})

‎src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
TestBed,
88
} from '@angular/core/testing';
99
import { By } from '@angular/platform-browser';
10-
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
10+
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
1111
import {
1212
TranslateLoader,
1313
TranslateModule,
@@ -25,7 +25,7 @@ describe('SupervisionOrderStatusComponent', () => {
2525
beforeEach(async () => {
2626
await TestBed.configureTestingModule({
2727
imports: [
28-
NgbTooltipModule,
28+
NgbTooltip,
2929
TranslateModule.forRoot({
3030
loader: {
3131
provide: TranslateLoader,

‎src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
Output,
88
SimpleChanges,
99
} from '@angular/core';
10-
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
10+
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
1111
import { TranslateModule } from '@ngx-translate/core';
1212
import {
1313
BehaviorSubject,
@@ -39,7 +39,7 @@ export interface SupervisionOrderListEntry {
3939
styleUrls: ['./supervision-order-status.component.scss'],
4040
imports: [
4141
AsyncPipe,
42-
NgbTooltipModule,
42+
NgbTooltip,
4343
TranslateModule,
4444
VarDirective,
4545
],

‎src/app/app.config.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
USER_PROVIDED_META_REDUCERS,
2828
} from '@ngrx/store';
2929
import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
30-
import { NgxMaskModule } from 'ngx-mask';
30+
import { provideEnvironmentNgxMask } from 'ngx-mask';
3131

3232
import {
3333
APP_CONFIG,
@@ -102,7 +102,6 @@ export const commonAppConfig: ApplicationConfig = {
102102
EagerThemesModule,
103103
RootModule,
104104
ListableModule.withEntryComponents(),
105-
NgxMaskModule.forRoot(),
106105
),
107106
provideRouter(
108107
APP_ROUTES,
@@ -161,7 +160,7 @@ export const commonAppConfig: ApplicationConfig = {
161160

162161
// DI-composable menus
163162
...MENUS,
164-
163+
provideEnvironmentNgxMask(),
165164
provideCore(),
166165
],
167166
};

‎src/app/breadcrumbs/breadcrumbs.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
} from '@angular/common';
55
import { Component } from '@angular/core';
66
import { RouterLink } from '@angular/router';
7-
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
7+
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
88
import { TranslateModule } from '@ngx-translate/core';
99
import { Observable } from 'rxjs';
1010

@@ -21,7 +21,7 @@ import { BreadcrumbsService } from './breadcrumbs.service';
2121
styleUrls: ['./breadcrumbs.component.scss'],
2222
imports: [
2323
AsyncPipe,
24-
NgbTooltipModule,
24+
NgbTooltip,
2525
NgTemplateOutlet,
2626
RouterLink,
2727
TranslateModule,

‎src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ import {
1010
ActivatedRoute,
1111
Router,
1212
} from '@angular/router';
13-
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
13+
import {
14+
NgbNav,
15+
NgbNavContent,
16+
NgbNavItem,
17+
NgbNavLink,
18+
NgbNavOutlet,
19+
} from '@ng-bootstrap/ng-bootstrap';
1420
import {
1521
TranslateModule,
1622
TranslateService,
@@ -81,7 +87,11 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
8187
AsyncPipe,
8288
BrowserOnlyPipe,
8389
ItemSelectComponent,
84-
NgbNavModule,
90+
NgbNav,
91+
NgbNavContent,
92+
NgbNavItem,
93+
NgbNavLink,
94+
NgbNavOutlet,
8595
ThemedSearchFormComponent,
8696
TranslateModule,
8797
],

0 commit comments

Comments
 (0)