merge feature/pbs-25.02 to resolve conflict

Author: mkovalua

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/files/components/move-file-dialog/move-file-dialog.component.ts

@@ -182,6 +182,8 @@ export class MoveFileDialogComponent {
     }
 
     this.isFilesUpdating.set(true);
+    const headerKey = this.isMoveAction ? 'files.dialogs.moveFile.movingHeader' : 'files.dialogs.moveFile.copingHeader';
+    this.config.header = this.translateService.instant(headerKey);
     const action = this.config.data.action;
     const files: FileModel[] = this.config.data.files;
     const totalFiles = files.length;
@@ -209,6 +211,7 @@ export class MoveFileDialogComponent {
                 this.openReplaceMoveDialog(conflictFiles, path, action);
               } else {
                 this.showToast(action);
+                this.config.header = this.translateService.instant('files.dialogs.moveFile.title');
                 this.completeMove();
               }
             }

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/store/preprint-moderation/preprint-moderation.state.ts

@@ -182,7 +182,7 @@ export class PreprintModerationState {
     );
 
     return this.contributorsService
-      .getAllContributors(ResourceType.Preprint, preprintId, 1, DEFAULT_TABLE_PARAMS.rows)
+      .getBibliographicContributors(ResourceType.Preprint, preprintId, 1, DEFAULT_TABLE_PARAMS.rows)
       .pipe(
         tap((res) => {
           ctx.setState(
@@ -241,7 +241,7 @@ export class PreprintModerationState {
     );
 
     return this.contributorsService
-      .getAllContributors(ResourceType.Preprint, preprintId, 1, DEFAULT_TABLE_PARAMS.rows)
+      .getBibliographicContributors(ResourceType.Preprint, preprintId, 1, DEFAULT_TABLE_PARAMS.rows)
       .pipe(
         tap((res) => {
           ctx.setState(

src/app/features/preprints/components/preprint-details/preprint-make-decision/preprint-make-decision.component.html

@@ -49,7 +49,11 @@ <h4 class="line-height-3">{{ 'preprints.details.decision.decline.label' | transl
       </section>
 
       <section class="w-full">
-        <label for="withdrawalJustification">{{ labelRequestDecisionJustification() | translate }}</label>
+        <div class="flex justify-content-between align-items-center gap-4">
+          <label for="withdrawalJustification">{{ labelRequestDecisionJustification() | translate }}</label>
+          <p>{{ reviewerComment()?.length ?? 0 }}/{{ decisionCommentLimit }}</p>
+        </div>
+
         <textarea
           pTextarea
           id="withdrawalJustification"
@@ -110,10 +114,12 @@ <h4 class="line-height-3">{{ rejectOptionLabel() | translate }}</h4>
         </section>
 
         <section class="w-full mt-4">
+          <p class="flex justify-content-end">{{ reviewerComment()?.length ?? 0 }}/{{ decisionCommentLimit }}</p>
+
           <textarea
             pTextarea
             id="comment"
-            class="w-full"
+            class="w-full mt-1"
             [placeholder]="'preprints.details.decision.commentPlaceholder' | translate"
             [rows]="4"
             [(ngModel)]="reviewerComment"

src/app/features/preprints/components/preprint-provider-hero/preprint-provider-hero.component.html

@@ -5,7 +5,11 @@
         <p-skeleton width="3rem" height="1.5rem" />
         <p-skeleton width="12rem" height="1.5rem" />
       } @else {
-        <img alt="Provider Logo" height="40" [src]="preprintProvider()!.brand.heroLogoImageUrl" />
+        <img
+          height="80"
+          [src]="preprintProvider()!.brand.heroLogoImageUrl"
+          [alt]="'preprints.selectService.providerLogoImageAlt' | translate"
+        />
         <h1 class="preprint-provider-name">{{ preprintProvider()!.name }}</h1>
       }
     </div>

src/app/features/preprints/components/stepper/preprints-metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.html

@@ -1,23 +1,25 @@
-<p-card>
-  <div>
-    <h2>{{ 'preprints.preprintStepper.metadata.affiliatedInstitutionsTitle' | translate }}</h2>
-    <p
-      class="mt-3"
-      [innerHTML]="
-        'preprints.preprintStepper.metadata.affiliatedInstitutionsDescription'
-          | translate: { preprintWord: provider()?.preprintWord }
-      "
-    ></p>
-
-    <div class="mt-4">
-      <osf-affiliated-institution-select
-        [institutions]="userInstitutions()"
-        [isLoading]="
-          areUserInstitutionsLoading() || areResourceInstitutionsLoading() || areResourceInstitutionsSubmitting()
+@if (userInstitutions().length) {
+  <p-card>
+    <div>
+      <h2>{{ 'preprints.preprintStepper.metadata.affiliatedInstitutionsTitle' | translate }}</h2>
+      <p
+        class="mt-3"
+        [innerHTML]="
+          'preprints.preprintStepper.metadata.affiliatedInstitutionsDescription'
+            | translate: { preprintWord: provider()?.preprintWord }
         "
-        [selectedInstitutions]="selectedInstitutions()"
-        (selectedInstitutionsChange)="onInstitutionsChange($event)"
-      />
+      ></p>
+
+      <div class="mt-4">
+        <osf-affiliated-institution-select
+          [institutions]="userInstitutions()"
+          [isLoading]="
+            areUserInstitutionsLoading() || areResourceInstitutionsLoading() || areResourceInstitutionsSubmitting()
+          "
+          [selectedInstitutions]="selectedInstitutions()"
+          (selectedInstitutionsChange)="onInstitutionsChange($event)"
+        />
+      </div>
     </div>
-  </div>
-</p-card>
+  </p-card>
+}

src/app/features/preprints/components/stepper/review-step/review-step.component.ts

@@ -20,6 +20,7 @@ import {
   FetchPreprintProject,
   PreprintStepperSelectors,
   SubmitPreprint,
+  UpdatePreprint,
   UpdatePrimaryFileRelationship,
 } from '@osf/features/preprints/store/preprint-stepper';
 import {
@@ -66,6 +67,7 @@ export class ReviewStepComponent implements OnInit {
     submitPreprint: SubmitPreprint,
     fetchResourceInstitutions: FetchResourceInstitutions,
     updatePrimaryFileRelationship: UpdatePrimaryFileRelationship,
+    updatePreprint: UpdatePreprint,
   });
 
   provider = input.required<PreprintProviderDetails | undefined>();
@@ -101,6 +103,10 @@ export class ReviewStepComponent implements OnInit {
       .updatePrimaryFileRelationship(preprintFile?.id ?? preprint.primaryFileId)
       .pipe(
         switchMap(() => {
+          if (!this.provider()?.reviewsWorkflow) {
+            return this.actions.updatePreprint(preprint.id, { isPublished: true });
+          }
+
           if (preprint.reviewsState !== ReviewsState.Accepted) {
             return this.actions.submitPreprint();
           }

src/app/features/preprints/pages/create-new-version/create-new-version.component.ts

@@ -85,6 +85,12 @@ export class CreateNewVersionComponent implements OnInit, OnDestroy, CanDeactiva
     });
   }
 
+  @HostListener('window:beforeunload', ['$event'])
+  onBeforeUnload($event: BeforeUnloadEvent): boolean {
+    $event.preventDefault();
+    return false;
+  }
+
   ngOnInit() {
     this.actions.getPreprintProviderById(this.providerId());
     this.actions.fetchPreprint(this.preprintId());
@@ -118,10 +124,4 @@ export class CreateNewVersionComponent implements OnInit, OnDestroy, CanDeactiva
     const id = this.preprintId().split('_')[0];
     this.router.navigate([id]);
   }
-
-  @HostListener('window:beforeunload', ['$event'])
-  public onBeforeUnload($event: BeforeUnloadEvent): boolean {
-    $event.preventDefault();
-    return false;
-  }
 }