SHIBUI-704 updates to schema for request url

TIER · Nov 13, 2018 · bf81bb2 · bf81bb2
1 parent a9ce4d1
commit bf81bb2
Show file tree

Hide file tree

Showing 2 changed files with 119 additions and 8 deletions.
diff --git a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts
@@ -35,12 +35,13 @@ export const DynamicHttpMetadataProviderWizard: Wizard<DynamicHttpMetadataProvid
             label: 'label.common-attributes',
             index: 2,
             initialValues: [],
-            schema: '/api/ui/MetadataResolver/DynamicHttpMetadataResolver',
+            schema: 'assets/schema/provider/dynamic-http.schema.json',
             fields: [
                 'xmlId',
                 'metadataURL',
                 'requireValidMetadata',
-                'failFastInitialization'
+                'failFastInitialization',
+                'requestURL'
             ]
         },
         {

diff --git a/ui/src/assets/schema/provider/dynamic-http.schema.json b/ui/src/assets/schema/provider/dynamic-http.schema.json
@@ -22,12 +22,33 @@
             "default": "",
             "minLength": 1
         },
-        "metadataURL": {
-            "title": "label.metadata-url",
-            "description": "tooltip.metadata-url",
-            "type": "string",
-            "default": "",
-            "minLength": 1
+        "requestURL": {
+            "title": "label.request-url",
+            "description": "tooltip.request-url",
+            "type": "object",
+            "widget": {
+                "id": "select"
+            },
+            "oneOf": [
+                {
+                    "enum": [
+                        "mdq"
+                    ],
+                    "description": "value.mdq-protocol"
+                },
+                {
+                    "enum": [
+                        "template"
+                    ],
+                    "description": "value.template"
+                },
+                {
+                    "enum": [
+                        "regex"
+                    ],
+                    "description": "value.regex"
+                }
+            ]
         },
         "requireValidMetadata": {
             "title": "label.require-valid-metadata",
@@ -616,5 +637,94 @@
                 }
             }
         }
+    },
+    "definitions": {
+        "MetadataQueryProtocol": {
+            "title": "label.mdq-protocol",
+            "description": "tooltip.mdq-protocol",
+            "type": "object",
+            "properties": {
+                "baseURL": {
+                    "title": "label.mdq-base-url",
+                    "description": "label.mdq-base-url",
+                    "type": "string"
+                }
+            },
+            "required": ["baseURL"]
+        },
+        "Template": {
+            "title": "label.template",
+            "description": "tooltip.template",
+            "type": "object",
+            "required": ["encodingStyle", "encoded"],
+            "properties": {
+                "encodingStyle": {
+                    "title": "label.template-encoding-style",
+                    "description": "tooltip.template-encoding-style",
+                    "type": "string",
+                    "oneOf": [
+                        {
+                            "enum": [
+                                "none"
+                            ],
+                            "description": "value.none"
+                        },
+                        {
+                            "enum": [
+                                "form"
+                            ],
+                            "description": "value.form"
+                        },
+                        {
+                            "enum": [
+                                "path"
+                            ],
+                            "description": "value.path"
+                        },
+                        {
+                            "enum": [
+                                "fragment"
+                            ],
+                            "description": "value.fragment"
+                        }
+                    ]
+                },
+                "encoded": {
+                    "title": "label.template-encoded",
+                    "description": "tooltip.template-encoded",
+                    "type": "boolean",
+                    "widget": {
+                        "id": "boolean-radio"
+                    },
+                    "oneOf": [
+                        {
+                            "enum": [
+                                true
+                            ],
+                            "description": "value.true"
+                        },
+                        {
+                            "enum": [
+                                false
+                            ],
+                            "description": "value.false"
+                        }
+                    ]
+                }
+            }
+        },
+        "Regex": {
+            "title": "label.regex",
+            "description": "tooltip.regex",
+            "type": "object",
+            "required": ["match"],
+            "properties": {
+                "match": {
+                    "title": "label.regex-match",
+                    "description": "tooltip.regex-match",
+                    "type": "string"
+                }
+            }
+        }
     }
 }