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-1220 - HostMap provider configuration wizard option in Admin UI
Date Fri, 06 Apr 2018 21:01:19 GMT
KNOX-1220 - HostMap provider configuration wizard option in Admin UI


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

Branch: refs/heads/master
Commit: 4ec9ae4e1b3526965a4ad52754841dd8908e76ae
Parents: 8e2cebd
Author: Phil Zampino <pzampino@apache.org>
Authored: Fri Apr 6 15:43:43 2018 -0400
Committer: Phil Zampino <pzampino@apache.org>
Committed: Fri Apr 6 16:47:14 2018 -0400

----------------------------------------------------------------------
 .../hostmap-provider-wizard.ts                  | 48 ++++++++++++++++++++
 .../provider-config-wizard.component.html       |  4 +-
 .../provider-config-wizard.component.ts         | 10 ++--
 .../applications/admin-ui/app/index.html        |  2 +-
 .../app/inline.28a8d98092b6bd6d51ba.bundle.js   |  1 -
 .../app/inline.98d3eecf2b39159e0477.bundle.js   |  1 +
 .../app/main.4c78bd217ec640c7a3cf.bundle.js     |  1 +
 .../app/main.631c768090fd2016d0d1.bundle.js     |  1 -
 8 files changed, 60 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/4ec9ae4e/gateway-admin-ui/src/app/provider-config-wizard/hostmap-provider-wizard.ts
