knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pzamp...@apache.org
Subject [7/7] knox git commit: KNOX-1397 - Admin UI Topologies List needs to Refresh on New or Deleted Topologies
Date Tue, 24 Jul 2018 18:39:38 GMT
KNOX-1397 - Admin UI Topologies List needs to Refresh on New or Deleted Topologies


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

Branch: refs/heads/master
Commit: 7a7450b90c1cc244a4bc96fcc9845c6de8464d63
Parents: 2784b52
Author: Phil Zampino <pzampino@apache.org>
Authored: Tue Jul 24 14:22:05 2018 -0400
Committer: Phil Zampino <pzampino@apache.org>
Committed: Tue Jul 24 14:23:49 2018 -0400

----------------------------------------------------------------------
 .../src/app/topology-detail.component.ts        | 34 ++++++++++++------
 gateway-admin-ui/src/app/topology.service.ts    |  2 +-
 .../applications/admin-ui/app/index.html        |  2 +-
 .../app/inline.3305dfeb870d0fb0a8de.bundle.js   |  1 -
 .../app/inline.7c9315cf85703fa31a25.bundle.js   |  1 +
 .../app/main.1d63eb071923c3ee4e61.bundle.js     |  1 -
 .../app/main.412cf9608524b45f6dbc.bundle.js     |  1 +
 .../service/admin/TopologiesResource.java       | 37 ++++++++++----------
 8 files changed, 46 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/7a7450b9/gateway-admin-ui/src/app/topology-detail.component.ts
----------------------------------------------------------------------
diff --git a/gateway-admin-ui/src/app/topology-detail.component.ts b/gateway-admin-ui/src/app/topology-detail.component.ts
index aeb30d5..ee854f4 100644
--- a/gateway-admin-ui/src/app/topology-detail.component.ts
+++ b/gateway-admin-ui/src/app/topology-detail.component.ts
@@ -17,8 +17,8 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Topology } from './topology';
 import { TopologyService } from "./topology.service";
+import { ResourceTypesService } from "./resourcetypes/resourcetypes.service";
 import { BsModalComponent } from 'ng2-bs3-modal/ng2-bs3-modal';
-import { ResourceService } from "./resource/resource.service";
 
 import 'brace/theme/monokai';
 import 'brace/mode/xml';
@@ -104,7 +104,7 @@ export class TopologyDetailComponent implements OnInit {
 
     @ViewChild('editor') editor;
 
-    constructor(private topologyService : TopologyService, private resourceService: ResourceService)
{
+    constructor(private topologyService : TopologyService, private resourceTypesService:
ResourceTypesService) {
     }
 
     ngOnInit(): void {
@@ -125,17 +125,27 @@ export class TopologyDetailComponent implements OnInit {
     }
 
     createTopology() {
-        if (this.changedTopology) {
-            this.topologyService.createTopology(this.newTopologyName, this.changedTopology)
-            .then(value => this.topologyService.changedTopology(this.newTopologyName));
-        } else {
-            this.topologyService.createTopology(this.newTopologyName, this.topologyContent)
-            .then(value => this.topologyService.changedTopology(this.newTopologyName));
-        }
+      this.topologyService.createTopology(this.newTopologyName,
+                                          (this.changedTopology ? this.changedTopology :
this.topologyContent))
+                          .then(() => {
+                              this.topologyService.changedTopology(this.newTopologyName)
+                              // This refreshes the list of topologies
+                              this.resourceTypesService.selectResourceType('Topologies');
+                          });
     }
 
     deleteTopology() {
-        this.topologyService.deleteTopology(this.topology.href).then(value => this.topologyService.changedTopology(this.topology.name));
+        this.topologyService.deleteTopology(this.topology.href)
+                            .then(() => {
+                                this.topologyService.changedTopology(this.topology.name);
+                                // This refreshes the list of topologies
+                                this.resourceTypesService.selectResourceType('Topologies');
+                                // This refreshes the topology content panel to the first
one in the list
+                                this.topologyService.getTopologies()
+                                                    .then(topologies => {
+                                                        this.topologyService.selectedTopology(topologies[0]);
+                                                    })
+                            });
     }
 
     populateContent(topology: Topology) {
@@ -143,7 +153,9 @@ export class TopologyDetailComponent implements OnInit {
         this.setTitle(topology.name);
         if (this.topology) {
             if (this.topology.href) {
-              this.topologyService.getTopology(this.topology.href).then( content => this.topologyContent
= content).then(() => this.makeReadOnly(this.topologyContent, 'generated') );
+              this.topologyService.getTopology(this.topology.href)
+                                  .then( content => this.topologyContent = content)
+                                  .then(() => this.makeReadOnly(this.topologyContent,
'generated') );
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/knox/blob/7a7450b9/gateway-admin-ui/src/app/topology.service.ts
----------------------------------------------------------------------
diff --git a/gateway-admin-ui/src/app/topology.service.ts b/gateway-admin-ui/src/app/topology.service.ts
index 28d1e70..00bf345 100644
--- a/gateway-admin-ui/src/app/topology.service.ts
+++ b/gateway-admin-ui/src/app/topology.service.ts
@@ -93,7 +93,7 @@ export class TopologyService {
                         .toPromise()
                         .then(() => xml)
                         .catch((err: HttpErrorResponse) => {
-                          console.debug('TopologyService --> getTopology() --> \n 
error: ' + err.status + ' ' + err.message);
+                          console.debug('TopologyService --> createTopology() --> \n
 error: ' + err.status + ' ' + err.message);
                           if (err.status === 401) {
                             window.location.assign(document.location.pathname);
                           } else {

http://git-wip-us.apache.org/repos/asf/knox/blob/7a7450b9/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 a2222fe..fa94f1b 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.3305dfeb870d0fb0a8de.bundle.js"></script><script
type="text/javascript" src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script
type="text/javascript" src="main.1d63eb071923c3ee4e61.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.7c9315cf85703fa31a25.bundle.js"></script><script
type="text/javascript" src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script
type="text/javascript" src="main.412cf9608524b45f6dbc.bundle.js"></script></div></body></html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/7a7450b9/gateway-applications/src/main/resources/applications/admin-ui/app/inline.3305dfeb870d0fb0a8de.bundle.js
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.3305dfeb870d0fb0a8de.bundle.js
b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.3305dfeb870d0fb0a8de.bundle.js
deleted file mode 100644
index 7f29c2a..0000000
--- a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.3305dfeb870d0fb0a8de.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:"1d63eb071923c3ee4e61",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/7a7450b9/gateway-applications/src/main/resources/applications/admin-ui/app/inline.7c9315cf85703fa31a25.bundle.js
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.7c9315cf85703fa31a25.bundle.js
b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.7c9315cf85703fa31a25.bundle.js
new file mode 100644
index 0000000..3520e07
--- /dev/null
+++ b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.7c9315cf85703fa31a25.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:"412cf9608524b45f6dbc",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