External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 03:10:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

fixes issue with ui-view for network UI

Browse Source 
and closes network UI socket connections after closing the network UI
This commit is contained in:
Jared Tabor 2018-05-01 12:36:59 -07:00
parent fd4f78a64c
commit 079d8e2565
No known key found for this signature in database
GPG Key ID: 1B343EC4C3CF7E5C
6 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/index.template.ejs
View File

@ -19,14 +19,13 @@
</head>
<body data-user-agent="{{userAgent}}">
<div ui-view="networking"><div>
<div ui-view="networking"></div>
<at-layout>
<bread-crumb></bread-crumb>
<toast></toast>
<div class="container-fluid" id="content-container">
<div class="row">
<div class="col-lg-12" ui-view>
</div>
<div class="col-lg-12" ui-view></div>
</div>
<!-- Password Dialog -->
<div id="password-modal" style="display: none;"></div>

4
awx/ui/client/lib/components/layout/side-nav.partial.html
View File

@ -1,7 +1,7 @@
<div class="at-Layout-side"
ng-class="{'at-Layout-side--expanded': vm.isExpanded && layoutVm.isLoggedIn}" ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing">
ng-class="{'at-Layout-side--expanded': vm.isExpanded && layoutVm.isLoggedIn}" ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing && layoutVm.currentState !== 'inventories.edit.networking'">
<div class="at-Layout-sideNavItem at-Layout-sideNavToggle" ng-click="vm.toggleExpansion()"
ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing">
ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing && layoutVm.currentState !== 'inventories.edit.networking'">
<i class="fa fa-bars"></i>
</div>
<ng-transclude></ng-transclude>

2
awx/ui/client/src/network-ui/network-nav/network.nav.block.less
View File

@ -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{

1
awx/ui/client/src/network-ui/network-nav/network.nav.controller.js
View File

@ -16,6 +16,7 @@ function NetworkingController (models, $state, $scope, strings) {
vm.groups = [];
$scope.devices = [];
vm.close = () => {
$scope.$broadcast('awxNet-closeNetworkUI');
$state.go('inventories');
};

39
awx/ui/client/src/network-ui/network.ui.controller.js
View File

@ -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<hosts.length; i++) {
console.log(i);
$log.debug(i);
try {
let device_type = null;
let device_name = null;
let device = null;
let host = hosts[i];
device_name = host.name;
console.log(device_name);
$log.debug(device_name);
if (host.variables !== "") {
host.data = jsyaml.safeLoad(host.variables);
console.log(host.data);
$log.debug(host.data);
} else {
host.data = {};
}
@ -297,14 +298,14 @@ var NetworkUIController = function($scope,
$scope.update_links_in_vars_by_device(device_name, host.data);
}
if ($scope.devices_by_name[device_name] === undefined) {
console.log(['adding', device_name]);
$log.debug(['adding', device_name]);
device = new models.Device(0, device_name, 0, 0, device_type, host.id);
device.icon = true;
device.variables = host.data;
$scope.inventory_toolbox.items.push(device);
}
} catch (error) {
console.log(error);
$log.debug(error);
}
}
}, 100);
@ -950,7 +951,7 @@ var NetworkUIController = function($scope,
};
$scope.create_device = function(data) {
console.log(data);
$log.debug(data);
var device = new models.Device(data.id,
data.name,
data.x,
@ -979,7 +980,7 @@ var NetworkUIController = function($scope,
};
$scope.onLinkCreate = function(data) {
console.log(data);
$log.debug(data);
$scope.create_link(data);
};
@ -1011,7 +1012,7 @@ var NetworkUIController = function($scope,
}
}
}
console.log(new_link);
$log.debug(new_link);
if (new_link.from_interface !== null && new_link.to_interface !== null) {
new_link.from_interface.dot();
new_link.to_interface.dot();
@ -1227,12 +1228,12 @@ var NetworkUIController = function($scope,
$scope.link_id_seq = util.natural_numbers(max_link_id);
}
console.log(['data.inventory_toolbox', data.inventory_toolbox]);
$log.debug(['data.inventory_toolbox', data.inventory_toolbox]);
if (data.inventory_toolbox !== undefined) {
$scope.inventory_toolbox.items = [];
for (i = 0; i < data.inventory_toolbox.length; i++) {
device = data.inventory_toolbox[i];
console.log(device);
$log.debug(device);
if (device.device_type === undefined) {
device.device_type = device.type;
}
@ -1247,7 +1248,7 @@ var NetworkUIController = function($scope,
}
$scope.inventory_toolbox.items.push(new_device);
}
console.log($scope.inventory_toolbox.items);
$log.debug($scope.inventory_toolbox.items);
}
$scope.updateInterfaceDots();
@ -1322,6 +1323,12 @@ var NetworkUIController = function($scope,
}
};
$scope.$on('awxNet-closeNetworkUI', function(){
$scope.control_socket.close();
if ($scope.tests_enabled) {
$scope.test_socket.close();
}
});
// End web socket
//
@ -1345,10 +1352,10 @@ var NetworkUIController = function($scope,
$scope.$apply();
}, 17);
console.log("Network UI started");
$log.debug("Network UI started");
$scope.$on('$destroy', function () {
console.log("Network UI stopping");
$log.debug("Network UI stopping");
$scope.first_channel.send('UnbindDocument', {});
});
@ -1380,7 +1387,7 @@ var NetworkUIController = function($scope,
try {
$scope.first_channel.send(test_event.msg_type, test_event);
} catch (err) {
console.log(["Test Error:", $scope.current_test, err]);
$log.debug(["Test Error:", $scope.current_test, err]);
$scope.test_errors.push(err);
}
}
@ -1455,7 +1462,7 @@ var NetworkUIController = function($scope,
}
$scope.animations = [];
};
$log.debug("Network UI loaded");
};
exports.NetworkUIController = NetworkUIController;
console.log("Network UI loaded");

1
awx/ui/client/src/network-ui/style.less
View File

@ -42,6 +42,7 @@
.NetworkUI {
background-color: @light-toolbox-background;
z-index: 1100;
}
.NetworkUI__text {