Merge pull request #5011 from tdonohue/port_4898_to_9x

[Port dspace-9_x] Integrate @ng-dynamic-forms in code base and upgrade ng-bootstrap version.

Author: tdonohue

package-lock.json

@@ -66,16 +66,11 @@
       "@angular/forms": "^20.3.12",
       "@angular/localize": "^20.3.12"
     },
-    "@ng-dynamic-forms/core": {
+    "@4science_ng-dynamic-forms/core": {
       "@angular/common": "^20.3.12",
       "@angular/core": "^20.3.12",
       "@angular/forms": "^20.3.12"
     },
-    "@ng-dynamic-forms/ui-ng-bootstrap": {
-      "ngx-mask": "14.2.4",
-      "@ng-bootstrap/ng-bootstrap": "^12.1.2",
-      "bootstrap": "^5.3"
-    },
     "@nicky-lenaers/ngx-scroll-to": {
       "@angular/common": "^20.3.12",
       "@angular/core": "^20.3.12"
@@ -95,9 +90,9 @@
     "@angular/router": "^20.3.14",
     "@angular/ssr": "^20.3.10",
     "@kolkov/ngx-gallery": "^2.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^12.1.2",
-    "@ng-dynamic-forms/core": "^16.0.0",
-    "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^15.1.2",
+    "@4science_ng-dynamic-forms/core": "^19.0.1",
+    "@4science_ng-dynamic-forms/ui-ng-bootstrap": "^19.0.4",
     "@ngrx/effects": "^20.1.0",
     "@ngrx/router-store": "^20.1.0",
     "@ngrx/store": "^20.1.0",
@@ -217,7 +212,7 @@
     "karma-mocha-reporter": "2.2.5",
     "md5": "^2.3.0",
     "ng-mocks": "^14.14.0",
-    "ngx-mask": "14.2.4",
+    "ngx-mask": "^16.0.0",
     "postcss": "^8.5",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",

package.json

@@ -7,7 +7,11 @@ import {
 } from '@angular/core';
 import {
   NgbAccordionModule,
-  NgbNavModule,
+  NgbNav,
+  NgbNavContent,
+  NgbNavItem,
+  NgbNavLink,
+  NgbNavOutlet,
 } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgxPaginationModule } from 'ngx-pagination';
@@ -55,7 +59,11 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     BrowserOnlyPipe,
     ListableObjectComponentLoaderComponent,
     NgbAccordionModule,
-    NgbNavModule,
+    NgbNav,
+    NgbNavContent,
+    NgbNavItem,
+    NgbNavLink,
+    NgbNavOutlet,
     NgxPaginationModule,
     PaginationComponent,
     SelectableListItemControlComponent,

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

@@ -11,7 +11,7 @@ import {
 import { RouterLink } from '@angular/router';
 import {
   NgbModal,
-  NgbTooltipModule,
+  NgbTooltip,
 } from '@ng-bootstrap/ng-bootstrap';
 import {
   TranslateModule,
@@ -75,7 +75,7 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
   imports: [
     AsyncPipe,
     BtnDisabledDirective,
-    NgbTooltipModule,
+    NgbTooltip,
     PaginationComponent,
     ReactiveFormsModule,
     RouterLink,

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

@@ -6,7 +6,7 @@ import {
 } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { Router } from '@angular/router';
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import {
   TranslateModule,
   TranslateService,
@@ -36,7 +36,7 @@ import { QueryPredicate } from '../query-predicate.model';
   templateUrl: './filtered-items-export-csv.component.html',
   imports: [
     AsyncPipe,
-    NgbTooltipModule,
+    NgbTooltip,
     TranslateModule,
   ],
 })

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

@@ -7,7 +7,7 @@ import {
   TestBed,
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import {
   TranslateLoader,
   TranslateModule,
@@ -25,7 +25,7 @@ describe('SupervisionOrderStatusComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [
-        NgbTooltipModule,
+        NgbTooltip,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

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

@@ -7,7 +7,7 @@ import {
   Output,
   SimpleChanges,
 } from '@angular/core';
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import {
   BehaviorSubject,
@@ -39,7 +39,7 @@ export interface SupervisionOrderListEntry {
   styleUrls: ['./supervision-order-status.component.scss'],
   imports: [
     AsyncPipe,
-    NgbTooltipModule,
+    NgbTooltip,
     TranslateModule,
     VarDirective,
   ],

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

@@ -27,7 +27,7 @@ import {
   USER_PROVIDED_META_REDUCERS,
 } from '@ngrx/store';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
-import { NgxMaskModule } from 'ngx-mask';
+import { provideEnvironmentNgxMask } from 'ngx-mask';
 
 import {
   APP_CONFIG,
@@ -102,7 +102,6 @@ export const commonAppConfig: ApplicationConfig = {
       EagerThemesModule,
       RootModule,
       ListableModule.withEntryComponents(),
-      NgxMaskModule.forRoot(),
     ),
     provideRouter(
       APP_ROUTES,
@@ -161,7 +160,7 @@ export const commonAppConfig: ApplicationConfig = {
 
     // DI-composable menus
     ...MENUS,
-
+    provideEnvironmentNgxMask(),
     provideCore(),
   ],
 };

src/app/app.config.ts

@@ -4,7 +4,7 @@ import {
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 
@@ -21,7 +21,7 @@ import { BreadcrumbsService } from './breadcrumbs.service';
   styleUrls: ['./breadcrumbs.component.scss'],
   imports: [
     AsyncPipe,
-    NgbTooltipModule,
+    NgbTooltip,
     NgTemplateOutlet,
     RouterLink,
     TranslateModule,

src/app/breadcrumbs/breadcrumbs.component.ts

@@ -10,7 +10,13 @@ import {
   ActivatedRoute,
   Router,
 } from '@angular/router';
-import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NgbNav,
+  NgbNavContent,
+  NgbNavItem,
+  NgbNavLink,
+  NgbNavOutlet,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   TranslateModule,
   TranslateService,
@@ -81,7 +87,11 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     AsyncPipe,
     BrowserOnlyPipe,
     ItemSelectComponent,
-    NgbNavModule,
+    NgbNav,
+    NgbNavContent,
+    NgbNavItem,
+    NgbNavLink,
+    NgbNavOutlet,
     ThemedSearchFormComponent,
     TranslateModule,
   ],