From 685e3c3b84ff2294052a64f47dd8ca97385e2fbc Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 7 Nov 2024 15:28:05 +0100 Subject: [PATCH 1/2] [DSC-2017] Fix problem with link in the item page navbar --- .../cris-layout-navbar.component.html | 4 ++-- .../cris-layout-sidebar.component.html | 2 +- .../cris-layout-tabs.component.ts | 5 ++++ .../cris-layout-sidebar-item.component.html | 23 ++++++++++++------- .../cris-layout-sidebar-item.component.ts | 7 ++++++ 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.html b/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.html index 99d84908787..a1540e3f55f 100644 --- a/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.html +++ b/src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.html @@ -11,11 +11,11 @@
- \ No newline at end of file + diff --git a/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.html b/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.html index 567e39165db..dbbcad19d61 100644 --- a/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.html +++ b/src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.html @@ -4,7 +4,7 @@
diff --git a/src/app/cris-layout/cris-layout-loader/shared/cris-layout-tabs/cris-layout-tabs.component.ts b/src/app/cris-layout/cris-layout-loader/shared/cris-layout-tabs/cris-layout-tabs.component.ts index d1df3c7327e..55f19cb9519 100644 --- a/src/app/cris-layout/cris-layout-loader/shared/cris-layout-tabs/cris-layout-tabs.component.ts +++ b/src/app/cris-layout/cris-layout-loader/shared/cris-layout-tabs/cris-layout-tabs.component.ts @@ -47,11 +47,16 @@ export abstract class CrisLayoutTabsComponent { */ @Output() selectedTab = new EventEmitter(); + /** + * The item base url + */ + itemBaseUrl: string; constructor(public location: Location, public router: Router, public route: ActivatedRoute) { } init(): void { + this.itemBaseUrl = getItemPageRoute(this.item) + '/'; if (this.tabs && this.tabs.length > 0) { if (isNotNull(this.route.snapshot.paramMap.get('tab'))) { this.parseTabs(this.route.snapshot.paramMap.get('tab')); diff --git a/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.html b/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.html index cee3403eced..90e13a1b467 100644 --- a/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.html +++ b/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.html @@ -1,9 +1,12 @@
  • - - - +
    diff --git a/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.ts b/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.ts index 097cd082e95..fd37d476bd5 100644 --- a/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.ts +++ b/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.ts @@ -4,6 +4,8 @@ import { CrisLayoutTab } from '../../../../core/layout/models/tab.model'; import { rotate, rotateNavbar } from '../../../../shared/animations/rotate'; import { slide } from '../../../../shared/animations/slide'; import { TranslateService } from '@ngx-translate/core'; +import { Item } from '../../../../core/shared/item.model'; +import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths'; /** * This component defines the default layout for all tabs of DSpace Items. @@ -17,6 +19,11 @@ import { TranslateService } from '@ngx-translate/core'; animations: [rotate, slide, rotateNavbar] }) export class CrisLayoutSidebarItemComponent { + /** + * Contains the items base url + */ + @Input() itemBaseUrl: string; + /** * The tab that will be shown */ From ca02b2b471be62f1783f9f4f678b72541ec274cd Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 7 Nov 2024 15:50:29 +0100 Subject: [PATCH 2/2] [DSC-2017] Fix lint --- .../shared/sidebar-item/cris-layout-sidebar-item.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.ts b/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.ts index fd37d476bd5..d834754ff77 100644 --- a/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.ts +++ b/src/app/cris-layout/cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component.ts @@ -4,8 +4,6 @@ import { CrisLayoutTab } from '../../../../core/layout/models/tab.model'; import { rotate, rotateNavbar } from '../../../../shared/animations/rotate'; import { slide } from '../../../../shared/animations/slide'; import { TranslateService } from '@ngx-translate/core'; -import { Item } from '../../../../core/shared/item.model'; -import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths'; /** * This component defines the default layout for all tabs of DSpace Items.