SHIBUI-1014 Fixed issue with modal

TIER · Nov 27, 2018 · 2541514 · 2541514
1 parent 0c2978a
commit 2541514
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts
@@ -107,6 +107,7 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate
             return of(true);
         }
         const diff = this.diffService.updatedDiff(this.provider, this.latest);
+        console.log(diff, this.provider, this.latest);
         if (diff && Object.keys(diff).length > 0) {
             let modal = this.modalService.open(UnsavedEntityComponent);
             modal.result.then(

diff --git a/ui/src/assets/schema/provider/filebacked-http-advanced.schema.json b/ui/src/assets/schema/provider/filebacked-http-advanced.schema.json
@@ -62,8 +62,7 @@
                     "title": "",
                     "description": "",
                     "placeholder": "",
-                    "widget": "hidden",
-                    "default": ""
+                    "widget": "hidden"
                 },
                 "connectionRequestTimeout": {
                     "type": "string",
@@ -84,7 +83,6 @@
                             "PT24H"
                         ]
                     },
-                    "default": null,
                     "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
                 },
                 "connectionTimeout": {
@@ -106,7 +104,6 @@
                             "PT24H"
                         ]
                     },
-                    "default": null,
                     "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
                 },
                 "socketTimeout": {
@@ -128,7 +125,6 @@
                             "PT24H"
                         ]
                     },
-                    "default": null,
                     "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
                 },
                 "disregardTLSCertificate": {
@@ -151,52 +147,45 @@
                             ],
                             "description": "False"
                         }
-                    ],
-                    "default": false
+                    ]
                 },
                 "tlsTrustEngineRef": {
                     "type": "string",
                     "title": "",
                     "description": "",
                     "placeholder": "",
-                    "widget": "hidden",
-                    "default": ""
+                    "widget": "hidden"
                 },
                 "httpClientSecurityParametersRef": {
                     "type": "string",
                     "title": "",
                     "description": "",
                     "placeholder": "",
-                    "widget": "hidden",
-                    "default": ""
+                    "widget": "hidden"
                 },
                 "proxyHost": {
                     "type": "string",
                     "title": "label.proxy-host",
                     "description": "tooltip.proxy-host",
-                    "placeholder": "",
-                    "default": ""
+                    "placeholder": ""
                 },
                 "proxyPort": {
                     "type": "string",
                     "title": "label.proxy-port",
                     "description": "tooltip.proxy-port",
-                    "placeholder": "",
-                    "default": ""
+                    "placeholder": ""
                 },
                 "proxyUser": {
                     "type": "string",
                     "title": "label.proxy-user",
                     "description": "tooltip.proxy-user",
-                    "placeholder": "",
-                    "default": ""
+                    "placeholder": ""
                 },
                 "proxyPassword": {
                     "type": "string",
                     "title": "label.proxy-password",
                     "description": "tooltip.proxy-password",
-                    "placeholder": "",
-                    "default": ""
+                    "placeholder": ""
                 },
                 "httpCaching": {
                     "type": "string",
@@ -238,15 +227,13 @@
                     "title": "label.http-max-cache-entries",
                     "description": "tooltip.http-max-cache-entries",
                     "placeholder": "",
-                    "default": 0,
                     "minimum": 0
                 },
                 "httpMaxCacheEntrySize": {
                     "type": "integer",
                     "title": "label.max-cache-entry-size",
                     "description": "tooltip.max-cache-entry-size",
                     "placeholder": "",
-                    "default": 0,
                     "minimum": 0
                 }
             }