@truedat/df 8.0.2 → 8.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/df",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "module": "src/index.js",
@@ -48,14 +48,14 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.0.2",
+    "@truedat/test": "8.0.3",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
   },
   "dependencies": {
     "@apollo/client": "^3.13.8",
-    "@truedat/core": "8.0.2",
+    "@truedat/core": "8.0.3",
     "axios": "^1.12.0",
     "graphql": "^16.11.0",
     "is-hotkey": "^0.2.0",
@@ -84,5 +84,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "db704fb9a008f425362ab96d69aa044fa1d7a720"
+  "gitHead": "5be7b14325000a19bb8f18a96dff0bc16757745b"
 }

package/src/templates/utils/validateContent.js

@@ -3,14 +3,14 @@ import { flattenFields } from "./flattenFields";
 
 const fieldIsHiddenVerifier =
   (content) =>
-    ({ depends }) => {
-      if (!depends) return false;
-      const { on, to_be } = depends;
-      const dependentValue = content[on]?.value;
-      return _.isArray(dependentValue)
-        ? !_.some((d) => to_be.includes(d))(dependentValue)
-        : !to_be.includes(dependentValue);
-    };
+  ({ depends }) => {
+    if (!depends) return false;
+    const { on, to_be } = depends;
+    const dependentValue = content[on]?.value || content[on] || undefined;
+    return _.isArray(dependentValue)
+      ? !_.some((d) => to_be.includes(d))(dependentValue)
+      : !to_be.includes(dependentValue);
+  };
 
 const isTableRequired = (field, content) => {
   if (field?.type === "dynamic_table" && _.has("values.table_columns")(field)) {
@@ -20,25 +20,26 @@ const isTableRequired = (field, content) => {
 
     return _.flow(
       _.pathOr([], "values.table_columns"),
-      _.any((nestedField) => _.includes(nestedField?.cardinality)(["1", "+"])))
-      (field);
+      _.any((nestedField) => _.includes(nestedField?.cardinality)(["1", "+"]))
+    )(field);
   }
 
   return false;
-}
+};
 
 const validateTemplateContent = (schema, content) => {
   const fieldIsHidden = fieldIsHiddenVerifier(content);
   const templateContent = _.reject(fieldIsHidden)(schema);
   return _.flow(validateRequired(templateContent), _.head)([[], content]);
-}
+};
 
 export const validateContent = (template) => (content) => {
   const schema = flattenFields(template);
   return validateTemplateContent(schema, content);
 };
 
-const isEmptyValue = (value) => _.isNil(value) || (!_.isNumber(value) && _.isEmpty(value));
+const isEmptyValue = (value) =>
+  _.isNil(value) || (!_.isNumber(value) && _.isEmpty(value));
 
 const isEmptyField = (field, content) => {
   if (field?.type === "dynamic_table" && _.has("values.table_columns")(field)) {
@@ -49,29 +50,29 @@ const isEmptyField = (field, content) => {
 
     const requiredErrors = _.flow(
       _.map((row) => _.flow(validateRequired(tableColumns), _.head)([[], row])),
-      _.flatten,
+      _.flatten
     )(rowValues);
 
     return !_.isEmpty(requiredErrors);
   }
   return isEmptyValue(content?.[field?.name]?.value);
-}
+};
 
 export const validateRequired =
   (templateContent) =>
-    ([validations, content]) => {
-      const newValidations = _.flow([
-        _.filter((field) => isRequired(field, content)),
-        _.filter((field) => isEmptyField(field, content)),
-        _.map((field) => ({ error: "missing required", field: field?.name })),
-      ])(templateContent);
-      return [[...validations, ...newValidations], content];
-    };
+  ([validations, content]) => {
+    const newValidations = _.flow([
+      _.filter((field) => isRequired(field, content)),
+      _.filter((field) => isEmptyField(field, content)),
+      _.map((field) => ({ error: "missing required", field: field?.name })),
+    ])(templateContent);
+    return [[...validations, ...newValidations], content];
+  };
 
 export const dependentRequired = (field, content) => {
   if (_.has("mandatory")(field)) {
     const on = field?.mandatory?.on;
-    const dependent = content[on]?.value;
+    const dependent = content[on]?.value || content[on] || undefined;
     const target = field?.mandatory?.to_be || [];
     if (_.isArray(dependent)) {
       return !_.isEmpty(_.intersection(dependent)(target));
@@ -83,7 +84,8 @@ export const dependentRequired = (field, content) => {
 };
 
 export const isRequired = (field, content) =>
-  _.includes(field?.cardinality)(["1", "+"]) || isTableRequired(field, content) ||
+  _.includes(field?.cardinality)(["1", "+"]) ||
+  isTableRequired(field, content) ||
   dependentRequired(field, content);
 
 export const enrichRequired = (content) => (field) => {
@@ -91,13 +93,13 @@ export const enrichRequired = (content) => (field) => {
   if (field?.type === "dynamic_table" && _.has("values.table_columns")(field)) {
     const tableColumns = _.flow(
       _.propOr([], "values.table_columns"),
-      _.map((field) => enrichRequired({})(field)))
-      (field);
+      _.map((field) => enrichRequired({})(field))
+    )(field);
 
     return _.flow(
       _.set("values.table_columns", tableColumns),
-      _.set("required", required))
-      (field);
+      _.set("required", required)
+    )(field);
   }
 
   return { ...field, required };