SHIBUI-1171: Updated Refresh Dely form field to string with option re…

…gex match;
TIER · Jan 23, 2019 · ce1f0b9 · ce1f0b9
1 parent c4043ea
commit ce1f0b9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/backend/src/main/resources/dynamic-http-metadata-provider.schema.json b/backend/src/main/resources/dynamic-http-metadata-provider.schema.json
@@ -119,14 +119,12 @@
                     "description": "tooltip.refresh-delay-factor",
                     "type": "string",
                     "widget": {
-                        "id": "number",
-                        "step": 0.01
+                        "id": "string",
+                        "help": "message.real-number"
                     },
                     "placeholder": "label.real-number",
-                    "minimum": 0,
-                    "maximum": 1,
-                    "default": null,
-                    "pattern": "^([0]*(\\.[0-9]+)?|[0]*\\.[0-9]*[1-9][0-9]*)$"
+                    "default": "",
+                    "pattern": "^(?:([0]*(\\.[0-9]+)?|[0]*\\.[0-9]*[1-9][0-9]*)|)$"
                 },
                 "minCacheDuration": {
                     "title": "label.min-cache-duration",

diff --git a/backend/src/main/resources/file-system-metadata-provider.schema.json b/backend/src/main/resources/file-system-metadata-provider.schema.json
@@ -130,14 +130,11 @@
                     "description": "tooltip.refresh-delay-factor",
                     "type": "string",
                     "widget": {
-                        "id": "number",
-                        "step": 0.01
+                        "id": "string",
+                        "help": "message.real-number"
                     },
                     "placeholder": "label.real-number",
-                    "minimum": 0,
-                    "maximum": 1,
-                    "default": null,
-                    "pattern": "^([0]*(\\.[0-9]+)?|[0]*\\.[0-9]*[1-9][0-9]*)$"
+                    "pattern": "^(?:([0]*(\\.[0-9]+)?|[0]*\\.[0-9]*[1-9][0-9]*)|)$"
                 }
             }
         }

diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
@@ -392,6 +392,7 @@ message.name-must-be-unique=Name must be unique.
 message.uri-valid-format=URI must be valid format.
 message.id-unique=ID must be unique.
 message.array-items-must-be-unique=Items in list must be unique.
+message.real-number=Optional. If using a value, must be a real number between 0-1.
 
 message.org-name-required=Organization Name is required.
 message.org-displayName-required=Organization Name is required.

diff --git a/backend/src/main/resources/local-dynamic-metadata-provider.schema.json b/backend/src/main/resources/local-dynamic-metadata-provider.schema.json
@@ -63,14 +63,12 @@
                     "description": "tooltip.refresh-delay-factor",
                     "type": "string",
                     "widget": {
-                        "id": "number",
-                        "step": 0.01
+                        "id": "string",
+                        "help": "message.real-number"
                     },
                     "placeholder": "label.real-number",
-                    "minimum": 0,
-                    "maximum": 1,
-                    "default": null,
-                    "pattern": "^([0]*(\\.[0-9]+)?|[0]*\\.[0-9]*[1-9][0-9]*)$"
+                    "default": "",
+                    "pattern": "^(?:([0]*(\\.[0-9]+)?|[0]*\\.[0-9]*[1-9][0-9]*)|)$"
                 },
                 "minCacheDuration": {
                     "title": "label.min-cache-duration",