knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pzamp...@apache.org
Subject [3/3] knox git commit: KNOX-1281 - HA provider configuration wizard should require the service name property value
Date Thu, 26 Apr 2018 20:11:15 GMT
KNOX-1281 - HA provider configuration wizard should require the service name property value


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/8886615a
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/8886615a
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/8886615a

Branch: refs/heads/master
Commit: 8886615ae738c3c606562ac6080a72ee42b446f8
Parents: 1e7fc71
Author: Phil Zampino <pzampino@apache.org>
Authored: Thu Apr 26 15:33:12 2018 -0400
Committer: Phil Zampino <pzampino@apache.org>
Committed: Thu Apr 26 15:37:02 2018 -0400

----------------------------------------------------------------------
 .../display-binding-provider-config.ts          |  4 ++-
 .../ha-provider-config.ts                       | 34 ++++++++++++--------
 .../src/app/provider-config-wizard/ha-wizard.ts |  5 ++-
 .../provider-config-wizard.component.ts         |  6 +++-
 .../applications/admin-ui/app/index.html        |  2 +-
 .../app/inline.8b440394d56c1b9f80b6.bundle.js   |  1 -
 .../app/inline.fda93ec14cbb0120997c.bundle.js   |  1 +
 .../app/main.2efbd98cdf9b2cd26024.bundle.js     |  1 -
 .../app/main.cf8a43d8be4617b91d5c.bundle.js     |  1 +
 9 files changed, 35 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/8886615a/gateway-admin-ui/src/app/provider-config-wizard/display-binding-provider-config.ts
