Skip to content

Commit 63ed343

Browse files
FrancescoMolinaroFrancescoMolinaro
committed
[DURACOM-317] fix conflicts, adapt paths
1 parent 15e3316 commit 63ed343

15 files changed

Lines changed: 95 additions & 95 deletions

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ 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 { PaginatedList } from '@dspace/core/data/paginated-list.model';
12+
import { AuditMock } from '@dspace/core/testing/audit.mock';
13+
import { DSONameServiceMock } from '@dspace/core/testing/dso-name.service.mock';
914
import { TranslateModule } from '@ngx-translate/core';
10-
import { PaginatedList } from 'src/app/core/data/paginated-list.model';
15+
import { PaginationComponent } from 'src/app/shared/pagination/pagination.component';
1116

12-
import { Audit } from '../../core/audit/model/audit.model';
13-
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
14-
import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
15-
import { PaginationComponent } from '../../shared/pagination/pagination.component';
16-
import { AuditMock } from '../../shared/testing/audit.mock';
1717
import { AuditTableComponent } from './audit-table.component';
1818

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ import {
1010
Input,
1111
} from '@angular/core';
1212
import { RouterLink } from '@angular/router';
13+
import { AUDIT_PERSON_NOT_AVAILABLE } from '@dspace/core/data/audit-data.service';
14+
import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
1315
import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
1416
import { TranslateModule } from '@ngx-translate/core';
1517

16-
import { AUDIT_PERSON_NOT_AVAILABLE } from '../../core/audit/audit-data.service';
1718
import { Audit } from '../../core/audit/model/audit.model';
1819
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
1920
import { PaginatedList } from '../../core/data/paginated-list.model';
2021
import { DSpaceObject } from '../../core/shared/dspace-object.model';
2122
import { PaginationComponent } from '../../shared/pagination/pagination.component';
22-
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
2323
import { StringReplacePipe } from '../../shared/utils/string-replace.pipe';
2424
import { VarDirective } from '../../shared/utils/var.directive';
2525

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

Lines changed: 13 additions & 13 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';
1629
import { provideMockStore } from '@ngrx/store/testing';
1730
import { TranslateModule } from '@ngx-translate/core';
1831
import { of } from 'rxjs';
19-
import { CollectionDataService } from 'src/app/core/data/collection-data.service';
20-
import { Item } from 'src/app/core/shared/item.model';
21-
import { APP_DATA_SERVICES_MAP } from 'src/config/app-config.interface';
2232

