Changed from match regex to denied match

Author: ahungerford-unicon

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

@@ -44,7 +44,8 @@ export interface DialogField {
   help?: string; // potential help text
   accept?: string;
   inputMode?: InputMode;
-  pattern?: string;
+  patternRegex?: string;
+  patternDeny?: string;
   patternErr?: string;
 }
 
@@ -117,9 +118,13 @@ export const CrudDialog: React.FC<CrudDialogProps> = ({
       return;
     }
 
-    const regexFields = fields.filter((f) => f.pattern && createParams[f.name] && !new RegExp(f.pattern).test(createParams[f.name]));
-    if (regexFields.length) {
-      setCreateError(`The following fields have invalid values:\n > ${regexFields.map(f => f.patternErr).join("\n > ")}`);
+    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;
     }
 
@@ -308,7 +313,7 @@ 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,8 +1,8 @@
 import { DialogField } from "../Dialog/Dialog";
 
 
-const PatternRegex = "^[A-Za-z][A-Za-z0-9_./-]*$";
-const PatternErrStr = " must start with a letter and contain only letters, numbers, underscores, periods, hyphens, and forward slashes.";
+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 */
@@ -21,16 +21,16 @@ export const entityCreateFields = (model: any): DialogField[] => {
       type: "text" as const,
       label: "Name",
       required: true,
-      pattern: PatternRegex,
-      patternErr: "Name" + PatternErrStr,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Name" + PatternDenyErr,
     },
     {
       name: "UniqueName",
       type: "text" as const,
       label: "Unique Name",
       required: true,
-      pattern: PatternRegex,
-      patternErr: "Unique Name" + PatternErrStr,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Unique Name" + PatternDenyErr,
     },
     { name: "Description", type: "text" as const, label: "Description" },
     {
@@ -107,16 +107,16 @@ export const attributeCreateFields = (model: any, valueSetId: string | number |
       type: "text" as const,
       label: "Name",
       required: true,
-      pattern: PatternRegex,
-      patternErr: "Name" + PatternErrStr,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Name" + PatternDenyErr,
     },
     {
       name: "UniqueName",
       type: "text" as const,
       label: "Unique Name",
       required: true,
-      pattern: PatternRegex,
-      patternErr: "Unique Name" + PatternErrStr,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Unique Name" + PatternDenyErr,
     },
     {
       name: "DataType",
@@ -199,8 +199,8 @@ export const valueSetCreateFields = (model: any): DialogField[] => {
       type: "text" as const,
       label: "Name",
       required: true,
-      pattern: PatternRegex,
-      patternErr: "Name" + PatternErrStr,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Name" + PatternDenyErr,
     },
     { name: "Description", type: "text" as const, label: "Description" },
     {
@@ -251,8 +251,8 @@ export const valueCreateFields = (model: any): DialogField[] => {
       type: "text" as const,
       label: "Value Name",
       required: true,
-      pattern: PatternRegex,
-      patternErr: "Value Name" + PatternErrStr,
+      patternDeny: PatternDenyRegex,
+      patternErr: "Value Name" + PatternDenyErr,
     },
     { name: "Description", type: "text" as const, label: "Description" },
     {