fix: white space regex & pattern unit test

datastreamapp · Jan 7, 2025 · d01b6a6 · d01b6a6
1 parent 73aac04
commit d01b6a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/schemas/data/src/definitions.json b/schemas/data/src/definitions.json
@@ -283,7 +283,7 @@
     },
     "trim": {
       "type": "string",
-      "pattern": "^([^\\s]+.*|.*[^\\s]+)$",
+      "pattern": "^(?!\\s).+(?<!\\s)$",
       "maxLength": 4000
     },
     "cr-char": {

diff --git a/schemas/data/test/quality-control.js b/schemas/data/test/quality-control.js
@@ -83,7 +83,7 @@ const checkProperty = (errors, keyword, property) => {
       error.instancePath.includes(property)
     ) {
       return true
-    } else if (keyword === 'pattern') return true
+    } else if (keyword === 'pattern' && error.instancePath.includes(property)) return true
   }
   return false
 }
@@ -823,7 +823,7 @@ test('Should accept columns without extra whitespace', async (t) => {
     ResultAnalyticalMethodID: 'sum',
     ResultAnalyticalMethodName: 'sum',
     LaboratoryName: 'sum',
-    LaboratorySampleID: 'sum'
+    LaboratorySampleID: 'A'
   })
   t.is(valid, true)
 })