diff --git a/src/app/core/constants/nav-items.constant.ts b/src/app/core/constants/nav-items.constant.ts index 0ce0a1e9c..32d862a4d 100644 --- a/src/app/core/constants/nav-items.constant.ts +++ b/src/app/core/constants/nav-items.constant.ts @@ -261,14 +261,14 @@ export const MENU_ITEMS: MenuItem[] = [ routerLink: '/registries/discover', label: 'navigation.discover', visible: true, - routerLinkActiveOptions: { exact: true }, + routerLinkActiveOptions: { exact: false }, }, { id: 'registries-moderation', - routerLink: '/registries/osf/moderation', + routerLink: '/registries', label: 'navigation.moderation', visible: false, - routerLinkActiveOptions: { exact: true }, + routerLinkActiveOptions: { exact: false }, }, { id: 'registry-details', diff --git a/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts b/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts index 4c9b1516c..bca6e1bf7 100644 --- a/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts +++ b/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts @@ -30,7 +30,7 @@ import { import { TABLE_PARAMS } from '@osf/shared/constants'; import { parseQueryFilterParams } from '@osf/shared/helpers'; import { QueryParams } from '@osf/shared/models'; -import { FetchInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions'; +import { FetchInstitutions, InstitutionsSelectors } from '@osf/shared/stores'; @Component({ selector: 'osf-institutions-list', diff --git a/src/app/features/institutions/pages/institutions-search/institutions-search.component.ts b/src/app/features/institutions/pages/institutions-search/institutions-search.component.ts index c8b66b63e..dd6f8583b 100644 --- a/src/app/features/institutions/pages/institutions-search/institutions-search.component.ts +++ b/src/app/features/institutions/pages/institutions-search/institutions-search.component.ts @@ -7,11 +7,10 @@ import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/cor import { FormsModule } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; -import { LoadingSpinnerComponent } from '@osf/shared/components'; +import { GlobalSearchComponent, LoadingSpinnerComponent } from '@osf/shared/components'; import { SEARCH_TAB_OPTIONS } from '@osf/shared/constants'; +import { SetDefaultFilterValue } from '@osf/shared/stores/global-search'; import { FetchInstitutionById, InstitutionsSearchSelectors } from '@osf/shared/stores/institutions-search'; -import { GlobalSearchComponent } from '@shared/components'; -import { SetDefaultFilterValue } from '@shared/stores/global-search'; @Component({ selector: 'osf-institutions-search', diff --git a/src/app/features/moderation/components/registry-submission-item/registry-submission-item.component.html b/src/app/features/moderation/components/registry-submission-item/registry-submission-item.component.html index 55c570e5c..418a9957b 100644 --- a/src/app/features/moderation/components/registry-submission-item/registry-submission-item.component.html +++ b/src/app/features/moderation/components/registry-submission-item/registry-submission-item.component.html @@ -6,7 +6,7 @@ class="link-btn-no-padding" link [label]="submission().title" - [routerLink]="[submission().id, 'overview']" + [routerLink]="['/', submission().id, 'overview']" [queryParams]="{ mode: 'moderator', revisionId: isPendingModeration && !isPending ? submission().revisionId : null, diff --git a/src/app/features/moderation/models/preprint-provider-moderation-info.model.ts b/src/app/features/moderation/models/preprint-provider-moderation-info.model.ts index 62ea85ef4..af069ba44 100644 --- a/src/app/features/moderation/models/preprint-provider-moderation-info.model.ts +++ b/src/app/features/moderation/models/preprint-provider-moderation-info.model.ts @@ -4,6 +4,6 @@ export interface PreprintProviderModerationInfo { submissionCount?: number; reviewsCommentsAnonymous: boolean; reviewsCommentsPrivate: boolean; - reviewsWorkflow: boolean; - supportEmail?: string; + reviewsWorkflow: string; + supportEmail: string | null; } diff --git a/src/app/features/moderation/models/preprint-related-count-json-api.model.ts b/src/app/features/moderation/models/preprint-related-count-json-api.model.ts index e288a496b..9524c1bfd 100644 --- a/src/app/features/moderation/models/preprint-related-count-json-api.model.ts +++ b/src/app/features/moderation/models/preprint-related-count-json-api.model.ts @@ -1,12 +1,8 @@ +import { PreprintProviderAttributesJsonApi } from '@osf/shared/models'; + export interface PreprintRelatedCountJsonApi { id: string; - attributes: { - name: string; - reviews_comments_anonymous: boolean; - reviews_comments_private: boolean; - reviews_workflow: boolean; - email_support?: string; - }; + attributes: PreprintProviderAttributesJsonApi; relationships: { preprints: { links: { diff --git a/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.scss b/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.scss index 96a95bbdd..e84a2dfaf 100644 --- a/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.scss +++ b/src/app/features/registries/components/registry-provider-hero/registry-provider-hero.component.scss @@ -1,10 +1,8 @@ -@use "styles/mixins" as mix; - .registries-hero-container { background-image: var(--branding-hero-background-image-url); color: var(--white); .provider-description { - line-height: mix.rem(24px); + line-height: 1.5rem; } } diff --git a/src/app/features/registries/components/registry-services/registry-services.component.html b/src/app/features/registries/components/registry-services/registry-services.component.html index 832caae5d..5c94dde52 100644 --- a/src/app/features/registries/components/registry-services/registry-services.component.html +++ b/src/app/features/registries/components/registry-services/registry-services.component.html @@ -7,7 +7,7 @@