From 15f26e7d4556f2108078235f2af82330f98d8202 Mon Sep 17 00:00:00 2001
From: Loki Sinclair <loki.sinclair@hdruk.ac.uk>
Date: Mon, 23 Sep 2024 15:48:43 +0100
Subject: [PATCH] regex into format field to rely on existing fe functionality

---
 docs/HDRUK/3.0.0.form.json | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/docs/HDRUK/3.0.0.form.json b/docs/HDRUK/3.0.0.form.json
index 258aa93..ea909fb 100644
--- a/docs/HDRUK/3.0.0.form.json
+++ b/docs/HDRUK/3.0.0.form.json
@@ -66,7 +66,7 @@
                   "is_optional": true,
                   "types": {
                         "title": "Url",
-                        "format": "uri",
+                        "format": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\n)?)+$",
                         "minLength": 1,
                         "type": "string"
                   },
@@ -168,7 +168,7 @@
                   "is_optional": true,
                   "types": {
                         "title": "Url",
-                        "format": "uri",
+                        "format": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\n)?)+$",
                         "minLength": 1,
                         "type": "string"
                   },
@@ -412,7 +412,7 @@
                   "is_optional": true,
                   "types": {
                         "title": "Url",
-                        "format": "uri",
+                        "format": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\n)?)+$",
                         "minLength": 1,
                         "type": "string"
                   },
@@ -1363,7 +1363,7 @@
                   "is_optional": true,
                   "types": {
                         "title": "Url",
-                        "format": "uri",
+                        "format": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\n)?)+$",
                         "minLength": 1,
                         "type": "string"
                   },
@@ -1411,7 +1411,7 @@
                   "is_optional": true,
                   "types": {
                         "title": "Url",
-                        "format": "uri",
+                        "format": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\n)?)+$",
                         "minLength": 1,
                         "type": "string"
                   },
@@ -1459,7 +1459,7 @@
                   "is_optional": true,
                   "types": {
                         "title": "Url",
-                        "format": "uri",
+                        "format": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\n)?)+$",
                         "minLength": 1,
                         "type": "string"
                   },
@@ -1507,7 +1507,7 @@
                   "is_optional": true,
                   "types": {
                         "title": "Url",
-                        "format": "uri",
+                        "format": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\n)?)+$",
                         "minLength": 1,
                         "type": "string"
                   },
@@ -1523,7 +1523,7 @@
                   "is_optional": true,
                   "types": {
                         "title": "Url",
-                        "format": "uri",
+                        "format": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\n)?)+$",
                         "minLength": 1,
                         "type": "string"
                   },
@@ -1539,7 +1539,7 @@
                   "is_optional": true,
                   "types": {
                         "title": "Url",
-                        "format": "uri",
+                        "format": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\n)?)+$",
                         "minLength": 1,
                         "type": "string"
                   },
@@ -1841,6 +1841,5 @@
                   },
                   "location": "omics.platform"
             }
-      ],
-      "url_regex": "^\\s*((https?:\\/\\/)*([a-zA-Z0-9-]+\\.?)+[a-zA-Z]{2,}(:\\d+)?(\\/[^\\s]*)?(\n)?)+$"
+      ]
 }
\ No newline at end of file