Skip to content

Commit 2ee23a6

Browse files
authored
Merge pull request DSpace#5319 from 4Science/task/dspace-9_x/DURACOM-449-backporting
[Port dspace-9_x] Migrate remaining legacy ng-bootstrap navbar modules
2 parents 39edf07 + 78a146e commit 2ee23a6

5 files changed

Lines changed: 56 additions & 10 deletions

File tree

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ import {
66
} from '@angular/core/testing';
77
import {
88
NgbAccordionModule,
9-
NgbNavModule,
9+
NgbNav,
10+
NgbNavContent,
11+
NgbNavItem,
12+
NgbNavLink,
13+
NgbNavOutlet,
1014
} from '@ng-bootstrap/ng-bootstrap';
1115
import { TranslateModule } from '@ngx-translate/core';
1216
import { of } from 'rxjs';
@@ -42,7 +46,11 @@ describe('BulkAccessBrowseComponent', () => {
4246
TestBed.configureTestingModule({
4347
imports: [
4448
NgbAccordionModule,
45-
NgbNavModule,
49+
NgbNav,
50+
NgbNavContent,
51+
NgbNavItem,
52+
NgbNavLink,
53+
NgbNavOutlet,
4654
TranslateModule.forRoot(),
4755
BulkAccessBrowseComponent,
4856
],

src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ import {
44
TestBed,
55
} from '@angular/core/testing';
66
import { ActivatedRoute } from '@angular/router';
7-
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
7+
import {
8+
NgbNav,
9+
NgbNavContent,
10+
NgbNavItem,
11+
NgbNavLink,
12+
NgbNavOutlet,
13+
} from '@ng-bootstrap/ng-bootstrap';
814
import { TranslateModule } from '@ngx-translate/core';
915

1016
import { APP_CONFIG } from '../../../config/app-config.interface';
@@ -125,7 +131,13 @@ describe('AdminNotifyDashboardComponent', () => {
125131
results = buildPaginatedList(undefined, [searchResult1, searchResult2, searchResult3]);
126132

127133
await TestBed.configureTestingModule({
128-
imports: [TranslateModule.forRoot(), NgbNavModule, AdminNotifyDashboardComponent],
134+
imports: [TranslateModule.forRoot(),
135+
NgbNav,
136+
NgbNavContent,
137+
NgbNavItem,
138+
NgbNavLink,
139+
NgbNavOutlet,
140+
AdminNotifyDashboardComponent],
129141
providers: [
130142
{ provide: APP_CONFIG, useValue: environment },
131143
{ provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } },

src/app/health-page/health-panel/health-panel.component.spec.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ import { By } from '@angular/platform-browser';
88
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
99
import {
1010
NgbAccordionModule,
11-
NgbNavModule,
11+
NgbNav,
12+
NgbNavContent,
13+
NgbNavItem,
14+
NgbNavLink,
15+
NgbNavOutlet,
1216
} from '@ng-bootstrap/ng-bootstrap';
1317
import {
1418
TranslateLoader,
@@ -29,7 +33,11 @@ describe('HealthPanelComponent', () => {
2933
beforeEach(async () => {
3034
await TestBed.configureTestingModule({
3135
imports: [
32-
NgbNavModule,
36+
NgbNav,
37+
NgbNavContent,
38+
NgbNavItem,
39+
NgbNavLink,
40+
NgbNavOutlet,
3341
NgbAccordionModule,
3442
CommonModule,
3543
BrowserAnimationsModule,

src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ import {
88
ActivatedRoute,
99
Router,
1010
} from '@angular/router';
11-
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
11+
import {
12+
NgbNav,
13+
NgbNavContent,
14+
NgbNavItem,
15+
NgbNavLink,
16+
NgbNavOutlet,
17+
} from '@ng-bootstrap/ng-bootstrap';
1218
import { TranslateModule } from '@ngx-translate/core';
1319
import { Observable } from 'rxjs';
1420
import { map } from 'rxjs/operators';
@@ -22,7 +28,11 @@ import { RelatedEntitiesSearchComponent } from '../related-entities-search/relat
2228
templateUrl: './tabbed-related-entities-search.component.html',
2329
imports: [
2430
AsyncPipe,
25-
NgbNavModule,
31+
NgbNav,
32+
NgbNavContent,
33+
NgbNavItem,
34+
NgbNavLink,
35+
NgbNavOutlet,
2636
RelatedEntitiesSearchComponent,
2737
TranslateModule,
2838
VarDirective,

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ import {
1010
import { Router } from '@angular/router';
1111
import {
1212
NgbActiveModal,
13-
NgbNavModule,
13+
NgbNav,
14+
NgbNavContent,
15+
NgbNavItem,
16+
NgbNavLink,
17+
NgbNavOutlet,
1418
} from '@ng-bootstrap/ng-bootstrap';
1519
import { Store } from '@ngrx/store';
1620
import { TranslateModule } from '@ngx-translate/core';
@@ -82,7 +86,11 @@ import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dy
8286
AsyncPipe,
8387
BtnDisabledDirective,
8488
DsDynamicLookupRelationSelectionTabComponent,
85-
NgbNavModule,
89+
NgbNav,
90+
NgbNavContent,
91+
NgbNavItem,
92+
NgbNavLink,
93+
NgbNavOutlet,
8694
ThemedDynamicLookupRelationExternalSourceTabComponent,
8795
ThemedDynamicLookupRelationSearchTabComponent,
8896
ThemedLoadingComponent,

0 commit comments

Comments
 (0)