Merged in DSC-673 (pull request DSpace#263)

DSC-673 changes for Context menu should not display "view item full" when already in same view

Approved-by: Giuseppe Digilio

Author: nikunj59

src/app/shared/context-menu/full-item/full-item-menu.component.html

@@ -1,3 +1,3 @@
-<button class="dropdown-item" [routerLink]="getItemFullPageRoute(contextMenuObject)"
+<button *ngIf="!isSameView(contextMenuObject)" class="dropdown-item" [routerLink]="getItemFullPageRoute(contextMenuObject)"
         [innerHTML]="'context-menu.actions.show-all-metadata' | translate">
 </button>

src/app/shared/context-menu/full-item/full-item-menu.component.spec.ts

@@ -9,6 +9,7 @@ import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { Item } from '../../../core/shared/item.model';
 import { FullItemMenuComponent } from './full-item-menu.component';
 import { AuthService } from '../../../core/auth/auth.service';
+import { Router } from '@angular/router';
 import { By } from '@angular/platform-browser';
 
 describe('FullItemMenuComponent', () => {
@@ -17,6 +18,7 @@ describe('FullItemMenuComponent', () => {
   let fixture: ComponentFixture<FullItemMenuComponent>;
   let scheduler: TestScheduler;
   let dso: DSpaceObject;
+  let router: Router;
 
   const authServiceStub = jasmine.createSpyObj('authorizationService', {
     getAuthenticatedUserFromStore: jasmine.createSpy('getAuthenticatedUserFromStore'),
@@ -25,9 +27,21 @@ describe('FullItemMenuComponent', () => {
 
   beforeEach(waitForAsync(() => {
     dso = Object.assign(new Item(), {
-      id: 'test-item',
-      _links: {
-        self: { href: 'test-item-selflink' }
+      'entityType': 'Publication',
+      'id': '12345',
+      'uuid': '12345',
+      'type': 'item',
+      'metadata': {
+        'dspace.entity.type': [
+          {
+            'uuid': '1234567890',
+            'language': null,
+            'value': 'Publication',
+            'place': 0,
+            'authority': null,
+            'confidence': -1
+          }
+        ]
       }
     });
 
@@ -48,6 +62,7 @@ describe('FullItemMenuComponent', () => {
         { provide: AuthService, useValue: authServiceStub },
       ]
     }).compileComponents();
+    router = TestBed.inject(Router);
   }));
 
   beforeEach(() => {
@@ -63,8 +78,16 @@ describe('FullItemMenuComponent', () => {
   });
 
   it('should render a button', () => {
+    fixture.detectChanges();
     const link = fixture.debugElement.query(By.css('button'));
     expect(link).not.toBeNull();
   });
 
+  it('should not render a button', () => {
+    spyOnProperty(router, 'url', 'get').and.returnValue('/entities/publication/12345/full');
+    fixture.detectChanges();
+    const link = fixture.debugElement.query(By.css('button'));
+    expect(link).toBeNull();
+  });
+
 });

src/app/shared/context-menu/full-item/full-item-menu.component.ts

@@ -7,6 +7,7 @@ import { ContextMenuEntryComponent } from '../context-menu-entry.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ContextMenuEntryType } from '../context-menu-entry-type';
 import { Item } from '../../../core/shared/item.model';
+import { Router } from '@angular/router';
 
 /**
  * This component renders a context menu option that provides to export an item.
@@ -21,6 +22,7 @@ export class FullItemMenuComponent extends ContextMenuEntryComponent {
   constructor(
     @Inject('contextMenuObjectProvider') protected injectedContextMenuObject: DSpaceObject,
     @Inject('contextMenuObjectTypeProvider') protected injectedContextMenuObjectType: DSpaceObjectType,
+    private router: Router
   ) {
     super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.FullItem);
   }
@@ -29,4 +31,8 @@ export class FullItemMenuComponent extends ContextMenuEntryComponent {
     return getItemFullPageRoute(object as Item);
   }
 
+  isSameView(object: DSpaceObject): boolean {
+    return this.router.url === getItemFullPageRoute(object as Item);
+  }
+
 }