Merge pull request #239 from CenterForOpenScience/feat/438-registration-revisions

Feat/438 registration revisions

Author: nmykhalkevch-exoft

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

@@ -7,7 +7,10 @@
       link
       [label]="submission().title"
       [routerLink]="['/registries/', submission().id, 'overview']"
-      [queryParams]="{ mode: 'moderator', revisionId: isPendingModeration ? submission().revisionId : null }"
+      [queryParams]="{
+        mode: 'moderator',
+        revisionId: isPendingModeration && !isPending ? submission().revisionId : null,
+      }"
     />
 
     @if (submission().public && !submission().embargoEndDate) {

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

@@ -6,7 +6,7 @@ import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { IconComponent } from '@osf/shared/components';
-import { RevisionReviewStates } from '@osf/shared/enums';
+import { RegistrationReviewStates, RevisionReviewStates } from '@osf/shared/enums';
 import { DateAgoPipe } from '@osf/shared/pipes';
 
 import { REGISTRY_ACTION_LABEL, ReviewStatusIcon } from '../../constants';
@@ -35,6 +35,10 @@ export class RegistrySubmissionItemComponent {
     return this.submission().revisionStatus === RevisionReviewStates.RevisionPendingModeration;
   }
 
+  get isPending(): boolean {
+    return this.submission().reviewsState === RegistrationReviewStates.Pending;
+  }
+
   toggleHistory() {
     this.showAll = !this.showAll;
   }

src/app/features/registries/components/custom-step/custom-step.component.ts

@@ -30,12 +30,11 @@ import { ActivatedRoute, Router } from '@angular/router';
 
 import { InfoIconComponent } from '@osf/shared/components';
 import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants';
-import { FilePayloadJsonApi, OsfFile } from '@osf/shared/models';
+import { FieldType } from '@osf/shared/enums';
+import { FilePayloadJsonApi, OsfFile, PageSchema } from '@osf/shared/models';
 import { CustomValidators, findChangedFields } from '@osf/shared/utils';
 
-import { FieldType } from '../../enums';
 import { FilesMapper } from '../../mappers/files.mapper';
-import { PageSchema } from '../../models';
 import { RegistriesSelectors, SetUpdatedFields, UpdateStepValidation } from '../../store';
 import { FilesControlComponent } from '../files-control/files-control.component';
 

src/app/features/registries/components/justification-review/justification-review.component.html

@@ -36,16 +36,19 @@ <h3 class="mb-2">{{ section.title }}</h3>
               <p class="mb-4">{{ section.description }}</p>
             }
             @if (section.questions?.length) {
-              <osf-review-data
+              <osf-registration-blocks-data
                 [questions]="section.questions"
                 [reviewData]="schemaResponseRevisionData()"
-              ></osf-review-data>
+              ></osf-registration-blocks-data>
             }
           </div>
         }
       } @else {
         @if (page.questions?.length) {
-          <osf-review-data [questions]="page.questions" [reviewData]="schemaResponseRevisionData()"></osf-review-data>
+          <osf-registration-blocks-data
+            [questions]="page.questions"
+            [reviewData]="schemaResponseRevisionData()"
+          ></osf-registration-blocks-data>
         }
       }
     </p-card>

src/app/features/registries/components/justification-review/justification-review.component.ts

@@ -10,18 +10,18 @@ import { Message } from 'primeng/message';
 import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 
+import { RegistrationBlocksDataComponent } from '@osf/shared/components';
 import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants';
-import { RevisionReviewStates } from '@osf/shared/enums';
+import { FieldType, RevisionReviewStates } from '@osf/shared/enums';
 import { CustomConfirmationService, ToastService } from '@osf/shared/services';
 
-import { FieldType, SchemaActionTrigger } from '../../enums';
+import { SchemaActionTrigger } from '../../enums';
 import { ClearState, DeleteSchemaResponse, HandleSchemaResponse, RegistriesSelectors } from '../../store';
 import { ConfirmContinueEditingDialogComponent } from '../confirm-continue-editing-dialog/confirm-continue-editing-dialog.component';
-import { ReviewDataComponent } from '../review-data/review-data.component';
 
 @Component({
   selector: 'osf-justification-review',
-  imports: [Button, Card, TranslatePipe, Message, ReviewDataComponent],
+  imports: [Button, Card, TranslatePipe, Message, RegistrationBlocksDataComponent],
   templateUrl: './justification-review.component.html',
   styleUrl: './justification-review.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -62,10 +62,28 @@ export class JustificationReviewComponent {
   }
 
   changes = computed(() => {
+    let questions: Record<string, string> = {};
+    this.pages().forEach((page) => {
+      if (page.sections?.length) {
+        questions = {
+          ...questions,
+          ...Object.fromEntries(
+            page.sections.flatMap(
+              (section) => section.questions?.map((q) => [q.responseKey, q.displayText || '']) || []
+            )
+          ),
+        };
+      } else {
+        questions = {
+          ...questions,
+          ...Object.fromEntries(page.questions?.map((q) => [q.responseKey, q.displayText]) || []),
+        };
+      }
+    });
     const updatedFields = this.updatedFields();
     const updatedResponseKeys = this.schemaResponse()?.updatedResponseKeys || [];
     const uniqueKeys = new Set([...updatedResponseKeys, ...Object.keys(updatedFields)]);
-    return Array.from(uniqueKeys);
+    return Array.from(uniqueKeys).map((key) => questions[key]);
   });
 
   submit(): void {

src/app/features/registries/components/justification-step/justification-step.component.html

@@ -18,6 +18,9 @@ <h2 class="mb-2">{{ 'registries.justification.title' | translate }}</h2>
         </p-message>
       }
     </section>
+    <p-message class="overview-message w-full" icon="fas fa-circle-exclamation" severity="error">
+      {{ 'registries.justification.caution' | translate }}
+    </p-message>
     <div class="flex justify-content-end">
       <p-button
         [label]="'registries.justification.deleteUpdates' | translate"

src/app/features/registries/components/new-registration/new-registration.component.html

@@ -1,13 +1,13 @@
-<section class="bg-white h-full">
+<section class="h-full">
   <osf-sub-header [title]="'registries.new.addNewRegistry' | translate" />
-  <section class="flex flex-column lg:flex-row flex-1 p-5 gap-4 w-full">
+  <section class="flex flex-column lg:flex-row flex-1 p-5 gap-4 bg-white w-full">
     <p>
       {{ 'registries.new.infoText1' | translate }}
       <a href="https://help.osf.io/"> {{ 'common.links.clickHere' | translate }}</a>
       {{ 'registries.new.infoText2' | translate }}
     </p>
   </section>
-  <section class="flex flex-column flex-1 p-5 gap-4 w-full">
+  <section class="flex flex-column flex-1 p-5 gap-4 w-full bg-white">
     <p-card class="w-full">
       <h2 class="mb-4">{{ ('registries.new.steps.title' | translate) + '1' }}</h2>
       <p class="mb-4 text-lg font-bold">{{ 'registries.new.steps.step1' | translate }}</p>