HOTFIX: Psp 9505 - ensure document metadata reset when document type …

…changed. (#4477) * psp-9436 - remove restriction on take date such that db layer logic corresponds to api logic. * psp-9505 reset the current documents metadata when the metadata type is changed. --------- Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>
bcgov · Nov 14, 2024 · fc4af60 · fc4af60
1 parent c7c4cd6
commit fc4af60
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/source/frontend/src/features/documents/ComposedDocument.ts b/source/frontend/src/features/documents/ComposedDocument.ts
@@ -221,11 +221,13 @@ export class DocumentUpdateFormData {
     return model;
   }
 
-  public toRequestApi(): ApiGen_Requests_DocumentUpdateRequest {
+  public static toRequestApi(
+    formData: DocumentUpdateFormData,
+  ): ApiGen_Requests_DocumentUpdateRequest {
     const metadata: ApiGen_Concepts_DocumentMetadataUpdate[] = [];
 
-    for (const key in this.documentMetadata) {
-      const value = this.documentMetadata[key];
+    for (const key in formData.documentMetadata) {
+      const value = formData.documentMetadata[key];
       const metadataTypeId = Number(key);
       metadata.push({
         value: value,
@@ -235,10 +237,10 @@ export class DocumentUpdateFormData {
     }
 
     return {
-      documentId: this.documentId,
-      mayanDocumentId: this.mayanDocumentId,
-      documentTypeId: stringToNumber(this.documentTypeId),
-      documentStatusCode: this.documentStatusCode,
+      documentId: formData.documentId,
+      mayanDocumentId: formData.mayanDocumentId,
+      documentTypeId: stringToNumber(formData.documentTypeId),
+      documentStatusCode: formData.documentStatusCode,
       documentMetadata: metadata,
     };
   }

diff --git a/source/frontend/src/features/documents/documentDetail/DocumentDetailContainer.tsx b/source/frontend/src/features/documents/documentDetail/DocumentDetailContainer.tsx
@@ -160,6 +160,7 @@ export const DocumentDetailContainer: React.FunctionComponent<
         if (documentTypeId !== props.pimsDocument.documentType.id) {
           await updateDocumentType(documentTypes.find(x => x.id === documentTypeId));
           setDocumentTypeUpdated(true);
+          formikRef?.current?.setValues({ ...formikRef?.current?.values, documentMetadata: {} });
         } else {
           setDocumentTypeUpdated(false);
         }

diff --git a/source/frontend/src/features/documents/documentDetail/DocumentDetailForm.tsx b/source/frontend/src/features/documents/documentDetail/DocumentDetailForm.tsx
@@ -117,7 +117,7 @@ export const DocumentDetailForm: React.FunctionComponent<
                     props.document?.pimsDocumentRelationship?.id &&
                     values.documentStatusCode !== undefined
                   ) {
-                    const request = values.toRequestApi();
+                    const request = DocumentUpdateFormData.toRequestApi(values);
                     await props.onUpdate(request);
                     setSubmitting(false);
                   } else {