[DURACOM-413] restore translation files, clear cache of findByCustumURL on new version creation

Author: FrancescoMolinaro

src/app/core/data/item-data.service.ts

@@ -460,6 +460,26 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
     return this.findByHref(hrefObs, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
+
+  /**
+   * Invalidate cache of request findByCustomURL
+   *
+   * @param customUrl
+   * @param projections
+   */
+  public invalidateFindByCustomUrlCache(customUrl: string, projections: string[] = []): void {
+    const options: any = {
+      searchParams: [new RequestParam('q', customUrl)],
+    };
+
+    projections.forEach((p) => options.searchParams.push(new RequestParam('projection', p)));
+
+    this.searchData.getSearchByHref('findByCustomURL', options).pipe(take(1)).subscribe((href: string) => {
+      this.requestService.setStaleByHrefSubstring(href);
+      this.objectCache.remove(href);
+    });
+  }
+
   /**
    * Returns an observable of {@link RemoteData} of an object, based on its ID, with a list of
    * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object

src/app/core/data/version-data.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { RestRequestMethod } from '@dspace/config/rest-request-method';
+import { Item } from '@dspace/core/shared/item.model';
 import { isNotEmpty } from '@dspace/shared/utils/empty.util';
 import { Operation } from 'fast-json-patch';
 import {
@@ -26,7 +27,6 @@ import {
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { Item } from "@dspace/core/shared/item.model";
 
 /**
  * Service responsible for handling requests related to the Version object

src/app/item-page/item-page.resolver.ts

@@ -55,7 +55,7 @@ export const itemPageResolver: ResolveFn<RemoteData<Item>> = (
   const itemRD$ = itemService.findByIdOrCustomUrl(
     route.params.id,
     true,
-    false,
+    true,
     ...getItemPageLinksToFollow(),
   ).pipe(
     getFirstCompletedRemoteData(),

src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts

@@ -1,13 +1,18 @@
-import { waitForAsync } from '@angular/core/testing';
+import {
+  fakeAsync,
+  flush,
+  waitForAsync,
+} from '@angular/core/testing';
 import { buildPaginatedList } from '@dspace/core/data/paginated-list.model';
 import { Item } from '@dspace/core/shared/item.model';
 import { MetadataMap } from '@dspace/core/shared/metadata.models';
 import { PageInfo } from '@dspace/core/shared/page-info.model';
 import { Version } from '@dspace/core/shared/version.model';
+import { WorkspaceItem } from '@dspace/core/submission/models/workspaceitem.model';
 import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
 import {
-  EMPTY,
   of,
+  Subject,
 } from 'rxjs';
 
 import { createRelationshipsObservable } from '../../../item-page/simple/item-types/shared/item.component.spec';
@@ -23,6 +28,9 @@ describe('DsoVersioningModalService', () => {
   let workspaceItemDataService;
   let itemService;
 
+  let createVersionEvent$: Subject<string>;
+
+
   const mockItem: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
     metadata: new MetadataMap(),
@@ -37,21 +45,40 @@ describe('DsoVersioningModalService', () => {
     },
   });
 
+  const mockVersion = Object.assign(new Version(), {
+    _links: {
+      self: {
+        href: 'version-href',
+      },
+      item: {
+        href: 'item-href',
+      },
+    },
+  });
+
   beforeEach(waitForAsync(() => {
+    createVersionEvent$ = new Subject<string>();
     modalService = jasmine.createSpyObj('modalService', {
-      open: { componentInstance: { firstVersion: {}, versionNumber: {}, createVersionEvent: EMPTY } },
+      open: {
+        componentInstance: { firstVersion: {}, versionNumber: {}, createVersionEvent: createVersionEvent$.asObservable() },
+        close: jasmine.createSpy('close'),
+      },
     });
     versionService = jasmine.createSpyObj('versionService', {
       findByHref: createSuccessfulRemoteDataObject$<Version>(new Version()),
+      invalidateVersionHrefCache: undefined,
     });
     versionHistoryService = jasmine.createSpyObj('versionHistoryService', {
-      createVersion: createSuccessfulRemoteDataObject$<Version>(new Version()),
+      createVersion: createSuccessfulRemoteDataObject$<Version>(mockVersion),
       hasDraftVersion$: of(false),
     });
     itemVersionShared = jasmine.createSpyObj('itemVersionShared', ['notifyCreateNewVersion']);
     router = jasmine.createSpyObj('router', ['navigateByUrl']);
     workspaceItemDataService = jasmine.createSpyObj('workspaceItemDataService', ['findByItem']);
-    itemService = jasmine.createSpyObj('itemService', ['findByHref']);
+    workspaceItemDataService.findByItem.and.returnValue(createSuccessfulRemoteDataObject$<WorkspaceItem>(new WorkspaceItem()));
+
+    itemService = jasmine.createSpyObj('itemService', ['findByHref', 'invalidateFindByCustomUrlCache']);
+    itemService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$<Item>(mockItem));
 
     service = new DsoVersioningModalService(
       modalService,
@@ -93,4 +120,27 @@ describe('DsoVersioningModalService', () => {
       });
     });
   });
+
+  describe('version modal', () => {
+    it('should invalidate version href cache after a successful create', fakeAsync(() => {
+      service.openCreateVersionModal(mockItem);
+      createVersionEvent$.next('summary');
+      flush();
+      expect(versionService.invalidateVersionHrefCache).toHaveBeenCalledWith(mockItem);
+      expect(itemService.invalidateFindByCustomUrlCache).not.toHaveBeenCalled();
+    }));
+
+    it('should invalidate findByCustomUrl cache when item has dspace.customurl metadata', fakeAsync(() => {
+      const itemWithCustomUrl: Item = Object.assign(new Item(), mockItem, {
+        metadata: Object.assign(new MetadataMap(), {
+          'dspace.customurl': [{ value: 'my-custom-url' }],
+        }),
+      });
+      service.openCreateVersionModal(itemWithCustomUrl);
+      createVersionEvent$.next('summary');
+      flush();
+      expect(versionService.invalidateVersionHrefCache).toHaveBeenCalledWith(itemWithCustomUrl);
+      expect(itemService.invalidateFindByCustomUrlCache).toHaveBeenCalledWith('my-custom-url');
+    }));
+  });
 });

src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts

@@ -82,6 +82,10 @@ export class DsoVersioningModalService {
       getFirstSucceededRemoteDataPayload<WorkspaceItem>(),
     ).subscribe((wsItem) => {
       this.versionService.invalidateVersionHrefCache(item);
+      if (item.hasMetadata('dspace.customurl')) {
+        // when a new version is created we need to invalidate the cache for findByCustomURL so the item will not be resolved with the cached old version.
+        this.itemService.invalidateFindByCustomUrlCache(item.firstMetadataValue('dspace.customurl'));
+      }
       const wsiId = wsItem.id;
       const route = 'workspaceitems/' + wsiId + '/edit';
       this.router.navigateByUrl(route);