Fix/gfs schemas (#553)

* fix(moderation): add registration moderation guard

* fix(files): file menu updates

* fix(files): reset files pagination

* fix(files): add provider for create guid

* fix(files): files redirect and create guid

* fix(gfs): update question rendering

Author: nmykhalkevch-exoft

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

@@ -12,6 +12,8 @@ <h2>{{ currentPage().title }}</h2>
 
     @let questions = currentPage().questions || [];
 
+    <ng-container *ngTemplateOutlet="questionList; context: { $implicit: questions }"></ng-container>
+
     @if (currentPage().sections?.length) {
       @for (section of currentPage().sections; track section.id) {
         <p-card>
@@ -29,8 +31,6 @@ <h3 class="mb-2">{{ section.title }}</h3>
           <ng-container *ngTemplateOutlet="questionList; context: { $implicit: section.questions }"></ng-container>
         </p-card>
       }
-    } @else {
-      <ng-container *ngTemplateOutlet="questionList; context: { $implicit: questions }"></ng-container>
     }
 
     <ng-template #questionList let-questions>

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

@@ -118,7 +118,7 @@ export class CustomStepComponent implements OnDestroy {
     this.stepForm = this.fb.group({});
     let questions = page.questions || [];
     if (page.sections?.length) {
-      questions = page.sections.flatMap((section) => section.questions || []);
+      questions = [...questions, ...page.sections.flatMap((section) => section.questions ?? [])];
     }
     questions?.forEach((q) => {
       const controlName = q.responseKey as string;

src/app/features/registries/components/drafts/drafts.component.ts

@@ -20,7 +20,7 @@ import { ActivatedRoute, NavigationEnd, Router, RouterOutlet } from '@angular/ro
 
 import { StepperComponent, SubHeaderComponent } from '@osf/shared/components';
 import { ResourceType } from '@osf/shared/enums';
-import { StepOption } from '@osf/shared/models';
+import { PageSchema, Question, StepOption } from '@osf/shared/models';
 import { LoaderService } from '@osf/shared/services';
 import {
   ContributorsSelectors,
@@ -95,8 +95,9 @@ export class DraftsComponent implements OnDestroy {
     this.defaultSteps[0].touched = true;
     const customSteps = this.pages().map((page, index) => {
       const pageStep = this.pages()[index];
+      const allQuestions = this.getAllQuestions(pageStep);
       const wasTouched =
-        pageStep?.questions?.some((question) => {
+        allQuestions?.some((question) => {
           const questionData = stepData[question.responseKey!];
           return Array.isArray(questionData) ? questionData.length : questionData;
         }) || false;
@@ -184,8 +185,9 @@ export class DraftsComponent implements OnDestroy {
       if (this.pages().length && this.currentStepIndex() > 0 && this.stepsData()) {
         for (let i = 1; i < this.currentStepIndex(); i++) {
           const pageStep = this.pages()[i - 1];
+          const allQuestions = this.getAllQuestions(pageStep);
           const isStepInvalid =
-            pageStep?.questions?.some((question) => {
+            allQuestions?.some((question) => {
               const questionData = this.stepsData()[question.responseKey!];
               return question.required && (Array.isArray(questionData) ? !questionData.length : !questionData);
             }) || false;
@@ -201,6 +203,13 @@ export class DraftsComponent implements OnDestroy {
     this.router.navigate([`/registries/drafts/${this.registrationId}/`, pageLink]);
   }
 
+  private getAllQuestions(pageStep: PageSchema): Question[] {
+    return [
+      ...(pageStep?.questions ?? []),
+      ...(pageStep?.sections?.flatMap((section) => section.questions ?? []) ?? []),
+    ];
+  }
+
   ngOnDestroy(): void {
     this.actions.clearState();
   }