@opencrvs/toolkit 1.9.10 → 1.9.11-rc.0272b4e

package/dist/commons/events/utils.d.ts

@@ -84,8 +84,8 @@ export declare function isPageVisible(page: PageConfig, formValues: ActionUpdate
  * * @param validatorContext - custom validation context
  * @returns {Partial<T>} A new object containing only the values for visible fields
  */
-export declare function omitHiddenFields<T extends EventState | ActionUpdate>(fields: FieldConfig[], formValues: T, validatorContext: ValidatorContext): Partial<T>;
-export declare function omitHiddenPaginatedFields<T extends EventState | ActionUpdate>(formConfig: FormConfig, values: T, validatorContext: ValidatorContext): Partial<Partial<T>>;
+export declare function omitHiddenFields<T extends EventState | ActionUpdate>(fields: FieldConfig[], formValues: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean): Partial<T>;
+export declare function omitHiddenPaginatedFields<T extends EventState | ActionUpdate>(formConfig: FormConfig, values: T, validatorContext: ValidatorContext, includeHiddenFieldsWithNullValues?: boolean): Partial<Partial<T>>;
 /**
  *
  * @returns a draft for the event that has been created since the last non-read action.

package/dist/events/index.js

@@ -3759,20 +3759,30 @@ function isPageVisible(page, formValues, context) {
   }
   return isConditionMet(page.conditional, formValues, context);
 }
-function omitHiddenFields(fields, formValues, validatorContext) {
+function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
   const base = (0, import_lodash.cloneDeep)(formValues);
   function fn(prevVisibilityContext) {
-    const cleaned = (0, import_lodash.omitBy)(base, (_2, fieldId) => {
+    const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
       const fieldConfig = fields.filter((f) => f.id === fieldId);
-      return fieldConfig.length ? fieldConfig.every(
+      if (!fieldConfig.length) {
+        return false;
+      }
+      const isHidden = fieldConfig.every(
         (f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
-      ) : false;
+      );
+      if (!isHidden) {
+        return false;
+      }
+      if (includeHiddenFieldsWithNullValues && value === null) {
+        return false;
+      }
+      return true;
     });
     return (0, import_lodash.isEqual)(cleaned, prevVisibilityContext) ? cleaned : fn(cleaned);
   }
   return fn(base);
 }
-function omitHiddenPaginatedFields(formConfig, values, validatorContext) {
+function omitHiddenPaginatedFields(formConfig, values, validatorContext, includeHiddenFieldsWithNullValues = false) {
   const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
   const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
   const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
@@ -3781,7 +3791,8 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext) {
   return omitHiddenFields(
     visibleFields,
     valuesExceptHiddenPage,
-    validatorContext
+    validatorContext,
+    includeHiddenFieldsWithNullValues
   );
 }
 function findActiveDraftForEvent(event2, draft) {
@@ -8429,8 +8440,9 @@ function generateActionDeclarationInput(configuration, action, rng, overrides) {
         ...declaration,
         ...overrides
       },
-      {}
+      {},
       // Intentionally empty. Allow generating fields with custom conditionals.
+      true
     );
   }
   console.warn(`${action} is not a declaration action. Setting data as {}.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/toolkit",
-  "version": "1.9.10",
+  "version": "1.9.11-rc.0272b4e",
   "description": "OpenCRVS toolkit for building country configurations",
   "license": "MPL-2.0",
   "exports": {