Skip to content

Commit c7ec5f1

Browse files
kshepherdkshepherd
committed
[DURACOM-317] Downgrade import paths for audit comps
ref: DSC-1504
1 parent 9fe9567 commit c7ec5f1

12 files changed

Lines changed: 81 additions & 80 deletions

‎src/app/audit-page/audit-table/audit-table.component.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ import {
66
} from '@angular/core/testing';
77
import { By } from '@angular/platform-browser';
88
import { RouterTestingModule } from '@angular/router/testing';
9-
import { Audit } from '@dspace/core/audit/model/audit.model';
10-
import { DSONameService } from '@dspace/core/breadcrumbs/dso-name.service';
11-
import { DSpaceObjectDataService } from '@dspace/core/data/dspace-object-data.service';
12-
import { PaginatedList } from '@dspace/core/data/paginated-list.model';
13-
import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
14-
import { AuditMock } from '@dspace/core/testing/audit.mock';
15-
import { DSONameServiceMock } from '@dspace/core/testing/dso-name.service.mock';
16-
import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
179
import { TranslateModule } from '@ngx-translate/core';
1810
import { PaginationComponent } from 'src/app/shared/pagination/pagination.component';
1911

12+
import { Audit } from '../../core/audit/model/audit.model';
13+
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
14+
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
15+
import { PaginatedList } from '../../core/data/paginated-list.model';
16+
import { DSpaceObject } from '../../core/shared/dspace-object.model';
17+
import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
18+
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
19+
import { AuditMock } from '../../shared/testing/audit.mock';
2020
import { AuditTableComponent } from './audit-table.component';
2121