----------------------------------------------------------------------
diff --git a/gateway-admin-ui/src/app/provider-config-wizard/hostmap-provider-wizard.ts b/gateway-admin-ui/src/app/provider-config-wizard/hostmap-provider-wizard.ts
new file mode 100644
index 0000000..c0e82ca
--- /dev/null
+++ b/gateway-admin-ui/src/app/provider-config-wizard/hostmap-provider-wizard.ts
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+import {CategoryWizard} from "./category-wizard";
+import {ProviderConfig} from "../resource-detail/provider-config";
+
+
+export class HostMapProviderWizard extends CategoryWizard {
+
+  private stepCount: number = 2;
+
+  getTypes(): string[] {
+    return [];
+  }
+
+  getSteps(): number {
+    return this.stepCount;
+  }
+
+  onChange() {
+    // Nothing to do
+  }
+
+  getProviderConfig(): ProviderConfig {
+    this.providerConfig = new ProviderConfig();
+    this.providerConfig.role = 'hostmap';
+    this.providerConfig.name = 'static';
+    this.providerConfig.enabled = 'true';
+    this.providerConfig.params = new Map<string, string>();
+    return this.providerConfig;
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/knox/blob/4ec9ae4e/gateway-admin-ui/src/app/provider-config-wizard/provider-config-wizard.component.html
----------------------------------------------------------------------
diff --git a/gateway-admin-ui/src/app/provider-config-wizard/provider-config-wizard.component.html
b/gateway-admin-ui/src/app/provider-config-wizard/provider-config-wizard.component.html
index 50a470d..c437d82 100644
--- a/gateway-admin-ui/src/app/provider-config-wizard/provider-config-wizard.component.html
+++ b/gateway-admin-ui/src/app/provider-config-wizard/provider-config-wizard.component.html
@@ -53,7 +53,7 @@
           <input type="radio"
                  [name]="pc"
                  [(ngModel)]="selectedCategory"
-                 [value]="pc">{{pc}}
+                 [value]="pc">&nbsp;{{pc}}
         </label>
       </div>
     </div> <!-- Provider Category Selection Step -->
@@ -67,7 +67,7 @@
                  [name]="pt"
                  (change)="getCategoryWizard().onChange()"
                  [(ngModel)]="getCategoryWizard().selectedType"
-                 [value]="pt">{{pt}}
+                 [value]="pt">&nbsp;{{pt}}
         </label>
       </div>
     </div> <!-- Provider Type Selection Step -->

http://git-wip-us.apache.org/repos/asf/knox/blob/4ec9ae4e/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 71a9076..a56ce2b 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
@@ -28,6 +28,7 @@ import {HaWizard} from "./ha-wizard";
 import {Resource} from "../resource/resource";
 import {DisplayBindingProviderConfig} from "./display-binding-provider-config";
 import {OrderedParamContainer} from "./ordered-param-container";
+import {HostMapProviderWizard} from "./hostmap-provider-wizard";
 
 
 @Component({
@@ -46,10 +47,12 @@ export class ProviderConfigWizardComponent implements OnInit {
   private static CATEGORY_AUTHORIZATION: string   = 'Authorization';
   private static CATEGORY_ID_ASSERTION: string    = 'Identity Assertion';
   private static CATEGORY_HA: string              = 'HA';
+  private static CATEGORY_HOSTMAP: string         = 'Host Mapping';
   private static providerCategories: string[] = [ ProviderConfigWizardComponent.CATEGORY_AUTHENTICATION,
                                                   ProviderConfigWizardComponent.CATEGORY_AUTHORIZATION,
                                                   ProviderConfigWizardComponent.CATEGORY_ID_ASSERTION,
-                                                  ProviderConfigWizardComponent.CATEGORY_HA
+                                                  ProviderConfigWizardComponent.CATEGORY_HA,
+                                                  ProviderConfigWizardComponent.CATEGORY_HOSTMAP
                                                 ];
 
   private static CATEGORY_TYPES: Map<string, CategoryWizard> =
@@ -57,7 +60,8 @@ export class ProviderConfigWizardComponent implements OnInit {
               [ProviderConfigWizardComponent.CATEGORY_AUTHENTICATION, new AuthenticationWizard()
as CategoryWizard],
               [ProviderConfigWizardComponent.CATEGORY_AUTHORIZATION,  new AuthorizationWizard()
as CategoryWizard],
               [ProviderConfigWizardComponent.CATEGORY_ID_ASSERTION,   new IdentityAssertionWizard()
as CategoryWizard],
-              [ProviderConfigWizardComponent.CATEGORY_HA,             new HaWizard() as CategoryWizard]
+              [ProviderConfigWizardComponent.CATEGORY_HA,             new HaWizard() as CategoryWizard],
+              [ProviderConfigWizardComponent.CATEGORY_HOSTMAP,        new HostMapProviderWizard()
as CategoryWizard]
             ]);
 
   @ViewChild('newProviderConfigModal')
@@ -166,7 +170,7 @@ export class ProviderConfigWizardComponent implements OnInit {
   }
 
   onNextStep() {
-      ++this.step;
+    ++this.step;
   }
 
   onPreviousStep() {

http://git-wip-us.apache.org/repos/asf/knox/blob/4ec9ae4e/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 1e51bc4..11cf9dc 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 0.1.0</div><gateway-version></gateway-version></div></footer><script
type="text/javascript" src="inline.28a8d98092b6bd6d51ba.bundle.js"></script><script
type="text/javascript" src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script
type="text/javascript" src="main.631c768090fd2016d0d1.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 0.1.0</div><gateway-version></gateway-version></div></footer><script
type="text/javascript" src="inline.98d3eecf2b39159e0477.bundle.js"></script><script
type="text/javascript" src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script
type="text/javascript" src="main.4c78bd217ec640c7a3cf.bundle.js"></script></div></body></html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/4ec9ae4e/gateway-applications/src/main/resources/applications/admin-ui/app/inline.28a8d98092b6bd6d51ba.bundle.js
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.28a8d98092b6bd6d51ba.bundle.js
b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.28a8d98092b6bd6d51ba.bundle.js
deleted file mode 100644
index b1de9f0..0000000
--- a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.28a8d98092b6bd6d51ba.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:"631c768090fd2016d0d1",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/4ec9ae4e/gateway-applications/src/main/resources/applications/admin-ui/app/inline.98d3eecf2b39159e0477.bundle.js
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.98d3eecf2b39159e0477.bundle.js
b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.98d3eecf2b39159e0477.bundle.js
new file mode 100644
index 0000000..e095192
--- /dev/null
+++ b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.98d3eecf2b39159e0477.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:"4c78bd217ec640c7a3cf",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