----------------------------------------------------------------------
diff --git a/gateway-admin-ui/src/app/provider-config-wizard/display-binding-provider-config.ts
b/gateway-admin-ui/src/app/provider-config-wizard/display-binding-provider-config.ts
index 2fb0eda..2309122 100644
--- a/gateway-admin-ui/src/app/provider-config-wizard/display-binding-provider-config.ts
+++ b/gateway-admin-ui/src/app/provider-config-wizard/display-binding-provider-config.ts
@@ -71,7 +71,9 @@ export abstract class DisplayBindingProviderConfig extends ProviderConfig
{
     let isValid: boolean = true;
 
     for (let param of this.getDisplayPropertyNames()) {
-      isValid = isValid && this.isValidParamValue(param);
+      if (isValid) { // quit if invalid param is discovered
+        isValid = isValid && this.isValidParamValue(param);
+      }
     }
 
     return isValid;

http://git-wip-us.apache.org/repos/asf/knox/blob/8886615a/gateway-admin-ui/src/app/provider-config-wizard/ha-provider-config.ts
----------------------------------------------------------------------
diff --git a/gateway-admin-ui/src/app/provider-config-wizard/ha-provider-config.ts b/gateway-admin-ui/src/app/provider-config-wizard/ha-provider-config.ts
index 54dea49..ce5752b 100644
--- a/gateway-admin-ui/src/app/provider-config-wizard/ha-provider-config.ts
+++ b/gateway-admin-ui/src/app/provider-config-wizard/ha-provider-config.ts
@@ -73,23 +73,29 @@ export class HaProviderConfig extends DisplayBindingProviderConfig {
     let isValid: boolean = true;
 
     let value = this.getParam(this.getDisplayNamePropertyBinding(paramName));
-    if (value) {
-      switch (paramName) {
-        case HaProviderConfig.SERVICE_NAME:
-          isValid = ValidationUtils.isValidString(value) && !ValidationUtils.isValidNumber(value);
-          break;
-        case HaProviderConfig.ZK_ENSEMBLE:
+
+    switch (paramName) {
+      case HaProviderConfig.SERVICE_NAME:
+        isValid = ValidationUtils.isValidString(value) && !ValidationUtils.isValidNumber(value);
+        break;
+      case HaProviderConfig.ZK_ENSEMBLE:
+        if (value) {
           isValid = this.isValidZooKeeperEnsemble(value);
-          break;
-        case HaProviderConfig.ZK_NAMESPACE:
+        }
+        break;
+      case HaProviderConfig.ZK_NAMESPACE:
+        if (value) {
           isValid = ValidationUtils.isValidString(value);
-          break;
-        default:
+        }
+        break;
+      default:
+        if (value) {
           isValid = ValidationUtils.isValidNumber(value);
-          if (!isValid) {
-            console.debug(paramName + ' value is not valid.');
-          }
-      }
+        }
+    }
+
+    if (!isValid) {
+      console.debug(paramName + ' (' + this.getDisplayNamePropertyBinding(paramName) + ')
value is NOT valid: ' + value);
     }
 
     return isValid;

http://git-wip-us.apache.org/repos/asf/knox/blob/8886615a/gateway-admin-ui/src/app/provider-config-wizard/ha-wizard.ts
----------------------------------------------------------------------
diff --git a/gateway-admin-ui/src/app/provider-config-wizard/ha-wizard.ts b/gateway-admin-ui/src/app/provider-config-wizard/ha-wizard.ts
index ca1eaec..243ffa8 100644
--- a/gateway-admin-ui/src/app/provider-config-wizard/ha-wizard.ts
+++ b/gateway-admin-ui/src/app/provider-config-wizard/ha-wizard.ts
@@ -60,7 +60,10 @@ export class HaWizard extends CategoryWizard implements ProviderContributorWizar
 
     for (let propertyName in this.providerConfig.params) {
       if (propertyName !== svcNameProperty) {
-        paramValue += ';' + propertyName + '=' + (this.providerConfig as DisplayBindingProviderConfig).getParam(propertyName);
+        let value = (this.providerConfig as DisplayBindingProviderConfig).getParam(propertyName);
+        if (value && value.trim().length > 0) {
+          paramValue += ';' + propertyName + '=' + value;
+        }
       }
     }
 

http://git-wip-us.apache.org/repos/asf/knox/blob/8886615a/gateway-admin-ui/src/app/provider-config-wizard/provider-config-wizard.component.ts
----------------------------------------------------------------------
diff --git a/gateway-admin-ui/src/app/provider-config-wizard/provider-config-wizard.component.ts
b/gateway-admin-ui/src/app/provider-config-wizard/provider-config-wizard.component.ts
index 6fe3e7b..af5af86 100644
--- a/gateway-admin-ui/src/app/provider-config-wizard/provider-config-wizard.component.ts
+++ b/gateway-admin-ui/src/app/provider-config-wizard/provider-config-wizard.component.ts
@@ -138,6 +138,8 @@ export class ProviderConfigWizardComponent implements OnInit {
           if (this.isProviderConfigValid(catWizard.getProviderConfig())) {
             contribWiz.contribute(pc);
             isContributed = true;
+          } else {
+            console.debug('CategoryWizard ProviderConfig is not valid.');
           }
         }
       }
@@ -146,7 +148,7 @@ export class ProviderConfigWizardComponent implements OnInit {
         pc = catWizard.getProviderConfig();
       }
 
-      if (pc && this.isProviderConfigValid(pc)) {
+      if (pc && (isContributed || this.isProviderConfigValid(pc))) {
         if (!isContributed) {
           this.providers.push(pc);
         }
@@ -166,6 +168,8 @@ export class ProviderConfigWizardComponent implements OnInit {
 
         // Clear the wizard state
         this.getCategoryWizard(this.selectedCategory).reset();
+      } else {
+        console.debug('ProviderConfig is missing or invalid.');
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/knox/blob/8886615a/gateway-applications/src/main/resources/applications/admin-ui/app/index.html
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/index.html
b/gateway-applications/src/main/resources/applications/admin-ui/app/index.html
index b7a65c9..d25f2da 100644
--- a/gateway-applications/src/main/resources/applications/admin-ui/app/index.html
+++ b/gateway-applications/src/main/resources/applications/admin-ui/app/index.html
@@ -11,4 +11,4 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
---><!doctype html><html><head><meta charset="utf-8"><title>Apache
Knox Manager</title><meta name="viewport" content="width=device-width,initial-scale=1"><link
rel="icon" type="image/x-icon" href="favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1"><!--
Latest compiled and minified CSS --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"><!--
Optional theme --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css"
integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous"><!--
Custom styles for this template --><link href="assets/sticky-footer.css" rel="stylesheet"><script
src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script><!--
Latest compiled and minified JavaScript --><scr
 ipt src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
crossorigin="anonymous"></script><script src="assets/vkbeautify.js"></script><link
href="styles.2ee5b7f4cd59a6cf015e.bundle.css" rel="stylesheet"/></head><body><div
class="navbar-wrapper"><div class="container-fluid"><nav class="navbar navbar-inverse
navbar-static-top"><div class="container-fluid"><div class="navbar-header"><button
type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
aria-expanded="false" aria-controls="navbar"><span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span> <span
class="icon-bar"></span></button> <a class="navbar-brand" href="#"><img
style="max-width:200px; margin-top: -9px;" src="assets/knox-logo-transparent.gif" alt="Apache
Knox Manager"></a></div></div></nav></div><!-- Content
--><resource-management></res
 ource-management><footer class="footer"><div class="container-fluid"><div>Knox
Manager Version 1.0.0</div><gateway-version></gateway-version></div></footer><script
type="text/javascript" src="inline.8b440394d56c1b9f80b6.bundle.js"></script><script
type="text/javascript" src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script
type="text/javascript" src="main.2efbd98cdf9b2cd26024.bundle.js"></script></div></body></html>
\ No newline at end of file
+--><!doctype html><html><head><meta charset="utf-8"><title>Apache
Knox Manager</title><meta name="viewport" content="width=device-width,initial-scale=1"><link
rel="icon" type="image/x-icon" href="favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1"><!--
Latest compiled and minified CSS --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"><!--
Optional theme --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css"
integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous"><!--
Custom styles for this template --><link href="assets/sticky-footer.css" rel="stylesheet"><script
src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script><!--
Latest compiled and minified JavaScript --><scr
 ipt src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
crossorigin="anonymous"></script><script src="assets/vkbeautify.js"></script><link
href="styles.2ee5b7f4cd59a6cf015e.bundle.css" rel="stylesheet"/></head><body><div
class="navbar-wrapper"><div class="container-fluid"><nav class="navbar navbar-inverse
navbar-static-top"><div class="container-fluid"><div class="navbar-header"><button
type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
aria-expanded="false" aria-controls="navbar"><span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span> <span
class="icon-bar"></span></button> <a class="navbar-brand" href="#"><img
style="max-width:200px; margin-top: -9px;" src="assets/knox-logo-transparent.gif" alt="Apache
Knox Manager"></a></div></div></nav></div><!-- Content
--><resource-management></res
 ource-management><footer class="footer"><div class="container-fluid"><div>Knox
Manager Version 1.0.0</div><gateway-version></gateway-version></div></footer><script
type="text/javascript" src="inline.fda93ec14cbb0120997c.bundle.js"></script><script
type="text/javascript" src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script
type="text/javascript" src="main.cf8a43d8be4617b91d5c.bundle.js"></script></div></body></html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/8886615a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.8b440394d56c1b9f80b6.bundle.js
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.8b440394d56c1b9f80b6.bundle.js
b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.8b440394d56c1b9f80b6.bundle.js
deleted file mode 100644
index 3123749..0000000
--- a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.8b440394d56c1b9f80b6.bundle.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,u){for(var a,i,f,l=0,s=[];l<r.length;l++)t[i=r[l]]&&s.push(t[i][0]),t[i]=0;for(a
in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,u);s.length;)s.shift()();if(u)for(l=0;l<u.length;l++)f=o(o.s=u[l]);return
f};var r={},t={2:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return
e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return
new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var
c=document.getElementsByTagName("head")[0],u=document.createElement("script");u.type="text/javascript",u.charset="utf-8",u.async=!0,u.timeout=12e4,o.nc&&u.setAttribute("nonce",o.nc),u.src=o.p+""+e+"."+{0:"2efbd98cdf9b2cd26024",1:"aed76669724804835353"}[e]+".chunk.js";var
a=setTimeout(i,12e4);function i(){u.onerror=u.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new
Error("Loading chu
 nk "+e+" failed.")),t[e]=void 0)}return u.onerror=u.onload=i,c.appendChild(u),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var
n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return
Object.prototype.hasOwnProperty.call(e,n)},o.p="",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/8886615a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.fda93ec14cbb0120997c.bundle.js
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.fda93ec14cbb0120997c.bundle.js
b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.fda93ec14cbb0120997c.bundle.js
new file mode 100644
index 0000000..f85b8d1
--- /dev/null
+++ b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.fda93ec14cbb0120997c.bundle.js
@@ -0,0 +1 @@
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,u){for(var a,i,f,l=0,s=[];l<r.length;l++)t[i=r[l]]&&s.push(t[i][0]),t[i]=0;for(a
in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,u);s.length;)s.shift()();if(u)for(l=0;l<u.length;l++)f=o(o.s=u[l]);return
f};var r={},t={2:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return
e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return
new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var
c=document.getElementsByTagName("head")[0],u=document.createElement("script");u.type="text/javascript",u.charset="utf-8",u.async=!0,u.timeout=12e4,o.nc&&u.setAttribute("nonce",o.nc),u.src=o.p+""+e+"."+{0:"cf8a43d8be4617b91d5c",1:"aed76669724804835353"}[e]+".chunk.js";var
a=setTimeout(i,12e4);function i(){u.onerror=u.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new
Error("Loading chu
 nk "+e+" failed.")),t[e]=void 0)}return u.onerror=u.onload=i,c.appendChild(u),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var
n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return
Object.prototype.hasOwnProperty.call(e,n)},o.p="",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file


Mime
View raw message