2222
describe('AuditTableComponent', () => {

‎src/app/audit-page/audit-table/audit-table.component.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ import {
1010
Input,
1111
} from '@angular/core';
1212
import { RouterLink } from '@angular/router';
13-
import { DSpaceObjectDataService } from '@dspace/core/data/dspace-object-data.service';
14-
import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
15-
import { getDSORoute } from '@dspace/core/router/utils/dso-route.utils';
16-
import { getFirstSucceededRemoteDataPayload } from '@dspace/core/shared/operators';
17-
import { URLCombiner } from '@dspace/core/url-combiner/url-combiner';
1813
import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
1914
import { TranslateModule } from '@ngx-translate/core';
2015
import { Observable } from 'rxjs';
2116
import { map } from 'rxjs/operators';
2217

18+
import { getDSORoute } from '../../app-routing-paths'
2319
import { Audit } from '../../core/audit/model/audit.model';
2420
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
21+
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
2522
import { PaginatedList } from '../../core/data/paginated-list.model';
2623
import { DSpaceObject } from '../../core/shared/dspace-object.model';
24+
import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
25+
import { URLCombiner } from '../../core/url-combiner/url-combiner';
2726
import { PaginationComponent } from '../../shared/pagination/pagination.component';
27+
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
2828
import { StringReplacePipe } from '../../shared/utils/string-replace.pipe';
2929
import { VarDirective } from '../../shared/utils/var.directive';
3030

‎src/app/audit-page/object-audit-overview/object-audit-logs.component.spec.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ import {
1313
RouterLink,
1414
} from '@angular/router';
1515
import { RouterTestingModule } from '@angular/router/testing';
16-
import { Audit } from '@dspace/core/audit/model/audit.model';
17-
import { AuditDataService } from '@dspace/core/data/audit-data.service';
18-
import { CollectionDataService } from '@dspace/core/data/collection-data.service';
19-
import { DSpaceObjectDataService } from '@dspace/core/data/dspace-object-data.service';
20-
import { APP_DATA_SERVICES_MAP } from '@dspace/core/data-services-map-type';
21-
import { PaginationService } from '@dspace/core/pagination/pagination.service';
22-
import { Item } from '@dspace/core/shared/item.model';
23-
import { MockActivatedRoute } from '@dspace/core/testing/active-router.mock';
24-
import { AuditMock } from '@dspace/core/testing/audit.mock';
25-
import { PaginationServiceStub } from '@dspace/core/testing/pagination-service.stub';
26-
import { RouterMock } from '@dspace/core/testing/router.mock';
27-
import { createPaginatedList } from '@dspace/core/testing/utils.test';
28-
import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
2916
import { provideMockStore } from '@ngrx/store/testing';
3017
import { TranslateModule } from '@ngx-translate/core';
3118
import { of } from 'rxjs';
3219

20+
import { Audit } from '../../core/audit/model/audit.model';
21+
import { AuditDataService } from '../../core/data/audit-data.service';
22+
import { CollectionDataService } from '../../core/data/collection-data.service';
23+
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
24+
//import { APP_DATA_SERVICES_MAP } from '../../core/data-services-map-type';
25+
import { PaginationService } from '../../core/pagination/pagination.service';
26+
import { Item } from '../../core/shared/item.model';
27+
import { MockActivatedRoute } from '../../shared/mocks/active-router.mock';
28+
import { RouterMock } from '../../shared/mocks/router.mock';
29+
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
30+
import { AuditMock } from '../../shared/testing/audit.mock';
31+
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
32+
import { createPaginatedList } from '../../shared/testing/utils.test';
3333
import { AuditTableComponent } from '../audit-table/audit-table.component';
3434
import { ObjectAuditLogsComponent } from './object-audit-logs.component';
3535

@@ -85,7 +85,7 @@ describe('ObjectAuditLogsComponent', () => {
8585
{ provide: ActivatedRoute, useValue: activatedRoute },
8686
{ provide: Router, useValue: new RouterMock() },
8787
{ provide: CollectionDataService, useValue: collectionService },
88-
{ provide: APP_DATA_SERVICES_MAP, useValue: new Map() },
88+
//{ provide: APP_DATA_SERVICES_MAP, useValue: new Map() },
8989
{ provide: Location, useValue: locationStub },
9090
provideMockStore({}),
9191
],

‎src/app/audit-page/object-audit-overview/object-audit-logs.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ import {
1212
Router,
1313
RouterLink,
1414
} from '@angular/router';
15-
import { AuditDataService } from '@dspace/core/data/audit-data.service';
16-
import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
17-
import { getDSORoute } from '@dspace/core/router/utils/dso-route.utils';
1815
import { TranslateModule } from '@ngx-translate/core';
1916
import {
2017
forkJoin,
@@ -28,9 +25,11 @@ import {
2825
tap,
2926
} from 'rxjs/operators';
3027

28+
import { getDSORoute } from '../../app-routing-paths';
3129
import { Audit } from '../../core/audit/model/audit.model';
3230
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
3331
import { SortDirection } from '../../core/cache/models/sort-options.model';
32+
import { AuditDataService } from '../../core/data/audit-data.service';
3433
import { CollectionDataService } from '../../core/data/collection-data.service';
3534
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
3635
import { FindListOptions } from '../../core/data/find-list-options.model';
@@ -42,6 +41,7 @@ import {
4241
getFirstCompletedRemoteData,
4342
getFirstSucceededRemoteDataPayload,
4443
} from '../../core/shared/operators';
44+
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
4545
import { AuditTableComponent } from '../audit-table/audit-table.component';
4646
/**
4747
* Component displaying a list of all audit about a object in a paginated table

‎src/app/audit-page/overview/audit-overview.component.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ import {
55
waitForAsync,
66
} from '@angular/core/testing';
77
import { RouterTestingModule } from '@angular/router/testing';
8-
import { Audit } from '@dspace/core/audit/model/audit.model';
9-
import { AuditDataService } from '@dspace/core/data/audit-data.service';
10-
import { PaginationService } from '@dspace/core/pagination/pagination.service';
11-
import { AuditMock } from '@dspace/core/testing/audit.mock';
12-
import { PaginationServiceStub } from '@dspace/core/testing/pagination-service.stub';
13-
import { createPaginatedList } from '@dspace/core/testing/utils.test';
14-
import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
158
import { provideMockStore } from '@ngrx/store/testing';
169
import { TranslateModule } from '@ngx-translate/core';
1710
import { of } from 'rxjs';
1811

12+
import { Audit } from '../../core/audit/model/audit.model';
13+
import { AuditDataService } from '../../core/data/audit-data.service';
14+
import { PaginationService } from '../../core/pagination/pagination.service';
15+
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
16+
import { AuditMock } from '../../shared/testing/audit.mock';
17+
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
18+
import { createPaginatedList } from '../../shared/testing/utils.test';
1919
import { AuditTableComponent } from '../audit-table/audit-table.component';
2020
import { AuditOverviewComponent } from './audit-overview.component';
2121

‎src/app/audit-page/overview/audit-overview.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ import {
33
Component,
44
OnInit,
55
} from '@angular/core';
6-
import { AuditDataService } from '@dspace/core/data/audit-data.service';
7-
import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
8-
import { followLink } from '@dspace/core/shared/follow-link-config.model';
96
import { TranslateModule } from '@ngx-translate/core';
107
import {
118
forkJoin,
@@ -20,10 +17,13 @@ import {
2017

2118
import { Audit } from '../../core/audit/model/audit.model';
2219
import { SortDirection } from '../../core/cache/models/sort-options.model';
20+
import { AuditDataService } from '../../core/data/audit-data.service';
2321
import { FindListOptions } from '../../core/data/find-list-options.model';
2422
import { PaginatedList } from '../../core/data/paginated-list.model';
2523
import { RemoteData } from '../../core/data/remote-data';
2624
import { PaginationService } from '../../core/pagination/pagination.service';
25+
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
26+
import { followLink } from '../../shared/utils/follow-link-config.model';
2727
import { AuditTableComponent } from '../audit-table/audit-table.component';
2828

2929
/**

‎src/app/core/data/audit-data.service.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { Injectable } from '@angular/core';
2-
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
3-
import {
4-
followLink,
5-
FollowLinkConfig,
6-
} from '@dspace/core/shared/follow-link-config.model';
7-
import { hasValue } from '@dspace/shared/utils/empty.util';
82
import {
93
Observable,
104
of,
115
} from 'rxjs';
126
import { map } from 'rxjs/operators';
137

8+
import { hasValue } from '../../shared/empty.util';
9+
import { NotificationsService } from '../../shared/notifications/notifications.service';
10+
import {
11+
followLink,
12+
FollowLinkConfig,
13+
} from '../../shared/utils/follow-link-config.model';
1414
import { Audit } from '../audit/model/audit.model';
1515
import { DSONameService } from '../breadcrumbs/dso-name.service';
1616
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';

‎src/app/shared/menu/providers/audit-item.menu.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

22
import { TestBed } from '@angular/core/testing';
3-
import { ConfigurationDataService } from '@dspace/core/data/configuration-data.service';
4-
import { AuthorizationDataService } from '@dspace/core/data/feature-authorization/authorization-data.service';
5-
import { Collection } from '@dspace/core/shared/collection.model';
6-
import { COLLECTION } from '@dspace/core/shared/collection.resource-type';
7-
import { ConfigurationProperty } from '@dspace/core/shared/configuration-property.model';
8-
import { AuthorizationDataServiceStub } from '@dspace/core/testing/authorization-service.stub';
9-
import { URLCombiner } from '@dspace/core/url-combiner/url-combiner';
10-
import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
113
import { of } from 'rxjs';
124

5+
import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
6+
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
7+
import { Collection } from '../../../core/shared/collection.model';
8+
import { COLLECTION } from '../../../core/shared/collection.resource-type';
9+
import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
10+
import { URLCombiner } from '../../../core/url-combiner/url-combiner';
11+
import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
12+
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
1313
import { MenuItemType } from '../menu-item-type.model';
1414
import { PartialMenuSection } from '../menu-provider.model';
1515
import { AuditLogsMenuProvider } from './audit-item.menu';

‎src/app/shared/menu/providers/audit-item.menu.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66
* http://www.dspace.org/license/
77
*/
88
import { Injectable } from '@angular/core';
9-
import { ConfigurationDataService } from '@dspace/core/data/configuration-data.service';
10-
import { AuthorizationDataService } from '@dspace/core/data/feature-authorization/authorization-data.service';
11-
import { FeatureID } from '@dspace/core/data/feature-authorization/feature-id';
12-
import { RemoteData } from '@dspace/core/data/remote-data';
13-
import { getDSORoute } from '@dspace/core/router/utils/dso-route.utils';
14-
import { ConfigurationProperty } from '@dspace/core/shared/configuration-property.model';
15-
import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
16-
import { getFirstCompletedRemoteData } from '@dspace/core/shared/operators';
17-
import { URLCombiner } from '@dspace/core/url-combiner/url-combiner';
189
import {
1910
combineLatest,
2011
map,
@@ -23,6 +14,15 @@ import {
2314
} from 'rxjs';
2415
import { switchMap } from 'rxjs/operators';
2516

17+
import { getDSORoute } from '../../../app-routing-paths';
18+
import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
19+
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
20+
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
21+
import { RemoteData } from '../../../core/data/remote-data';
22+
import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
23+
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
24+
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
25+
import { URLCombiner } from '../../../core/url-combiner/url-combiner';
2626
import { LinkMenuItemModel } from '../menu-item/models/link.model';
2727
import { MenuItemType } from '../menu-item-type.model';
2828
import { PartialMenuSection } from '../menu-provider.model';

‎src/app/shared/menu/providers/audit-overview.menu.spec.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
*/
88

99
import { TestBed } from '@angular/core/testing';
10-
import { APP_CONFIG } from '@dspace/config/app-config.interface';
11-
import { ConfigurationDataService } from '@dspace/core/data/configuration-data.service';
12-
import { AuthorizationDataService } from '@dspace/core/data/feature-authorization/authorization-data.service';
13-
import { ConfigurationProperty } from '@dspace/core/shared/configuration-property.model';
14-
import { AuthorizationDataServiceStub } from '@dspace/core/testing/authorization-service.stub';
15-
import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
1610
import { of } from 'rxjs';
1711

12+
import { APP_CONFIG } from '../../../../config/app-config.interface';
1813
import { environment } from '../../../../environments/environment';
14+
import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
15+
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
16+
import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
17+
import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
18+
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
1919
import { MenuItemType } from '../menu-item-type.model';
2020
import { PartialMenuSection } from '../menu-provider.model';
2121
import { AuditOverviewMenuProvider } from './audit-overview.menu';

0 commit comments

Comments
 (0)