@oneblink/sdk-core 8.7.0-beta.2 → 8.8.0-beta.1

package/dist/conditionalLogicService/conditionallyShowOption.js

@@ -120,7 +120,7 @@ const isAttributeFilterValid = (formElementsCtrl, predicate, elementsEvaluated)
 };
 function conditionallyShowOption(formElementsCtrl, elementToEvaluate, optionToEvaluate, optionsEvaluated) {
     // If the element does not have the `conditionallyShow` flag set,
-    // we can always show the element.
+    // we can always show the option.
     if (!elementToEvaluate.conditionallyShowOptions ||
         !optionToEvaluate ||
         !optionToEvaluate.attributes ||
@@ -129,7 +129,7 @@ function conditionallyShowOption(formElementsCtrl, elementToEvaluate, optionToEv
         return 'SHOW';
     }
     // Check to see if this element has already been used to evaluate
-    // if the element should be shown based on parent element conditional logic
+    // if the option should be shown based on parent element conditional logic
     if (optionsEvaluated.some((optionId) => optionId === optionToEvaluate.id)) {
         throw new Error('Your conditional logic has caused an infinite loop. Check the following Fields to ensure element A does not rely on element B if element B also relies on element A.');
     }
@@ -143,10 +143,17 @@ function conditionallyShowOption(formElementsCtrl, elementToEvaluate, optionToEv
         return 'SHOW';
     let isLoadingDynamicDEPENDENCY = false;
     let isLoadingStaticDEPENDENCY = false;
-    for (const predicate of validPredicates) {
+    const showResults = Array(validPredicates.length).fill(false);
+    for (let i = 0; i < validPredicates.length; i++) {
+        const predicate = validPredicates[i];
         const predicateResult = conditionallyShowOptionByPredicate(formElementsCtrl, predicate, optionsEvaluated);
         switch (predicateResult) {
             case 'SHOW': {
+                if (elementToEvaluate.requiresAllConditionallyShowOptionsPredicates) {
+                    showResults[i] = true;
+                    break;
+                }
+                // if match any return show
                 return 'SHOW';
             }
             case 'LOADING_DYNAMIC_DEPENDENCY': {
@@ -159,6 +166,10 @@ function conditionallyShowOption(formElementsCtrl, elementToEvaluate, optionToEv
             }
         }
     }
+    if (elementToEvaluate.requiresAllConditionallyShowOptionsPredicates &&
+        showResults.every((result) => result)) {
+        return 'SHOW';
+    }
     if (isLoadingDynamicDEPENDENCY) {
         return 'LOADING_DYNAMIC_DEPENDENCY';
     }

package/dist/conditionalLogicService/conditionallyShowOption.js.map

@@ -1 +1 @@
-{"version":3,"file":"conditionallyShowOption.js","sourceRoot":"","sources":["../../src/conditionalLogicService/conditionallyShowOption.ts"],"names":[],"mappings":";;;;;AAgLA,0CAoEC;AAnPD,gHAAuF;AAEvF,0BAAoC;AACpC,0FAAiE;AAQjE,MAAM,wBAAwB,GAAG,CAC/B,SAAiD,EACjD,KAAqD,EACrD,gBAAkD,EAClD,EAAE;IACF,MAAM,MAAM,GAAG,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAC3C,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAA;IAExB,IACE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACrB,CAAC,CAAC,MAAM,CAAC,MAAM;YACb,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,WAAW,CAAC,CAAC,MAAM,CAAC,EACjE,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,IAAA,6CAAmC,EAAC;QACzC,SAAS,EAAE;YACT,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,SAAS,EAAE,SAAS,CAAC,SAAS;SAC/B;QACD,cAAc,EAAE,MAAM;QACtB,gBAAgB;KACjB,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,kCAAkC,GAAG,CACzC,gBAAkC,EAClC,SAAiD,EACjD,iBAA2B,EACT,EAAE;IACpB,iDAAiD;IACjD,gCAAgC;IAChC,IACE,CAAC,SAAS;QACV,CAAC,SAAS,CAAC,SAAS;QACpB,CAAC,SAAS,CAAC,SAAS;QACpB,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAC3B,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IACD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAC9D,CAAC,OAAO,EAAE,EAAE;QACV,OAAO,OAAO,CAAC,EAAE,KAAK,SAAS,CAAC,SAAS,CAAA;IAC3C,CAAC,CACF,CAAA;IAED,sDAAsD;IACtD,qDAAqD;IACrD,sDAAsD;IACtD,gCAAgC;IAChC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,IAAI,gBAAgB,CAAC,sBAAsB,EAAE,CAAC;YAC5C,OAAO,kCAAkC,CACvC,gBAAgB,CAAC,sBAAsB,EACvC,SAAS,EACT,iBAAiB,CAClB,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,CAAA;QACf,CAAC;IACH,CAAC;IAED,MAAM,uBAAuB,GAC3B,mBAAe,CAAC,YAAY,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;IACjE,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAA;IACf,CAAC;IACD,kEAAkE;IAClE,4BAA4B;IAC5B,uDAAuD;IACvD,qCAAqC;IACrC,MAAM,iCAAiC,GAAG,CAAC,KAAK,CAAC,OAAO,CACtD,uBAAuB,CAAC,OAAO,CAChC,CAAA;IACD,IAAI,iCAAiC,EAAE,CAAC;QACtC,IAAI,uBAAuB,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACtD,OAAO,4BAA4B,CAAA;QACrC,CAAC;aAAM,CAAC;YACN,OAAO,2BAA2B,CAAA;QACpC,CAAC;IACH,CAAC;IAED,MAAM,oBAAoB,GAAG,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;;QAC5D,MAAM,eAAe,GAAG,MAAA,uBAAuB,CAAC,OAAO,0CAAE,IAAI,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CACnB,CAAA;QACD,IAAI,CAAC,eAAe;YAAE,OAAO,MAAM,CAAA;QAEnC,OAAO,uBAAuB,CAC5B,EAAE,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,EAAE,EACxD,uBAAuB,EACvB,eAAe,EACf,iBAAiB,CAClB,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAA;IACf,CAAC;IAED,4EAA4E;IAC5E,MAAM,UAAU,GAAG,wBAAwB,CACzC,SAAS,EACT,gBAAgB,CAAC,KAAK,EACtB,uBAAuB,CACxB,CAAA;IACD,OAAO,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAA;AACrC,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,CAC7B,gBAAkC,EAClC,SAAiD,EACjD,iBAA2B,EAClB,EAAE;IACX,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAC9D,CAAC,OAAO,EAAE,EAAE;QACV,OAAO,OAAO,CAAC,EAAE,KAAK,SAAS,CAAC,SAAS,CAAA;IAC3C,CAAC,CACF,CAAA;IAED,sDAAsD;IACtD,qDAAqD;IACrD,sDAAsD;IACtD,gCAAgC;IAChC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,IAAI,gBAAgB,CAAC,sBAAsB,EAAE,CAAC;YAC5C,OAAO,sBAAsB,CAC3B,gBAAgB,CAAC,sBAAsB,EACvC,SAAS,EACT,iBAAiB,CAClB,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IAED,iFAAiF;IACjF,gBAAgB;IAChB;IACE,wDAAwD;IACxD,gBAAgB,CAAC,IAAI,KAAK,MAAM;QAChC,gBAAgB,CAAC,IAAI,KAAK,SAAS;QACnC,CAAC,IAAA,kCAAwB,EAAC,gBAAgB,EAAE,gBAAgB,EAAE,EAAE,CAAC,EACjE,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,8CAA8C;IAC9C,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAC5D,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IACzB,iEAAiE;IACjE,IACE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACrB,CAAC,CAAC,MAAM,CAAC,MAAM;YACb,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,WAAW,CAAC,CAAC,MAAM,CAAC,EACjE,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,SAAwB,uBAAuB,CAC7C,gBAAkC,EAClC,iBAAmD,EACnD,gBAA+C,EAC/C,gBAA0B;IAE1B,iEAAiE;IACjE,kCAAkC;IAElC,IACE,CAAC,iBAAiB,CAAC,wBAAwB;QAC3C,CAAC,gBAAgB;QACjB,CAAC,gBAAgB,CAAC,UAAU;QAC5B,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC;QAC3C,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,EACnC,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAED,iEAAiE;IACjE,2EAA2E;IAC3E,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,gBAAgB,CAAC,EAAE,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,KAAK,CACb,sKAAsK,CACvK,CAAA;IACH,CAAC;SAAM,CAAC;QACN,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;IAC5C,CAAC;IACD,MAAM,eAAe,GAAG,CAAC,gBAAgB,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAChE,CAAC,SAAS,EAAE,EAAE;QACZ,OAAO,sBAAsB,CAC3B,gBAAgB,EAChB,SAAS,EACT,gBAAgB,CACjB,CAAA;IACH,CAAC,CACF,CAAA;IACD,IAAI,CAAC,eAAe,CAAC,MAAM;QAAE,OAAO,MAAM,CAAA;IAE1C,IAAI,0BAA0B,GAAG,KAAK,CAAA;IACtC,IAAI,yBAAyB,GAAG,KAAK,CAAA;IACrC,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE,CAAC;QACxC,MAAM,eAAe,GAAG,kCAAkC,CACxD,gBAAgB,EAChB,SAAS,EACT,gBAAgB,CACjB,CAAA;QACD,QAAQ,eAAe,EAAE,CAAC;YACxB,KAAK,MAAM,CAAC,CAAC,CAAC;gBACZ,OAAO,MAAM,CAAA;YACf,CAAC;YACD,KAAK,4BAA4B,CAAC,CAAC,CAAC;gBAClC,0BAA0B,GAAG,IAAI,CAAA;gBACjC,MAAK;YACP,CAAC;YACD,KAAK,2BAA2B,CAAC,CAAC,CAAC;gBACjC,yBAAyB,GAAG,IAAI,CAAA;gBAChC,MAAK;YACP,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,0BAA0B,EAAE,CAAC;QAC/B,OAAO,4BAA4B,CAAA;IACrC,CAAC;SAAM,IAAI,yBAAyB,EAAE,CAAC;QACrC,OAAO,2BAA2B,CAAA;IACpC,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAA;IACf,CAAC;AACH,CAAC","sourcesContent":["import { FormTypes, SubmissionTypes } from '@oneblink/types'\nimport evaluateConditionalOptionsPredicate from './evaluateConditionalOptionsPredicate'\nimport { FormElementsCtrl } from './types'\nimport { typeCastService } from '..'\nimport conditionallyShowElement from './conditionallyShowElement'\n\nexport type ShouldShowOption =\n  | 'SHOW'\n  | 'HIDE'\n  | 'LOADING_DYNAMIC_DEPENDENCY'\n  | 'LOADING_STATIC_DEPENDENCY'\n\nconst handleAttributePredicate = (\n  predicate: FormTypes.ChoiceElementOptionAttribute,\n  model: SubmissionTypes.S3SubmissionData['submission'],\n  predicateElement: FormTypes.FormElementWithOptions,\n) => {\n  const values = model[predicateElement.name]\n  if (!values) return true\n\n  if (\n    Array.isArray(values) &&\n    (!values.length ||\n      !values.filter((value) => typeof value !== 'undefined').length)\n  ) {\n    return true\n  }\n\n  return evaluateConditionalOptionsPredicate({\n    predicate: {\n      type: 'OPTIONS',\n      elementId: predicate.elementId,\n      optionIds: predicate.optionIds,\n    },\n    predicateValue: values,\n    predicateElement,\n  })\n}\n\nconst conditionallyShowOptionByPredicate = (\n  formElementsCtrl: FormElementsCtrl,\n  predicate: FormTypes.ChoiceElementOptionAttribute,\n  elementsEvaluated: string[],\n): ShouldShowOption => {\n  // Validate the predicate data, if it is invalid,\n  // we will always show the field\n  if (\n    !predicate ||\n    !predicate.elementId ||\n    !predicate.optionIds ||\n    !predicate.optionIds.length\n  ) {\n    return 'SHOW'\n  }\n  const predicateElement = formElementsCtrl.flattenedElements.find(\n    (element) => {\n      return element.id === predicate.elementId\n    },\n  )\n\n  // If we cant find the element used for the predicate,\n  // we can check to see if the element being evaluated\n  // is in a repeatable set and the predicate element is\n  // in a parent list of elements.\n  if (!predicateElement) {\n    if (formElementsCtrl.parentFormElementsCtrl) {\n      return conditionallyShowOptionByPredicate(\n        formElementsCtrl.parentFormElementsCtrl,\n        predicate,\n        elementsEvaluated,\n      )\n    } else {\n      return 'HIDE'\n    }\n  }\n\n  const optionsPredicateElement =\n    typeCastService.formElements.toOptionsElement(predicateElement)\n  if (!optionsPredicateElement) {\n    return 'HIDE'\n  }\n  // If the predicate element does not have any options to evaluate,\n  // we will show the element.\n  // Unless the predicate element has dynamic options and\n  // options have not been fetched yet.\n  const isLoadingPredicateElementsOptions = !Array.isArray(\n    optionsPredicateElement.options,\n  )\n  if (isLoadingPredicateElementsOptions) {\n    if (optionsPredicateElement.optionsType === 'DYNAMIC') {\n      return 'LOADING_DYNAMIC_DEPENDENCY'\n    } else {\n      return 'LOADING_STATIC_DEPENDENCY'\n    }\n  }\n\n  const everyOptionIsShowing = predicate.optionIds.every((id) => {\n    const predicateOption = optionsPredicateElement.options?.find(\n      (o) => o.id === id,\n    )\n    if (!predicateOption) return 'HIDE'\n\n    return conditionallyShowOption(\n      { model: formElementsCtrl.model, flattenedElements: [] },\n      optionsPredicateElement,\n      predicateOption,\n      elementsEvaluated,\n    )\n  })\n\n  if (!everyOptionIsShowing) {\n    return 'HIDE'\n  }\n\n  // Check to see if the model has one of the valid values to show the element\n  const shouldShow = handleAttributePredicate(\n    predicate,\n    formElementsCtrl.model,\n    optionsPredicateElement,\n  )\n  return shouldShow ? 'SHOW' : 'HIDE'\n}\n\nconst isAttributeFilterValid = (\n  formElementsCtrl: FormElementsCtrl,\n  predicate: FormTypes.ChoiceElementOptionAttribute,\n  elementsEvaluated: string[],\n): boolean => {\n  const predicateElement = formElementsCtrl.flattenedElements.find(\n    (element) => {\n      return element.id === predicate.elementId\n    },\n  )\n\n  // If we cant find the element used for the predicate,\n  // we can check to see if the element being evaluated\n  // is in a repeatable set and the predicate element is\n  // in a parent list of elements.\n  if (!predicateElement) {\n    if (formElementsCtrl.parentFormElementsCtrl) {\n      return isAttributeFilterValid(\n        formElementsCtrl.parentFormElementsCtrl,\n        predicate,\n        elementsEvaluated,\n      )\n    } else {\n      return false\n    }\n  }\n\n  // now we have the model and predicate element, verify that the predicate element\n  // is not hidden\n  if (\n    // Will never be a page, just making typescript happy :)\n    predicateElement.type === 'page' ||\n    predicateElement.type === 'section' ||\n    !conditionallyShowElement(formElementsCtrl, predicateElement, [])\n  ) {\n    return false\n  }\n\n  // verify that at least one option is selected\n  const values = formElementsCtrl.model[predicateElement.name]\n  if (!values) return false\n  // if the model value is an array, verify that it has a selection\n  if (\n    Array.isArray(values) &&\n    (!values.length ||\n      !values.filter((value) => typeof value !== 'undefined').length)\n  ) {\n    return false\n  }\n\n  return true\n}\n\nexport default function conditionallyShowOption(\n  formElementsCtrl: FormElementsCtrl,\n  elementToEvaluate: FormTypes.FormElementWithOptions,\n  optionToEvaluate: FormTypes.ChoiceElementOption,\n  optionsEvaluated: string[],\n): ShouldShowOption {\n  // If the element does not have the `conditionallyShow` flag set,\n  // we can always show the element.\n\n  if (\n    !elementToEvaluate.conditionallyShowOptions ||\n    !optionToEvaluate ||\n    !optionToEvaluate.attributes ||\n    !Array.isArray(optionToEvaluate.attributes) ||\n    !optionToEvaluate.attributes.length\n  ) {\n    return 'SHOW'\n  }\n\n  // Check to see if this element has already been used to evaluate\n  // if the element should be shown based on parent element conditional logic\n  if (optionsEvaluated.some((optionId) => optionId === optionToEvaluate.id)) {\n    throw new Error(\n      'Your conditional logic has caused an infinite loop. Check the following Fields to ensure element A does not rely on element B if element B also relies on element A.',\n    )\n  } else {\n    optionsEvaluated.push(optionToEvaluate.id)\n  }\n  const validPredicates = (optionToEvaluate.attributes || []).filter(\n    (predicate) => {\n      return isAttributeFilterValid(\n        formElementsCtrl,\n        predicate,\n        optionsEvaluated,\n      )\n    },\n  )\n  if (!validPredicates.length) return 'SHOW'\n\n  let isLoadingDynamicDEPENDENCY = false\n  let isLoadingStaticDEPENDENCY = false\n  for (const predicate of validPredicates) {\n    const predicateResult = conditionallyShowOptionByPredicate(\n      formElementsCtrl,\n      predicate,\n      optionsEvaluated,\n    )\n    switch (predicateResult) {\n      case 'SHOW': {\n        return 'SHOW'\n      }\n      case 'LOADING_DYNAMIC_DEPENDENCY': {\n        isLoadingDynamicDEPENDENCY = true\n        break\n      }\n      case 'LOADING_STATIC_DEPENDENCY': {\n        isLoadingStaticDEPENDENCY = true\n        break\n      }\n    }\n  }\n  if (isLoadingDynamicDEPENDENCY) {\n    return 'LOADING_DYNAMIC_DEPENDENCY'\n  } else if (isLoadingStaticDEPENDENCY) {\n    return 'LOADING_STATIC_DEPENDENCY'\n  } else {\n    return 'HIDE'\n  }\n}\n"]}
+{"version":3,"file":"conditionallyShowOption.js","sourceRoot":"","sources":["../../src/conditionalLogicService/conditionallyShowOption.ts"],"names":[],"mappings":"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","sourcesContent":["import { FormTypes, SubmissionTypes } from '@oneblink/types'\nimport evaluateConditionalOptionsPredicate from './evaluateConditionalOptionsPredicate'\nimport { FormElementsCtrl } from './types'\nimport { typeCastService } from '..'\nimport conditionallyShowElement from './conditionallyShowElement'\n\nexport type ShouldShowOption =\n  | 'SHOW'\n  | 'HIDE'\n  | 'LOADING_DYNAMIC_DEPENDENCY'\n  | 'LOADING_STATIC_DEPENDENCY'\n\nconst handleAttributePredicate = (\n  predicate: FormTypes.ChoiceElementOptionAttribute,\n  model: SubmissionTypes.S3SubmissionData['submission'],\n  predicateElement: FormTypes.FormElementWithOptions,\n) => {\n  const values = model[predicateElement.name]\n  if (!values) return true\n\n  if (\n    Array.isArray(values) &&\n    (!values.length ||\n      !values.filter((value) => typeof value !== 'undefined').length)\n  ) {\n    return true\n  }\n\n  return evaluateConditionalOptionsPredicate({\n    predicate: {\n      type: 'OPTIONS',\n      elementId: predicate.elementId,\n      optionIds: predicate.optionIds,\n    },\n    predicateValue: values,\n    predicateElement,\n  })\n}\n\nconst conditionallyShowOptionByPredicate = (\n  formElementsCtrl: FormElementsCtrl,\n  predicate: FormTypes.ChoiceElementOptionAttribute,\n  elementsEvaluated: string[],\n): ShouldShowOption => {\n  // Validate the predicate data, if it is invalid,\n  // we will always show the field\n  if (\n    !predicate ||\n    !predicate.elementId ||\n    !predicate.optionIds ||\n    !predicate.optionIds.length\n  ) {\n    return 'SHOW'\n  }\n  const predicateElement = formElementsCtrl.flattenedElements.find(\n    (element) => {\n      return element.id === predicate.elementId\n    },\n  )\n\n  // If we cant find the element used for the predicate,\n  // we can check to see if the element being evaluated\n  // is in a repeatable set and the predicate element is\n  // in a parent list of elements.\n  if (!predicateElement) {\n    if (formElementsCtrl.parentFormElementsCtrl) {\n      return conditionallyShowOptionByPredicate(\n        formElementsCtrl.parentFormElementsCtrl,\n        predicate,\n        elementsEvaluated,\n      )\n    } else {\n      return 'HIDE'\n    }\n  }\n\n  const optionsPredicateElement =\n    typeCastService.formElements.toOptionsElement(predicateElement)\n  if (!optionsPredicateElement) {\n    return 'HIDE'\n  }\n  // If the predicate element does not have any options to evaluate,\n  // we will show the element.\n  // Unless the predicate element has dynamic options and\n  // options have not been fetched yet.\n  const isLoadingPredicateElementsOptions = !Array.isArray(\n    optionsPredicateElement.options,\n  )\n  if (isLoadingPredicateElementsOptions) {\n    if (optionsPredicateElement.optionsType === 'DYNAMIC') {\n      return 'LOADING_DYNAMIC_DEPENDENCY'\n    } else {\n      return 'LOADING_STATIC_DEPENDENCY'\n    }\n  }\n\n  const everyOptionIsShowing = predicate.optionIds.every((id) => {\n    const predicateOption = optionsPredicateElement.options?.find(\n      (o) => o.id === id,\n    )\n    if (!predicateOption) return 'HIDE'\n\n    return conditionallyShowOption(\n      { model: formElementsCtrl.model, flattenedElements: [] },\n      optionsPredicateElement,\n      predicateOption,\n      elementsEvaluated,\n    )\n  })\n\n  if (!everyOptionIsShowing) {\n    return 'HIDE'\n  }\n\n  // Check to see if the model has one of the valid values to show the element\n  const shouldShow = handleAttributePredicate(\n    predicate,\n    formElementsCtrl.model,\n    optionsPredicateElement,\n  )\n  return shouldShow ? 'SHOW' : 'HIDE'\n}\n\nconst isAttributeFilterValid = (\n  formElementsCtrl: FormElementsCtrl,\n  predicate: FormTypes.ChoiceElementOptionAttribute,\n  elementsEvaluated: string[],\n): boolean => {\n  const predicateElement = formElementsCtrl.flattenedElements.find(\n    (element) => {\n      return element.id === predicate.elementId\n    },\n  )\n\n  // If we cant find the element used for the predicate,\n  // we can check to see if the element being evaluated\n  // is in a repeatable set and the predicate element is\n  // in a parent list of elements.\n  if (!predicateElement) {\n    if (formElementsCtrl.parentFormElementsCtrl) {\n      return isAttributeFilterValid(\n        formElementsCtrl.parentFormElementsCtrl,\n        predicate,\n        elementsEvaluated,\n      )\n    } else {\n      return false\n    }\n  }\n\n  // now we have the model and predicate element, verify that the predicate element\n  // is not hidden\n  if (\n    // Will never be a page, just making typescript happy :)\n    predicateElement.type === 'page' ||\n    predicateElement.type === 'section' ||\n    !conditionallyShowElement(formElementsCtrl, predicateElement, [])\n  ) {\n    return false\n  }\n\n  // verify that at least one option is selected\n  const values = formElementsCtrl.model[predicateElement.name]\n  if (!values) return false\n  // if the model value is an array, verify that it has a selection\n  if (\n    Array.isArray(values) &&\n    (!values.length ||\n      !values.filter((value) => typeof value !== 'undefined').length)\n  ) {\n    return false\n  }\n\n  return true\n}\n\nexport default function conditionallyShowOption(\n  formElementsCtrl: FormElementsCtrl,\n  elementToEvaluate: FormTypes.FormElementWithOptions,\n  optionToEvaluate: FormTypes.ChoiceElementOption,\n  optionsEvaluated: string[],\n): ShouldShowOption {\n  // If the element does not have the `conditionallyShow` flag set,\n  // we can always show the option.\n\n  if (\n    !elementToEvaluate.conditionallyShowOptions ||\n    !optionToEvaluate ||\n    !optionToEvaluate.attributes ||\n    !Array.isArray(optionToEvaluate.attributes) ||\n    !optionToEvaluate.attributes.length\n  ) {\n    return 'SHOW'\n  }\n\n  // Check to see if this element has already been used to evaluate\n  // if the option should be shown based on parent element conditional logic\n  if (optionsEvaluated.some((optionId) => optionId === optionToEvaluate.id)) {\n    throw new Error(\n      'Your conditional logic has caused an infinite loop. Check the following Fields to ensure element A does not rely on element B if element B also relies on element A.',\n    )\n  } else {\n    optionsEvaluated.push(optionToEvaluate.id)\n  }\n  const validPredicates = (optionToEvaluate.attributes || []).filter(\n    (predicate) => {\n      return isAttributeFilterValid(\n        formElementsCtrl,\n        predicate,\n        optionsEvaluated,\n      )\n    },\n  )\n  if (!validPredicates.length) return 'SHOW'\n\n  let isLoadingDynamicDEPENDENCY = false\n  let isLoadingStaticDEPENDENCY = false\n  const showResults = Array(validPredicates.length).fill(false)\n  for (let i = 0; i < validPredicates.length; i++) {\n    const predicate = validPredicates[i]\n    const predicateResult = conditionallyShowOptionByPredicate(\n      formElementsCtrl,\n      predicate,\n      optionsEvaluated,\n    )\n    switch (predicateResult) {\n      case 'SHOW': {\n        if (elementToEvaluate.requiresAllConditionallyShowOptionsPredicates) {\n          showResults[i] = true\n          break\n        }\n        // if match any return show\n        return 'SHOW'\n      }\n      case 'LOADING_DYNAMIC_DEPENDENCY': {\n        isLoadingDynamicDEPENDENCY = true\n        break\n      }\n      case 'LOADING_STATIC_DEPENDENCY': {\n        isLoadingStaticDEPENDENCY = true\n        break\n      }\n    }\n  }\n  if (\n    elementToEvaluate.requiresAllConditionallyShowOptionsPredicates &&\n    showResults.every((result) => result)\n  ) {\n    return 'SHOW'\n  }\n  if (isLoadingDynamicDEPENDENCY) {\n    return 'LOADING_DYNAMIC_DEPENDENCY'\n  } else if (isLoadingStaticDEPENDENCY) {\n    return 'LOADING_STATIC_DEPENDENCY'\n  } else {\n    return 'HIDE'\n  }\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oneblink/sdk-core",
   "description": "OneBlink SDK for JavaScript (works in Browsers and NodeJS)",
-  "version": "8.7.0-beta.2",
+  "version": "8.8.0-beta.1",
   "author": "OneBlink <developers@oneblink.io> (https://oneblink.io)",
   "bugs": {
     "url": "https://github.com/oneblink/sdk-core-js/issues"