Skip to content

Commit 6c4ff40

Browse files
tdonohuetdonohue
authored
Merge pull request DSpace#3012 from alexandrevryghem/advanced-search_contribute-main
Refactored advanced search to rely on available filters
2 parents ceca3bf + fd6d470 commit 6c4ff40

76 files changed

Lines changed: 1185 additions & 1388 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.

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ import {
2222
} from '@angular/router';
2323
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
2424
import { provideMockStore } from '@ngrx/store/testing';
25-
import {
26-
TranslateLoader,
27-
TranslateModule,
28-
} from '@ngx-translate/core';
25+
import { TranslateModule } from '@ngx-translate/core';
2926
import {
3027
Observable,
3128
of as observableOf,
@@ -59,6 +56,7 @@ import {
5956
} from '../../shared/mocks/dso-name.service.mock';
6057
import { RouterMock } from '../../shared/mocks/router.mock';
6158
import { NotificationsService } from '../../shared/notifications/notifications.service';
59+
import { PaginationComponent } from '../../shared/pagination/pagination.component';
6260
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
6361
import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
6462
import {
@@ -72,7 +70,6 @@ import {
7270
import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
7371
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
7472
import { routeServiceStub } from '../../shared/testing/route-service.stub';
75-
import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
7673
import { GroupsRegistryComponent } from './groups-registry.component';
7774

7875
describe('GroupsRegistryComponent', () => {
@@ -209,12 +206,9 @@ describe('GroupsRegistryComponent', () => {
209206
paginationService = new PaginationServiceStub();
210207
return TestBed.configureTestingModule({
211208
imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
212-
TranslateModule.forRoot({
213-
loader: {
214-
provide: TranslateLoader,
215-
useClass: TranslateLoaderMock,
216-
},
217-
}), GroupsRegistryComponent],
209+
TranslateModule.forRoot(),
210+
GroupsRegistryComponent,
211+
],
218212
providers: [GroupsRegistryComponent,
219213
{ provide: DSONameService, useValue: new DSONameServiceMock() },
220214
{ provide: EPersonDataService, useValue: ePersonDataServiceStub },
@@ -232,6 +226,12 @@ describe('GroupsRegistryComponent', () => {
232226
provideMockStore(),
233227
],
234228
schemas: [NO_ERRORS_SCHEMA],
229+
}).overrideComponent(GroupsRegistryComponent, {
230+
remove: {
231+
imports: [
232+
PaginationComponent,
233+
],
234+
},
235235
}).compileComponents();
236236
}));
237237

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ import {
1414
ReactiveFormsModule,
1515
UntypedFormBuilder,
1616
} from '@angular/forms';
17-
import {
18-
Router,
19-
RouterLink,
20-
} from '@angular/router';
17+
import { RouterLink } from '@angular/router';
2118
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
2219
import {
2320
TranslateModule,
@@ -149,7 +146,6 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
149146
private notificationsService: NotificationsService,
150147
private formBuilder: UntypedFormBuilder,
151148
protected routeService: RouteService,
152-
private router: Router,
153149
private authorizationService: AuthorizationDataService,
154150
private paginationService: PaginationService,
155151
public requestService: RequestService,

‎src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts‎

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,34 @@ import {
22
ComponentFixture,
33
TestBed,
44
} from '@angular/core/testing';
5-
import { ActivatedRoute } from '@angular/router';
6-
import { provideMockStore } from '@ngrx/store/testing';
5+
import { RouterModule } from '@angular/router';
76
import { TranslateModule } from '@ngx-translate/core';
87

9-
import { APP_DATA_SERVICES_MAP } from '../../../../../config/app-config.interface';
10-
import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
11-
import { RequestService } from '../../../../core/data/request.service';
12-
import { RouteService } from '../../../../core/services/route.service';
13-
import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
14-
import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
158
import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
16-
import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
17-
import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
18-
import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
9+
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
1910
import { AdminNotifyLogsResultComponent } from '../admin-notify-logs-result/admin-notify-logs-result.component';
2011
import { AdminNotifyIncomingComponent } from './admin-notify-incoming.component';
2112

2213
describe('AdminNotifyIncomingComponent', () => {
2314
let component: AdminNotifyIncomingComponent;
2415
let fixture: ComponentFixture<AdminNotifyIncomingComponent>;
25-
let halService: HALEndpointService;
26-
let requestService: RequestService;
27-
let rdbService: RemoteDataBuildService;
28-
2916

17+
let searchConfigurationService: SearchConfigurationServiceStub;
3018

3119
beforeEach(async () => {
32-
rdbService = getMockRemoteDataBuildService();
33-
halService = jasmine.createSpyObj('halService', {
34-
'getRootHref': '/api',
35-
});
36-
requestService = jasmine.createSpyObj('requestService', {
37-
'generateRequestId': 'client/1234',
38-
'send': '',
39-
});
20+
searchConfigurationService = new SearchConfigurationServiceStub();
21+
4022
await TestBed.configureTestingModule({
41-
imports: [TranslateModule.forRoot(), AdminNotifyIncomingComponent],
42-
providers: [
43-
{ provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService },
44-
{ provide: RouteService, useValue: routeServiceStub },
45-
{ provide: ActivatedRoute, useValue: new MockActivatedRoute() },
46-
{ provide: HALEndpointService, useValue: halService },
47-
{ provide: RequestService, useValue: requestService },
48-
{ provide: RemoteDataBuildService, useValue: rdbService },
49-
{ provide: APP_DATA_SERVICES_MAP, useValue: {} },
50-
provideMockStore({}),
23+
imports: [
24+
AdminNotifyIncomingComponent,
25+
RouterModule.forRoot([]),
26+
TranslateModule.forRoot(),
5127
],
28+
}).overrideProvider(SEARCH_CONFIG_SERVICE, {
29+
useValue: searchConfigurationService,
5230
}).overrideComponent(AdminNotifyIncomingComponent, {
5331
remove: { imports: [AdminNotifyLogsResultComponent] },
54-
})
55-
.compileComponents();
32+
}).compileComponents();
5633

5734
fixture = TestBed.createComponent(AdminNotifyIncomingComponent);
5835
component = fixture.componentInstance;

‎src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts‎

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,41 @@ import {
66
ActivatedRoute,
77
Router,
88
} from '@angular/router';
9-
import { provideMockStore } from '@ngrx/store/testing';
109
import { TranslateModule } from '@ngx-translate/core';
1110

12-
import { APP_DATA_SERVICES_MAP } from '../../../../../config/app-config.interface';
13-
import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
14-
import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
15-
import { RequestService } from '../../../../core/data/request.service';
16-
import { RouteService } from '../../../../core/services/route.service';
17-
import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
11+
import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
1812
import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
1913
import { SearchLabelsComponent } from '../../../../shared/search/search-labels/search-labels.component';
2014
import { ThemedSearchComponent } from '../../../../shared/search/themed-search.component';
21-
import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
2215
import { RouterStub } from '../../../../shared/testing/router.stub';
16+
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
2317
import { AdminNotifyLogsResultComponent } from './admin-notify-logs-result.component';
2418

2519
describe('AdminNotifyLogsResultComponent', () => {
2620
let component: AdminNotifyLogsResultComponent;
2721
let fixture: ComponentFixture<AdminNotifyLogsResultComponent>;
28-
let objectCache: ObjectCacheService;
29-
let requestService: RequestService;
30-
let halService: HALEndpointService;
31-
let rdbService: RemoteDataBuildService;
22+
23+
let searchConfigurationService: SearchConfigurationServiceStub;
3224

3325
beforeEach(async () => {
26+
searchConfigurationService = new SearchConfigurationServiceStub();
27+
3428
await TestBed.configureTestingModule({
3529
imports: [TranslateModule.forRoot(), AdminNotifyLogsResultComponent],
3630
providers: [
37-
{ provide: RouteService, useValue: routeServiceStub },
3831
{ provide: Router, useValue: new RouterStub() },
3932
{ provide: ActivatedRoute, useValue: new MockActivatedRoute() },
40-
{ provide: HALEndpointService, useValue: halService },
41-
{ provide: ObjectCacheService, useValue: objectCache },
42-
{ provide: RequestService, useValue: requestService },
43-
{ provide: APP_DATA_SERVICES_MAP, useValue: {} },
44-
{ provide: RemoteDataBuildService, useValue: rdbService },
45-
provideMockStore({}),
4633
],
47-
})
48-
.overrideComponent(AdminNotifyLogsResultComponent, {
49-
remove: {
50-
imports: [
51-
SearchLabelsComponent,
52-
ThemedSearchComponent,
53-
],
54-
},
55-
})
56-
.compileComponents();
34+
}).overrideProvider(SEARCH_CONFIG_SERVICE, {
35+
useValue: searchConfigurationService,
36+
}).overrideComponent(AdminNotifyLogsResultComponent, {
37+
remove: {
38+
imports: [
39+
SearchLabelsComponent,
40+
ThemedSearchComponent,
41+
],
42+
},
43+
}).compileComponents();
5744

5845
fixture = TestBed.createComponent(AdminNotifyLogsResultComponent);
5946
component = fixture.componentInstance;

‎src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {
33
NgIf,
44
} from '@angular/common';
55
import {
6-
ChangeDetectorRef,
76
Component,
87
Inject,
98
Input,
@@ -59,10 +58,11 @@ export class AdminNotifyLogsResultComponent implements OnInit {
5958

6059
protected readonly context = Context.CoarNotify;
6160

62-
constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
63-
private router: Router,
64-
private route: ActivatedRoute,
65-
protected cdRef: ChangeDetectorRef) {
61+
constructor(
62+
@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
63+
protected router: Router,
64+
protected route: ActivatedRoute,
65+
) {
6666
}
6767

6868
ngOnInit() {

‎src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts‎

Lines changed: 14 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,34 @@ import {
22
ComponentFixture,
33
TestBed,
44
} from '@angular/core/testing';
5-
import { ActivatedRoute } from '@angular/router';
6-
import { provideMockStore } from '@ngrx/store/testing';
5+
import { RouterModule } from '@angular/router';
76
import { TranslateModule } from '@ngx-translate/core';
87

9-
import { APP_DATA_SERVICES_MAP } from '../../../../../config/app-config.interface';
10-
import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
11-
import { RequestService } from '../../../../core/data/request.service';
12-
import { RouteService } from '../../../../core/services/route.service';
13-
import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
14-
import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
158
import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
16-
import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
17-
import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
18-
import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
9+
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
1910
import { AdminNotifyLogsResultComponent } from '../admin-notify-logs-result/admin-notify-logs-result.component';
2011
import { AdminNotifyOutgoingComponent } from './admin-notify-outgoing.component';
2112

2213
describe('AdminNotifyOutgoingComponent', () => {
2314
let component: AdminNotifyOutgoingComponent;
2415
let fixture: ComponentFixture<AdminNotifyOutgoingComponent>;
25-
let halService: HALEndpointService;
26-
let requestService: RequestService;
27-
let rdbService: RemoteDataBuildService;
2816

17+
let searchConfigurationService: SearchConfigurationServiceStub;
2918

3019
beforeEach(async () => {
31-
rdbService = getMockRemoteDataBuildService();
32-
requestService = jasmine.createSpyObj('requestService', {
33-
'generateRequestId': 'client/1234',
34-
'send': '',
35-
});
36-
halService = jasmine.createSpyObj('halService', {
37-
'getRootHref': '/api',
38-
});
20+
searchConfigurationService = new SearchConfigurationServiceStub();
21+
3922
await TestBed.configureTestingModule({
40-
imports: [TranslateModule.forRoot()],
41-
providers: [
42-
{ provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService },
43-
{ provide: APP_DATA_SERVICES_MAP, useValue: {} },
44-
{ provide: RouteService, useValue: routeServiceStub },
45-
{ provide: ActivatedRoute, useValue: new MockActivatedRoute() },
46-
{ provide: HALEndpointService, useValue: halService },
47-
{ provide: RequestService, useValue: requestService },
48-
{ provide: RemoteDataBuildService, useValue: rdbService },
49-
provideMockStore({}),
23+
imports: [
24+
AdminNotifyOutgoingComponent,
25+
RouterModule.forRoot([]),
26+
TranslateModule.forRoot(),
5027
],
51-
})
52-
.overrideComponent(AdminNotifyOutgoingComponent, {
53-
remove: { imports: [AdminNotifyLogsResultComponent] },
54-
})
55-
.compileComponents();
28+
}).overrideProvider(SEARCH_CONFIG_SERVICE, {
29+
useValue: searchConfigurationService,
30+
}).overrideComponent(AdminNotifyOutgoingComponent, {
31+
remove: { imports: [AdminNotifyLogsResultComponent] },
32+
}).compileComponents();
5633

5734
fixture = TestBed.createComponent(AdminNotifyOutgoingComponent);
5835
component = fixture.componentInstance;

0 commit comments

Comments
 (0)