Skip to content

Commit d4df6b3

Browse files
committed
fix references
1 parent bf8ac5b commit d4df6b3

48 files changed

Lines changed: 136 additions & 804 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/bulk-import/bulk-import-page.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { of } from 'rxjs';
1111
import { DSONameService } from '../core/breadcrumbs/dso-name.service';
1212
import { RestResponse } from '../core/cache/response.models';
1313
import { ScriptDataService } from '../core/data/processes/script-data.service';
14-
import { RequestEntry } from '../core/data/request.reducer';
14+
import { RequestEntry } from '../core/data/request-entry.model';
1515
import { RequestService } from '../core/data/request.service';
1616
import { Collection } from '../core/shared/collection.model';
1717
import { getMockRequestService } from '../shared/mocks/request.service.mock';

src/app/bulk-import/bulk-import-page.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ import { ScriptDataService } from '../core/data/processes/script-data.service';
1212
import { RemoteData } from '../core/data/remote-data';
1313
import { RequestService } from '../core/data/request.service';
1414
import { Collection } from '../core/shared/collection.model';
15-
import { getFirstCompletedRemoteData, redirectOn4xx } from '../core/shared/operators';
15+
import { getFirstCompletedRemoteData } from '../core/shared/operators';
1616
import { ProcessParameter } from '../process-page/processes/process-parameter.model';
1717
import { NotificationsService } from '../shared/notifications/notifications.service';
1818
import { AuthService } from '../core/auth/auth.service';
1919
import { Process } from '../process-page/processes/process.model';
20+
import { redirectOn4xx } from '../core/shared/authorized.operators';
2021

2122
/**
2223
* Page to perform an items bulk imports into the given collection.

src/app/core/config/submission-definitions-config.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { RequestService } from '../data/request.service';
55
import { HALEndpointService } from '../shared/hal-endpoint.service';
66
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
77
import { Store } from '@ngrx/store';
8-
import { CoreState } from '../core.reducers';
8+
import { CoreState } from '../core-state.model';
99
import { ObjectCacheService } from '../cache/object-cache.service';
1010
import { NotificationsService } from '../../shared/notifications/notifications.service';
1111
import { HttpClient } from '@angular/common/http';
@@ -17,7 +17,7 @@ import { SubmissionFormsModel } from './models/config-submission-forms.model';
1717
import { RemoteData } from '../data/remote-data';
1818
import { Observable } from 'rxjs';
1919
import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
20-
import { FindListOptions } from '../data/request.models';
20+
import { FindListOptions } from '../data/find-list-options.model';
2121
import { PaginatedList } from '../data/paginated-list.model';
2222

2323
@Injectable()
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
import { PathableObjectError } from "./response-state.model";
2+
13
export class RequestError extends Error {
24
statusCode: number;
35
statusText: string;
6+
errors?: PathableObjectError[];
47
}

src/app/core/data/request.actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { type } from '../../shared/ngrx/type';
44
import { HALLink } from '../shared/hal-link.model';
55
import { UnCacheableObject } from '../shared/uncacheable-object.model';
66
import { RestRequest } from './rest-request.model';
7-
import { PathableObjectError } from './request.reducer';
7+
import { PathableObjectError } from './response-state.model';
88

99
/**
1010
* The list of RequestAction type definitions

src/app/core/layout/metrics-components-data.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { RequestService } from '../data/request.service';
66
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
77
import { ObjectCacheService } from '../cache/object-cache.service';
88
import { HALEndpointService } from '../shared/hal-endpoint.service';
9-
import { RequestEntry } from '../data/request.reducer';
9+
import { RequestEntry } from '../data/request-entry.model';
1010
import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
1111
import { cold, getTestScheduler, hot } from 'jasmine-marbles';
1212
import { RestResponse } from '../cache/response.models';

src/app/core/layout/models/section.model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { typedObject } from '../../cache/builders/build-decorators';
2-
import { CacheableObject } from '../../cache/object-cache.reducer';
2+
import { CacheableObject } from '../../cache/cacheable-object.model';
33
import { SECTION } from './section.resource-type';
44
import { autoserialize, deserialize } from 'cerialize';
55
import { HALLink } from '../../shared/hal-link.model';

src/app/core/layout/tab-data.service.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import { CrisLayoutTab } from './models/tab.model';
88
import { HALEndpointService } from '../shared/hal-endpoint.service';
99
import { NotificationsService } from '../../shared/notifications/notifications.service';
1010
import { HttpClient } from '@angular/common/http';
11-
import { RequestEntry } from '../data/request.reducer';
11+
import { RequestEntry } from '../data/request-entry.model';
1212
import { TAB } from './models/tab.resource-type';
1313
import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
1414
import { RestResponse } from '../cache/response.models';
1515
import { of } from 'rxjs';
16-
import { FindListOptions } from '../data/request.models';
16+
import { FindListOptions } from '../data/find-list-options.model';
1717
import { RequestParam } from '../cache/models/request-param.model';
1818
import { createPaginatedList } from '../../shared/testing/utils.test';
1919

src/app/core/openaire/broker/events/openaire-broker-event-rest.service.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { cold, getTestScheduler } from 'jasmine-marbles';
66

77
import { RequestService } from '../../../data/request.service';
88
import { buildPaginatedList } from '../../../data/paginated-list.model';
9-
import { RequestEntry } from '../../../data/request.reducer';
10-
import { FindListOptions } from '../../../data/request.models';
9+
import { RequestEntry } from '../../../data/request-entry.model';
10+
import { FindListOptions } from '../../../data/find-list-options.model';
1111
import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
1212
import { ObjectCacheService } from '../../../cache/object-cache.service';
1313
import { RestResponse } from '../../../cache/response.models';

src/app/core/openaire/broker/topics/openaire-broker-topic-rest.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import { Store } from '@ngrx/store';
77
import { Observable } from 'rxjs';
88
import { mergeMap, take } from 'rxjs/operators';
99

10-
import { CoreState } from '../../../core.reducers';
10+
import { CoreState } from '../../../core-state.model';
1111
import { HALEndpointService } from '../../../shared/hal-endpoint.service';
1212
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
1313
import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
1414
import { ObjectCacheService } from '../../../cache/object-cache.service';
1515
import { dataService } from '../../../cache/builders/build-decorators';
1616
import { RequestService } from '../../../data/request.service';
17-
import { FindListOptions } from '../../../data/request.models';
17+
import { FindListOptions } from '../../../data/find-list-options.model';
1818
import { DataService } from '../../../data/data.service';
1919
import { ChangeAnalyzer } from '../../../data/change-analyzer';
2020
import { DefaultChangeAnalyzer } from '../../../data/default-change-analyzer.service';

0 commit comments

Comments
 (0)