Skip to content

Commit 388c7eb

Browse files
FrancescoMolinaroFrancescoMolinaro
authored
Integrate @ng-dynamic-forms in code base and upgrade ng-bootstrap version. (DSpace#4898)
* [CST-22299] replace form library, update ng-bootstrap and ng-mask * [CST-22299] bump lib version * [CST-22299] add labels, sync translations files * Revert "[CST-22299] add labels, sync translations files" This reverts commit e872d00.
1 parent a9e8958 commit 388c7eb

74 files changed

Lines changed: 281 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
@@ -17,7 +17,11 @@ import { createSuccessfulRemoteDataObject } from '@dspace/core/utilities/remote-
1717
import { hasValue } from '@dspace/shared/utils/empty.util';
1818
import {
1919
NgbAccordionModule,
20-
NgbNavModule,
20+
NgbNav,
21+
NgbNavContent,
22+
NgbNavItem,
23+
NgbNavLink,
24+
NgbNavOutlet,
2125
} from '@ng-bootstrap/ng-bootstrap';
2226
import { TranslateModule } from '@ngx-translate/core';
2327
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
@@ -41,7 +41,7 @@ import { PageInfo } from '@dspace/core/shared/page-info.model';
4141
import { hasValue } from '@dspace/shared/utils/empty.util';
4242
import {
4343
NgbModal,
44-
NgbTooltipModule,
44+
NgbTooltip,
4545
} from '@ng-bootstrap/ng-bootstrap';
4646
import {
4747
TranslateModule,
@@ -76,7 +76,7 @@ import { getGroupEditPageRouterLink } from '../access-control-routing-paths';
7676
imports: [
7777
AsyncPipe,
7878
BtnDisabledDirective,
79-
NgbTooltipModule,
79+
NgbTooltip,
8080
PaginationComponent,
8181
ReactiveFormsModule,
8282
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
@@ -14,7 +14,7 @@ import { NotificationsService } from '@dspace/core/notification-system/notificat
1414
import { Process } from '@dspace/core/processes/process.model';
1515
import { getFirstCompletedRemoteData } from '@dspace/core/shared/operators';
1616
import { hasValue } from '@dspace/shared/utils/empty.util';
17-
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
17+
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
1818
import {
1919
TranslateModule,
2020
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
@@ -9,7 +9,7 @@ import {
99
import { By } from '@angular/platform-browser';
1010
import { supervisionOrderListMock } from '@dspace/core/testing/supervision-order.mock';
1111
import { TranslateLoaderMock } from '@dspace/core/testing/translate-loader.mock';
12-
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
12+
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
1313
import {
1414
TranslateLoader,
1515
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
@@ -13,7 +13,7 @@ import { Group } from '@dspace/core/eperson/models/group.model';
1313
import { getFirstCompletedRemoteData } from '@dspace/core/shared/operators';
1414
import { SupervisionOrder } from '@dspace/core/supervision-order/models/supervision-order.model';
1515
import { isNotEmpty } from '@dspace/shared/utils/empty.util';
16-
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
16+
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
1717
import { TranslateModule } from '@ngx-translate/core';
1818
import {
1919
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
@@ -43,7 +43,7 @@ import {
4343
USER_PROVIDED_META_REDUCERS,
4444
} from '@ngrx/store';
4545
import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
46-
import { NgxMaskModule } from 'ngx-mask';
46+
import { provideEnvironmentNgxMask } from 'ngx-mask';
4747

4848
import { environment } from '../environments/environment';
4949
import { EagerThemesModule } from '../themes/eager-themes.module';
@@ -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
@@ -5,7 +5,7 @@ import {
55
import { Component } from '@angular/core';
66
import { RouterLink } from '@angular/router';
77
import { Breadcrumb } from '@dspace/core/breadcrumbs/models/breadcrumb.model';
8-
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
8+
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
99
import { TranslateModule } from '@ngx-translate/core';
1010
import { Observable } from 'rxjs';
1111

@@ -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
@@ -34,7 +34,13 @@ import {
3434
} from '@dspace/core/shared/operators';
3535
import { PaginatedSearchOptions } from '@dspace/core/shared/search/models/paginated-search-options.model';
3636
import { isNotEmpty } from '@dspace/shared/utils/empty.util';
37-
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
37+
import {
38+
NgbNav,
39+
NgbNavContent,
40+
NgbNavItem,
41+
NgbNavLink,
42+
NgbNavOutlet,
43+
} from '@ng-bootstrap/ng-bootstrap';
3844
import {
3945
TranslateModule,
4046
TranslateService,
@@ -81,7 +87,11 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
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)