From 079d8e25657d9e87169cfbd29d791a935ebeb2df Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 1 May 2018 12:36:59 -0700 Subject: [PATCH] fixes issue with ui-view for network UI and closes network UI socket connections after closing the network UI --- awx/ui/client/index.template.ejs | 5 +-- .../components/layout/side-nav.partial.html | 4 +- .../network-nav/network.nav.block.less | 2 + .../network-nav/network.nav.controller.js | 1 + .../src/network-ui/network.ui.controller.js | 39 +++++++++++-------- awx/ui/client/src/network-ui/style.less | 1 + 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/awx/ui/client/index.template.ejs b/awx/ui/client/index.template.ejs index 6f6a5c2cba..f16282bd91 100644 --- a/awx/ui/client/index.template.ejs +++ b/awx/ui/client/index.template.ejs @@ -19,14 +19,13 @@ -
+
-
-
+
diff --git a/awx/ui/client/lib/components/layout/side-nav.partial.html b/awx/ui/client/lib/components/layout/side-nav.partial.html index 8996df899f..5786c13537 100644 --- a/awx/ui/client/lib/components/layout/side-nav.partial.html +++ b/awx/ui/client/lib/components/layout/side-nav.partial.html @@ -1,7 +1,7 @@
+ ng-class="{'at-Layout-side--expanded': vm.isExpanded && layoutVm.isLoggedIn}" ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing && layoutVm.currentState !== 'inventories.edit.networking'">
+ ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing && layoutVm.currentState !== 'inventories.edit.networking'">
diff --git a/awx/ui/client/src/network-ui/network-nav/network.nav.block.less b/awx/ui/client/src/network-ui/network-nav/network.nav.block.less index 8cb4006389..552c0151bc 100644 --- a/awx/ui/client/src/network-ui/network-nav/network.nav.block.less +++ b/awx/ui/client/src/network-ui/network-nav/network.nav.block.less @@ -4,6 +4,7 @@ width:100%; align-items: flex-end; position:absolute; + z-index: 1100; } .Networking-top{ @@ -135,6 +136,7 @@ .Networking-dropDown{ left:-2px!important; + z-index: 1101; } .Networking-searchButton{ diff --git a/awx/ui/client/src/network-ui/network-nav/network.nav.controller.js b/awx/ui/client/src/network-ui/network-nav/network.nav.controller.js index f05bee4dd7..820ed7e37d 100644 --- a/awx/ui/client/src/network-ui/network-nav/network.nav.controller.js +++ b/awx/ui/client/src/network-ui/network-nav/network.nav.controller.js @@ -16,6 +16,7 @@ function NetworkingController (models, $state, $scope, strings) { vm.groups = []; $scope.devices = []; vm.close = () => { + $scope.$broadcast('awxNet-closeNetworkUI'); $state.go('inventories'); }; diff --git a/awx/ui/client/src/network-ui/network.ui.controller.js b/awx/ui/client/src/network-ui/network.ui.controller.js index a261b326bb..7f324988c7 100644 --- a/awx/ui/client/src/network-ui/network.ui.controller.js +++ b/awx/ui/client/src/network-ui/network.ui.controller.js @@ -25,6 +25,7 @@ var NetworkUIController = function($scope, $http, $q, $state, + $log, ProcessErrors, ConfigService, rbacUiControlService) { @@ -269,19 +270,19 @@ var NetworkUIController = function($scope, $scope.for_each_page('/api/v2/inventories/' + $scope.inventory_id + '/hosts/', function(all_results) { let hosts = all_results; - console.log(hosts.length); + $log.debug(hosts.length); for(var i = 0; i