Track custom field changes for correction

CHANGELOG.md

@@ -84,6 +84,7 @@
 - Fix Registrar of any location should be able to review a correction request [#6247](https://github.com/opencrvs/opencrvs-core/issues/6247)
 - remove upload button when no supporting docs are configured [#5944](https://github.com/opencrvs/opencrvs-core/issues/5944)
 - Fix issues of invisible inputs when navigating from can't login link in login page [#6163](https://github.com/opencrvs/opencrvs-core/issues/6163)
+- Fix the "Continue" button being disabled when changes in correction form is made [#6780](https://github.com/opencrvs/opencrvs-core/issues/6780)
 - Remove leading slash from `resendAuthenticationCode` in login to fix resend email button [#6987](https://github.com/opencrvs/opencrvs-core/issues/6987) [#7037](https://github.com/opencrvs/opencrvs-core/issues/7037)
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
 - Fix client modal glitches on integrations page [#7002] (https://github.com/opencrvs/opencrvs-core/issues/7002)

packages/client/src/views/CorrectionForm/utils.ts

@@ -564,28 +564,32 @@ export const renderValue = (
 
 export function hasFieldChanged(
   field: IFormField,
-  data: IFormSectionData,
-  originalData?: IFormSectionData
+  sectionData: IFormSectionData,
+  originalSectionData?: IFormSectionData
 ) {
-  if (!originalData) return false
-  if (data[field.name] && (data[field.name] as IFormData).value) {
+  if (!originalSectionData) {
+    const isCustomSection = sectionData && sectionData[field.name]
+    if (isCustomSection) return true
+    return false
+  }
+  if (sectionData[field.name] && (sectionData[field.name] as IFormData).value) {
     return hasNestedDataChanged(
-      data[field.name] as IFormData,
-      originalData[field.name] as IFormData
+      sectionData[field.name] as IFormData,
+      originalSectionData[field.name] as IFormData
     )
   }
   /*
    * data section might have some values as empty string
    * whereas original data section have them as undefined
    */
-  if (!originalData[field.name] && data[field.name] === '') {
+  if (!originalSectionData[field.name] && sectionData[field.name] === '') {
     return false
   }
 
-  if (Array.isArray(data[field.name])) {
-    return !isEqual(data[field.name], originalData[field.name])
+  if (Array.isArray(sectionData[field.name])) {
+    return !isEqual(sectionData[field.name], originalSectionData[field.name])
   }
-  return data[field.name] !== originalData[field.name]
+  return sectionData[field.name] !== originalSectionData[field.name]
 }
 
 function hasNestedDataChanged(

packages/client/src/views/RegisterForm/review/ReviewSection.tsx

@@ -1236,25 +1236,36 @@ class ReviewSectionComp extends React.Component<FullProps, State> {
 
   hasFieldChanged(
     field: IFormField,
-    data: IFormSectionData,
-    originalData?: IFormSectionData
+    sectionData: IFormSectionData,
+    originalSectionData?: IFormSectionData
   ) {
-    if (!originalData) return false
-    if (data[field.name] && (data[field.name] as IFormData).value) {
+    if (!originalSectionData) {
+      const isCustomSection = sectionData && sectionData[field.name]
+      if (isCustomSection) {
+        this.hasChangesBeenMade = true
+        return true
+      }
+      return false
+    }
+    if (
+      sectionData[field.name] &&
+      (sectionData[field.name] as IFormData).value
+    ) {
       return this.hasNestedDataChanged(
-        data[field.name] as IFormData,
-        originalData[field.name] as IFormData
+        sectionData[field.name] as IFormData,
+        originalSectionData[field.name] as IFormData
       )
     }
     /*
      * data section might have some values as empty string
      * whereas original data section have them as undefined
      */
-    if (!originalData[field.name] && data[field.name] === '') {
+    if (!originalSectionData[field.name] && sectionData[field.name] === '') {
       return false
     }
 
-    const hasChanged = data[field.name] !== originalData[field.name]
+    const hasChanged =
+      sectionData[field.name] !== originalSectionData[field.name]
     this.hasChangesBeenMade = this.hasChangesBeenMade || hasChanged
     return hasChanged
   }