Skip to content

Integrate @ng-dynamic-forms in code base and upgrade ng-bootstrap version. #4898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FrancescoMolinaro wants to merge 1 commit into
base: main
Choose a base branch
from
+281 −221
Open

Integrate @ng-dynamic-forms in code base and upgrade ng-bootstrap version. #4898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 50 additions & 47 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 5 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Comment on lines +69 to 73
Copy link
Member

@artlowel artlowel Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these overrides still necessary now?

Copy link
Contributor Author

@FrancescoMolinaro FrancescoMolinaro Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @artlowel , they are still necessary as I didn't upgrade the Angular version of the library, wich is still on v16.
Since we plan anyway to move away from the library I don't know if it makes sense to spend time to upgrade it.
In case necessary we could handle that in a separate task as I believe is not trivial, what do you think?

"@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"
Expand All @@ -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.1",
"@ngrx/effects": "^20.1.0",
"@ngrx/router-store": "^20.1.0",
"@ngrx/store": "^20.1.0",
Expand Down Expand Up @@ -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",
Expand Down
12 changes: 10 additions & 2 deletions src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ import { createSuccessfulRemoteDataObject } from '@dspace/core/utilities/remote-
import { hasValue } from '@dspace/shared/utils/empty.util';
import {
NgbAccordionModule,
NgbNavModule,
NgbNav,
NgbNavContent,
NgbNavItem,
NgbNavLink,
NgbNavOutlet,
} from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
import { NgxPaginationModule } from 'ngx-pagination';
Expand Down Expand Up @@ -55,7 +59,11 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
BrowserOnlyPipe,
ListableObjectComponentLoaderComponent,
NgbAccordionModule,
NgbNavModule,
NgbNav,
NgbNavContent,
NgbNavItem,
NgbNavLink,
NgbNavOutlet,
NgxPaginationModule,
PaginationComponent,
SelectableListItemControlComponent,
Expand Down
4 changes: 2 additions & 2 deletions src/app/access-control/group-registry/groups-registry.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import { PageInfo } from '@dspace/core/shared/page-info.model';
import { hasValue } from '@dspace/shared/utils/empty.util';
import {
NgbModal,
NgbTooltipModule,
NgbTooltip,
} from '@ng-bootstrap/ng-bootstrap';
import {
TranslateModule,
Expand Down Expand Up @@ -76,7 +76,7 @@ import { getGroupEditPageRouterLink } from '../access-control-routing-paths';
imports: [
AsyncPipe,
BtnDisabledDirective,
NgbTooltipModule,
NgbTooltip,
PaginationComponent,
ReactiveFormsModule,
RouterLink,
Expand Down
4 changes: 2 additions & 2 deletions ...n-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { NotificationsService } from '@dspace/core/notification-system/notificat
import { Process } from '@dspace/core/processes/process.model';
import { getFirstCompletedRemoteData } from '@dspace/core/shared/operators';
import { hasValue } from '@dspace/shared/utils/empty.util';
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import {
TranslateModule,
TranslateService,
Expand All @@ -36,7 +36,7 @@ import { QueryPredicate } from '../query-predicate.model';
templateUrl: './filtered-items-export-csv.component.html',
imports: [
AsyncPipe,
NgbTooltipModule,
NgbTooltip,
TranslateModule,
],
})
Expand Down
4 changes: 2 additions & 2 deletions ...ctions/workspace-item/supervision-order-status/supervision-order-status.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import { By } from '@angular/platform-browser';
import { supervisionOrderListMock } from '@dspace/core/testing/supervision-order.mock';
import { TranslateLoaderMock } from '@dspace/core/testing/translate-loader.mock';
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import {
TranslateLoader,
TranslateModule,
Expand All @@ -25,7 +25,7 @@ describe('SupervisionOrderStatusComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [
NgbTooltipModule,
NgbTooltip,
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
Expand Down
4 changes: 2 additions & 2 deletions ...lts/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { Group } from '@dspace/core/eperson/models/group.model';
import { getFirstCompletedRemoteData } from '@dspace/core/shared/operators';
import { SupervisionOrder } from '@dspace/core/supervision-order/models/supervision-order.model';
import { isNotEmpty } from '@dspace/shared/utils/empty.util';
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
import {
BehaviorSubject,
Expand All @@ -39,7 +39,7 @@ export interface SupervisionOrderListEntry {
styleUrls: ['./supervision-order-status.component.scss'],
imports: [
AsyncPipe,
NgbTooltipModule,
NgbTooltip,
TranslateModule,
VarDirective,
],
Expand Down
5 changes: 2 additions & 3 deletions src/app/app.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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 { environment } from '../environments/environment';
import { EagerThemesModule } from '../themes/eager-themes.module';
Expand Down Expand Up @@ -102,7 +102,6 @@ export const commonAppConfig: ApplicationConfig = {
EagerThemesModule,
RootModule,
ListableModule.withEntryComponents(),
NgxMaskModule.forRoot(),
),
provideRouter(
APP_ROUTES,
Expand Down Expand Up @@ -161,7 +160,7 @@ export const commonAppConfig: ApplicationConfig = {

// DI-composable menus
...MENUS,

provideEnvironmentNgxMask(),
provideCore(),
],
};
Expand Down
4 changes: 2 additions & 2 deletions src/app/breadcrumbs/breadcrumbs.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
import { Component } from '@angular/core';
import { RouterLink } from '@angular/router';
import { Breadcrumb } from '@dspace/core/breadcrumbs/models/breadcrumb.model';
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
import { Observable } from 'rxjs';

Expand All @@ -21,7 +21,7 @@ import { BreadcrumbsService } from './breadcrumbs.service';
styleUrls: ['./breadcrumbs.component.scss'],
imports: [
AsyncPipe,
NgbTooltipModule,
NgbTooltip,
NgTemplateOutlet,
RouterLink,
TranslateModule,
Expand Down
14 changes: 12 additions & 2 deletions src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@ import {
} from '@dspace/core/shared/operators';
import { PaginatedSearchOptions } from '@dspace/core/shared/search/models/paginated-search-options.model';
import { isNotEmpty } from '@dspace/shared/utils/empty.util';
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
import {
NgbNav,
NgbNavContent,
NgbNavItem,
NgbNavLink,
NgbNavOutlet,
} from '@ng-bootstrap/ng-bootstrap';
import {
TranslateModule,
TranslateService,
Expand Down Expand Up @@ -81,7 +87,11 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
AsyncPipe,
BrowserOnlyPipe,
ItemSelectComponent,
NgbNavModule,
NgbNav,
NgbNavContent,
NgbNavItem,
NgbNavLink,
NgbNavOutlet,
ThemedSearchFormComponent,
TranslateModule,
],
Expand Down
4 changes: 2 additions & 2 deletions ...ue-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
import { Vocabulary } from '@dspace/core/submission/vocabularies/models/vocabulary.model';
import { VocabularyOptions } from '@dspace/core/submission/vocabularies/models/vocabulary-options.model';
import { isNotEmpty } from '@dspace/shared/utils/empty.util';
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import {
TranslateModule,
TranslateService,
Expand Down Expand Up @@ -73,7 +73,7 @@ import { DsoEditMetadataFieldService } from '../dso-edit-metadata-field.service'
DsDynamicOneboxComponent,
DsDynamicScrollableDropdownComponent,
FormsModule,
NgbTooltipModule,
NgbTooltip,
NgClass,
TranslateModule,
],
Expand Down
4 changes: 2 additions & 2 deletions ...dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
} from '@dspace/core/shared/metadata-representation/metadata-representation.model';
import { Vocabulary } from '@dspace/core/submission/vocabularies/models/vocabulary.model';
import { hasValue } from '@dspace/shared/utils/empty.util';
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
import {
EMPTY,
Expand Down Expand Up @@ -64,7 +64,7 @@ import { DsoEditMetadataValueFieldLoaderComponent } from '../dso-edit-metadata-v
DebounceDirective,
DsoEditMetadataValueFieldLoaderComponent,
FormsModule,
NgbTooltipModule,
NgbTooltip,
NgClass,
RouterLink,
ThemedTypeBadgeComponent,
Expand Down
Loading
Loading