74199: ItemResolver item to dso refactor

src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts

@@ -48,7 +48,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
   ngOnInit(): void {
     observableCombineLatest(this.route.data, this.route.parent.data).pipe(
       map(([data, parentData]) => Object.assign({}, data, parentData)),
-      map((data) => data.item),
+      map((data) => data.dso),
       first(),
       map((data: RemoteData<Item>) => data.payload)
     ).subscribe((item: Item) => {

src/app/+item-page/edit-item-page/edit-item-page.component.ts

@@ -47,7 +47,7 @@ export class EditItemPageComponent implements OnInit {
     this.pages = this.route.routeConfig.children
       .map((child: any) => child.path)
       .filter((path: string) => isNotEmpty(path)); // ignore reroutes
-    this.itemRD$ = this.route.data.pipe(map((data) => data.item));
+    this.itemRD$ = this.route.data.pipe(map((data) => data.dso));
   }
 
   /**

src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts

@@ -74,7 +74,7 @@ describe('ItemAuthorizationsComponent test suite', () => {
 
   const routeStub = {
     data: observableOf({
-      item: createSuccessfulRemoteDataObject(item)
+      dso: createSuccessfulRemoteDataObject(item)
     })
   };
 

src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts

@@ -75,7 +75,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
    */
   ngOnInit(): void {
     this.item$ = this.route.data.pipe(
-      map((data) => data.item),
+      map((data) => data.dso),
       getFirstSucceededRemoteDataWithNotEmptyPayload(),
       map((item: Item) => this.linkService.resolveLink(
         item,

src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts

@@ -140,7 +140,7 @@ describe('ItemBitstreamsComponent', () => {
     });
     route = Object.assign({
       parent: {
-        data: observableOf({ item: createMockRD(item) })
+        data: observableOf({ dso: createMockRD(item) })
       },
       data: observableOf({}),
       url: url

src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts

@@ -89,7 +89,7 @@ describe('ItemCollectionMapperComponent', () => {
     clearDiscoveryRequests: () => {}
     /* tslint:enable:no-empty */
   });
-  const activatedRouteStub = new ActivatedRouteStub({}, { item: mockItemRD });
+  const activatedRouteStub = new ActivatedRouteStub({}, { dso: mockItemRD });
   const translateServiceStub = {
     get: () => of('test-message of item ' + mockItem.name),
     onLangChange: new EventEmitter(),

src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts

@@ -92,7 +92,7 @@ export class ItemCollectionMapperComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.itemRD$ = this.route.data.pipe(map((data) => data.item)).pipe(getSucceededRemoteData()) as Observable<RemoteData<Item>>;
+    this.itemRD$ = this.route.data.pipe(map((data) => data.dso)).pipe(getSucceededRemoteData()) as Observable<RemoteData<Item>>;
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
     this.loadCollectionLists();
   }

src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts

@@ -138,7 +138,7 @@ describe('ItemDeleteComponent', () => {
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject(mockItem)
+        dso: createSuccessfulRemoteDataObject(mockItem)
       })
     };
 

src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts

@@ -130,7 +130,7 @@ describe('ItemMetadataComponent', () => {
       routeStub = {
         data: observableOf({}),
         parent: {
-          data: observableOf({ item: createSuccessfulRemoteDataObject(item) })
+          data: observableOf({ dso: createSuccessfulRemoteDataObject(item) })
         }
       };
       paginatedMetadataFields = new PaginatedList(undefined, [mdField1, mdField2, mdField3]);

src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts

@@ -44,7 +44,7 @@ describe('ItemMoveComponent', () => {
 
   const routeStub = {
     data: observableOf({
-      item: new RemoteData(false, false, true, null, {
+      dso: new RemoteData(false, false, true, null, {
         id: 'item1'
       })
     })

src/app/+item-page/edit-item-page/item-move/item-move.component.ts

@@ -55,7 +55,7 @@ export class ItemMoveComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.itemRD$ = this.route.data.pipe(map((data) => data.item), getSucceededRemoteData()) as Observable<RemoteData<Item>>;
+    this.itemRD$ = this.route.data.pipe(map((data) => data.dso), getSucceededRemoteData()) as Observable<RemoteData<Item>>;
     this.itemRD$.subscribe((rd) => {
         this.itemId = rd.payload.id;
       }

src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts

@@ -51,7 +51,7 @@ describe('ItemPrivateComponent', () => {
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject({
+        dso: createSuccessfulRemoteDataObject({
           id: 'fake-id'
         })
       })

src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts

@@ -51,7 +51,7 @@ describe('ItemPublicComponent', () => {
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject({
+        dso: createSuccessfulRemoteDataObject({
           id: 'fake-id'
         })
       })

src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts

@@ -51,7 +51,7 @@ describe('ItemReinstateComponent', () => {
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject({
+        dso: createSuccessfulRemoteDataObject({
           id: 'fake-id'
         })
       })

src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts

@@ -142,7 +142,7 @@ describe('ItemRelationshipsComponent', () => {
     routeStub = {
       data: observableOf({}),
       parent: {
-        data: observableOf({ item: new RemoteData(false, false, true, null, item) })
+        data: observableOf({ dso: new RemoteData(false, false, true, null, item) })
       }
     };
 

src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts

@@ -51,7 +51,7 @@ describe('ItemWithdrawComponent', () => {
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject({
+        dso: createSuccessfulRemoteDataObject({
           id: 'fake-id'
         })
       })

src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts

@@ -74,7 +74,7 @@ describe('AbstractSimpleItemActionComponent', () => {
 
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject({
+        dso: createSuccessfulRemoteDataObject({
           id: 'fake-id'
         })
       })

src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts

@@ -42,7 +42,7 @@ export class AbstractSimpleItemActionComponent implements OnInit {
 
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
-      map((data) => data.item),
+      map((data) => data.dso),
       getSucceededRemoteData()
     )as Observable<RemoteData<Item>>;
 

src/app/+item-page/full/full-item-page.component.spec.ts

@@ -34,7 +34,7 @@ const mockItem: Item = Object.assign(new Item(), {
     }
 });
 const routeStub = Object.assign(new ActivatedRouteStub(), {
-  data: observableOf({ item: createSuccessfulRemoteDataObject(mockItem) })
+  data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })
 });
 const metadataServiceStub = {
   /* tslint:disable:no-empty */

src/app/+item-page/item-page-routing.module.ts

@@ -20,7 +20,7 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
       {
         path: ':id',
         resolve: {
-          item: ItemPageResolver,
+          dso: ItemPageResolver,
           breadcrumb: ItemBreadcrumbResolver
         },
         runGuardsAndResolvers: 'always',

src/app/+item-page/simple/item-page.component.spec.ts

@@ -37,7 +37,7 @@ describe('ItemPageComponent', () => {
     /* tslint:enable:no-empty */
   };
   const mockRoute = Object.assign(new ActivatedRouteStub(), {
-    data: observableOf({ item: createSuccessfulRemoteDataObject(mockItem) })
+    data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })
   });
 
   beforeEach(async(() => {

src/app/+item-page/simple/item-page.component.ts

@@ -55,7 +55,7 @@ export class ItemPageComponent implements OnInit {
    */
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
-      map((data) => data.item as RemoteData<Item>),
+      map((data) => data.dso as RemoteData<Item>),
       redirectToPageNotFoundOn404(this.router)
     );
     this.metadataService.processRemoteData(this.itemRD$);