diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index f08ca7a23..9ca9fbd2a 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -110,6 +110,7 @@ export const routes: Routes = [ path: 'profile', loadComponent: () => import('./features/profile/profile.component').then((mod) => mod.ProfileComponent), providers: [provideStates([ProfileState])], + data: { scrollToTop: false }, canActivate: [authGuard], }, { diff --git a/src/app/features/profile/profile.component.ts b/src/app/features/profile/profile.component.ts index 3720c18c0..577e5f215 100644 --- a/src/app/features/profile/profile.component.ts +++ b/src/app/features/profile/profile.component.ts @@ -65,7 +65,7 @@ export class ProfileComponent implements OnInit { private setupMyProfile(user: User): void { this.actions.setUserProfile(user); if (user?.iri) { - this.actions.setDefaultFilterValue('creator', user.iri); + this.actions.setDefaultFilterValue('creator,isContainedBy.creator', user.iri); } } diff --git a/src/app/shared/components/resource-card/resource-card.component.html b/src/app/shared/components/resource-card/resource-card.component.html index 57e6968d3..d6a5f84b2 100644 --- a/src/app/shared/components/resource-card/resource-card.component.html +++ b/src/app/shared/components/resource-card/resource-card.component.html @@ -38,8 +38,13 @@

@if (resource().isPartOf) {
-

{{ 'resourceCard.labels.from' | translate }}

- +

{{ 'resourceCard.labels.from' | translate }}

+
{{ resource().isPartOf!.name }}
@@ -47,8 +52,13 @@

@if (resource().isContainedBy) {
-

{{ 'resourceCard.labels.from' | translate }}

- +

{{ 'resourceCard.labels.from' | translate }}

+
{{ resource().isContainedBy!.name }}
diff --git a/src/app/shared/directives/scroll-top.directive.ts b/src/app/shared/directives/scroll-top.directive.ts index 09fd04e36..ba9369496 100644 --- a/src/app/shared/directives/scroll-top.directive.ts +++ b/src/app/shared/directives/scroll-top.directive.ts @@ -18,10 +18,18 @@ export class ScrollTopOnRouteChangeDirective { takeUntilDestroyed() ) .subscribe(() => { - (this.el.nativeElement as HTMLElement).scrollTo({ - top: 0, - behavior: 'instant', - }); + let route = this.router.routerState.root; + + while (route.firstChild) { + route = route.firstChild; + } + + if (route.snapshot.data['scrollToTop'] !== false) { + (this.el.nativeElement as HTMLElement).scrollTo({ + top: 0, + behavior: 'instant', + }); + } }); } } diff --git a/src/styles/_common.scss b/src/styles/_common.scss index 16ad29571..4cfe1c047 100644 --- a/src/styles/_common.scss +++ b/src/styles/_common.scss @@ -136,3 +136,9 @@ .dark-blue-link { color: var(--dark-blue-1); } + +.provider-description { + a:hover { + color: var(--branding-primary-color); + } +}