MAT-7791: validation for argument name

MeasureAuthoringTool · Dec 6, 2024 · aa68b85 · aa68b85
1 parent e459882
commit aa68b85
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/CqlBuilderPanel/functionsSection/argumentSection/ArgumentSection.tsx b/src/CqlBuilderPanel/functionsSection/argumentSection/ArgumentSection.tsx
@@ -15,6 +15,7 @@ import { useFormik } from "formik";
 import Arguments from "./Arguments";
 import { FunctionArgument } from "../../../model/CqlBuilderLookup";
 import ConfirmationDialog from "../../common/ConfirmationDialog";
+import { FunctionArgumentSchemaValidator } from "../../../validations/FunctionArgumentSchemaValidator";
 
 interface ArgumentsProps {
   functionArguments?: FunctionArgument[];
@@ -51,7 +52,7 @@ export default function ArgumentSection(props: ArgumentsProps) {
       dataType: "",
       other: "",
     },
-    // validationSchema: FunctionSectionSchemaValidator,
+    validationSchema: FunctionArgumentSchemaValidator,
     enableReinitialize: false,
     onSubmit: () => {},
   });
@@ -86,9 +87,9 @@ export default function ArgumentSection(props: ArgumentsProps) {
             inputProps={{
               "data-testid": "argument-name-input",
             }}
-            {...formik.getFieldProps("argumentName")}
             error={Boolean(formik.errors.argumentName)}
             helperText={formik.errors.argumentName}
+            {...formik.getFieldProps("argumentName")}
           />
         </div>
         <div tw="flex-grow pl-5">

diff --git a/src/validations/FunctionArgumentSchemaValidator.ts b/src/validations/FunctionArgumentSchemaValidator.ts
@@ -0,0 +1,10 @@
+import * as Yup from "yup";
+
+export const FunctionArgumentSchemaValidator = Yup.object().shape({
+  argumentName: Yup.string().matches(
+    /^[a-zA-Z0-9_]*$/,
+    "No spaces or special characters besides underscore are allowed"
+  ),
+  dataType: Yup.string(),
+  other: Yup.string(),
+});