Adhoc fixes 91 (#1912)

* updates to validation * Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated regex --------- Co-authored-by: Nipun Arora <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
egovernments · Nov 27, 2024 · 3e214a9 · 3e214a9
1 parent 7924f59
commit 3e214a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.../web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js b/.../web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js
@@ -517,8 +517,8 @@ const FormulaConfiguration = ({ onSelect, category, customProps, formulas: initi
                     });
                     return;
                   }
-
-                  if (!(selectedDeletedFormula?.name && /^(?=.*[a-zA-Z])[a-zA-Z0-9]+$/.test(selectedDeletedFormula?.name))) {
+             
+                  if (selectedDeletedFormula?.code === "NEW_FORMULA" && !(selectedDeletedFormula?.name && /^(?=.*[a-zA-Z])[a-zA-Z0-9]+(?: [a-zA-Z0-9]+)*$/.test(selectedDeletedFormula?.name))) {
                     setShowToast({
                       key: "error",
                       label: t("MP_FORMULA_NAME_INVALID") ,

diff --git a/...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js b/...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js
@@ -399,8 +399,9 @@ const Hypothesis = ({ category, assumptions: initialAssumptions, setShowToast, a
                     return;
                   }
 
+
                   //alphanumeric name of assumption
-                  if (!(selectedDeletedAssumption?.name && /^(?=.*[a-zA-Z])[a-zA-Z0-9]+$/.test(selectedDeletedAssumption?.name))) {
+                  if (selectedDeletedAssumption?.code === "NEW_ASSUMPTION" && !(selectedDeletedAssumption?.name && /^(?=.*[a-zA-Z])[a-zA-Z0-9]+(?: [a-zA-Z0-9]+)*$/.test(selectedDeletedAssumption?.name))) {
                     setShowToast({
                       key: "error",
                       label: t("MP_ASSUMPTION_NAME_INVALID") ,