Merge branch 'release/25.1.0'

Author: adlius

src/app/features/analytics/components/view-linked-projects/view-linked-projects.component.spec.ts

@@ -3,12 +3,12 @@ import { MockComponents, MockProvider } from 'ng-mocks';
 import { PaginatorState } from 'primeng/paginator';
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 
 import { ProjectOverviewSelectors } from '@osf/features/project/overview/store';
 import { RegistryOverviewSelectors } from '@osf/features/registry/store/registry-overview';
 import { ResourceType } from '@osf/shared/enums';
-import { DuplicatesSelectors } from '@osf/shared/stores';
+import { LinkedProjectsSelectors } from '@osf/shared/stores/linked-projects';
 import {
   ContributorsListComponent,
   CustomPaginatorComponent,
@@ -17,27 +17,20 @@ import {
   SubHeaderComponent,
   TruncatedTextComponent,
 } from '@shared/components';
-import { MOCK_PROJECT_OVERVIEW } from '@shared/mocks';
-import { CustomDialogService } from '@shared/services';
 
 import { ViewLinkedProjectsComponent } from './view-linked-projects.component';
 
+import { MOCK_PROJECT_OVERVIEW } from '@testing/mocks';
 import { OSFTestingModule } from '@testing/osf.testing.module';
-import { CustomDialogServiceMockBuilder } from '@testing/providers/custom-dialog-provider.mock';
 import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock';
-import { RouterMockBuilder } from '@testing/providers/router-provider.mock';
 import { provideMockStore } from '@testing/providers/store-provider.mock';
 
 describe('Component: View Duplicates', () => {
   let component: ViewLinkedProjectsComponent;
   let fixture: ComponentFixture<ViewLinkedProjectsComponent>;
-  let routerMock: ReturnType<RouterMockBuilder['build']>;
   let activatedRouteMock: ReturnType<ActivatedRouteMockBuilder['build']>;
-  let mockCustomDialogService: ReturnType<CustomDialogServiceMockBuilder['build']>;
 
   beforeEach(async () => {
-    mockCustomDialogService = CustomDialogServiceMockBuilder.create().build();
-    routerMock = RouterMockBuilder.create().build();
     activatedRouteMock = ActivatedRouteMockBuilder.create()
       .withParams({ id: 'rid' })
       .withData({ resourceType: ResourceType.Project })
@@ -59,17 +52,13 @@ describe('Component: View Duplicates', () => {
       providers: [
         provideMockStore({
           signals: [
-            { selector: DuplicatesSelectors.getDuplicates, value: [] },
-            { selector: DuplicatesSelectors.getDuplicatesLoading, value: false },
-            { selector: DuplicatesSelectors.getDuplicatesTotalCount, value: 0 },
+            { selector: LinkedProjectsSelectors.getLinkedProjects, value: [] },
+            { selector: LinkedProjectsSelectors.getLinkedProjectsLoading, value: false },
+            { selector: LinkedProjectsSelectors.getLinkedProjectsTotalCount, value: 0 },
             { selector: ProjectOverviewSelectors.getProject, value: MOCK_PROJECT_OVERVIEW },
-            { selector: ProjectOverviewSelectors.isProjectAnonymous, value: false },
             { selector: RegistryOverviewSelectors.getRegistry, value: undefined },
-            { selector: RegistryOverviewSelectors.isRegistryAnonymous, value: false },
           ],
         }),
-        MockProvider(CustomDialogService, mockCustomDialogService),
-        MockProvider(Router, routerMock),
         MockProvider(ActivatedRoute, activatedRouteMock),
       ],
     }).compileComponents();

src/app/features/collections/components/collections-discover/collections-discover.component.html

@@ -5,8 +5,14 @@
     >
       <div class="flex gap-3">
         @let provider = collectionProvider();
-        @if (provider && provider.brand) {
-          <img class="collections-logo" alt="Collections Logo" height="64" [src]="provider.brand.heroLogoImageUrl" />
+
+        @if (provider && provider.assets) {
+          <img
+            class="collections-logo"
+            alt="Collections Logo"
+            height="80"
+            [src]="provider.assets.squareColorNoTransparent"
+          />
         }
 
         <h1 class="collections-heading flex align-items-center">{{ collectionProvider()?.name }}</h1>

src/app/features/institutions/pages/institutions-list/institutions-list.component.html

@@ -18,7 +18,7 @@
         @for (institution of institutions(); track $index) {
           <a class="dark-blue-link" [routerLink]="[institution.id]">
             <div class="border-1 border-round-xl grey-border-color px-5 py-4 flex align-items-center gap-4">
-              <img class="fit-contain" [ngSrc]="institution.assets.logo" [alt]="'Logo'" width="60" height="60" />
+              <img class="fit-contain" [ngSrc]="institution.assets.logo" [alt]="'Logo'" width="80" height="80" />
 
               <h2>{{ institution.name }}</h2>
             </div>

src/app/features/institutions/pages/institutions-search/institutions-search.component.html

@@ -9,8 +9,8 @@
         <img
           [ngSrc]="institution().assets.logo"
           [alt]="institution().name"
-          width="60"
-          height="60"
+          width="80"
+          height="80"
           class="fit-contain"
         />
 

src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.html

@@ -1,35 +1,54 @@
-<div class="flex align-items-baseline gap-2 p-3">
-  <osf-icon [class]="reviewStatusIcon[status()].value" [iconClass]="reviewStatusIcon[status()].icon"></osf-icon>
+<div class="resource">
+  <p-accordion (onOpen)="handleOpen()">
+    <p-accordion-panel value="0">
+      <p-accordion-header class="flex flex-row align-items-start gap-3 p-3">
+        <div osfStopPropagation class="flex align-items-baseline gap-2 font-normal">
+          <osf-icon [class]="reviewStatusIcon[status()].value" [iconClass]="reviewStatusIcon[status()].icon"></osf-icon>
 
-  <div>
-    <p-button
-      class="link-btn-no-padding"
-      styleClass="text-left"
-      link
-      [label]="submission().title"
-      (onClick)="selected.emit()"
-    />
+          <div>
+            <p-button
+              class="link-btn-no-padding"
+              styleClass="text-left"
+              link
+              [label]="submission().title"
+              (onClick)="selected.emit()"
+            />
+            @for (action of showAll ? submission().actions : submission().actions.slice(0, limitValue); track $index) {
+              <div class="flex flex-wrap align-items-baseline gap-1 mt-2">
+                <span>{{ actionLabel[action.toState] | translate }}</span>
+                <span>{{ action.dateModified | dateAgo }}</span>
+                <span>{{ 'moderation.submissionReview.by' | translate }}</span>
+                <span>{{ action.creator?.name }}</span>
 
-    @for (action of showAll ? submission().actions : submission().actions.slice(0, limitValue); track $index) {
-      <div class="flex flex-wrap gap-1 mt-2">
-        <span>{{ actionLabel[action.toState] | translate }}</span>
-        <span>{{ action.dateModified | dateAgo }}</span>
-        <span>{{ 'moderation.submissionReview.by' | translate }}</span>
-        <span>{{ action.creator?.name }}</span>
+                @if (action.comment.length) {
+                  <osf-truncated-text class="font-italic" [text]="'- ' + action.comment" />
+                }
+              </div>
+            }
 
-        @if (action.comment.length) {
-          <osf-truncated-text class="font-italic" [text]="action.comment" />
-        }
-      </div>
-    }
+            @if (submission().actions.length > 1) {
+              <p-button
+                class="link-btn-no-padding block mt-2"
+                [link]="true"
+                [label]="(showAll ? 'common.buttons.hide' : 'moderation.showHistory') | translate"
+                (onClick)="toggleHistory()"
+              />
+            }
+          </div>
+        </div>
+      </p-accordion-header>
 
-    @if (submission().actions.length > 1) {
-      <p-button
-        class="link-btn-no-padding block mt-2"
-        [link]="true"
-        [label]="(showAll ? 'common.buttons.hide' : 'moderation.showHistory') | translate"
-        (onClick)="toggleHistory()"
-      />
-    }
-  </div>
+      <p-accordion-content>
+        <div class="flex align-items-center gap-1 p-3 pt-0 ml-3">
+          <p>{{ 'common.labels.contributors' | translate }}:</p>
+
+          @if (submission().contributorsLoading) {
+            <p-skeleton width="10rem" height="1.25rem" />
+          } @else {
+            <osf-contributors-list [contributors]="submission().contributors"></osf-contributors-list>
+          }
+        </div>
+      </p-accordion-content>
+    </p-accordion-panel>
+  </p-accordion>
 </div>

src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.spec.ts

@@ -3,11 +3,11 @@ import { MockComponents, MockPipes } from 'ng-mocks';
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { IconComponent } from '@osf/shared/components';
+import { ContributorsListComponent, IconComponent } from '@osf/shared/components';
 import { DateAgoPipe } from '@osf/shared/pipes';
 
 import { SubmissionReviewStatus } from '../../enums';
-import { PreprintSubmission } from '../../models';
+import { PreprintSubmissionModel } from '../../models';
 
 import { PreprintSubmissionItemComponent } from './preprint-submission-item.component';
 
@@ -18,14 +18,14 @@ describe('PreprintSubmissionItemComponent', () => {
   let component: PreprintSubmissionItemComponent;
   let fixture: ComponentFixture<PreprintSubmissionItemComponent>;
 
-  const mockSubmission: PreprintSubmission = MOCK_PREPRINT_SUBMISSION;
+  const mockSubmission: PreprintSubmissionModel = MOCK_PREPRINT_SUBMISSION;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [
         PreprintSubmissionItemComponent,
         OSFTestingModule,
-        ...MockComponents(IconComponent),
+        ...MockComponents(IconComponent, ContributorsListComponent),
         MockPipes(DateAgoPipe, TranslatePipe),
       ],
     }).compileComponents();

src/app/features/moderation/components/preprint-submission-item/preprint-submission-item.component.ts

@@ -1,27 +1,44 @@
 import { TranslatePipe } from '@ngx-translate/core';
 
+import { Accordion, AccordionContent, AccordionHeader, AccordionPanel } from 'primeng/accordion';
 import { Button } from 'primeng/button';
+import { Skeleton } from 'primeng/skeleton';
 
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { IconComponent, TruncatedTextComponent } from '@osf/shared/components';
+import { ContributorsListComponent, IconComponent, TruncatedTextComponent } from '@osf/shared/components';
+import { StopPropagationDirective } from '@osf/shared/directives';
 import { DateAgoPipe } from '@osf/shared/pipes';
 
 import { PREPRINT_ACTION_LABEL, ReviewStatusIcon } from '../../constants';
 import { ActionStatus, SubmissionReviewStatus } from '../../enums';
-import { PreprintSubmission, PreprintWithdrawalSubmission } from '../../models';
+import { PreprintSubmissionModel, PreprintWithdrawalSubmission } from '../../models';
 
 @Component({
   selector: 'osf-preprint-submission-item',
-  imports: [IconComponent, DateAgoPipe, Button, TranslatePipe, TruncatedTextComponent],
+  imports: [
+    IconComponent,
+    DateAgoPipe,
+    Button,
+    TranslatePipe,
+    TruncatedTextComponent,
+    Accordion,
+    AccordionPanel,
+    AccordionHeader,
+    AccordionContent,
+    ContributorsListComponent,
+    Skeleton,
+    StopPropagationDirective,
+  ],
   templateUrl: './preprint-submission-item.component.html',
   styleUrl: './preprint-submission-item.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PreprintSubmissionItemComponent {
   status = input.required<SubmissionReviewStatus>();
-  submission = input.required<PreprintSubmission | PreprintWithdrawalSubmission>();
+  submission = input.required<PreprintSubmissionModel | PreprintWithdrawalSubmission>();
   selected = output<void>();
+  loadContributors = output<void>();
 
   readonly reviewStatusIcon = ReviewStatusIcon;
   readonly actionLabel = PREPRINT_ACTION_LABEL;
@@ -33,4 +50,8 @@ export class PreprintSubmissionItemComponent {
   toggleHistory() {
     this.showAll = !this.showAll;
   }
+
+  handleOpen() {
+    this.loadContributors.emit();
+  }
 }

src/app/features/moderation/components/preprint-submissions/preprint-submissions.component.html

@@ -40,6 +40,7 @@
             [submission]="item"
             [status]="selectedReviewOption()"
             (selected)="navigateToPreprint(item)"
+            (loadContributors)="loadContributors(item)"
           ></osf-preprint-submission-item>
         </div>
       }

src/app/features/moderation/components/preprint-submissions/preprint-submissions.component.ts

@@ -24,8 +24,12 @@ import {
 } from '@osf/shared/components';
 import { Primitive } from '@osf/shared/helpers';
 
-import { PreprintSubmission } from '../../models';
-import { GetPreprintSubmissions, PreprintModerationSelectors } from '../../store/preprint-moderation';
+import { PreprintSubmissionModel } from '../../models';
+import {
+  GetPreprintSubmissionContributors,
+  GetPreprintSubmissions,
+  PreprintModerationSelectors,
+} from '../../store/preprint-moderation';
 
 @Component({
   selector: 'osf-preprint-submissions',
@@ -53,7 +57,10 @@ export class PreprintSubmissionsComponent implements OnInit {
     this.route.parent?.params.pipe(map((params) => params['providerId'])) ?? of(undefined)
   );
 
-  readonly actions = createDispatchMap({ getPreprintSubmissions: GetPreprintSubmissions });
+  readonly actions = createDispatchMap({
+    getPreprintSubmissions: GetPreprintSubmissions,
+    getPreprintSubmissionContributors: GetPreprintSubmissionContributors,
+  });
 
   readonly submissions = select(PreprintModerationSelectors.getPreprintSubmissions);
   readonly isLoading = select(PreprintModerationSelectors.arePreprintSubmissionsLoading);
@@ -112,14 +119,18 @@ export class PreprintSubmissionsComponent implements OnInit {
     this.fetchSubmissions();
   }
 
-  navigateToPreprint(item: PreprintSubmission) {
+  navigateToPreprint(item: PreprintSubmissionModel) {
     const url = this.router.serializeUrl(
       this.router.createUrlTree(['/preprints/', this.providerId(), item.id], { queryParams: { mode: 'moderator' } })
     );
 
     window.open(url, '_blank');
   }
 
+  loadContributors(item: PreprintSubmissionModel) {
+    this.actions.getPreprintSubmissionContributors(item.id);
+  }
+
   private getStatusFromQueryParams() {
     const queryParams = this.route.snapshot.queryParams;
     const statusValues = Object.values(SubmissionReviewStatus);

src/app/features/moderation/components/preprint-withdrawal-submissions/preprint-withdrawal-submissions.component.html

@@ -40,6 +40,7 @@
             [submission]="item"
             [status]="selectedReviewOption()"
             (selected)="navigateToPreprint(item)"
+            (loadContributors)="loadContributors(item)"
           ></osf-preprint-submission-item>
         </div>
       }