Issue #801: Added regex pattern to ValueSet Name, Value Name, Entity/Attribute Name & UniqueName fields and custo… (#822)

…m error checking for those fields

Author: cbeach47

frontends/mdr-frontend/src/components/Dialog/Dialog.tsx

@@ -44,7 +44,9 @@ export interface DialogField {
   help?: string; // potential help text
   accept?: string;
   inputMode?: InputMode;
-  pattern?: string;
+  patternRegex?: string;
+  patternDeny?: string;
+  patternErr?: string;
 }
 
 export interface DialogItem {
@@ -92,6 +94,10 @@ export const CrudDialog: React.FC<CrudDialogProps> = ({
           nextParams.BaseDataModelId = null;
         }
       }
+      // # Disabled pattern validation here; now handled on handleCreateOrEdit
+      // if (field.pattern && createParams[field.name] && !new RegExp(field.pattern).test(createParams[field.name])) {
+      //   setCreateError(`The following fields have invalid values:\n > ${field.patternErr}`);
+      // }
       return nextParams;
     });
   };
@@ -111,6 +117,16 @@ export const CrudDialog: React.FC<CrudDialogProps> = ({
       setCreateError(`Please complete all required fields: ${missingFields.join(", ")}`);
       return;
     }
+
+    let patternErrors: any = [];
+    const regexFields = fields.filter((f) => f.patternRegex && createParams[f.name] && !new RegExp(f.patternRegex).test(createParams[f.name]));
+    patternErrors = [...patternErrors, ...regexFields];
+    const deniedFields = fields.filter((f) => f.patternDeny && createParams[f.name] && new RegExp(f.patternDeny).test(createParams[f.name]));
+    patternErrors = [...patternErrors, ...deniedFields];
+    if (patternErrors.length) {
+      setCreateError(`The following fields have invalid values:\n > ${patternErrors.map((f: any) => f.patternErr).join("\n > ")}`);
+      return;
+    }
 
     setDisableSubmitForm(true);
     if (isEditMode && itemToEdit) {
@@ -228,7 +244,7 @@ export const CrudDialog: React.FC<CrudDialogProps> = ({
           {createError && (
             <>
               <br /><br />
-              <Text color="red" size="2" mb="3">
+              <Text color="red" size="2" mb="3" style={{ whiteSpace: "pre-line" }}>
                 {createError}
               </Text>
             </>
@@ -297,7 +313,8 @@ export const CrudDialog: React.FC<CrudDialogProps> = ({
                     placeholder={`Enter ${field.label.toLowerCase()}`}
                     onChange={(e) => handleFieldValueChange(field, e.target.value) }
                     inputMode={field.inputMode}
-                    pattern={field.pattern}
+                    pattern={field.patternRegex}
+                    title={field.patternErr ?? ""}
                     readOnly={field.readOnly || (isEditMode && field.name === "CreationDate")}
                   />
                 )}

frontends/mdr-frontend/src/components/ModelExplorer/CreateOptFields.tsx

@@ -1,5 +1,8 @@
 import { DialogField } from "../Dialog/Dialog";
 
+
+const PatternDenyRegex = "[ ,:~]";
+const PatternDenyErr = " cannot contain spaces, commas, colons, or tildes.";
 const capitalize = (s: string): string => { return s?.length ? s.charAt(0).toUpperCase() + s.slice(1) : ""; }
 
 /** Dev Note: Once we get actual user data we should use that for Contributor and ContributorOrganization */
@@ -13,12 +16,21 @@ export const entityCreateFields = (model: any): DialogField[] => {
       hidden: true,
       defaultValue: model?.Id,
     },
-    { name: "Name", type: "text" as const, label: "Name", required: true },
+    {
+      name: "Name",
+      type: "text" as const,
+      label: "Name",
+      required: true,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Name" + PatternDenyErr,
+    },
     {
       name: "UniqueName",
       type: "text" as const,
       label: "Unique Name",
       required: true,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Unique Name" + PatternDenyErr,
     },
     { name: "Description", type: "text" as const, label: "Description" },
     {
@@ -90,12 +102,21 @@ export const attributeCreateFields = (model: any, valueSetId: string | number |
       hidden: true,
       defaultValue: valueSetId?.toString(),
     },
-    { name: "Name", type: "text" as const, label: "Name", required: true },
+    {
+      name: "Name",
+      type: "text" as const,
+      label: "Name",
+      required: true,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Name" + PatternDenyErr,
+    },
     {
       name: "UniqueName",
       type: "text" as const,
       label: "Unique Name",
       required: true,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Unique Name" + PatternDenyErr,
     },
     {
       name: "DataType",
@@ -173,7 +194,14 @@ export const valueSetCreateFields = (model: any): DialogField[] => {
       hidden: true,
       defaultValue: model?.Id,
     },
-    { name: "Name", type: "text" as const, label: "Name", required: true },
+    {
+      name: "Name",
+      type: "text" as const,
+      label: "Name",
+      required: true,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Name" + PatternDenyErr,
+    },
     { name: "Description", type: "text" as const, label: "Description" },
     {
       name: "Use Considerations",
@@ -223,6 +251,8 @@ export const valueCreateFields = (model: any): DialogField[] => {
       type: "text" as const,
       label: "Value Name",
       required: true,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Value Name" + PatternDenyErr,
     },
     { name: "Description", type: "text" as const, label: "Description" },
     {