diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html index db3d3f8bd1..11d722f317 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html @@ -1,9 +1,4 @@ -
-
- -
-
- +
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss index b596e76018..b810d2ddd4 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss @@ -1,5 +1,2 @@ @import '../../../../../styles/variables.scss'; -button.back-btn { - margin-bottom: 10px; -} diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html index 957d409ed0..4475fbec8a 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html @@ -1,9 +1,4 @@ -
-
- -
-
- +
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss index b596e76018..3575cae797 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss @@ -1,5 +1 @@ @import '../../../../../styles/variables.scss'; - -button.back-btn { - margin-bottom: 10px; -} diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html index c6ad79628d..1c079ed36f 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html @@ -1,9 +1,4 @@ -
-
- -
-
- +
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss index b596e76018..3575cae797 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss @@ -1,5 +1 @@ @import '../../../../../styles/variables.scss'; - -button.back-btn { - margin-bottom: 10px; -} diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index 06d6ba5b1d..87c9cc2fa1 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -1,9 +1,4 @@ -
-
- -
-
- +
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss index b596e76018..3575cae797 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss @@ -1,5 +1 @@ @import '../../../../../styles/variables.scss'; - -button.back-btn { - margin-bottom: 10px; -} diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html index d02ffeaf55..34c23ebf12 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html @@ -1,9 +1,4 @@ -
-
- -
-
- +
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.scss b/src/app/entity-groups/research-entities/item-pages/person/person.component.scss index b596e76018..3575cae797 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.scss +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.scss @@ -1,5 +1 @@ @import '../../../../../styles/variables.scss'; - -button.back-btn { - margin-bottom: 10px; -} diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html index f1fea10e33..bb49dc507a 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html @@ -1,9 +1,4 @@ -
-
- -
-
- +
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.scss b/src/app/entity-groups/research-entities/item-pages/project/project.component.scss index b596e76018..3575cae797 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.scss +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.scss @@ -1,5 +1 @@ @import '../../../../../styles/variables.scss'; - -button.back-btn { - margin-bottom: 10px; -} diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html index 92da2f14ca..f418f5691e 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.html +++ b/src/app/item-page/simple/item-types/publication/publication.component.html @@ -1,9 +1,4 @@ -
-
- -
-
- +
{ }, }); - describe('back to results', () => { - let comp: ItemComponent; - let fixture: ComponentFixture; - let router: Router; - - const searchUrl = '/search?query=test&spc.page=2'; - const browseUrl = '/browse/title?scope=0cc&bbm.page=3'; - const recentSubmissionsUrl = '/collections/be7b8430-77a5-4016-91c9-90863e50583a?cp.page=3'; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - RouterTestingModule, - ], - declarations: [ItemComponent, GenericItemPageFieldComponent, TruncatePipe ], - providers: [ - { provide: ItemDataService, useValue: {} }, - { provide: TruncatableService, useValue: {} }, - { provide: RelationshipDataService, useValue: {} }, - { provide: ObjectCacheService, useValue: {} }, - { provide: UUIDService, useValue: {} }, - { provide: Store, useValue: {} }, - { provide: RemoteDataBuildService, useValue: {} }, - { provide: CommunityDataService, useValue: {} }, - { provide: HALEndpointService, useValue: {} }, - { provide: NotificationsService, useValue: {} }, - { provide: HttpClient, useValue: {} }, - { provide: DSOChangeAnalyzer, useValue: {} }, - { provide: DefaultChangeAnalyzer, useValue: {} }, - { provide: VersionHistoryDataService, useValue: {} }, - { provide: VersionDataService, useValue: {} }, - { provide: BitstreamDataService, useValue: {} }, - { provide: WorkspaceitemDataService, useValue: {} }, - { provide: SearchService, useValue: {} }, - { provide: ItemDataService, useValue: {} }, - { provide: ItemVersionsSharedService, useValue: {} }, - { provide: RouteService, useValue: mockRouteService } - ], - schemas: [NO_ERRORS_SCHEMA] - }).overrideComponent(ItemComponent, { - set: {changeDetection: ChangeDetectionStrategy.Default} - }); - })); - - beforeEach(waitForAsync(() => { - router = TestBed.inject(Router); - spyOn(router, 'navigateByUrl'); - TestBed.compileComponents(); - fixture = TestBed.createComponent(ItemComponent); - comp = fixture.componentInstance; - comp.object = mockItem; - fixture.detectChanges(); - })); - - it('should hide back button',() => { - spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf('')); - comp.showBackButton.subscribe((val) => { - expect(val).toBeFalse(); - }); - }); - it('should show back button', () => { - spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl)); - comp.ngOnInit(); - comp.showBackButton.subscribe((val) => { - expect(val).toBeTrue(); - }); - }); - }); - }); diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts index 8479bd541a..77da752196 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.ts @@ -5,7 +5,6 @@ import { getItemPageRoute } from '../../../item-page-routing-paths'; import { RouteService } from '../../../../core/services/route.service'; import { Observable } from 'rxjs'; import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils'; -import { filter, map, take } from 'rxjs/operators'; @Component({ selector: 'ds-item', @@ -55,12 +54,5 @@ export class ItemComponent implements OnInit { if (this.iiifSearchEnabled) { this.iiifQuery$ = getDSpaceQuery(this.object, this.routeService); } - // Show the back to results button when the previous context was search, browse, - // or recent submissions pagination. - this.showBackButton = this.routeService.getPreviousUrl().pipe( - filter(url => /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/.test(url)), - take(1), - map(() => true) - ); } } diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html index 9ca50cc2ee..ef96eef620 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html @@ -1,9 +1,4 @@ -
-
- -
-
- +
- +
- +