23-
import { AuditDataService } from '../../core/audit/audit-data.service';
24-
import { Audit } from '../../core/audit/model/audit.model';
25-
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
26-
import { PaginationService } from '../../core/pagination/pagination.service';
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 { ObjectAuditOverviewComponent } from './object-audit-overview.component';
3535

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ import {
1212
Router,
1313
RouterLink,
1414
} from '@angular/router';
15+
import {
16+
AUDIT_PERSON_NOT_AVAILABLE,
17+
AuditDataService,
18+
} from '@dspace/core/data/audit-data.service';
19+
import { PaginationComponentOptions } from '@dspace/core/pagination/pagination-component-options.model';
20+
import { getDSORoute } from '@dspace/core/router/utils/dso-route.utils';
1521
import { TranslateModule } from '@ngx-translate/core';
1622
import {
1723
forkJoin,
@@ -25,11 +31,6 @@ import {
2531
tap,
2632
} from 'rxjs/operators';
2733

28-
import { getDSORoute } from '../../app-routing-paths';
29-
import {
30-
AUDIT_PERSON_NOT_AVAILABLE,
31-
AuditDataService,
32-
} from '../../core/audit/audit-data.service';
3334
import { Audit } from '../../core/audit/model/audit.model';
3435
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
3536
import { SortDirection } from '../../core/cache/models/sort-options.model';
@@ -44,7 +45,6 @@ import {
4445
getFirstCompletedRemoteData,
4546
getFirstSucceededRemoteDataPayload,
4647
} from '../../core/shared/operators';
47-
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
4848
import { AuditTableComponent } from '../audit-table/audit-table.component';
4949
/**
5050
* 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';
815
import { provideMockStore } from '@ngrx/store/testing';
916
import { TranslateModule } from '@ngx-translate/core';
1017
import { of } from 'rxjs';
1118

12-
import { AuditDataService } from '../../core/audit/audit-data.service';
13-
import { Audit } from '../../core/audit/model/audit.model';
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,6 +3,9 @@ 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';
69
import { TranslateModule } from '@ngx-translate/core';
710
import {
811
forkJoin,
@@ -15,15 +18,12 @@ import {
1518
mergeMap,
1619
} from 'rxjs/operators';
1720

18-
import { AuditDataService } from '../../core/audit/audit-data.service';
1921
import { Audit } from '../../core/audit/model/audit.model';
2022
import { SortDirection } from '../../core/cache/models/sort-options.model';
2123
import { FindListOptions } from '../../core/data/find-list-options.model';
2224
import { PaginatedList } from '../../core/data/paginated-list.model';
2325
import { RemoteData } from '../../core/data/remote-data';
2426
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-services-map.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { AUDIT } from './audit/model/audit.resource-type';
12
import {
23
LDN_SERVICE,
34
LDN_SERVICE_CONSTRAINT_FILTERS,
@@ -29,7 +30,6 @@ import { RESEARCHER_PROFILE } from './profile/model/researcher-profile.resource-
2930
import { RESOURCE_POLICY } from './resource-policy/models/resource-policy.resource-type';
3031
import { ACCESS_STATUS } from './shared/access-status.resource-type';
3132
import { ADMIN_NOTIFY_MESSAGE } from './shared/admin-notify-message.resource-type';
32-
import { AUDIT } from './audit/model/audit.resource-type';
3333
import { AUTHORIZATION } from './shared/authorization.resource-type';
3434
import { BITSTREAM } from './shared/bitstream.resource-type';
3535
import { BITSTREAM_FORMAT } from './shared/bitstream-format.resource-type';
@@ -137,5 +137,5 @@ export const LAZY_DATA_SERVICES: LazyDataServicesMap = new Map([
137137
[SUGGESTION_TARGET.value, () => import('./notifications/suggestions/target/suggestion-target-data.service').then(m => m.SuggestionTargetDataService)],
138138
[DUPLICATE.value, () => import('./submission/submission-duplicate-data.service').then(m => m.SubmissionDuplicateDataService)],
139139
[CorrectionType.type.value, () => import('./submission/correctiontype-data.service').then(m => m.CorrectionTypeDataService)],
140-
[AUDIT.value, () => import('./audit/audit-data.service').then(m => m.AuditDataService)],
140+
[AUDIT.value, () => import('./data/audit-data.service').then(m => m.AuditDataService)],
141141
]);

src/app/core/audit/audit-data.service.spec.ts renamed to src/app/core/data/audit-data.service.spec.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ import {
1111
TranslateModule,
1212
} from '@ngx-translate/core';
1313

14-
import { getMockRequestService } from '../../shared/mocks/request.service.mock';
15-
import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
16-
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
17-
import { AuditMock } from '../../shared/testing/audit.mock';
18-
import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
14+
import { RequestParam } from '../cache/models/request-param.model';
15+
import { CoreState } from '../core-state.model';
16+
import { followLink } from '../shared/follow-link-config.model';
17+
import { AuditMock } from '../testing/audit.mock';
18+
import { HALEndpointServiceStub } from '../testing/hal-endpoint-service.stub';
19+
import { getMockRequestService } from '../testing/request.service.mock';
20+
import { TranslateLoaderMock } from '../testing/translate-loader.mock';
1921
import {
2022
createPaginatedList,
2123
createRequestEntry$,
22-
} from '../../shared/testing/utils.test';
23-
import { followLink } from '../../shared/utils/follow-link-config.model';
24-
import { RequestParam } from '../cache/models/request-param.model';
25-
import { CoreState } from '../core-state.model';
26-
import { FindListOptions } from '../data/find-list-options.model';
27-
import { RequestService } from '../data/request.service';
24+
} from '../testing/utils.test';
25+
import { createSuccessfulRemoteDataObject$ } from '../utilities/remote-data.utils';
2826
import {
2927
AUDIT_FIND_BY_OBJECT_SEARCH_METHOD,
3028
AuditDataService,
3129
} from './audit-data.service';
30+
import { FindListOptions } from './find-list-options.model';
31+
import { RequestService } from './request.service';
3232

3333
describe('AuditDataService', () => {
3434
let service: AuditDataService;

src/app/core/audit/audit-data.service.ts renamed to src/app/core/data/audit-data.service.ts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
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';
28
import {
39
Observable,
410
of,
511
} from 'rxjs';
612
import { map } from 'rxjs/operators';
713

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';
14+
import { Audit } from '../audit/model/audit.model';
1415
import { DSONameService } from '../breadcrumbs/dso-name.service';
1516
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
1617
import { RequestParam } from '../cache/models/request-param.model';
1718
import { ObjectCacheService } from '../cache/object-cache.service';
18-
import { DeleteDataImpl } from '../data/base/delete-data';
19-
import {
20-
FindAllData,
21-
FindAllDataImpl,
22-
} from '../data/base/find-all-data';
23-
import { IdentifiableDataService } from '../data/base/identifiable-data.service';
24-
import { SearchDataImpl } from '../data/base/search-data';
25-
import { FindListOptions } from '../data/find-list-options.model';
26-
import { PaginatedList } from '../data/paginated-list.model';
27-
import { RemoteData } from '../data/remote-data';
28-
import { RequestService } from '../data/request.service';
2919
import { EPerson } from '../eperson/models/eperson.model';
3020
import { HALEndpointService } from '../shared/hal-endpoint.service';
3121
import { getFirstCompletedRemoteData } from '../shared/operators';
32-
import { Audit } from './model/audit.model';
22+
import { DeleteDataImpl } from './base/delete-data';
23+
import {
24+
FindAllData,
25+
FindAllDataImpl,
26+
} from './base/find-all-data';
27+
import { IdentifiableDataService } from './base/identifiable-data.service';
28+
import { SearchDataImpl } from './base/search-data';
29+
import { FindListOptions } from './find-list-options.model';
30+
import { PaginatedList } from './paginated-list.model';
31+
import { RemoteData } from './remote-data';
32+
import { RequestService } from './request.service';
3333

3434
export const AUDIT_PERSON_NOT_AVAILABLE = 'n/a';
3535

‎src/app/core/testing/audit.mock.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Audit } from '../../core/audit/model/audit.model';
2-
import { EPerson } from '../../core/eperson/models/eperson.model';
1+
import { Audit } from '@dspace/core/audit/model/audit.model';
2+
import { EPerson } from '@dspace/core/eperson/models/eperson.model';
33

44
export const AuditEPersonMock: EPerson = Object.assign(new EPerson(), {
55
handle: null,

0 commit comments

Comments
 (0)