fix references

Author: atarix83

src/app/audit-page/detail/audit-detail.component.ts

@@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 
 import { RemoteData } from '../../core/data/remote-data';
-import { redirectOn4xx } from '../../core/shared/operators';
+import { redirectOn4xx } from '../../core/shared/authorized.operators';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { Audit } from '../../core/audit/model/audit.model';
 import { AuditDataService } from '../../core/audit/audit-data.service';

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

@@ -5,18 +5,19 @@ import { mergeMap } from 'rxjs/operators';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { FindListOptions } from '../../core/data/request.models';
+import { FindListOptions } from '../../core/data/find-list-options.model';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Audit } from '../../core/audit/model/audit.model';
 import { AuditDataService } from '../../core/audit/audit-data.service';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { ItemDataService } from '../../core/data/item-data.service';
-import { getFirstCompletedRemoteData, redirectOn4xx } from '../../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { AuthService } from '../../core/auth/auth.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { redirectOn4xx } from '../../core/shared/authorized.operators';
 
 /**
  * Component displaying a list of all audit about a object in a paginated table

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

@@ -6,7 +6,7 @@ import { mergeMap } from 'rxjs/operators';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { FindListOptions } from '../../core/data/request.models';
+import { FindListOptions } from '../../core/data/find-list-options.model';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Audit } from '../../core/audit/model/audit.model';

src/app/bitstream-page/bitstream-page-routing.module.ts

@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { BitstreamPageResolver } from './bitstream-page.resolver';
 import { BitstreamDownloadPageComponent } from '../shared/bitstream-download-page/bitstream-download-page.component';
 import { ResourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver';

src/app/bulk-import/bulk-import.guard.ts

@@ -2,18 +2,15 @@ import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 
 import { Observable } from 'rxjs';
-import { flatMap, take } from 'rxjs/operators';
+import { mergeMap } from 'rxjs/operators';
 
 import { CollectionDataService } from '../core/data/collection-data.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { Collection } from '../core/shared/collection.model';
-import {
-  getFirstCompletedRemoteData,
-  redirectOn4xx,
-  returnForbiddenUrlTreeOrLoginOnFalse
-} from '../core/shared/operators';
+import { getFirstCompletedRemoteData, } from '../core/shared/operators';
 import { AuthService } from '../core/auth/auth.service';
+import { redirectOn4xx, returnForbiddenUrlTreeOrLoginOnFalse } from '../core/shared/authorized.operators';
 
 /**
  * A guard taking care of the correct route.data being set for the BulkImport components
@@ -33,7 +30,7 @@ export class BulkImportGuard implements CanActivate {
     return this.collectionService.findById(route.params.id).pipe(
       getFirstCompletedRemoteData(),
       redirectOn4xx(this.router, this.authService),
-      flatMap((RD) => this.isCollectionAdmin(RD.payload)),
+      mergeMap((RD) => this.isCollectionAdmin(RD.payload)),
       returnForbiddenUrlTreeOrLoginOnFalse(this.router, this.authService, state.url)
     );
   }

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

@@ -3,7 +3,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Store, StoreModule } from '@ngrx/store';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { CoreState } from '../core.reducers';
+import { CoreState } from '../core-state.model';
 import { RequestService } from '../data/request.service';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -12,7 +12,7 @@ import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { createPaginatedList, createRequestEntry$ } from '../../shared/testing/utils.test';
 import { AUDIT_FIND_BY_OBJECT_SEARCH_METHOD, AuditDataService } from './audit-data.service';
 import { AuditMock } from '../../shared/testing/audit.mock';
-import { FindListOptions } from '../data/request.models';
+import { FindListOptions } from '../data/find-list-options.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 

src/app/core/auth/models/machine-token.model.ts

@@ -1,7 +1,7 @@
 import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
 
 import { typedObject } from '../../cache/builders/build-decorators';
-import { CacheableObject } from '../../cache/object-cache.reducer';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { ResourceType } from '../../shared/resource-type';
 import { HALLink } from '../../shared/hal-link.model';

src/app/core/data/external-source.service.ts

@@ -20,7 +20,7 @@ import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
-import { sendRequest } from '../shared/operators';
+import { sendRequest } from '../shared/request.operators';
 
 /**
  * A service handling all external source requests

src/app/core/data/metric.service.ts

@@ -3,7 +3,7 @@ import { DataService } from './data.service';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
-import { CoreState } from '../core.reducers';
+import { CoreState } from '../core-state.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';

src/app/core/data/remote-data.ts

@@ -10,9 +10,9 @@ import {
   isStale,
   isSuccess,
   isSuccessStale,
-  PathableObjectError,
   RequestEntryState
 } from './request-entry-state.model';
+import { PathableObjectError } from './response-state.model';
 
 /**
  * A class to represent the state of a remote resource