fix: files uploaded before addRecord

Author: matheus-relief

libs/safe/src/lib/components/form/form.component.ts

@@ -19,7 +19,7 @@ import {
   EDIT_RECORD,
 } from './graphql/mutations';
 import { Form } from '../../models/form.model';
-import { Record } from '../../models/record.model';
+import { Record as RecordModel } from '../../models/record.model';
 import { BehaviorSubject, takeUntil } from 'rxjs';
 import addCustomFunctions from '../../utils/custom-functions';
 import { SafeAuthService } from '../../services/auth/auth.service';
@@ -45,7 +45,7 @@ export class SafeFormComponent
   implements OnInit, OnDestroy, AfterViewInit
 {
   @Input() form!: Form;
-  @Input() record?: Record;
+  @Input() record?: RecordModel;
   @Output() save: EventEmitter<{
     completed: boolean;
     hideNewRecord?: boolean;
@@ -54,7 +54,7 @@ export class SafeFormComponent
   // === SURVEYJS ===
   public survey!: Survey.SurveyModel;
   public surveyActive = true;
-  private temporaryFilesStorage: any = {};
+  public temporaryFilesStorage: Record<string, Array<File>> = {};
 
   @ViewChild('formContainer') formContainer!: ElementRef;
 
@@ -213,7 +213,9 @@ export class SafeFormComponent
    */
   public reset(): void {
     this.survey.clear();
-    this.temporaryFilesStorage = {};
+    this.formHelpersService.clearTemporaryFilesStorage(
+      this.temporaryFilesStorage
+    );
     this.survey.showCompletedPage = false;
     this.save.emit({ completed: false });
     this.survey.render();
@@ -347,7 +349,9 @@ export class SafeFormComponent
     } else {
       this.survey.clear();
     }
-    this.temporaryFilesStorage = {};
+    this.formHelpersService.clearTemporaryFilesStorage(
+      this.temporaryFilesStorage
+    );
     localStorage.removeItem(this.storageId);
     this.formHelpersService.cleanCachedRecords(this.survey);
     this.isFromCacheData = false;

libs/safe/src/lib/services/form-builder/form-builder.service.ts

@@ -5,7 +5,7 @@ import { SafeReferenceDataService } from '../reference-data/reference-data.servi
 import { renderGlobalProperties } from '../../survey/render-global-properties';
 import { Apollo } from 'apollo-angular';
 import get from 'lodash/get';
-import { Record } from '../../models/record.model';
+import { Record as RecordModel } from '../../models/record.model';
 import { EditRecordMutationResponse, EDIT_RECORD } from './graphql/mutations';
 import { Metadata } from '../../models/metadata.model';
 import { SafeRestService } from '../rest/rest.service';
@@ -53,7 +53,7 @@ export class SafeFormBuilderService {
     structure: string,
     pages: BehaviorSubject<any[]>,
     fields: Metadata[] = [],
-    record?: Record
+    record?: RecordModel
   ): Survey.SurveyModel {
     const survey = new Survey.Model(structure);
     this.formHelpersService.addUserVariables(survey);
@@ -145,7 +145,7 @@ export class SafeFormBuilderService {
     survey: Survey.SurveyModel,
     pages: BehaviorSubject<any[]>,
     selectedPageIndex: BehaviorSubject<number>,
-    temporaryFilesStorage: any
+    temporaryFilesStorage: Record<string, Array<File>>
   ) {
     survey.onClearFiles.add((_, options: any) => this.onClearFiles(options));
     survey.onUploadFiles.add((_, options: any) =>

libs/safe/src/lib/services/form-helper/form-helper.service.ts

@@ -339,4 +339,17 @@ export class SafeFormHelpersService {
     // as a default question for Users question type
     survey.setVariable('user.id', user?.id || '');
   };
+
+  /**
+   * Clears the temporary files storage
+   *
+   * @param storage Storage to clear
+   */
+  public clearTemporaryFilesStorage(
+    storage: Record<string, Array<File>>
+  ): void {
+    Object.keys(storage).forEach((key) => {
+      delete storage[key];
+    });
+  }
 }