From ce1f0b9686638282cb2468301a343f5e725b4e93 Mon Sep 17 00:00:00 2001 From: Jodie Muramoto Date: Wed, 23 Jan 2019 15:18:50 -0700 Subject: [PATCH] SHIBUI-1171: Updated Refresh Dely form field to string with option regex match; --- .../dynamic-http-metadata-provider.schema.json | 10 ++++------ .../file-system-metadata-provider.schema.json | 9 +++------ backend/src/main/resources/i18n/messages_en.properties | 1 + .../local-dynamic-metadata-provider.schema.json | 10 ++++------ 4 files changed, 12 insertions(+), 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 index 167e79ab1..d346c5393 100644 --- 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 index b4722fc1d..834c75a3c 100644 --- 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 index f7c238fb5..2d90ae43d 100644 --- 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 index b3c193dcf..b3414be39 100644 --- 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",