External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 12:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Changes console.logs to $log.debug for network UI

Browse Source
This commit is contained in:
Jared Tabor
2018-06-11 16:01:08 -04:00
parent 5bf0724bd0
commit 0bc3332f68
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/network-ui/extract_messages.js
View File

@@ -54,4 +54,4 @@ while(next_message !== undefined) {
} }
console.log(YAML.stringify(data)); controller.log.debug(YAML.stringify(data));

3
awx/ui/client/src/network-ui/fsm.js
View File

@@ -22,7 +22,7 @@ function NullChannel(from_controller, tracer) {
NullChannel.prototype.send = function() { NullChannel.prototype.send = function() {
}; };
function FSMController (scope, name, initial_state, tracer) { function FSMController (scope, name, initial_state, tracer, log) {
this.scope = scope; this.scope = scope;
this.name = name; this.name = name;
this.state = initial_state; this.state = initial_state;
@@ -32,6 +32,7 @@ function FSMController (scope, name, initial_state, tracer) {
this.handling_message_type = 'start'; this.handling_message_type = 'start';
this.state.start(this); this.state.start(this);
this.handling_message_type = null; this.handling_message_type = null;
this.log = log;
} }
exports.FSMController = FSMController; exports.FSMController = FSMController;

2
awx/ui/client/src/network-ui/move.fsm.js
View File

@@ -174,7 +174,7 @@ _Ready.prototype.onPasteDevice = function (controller, msg_type, message) {
} }
scope.selected_devices.push(device); scope.selected_devices.push(device);
device.selected = true; device.selected = true;
console.log(c_messages); controller.log.debug(c_messages);
scope.$emit('awxNet-addSearchOption', device); scope.$emit('awxNet-addSearchOption', device);
scope.send_control_message(new messages.MultipleMessage(controller.scope.client_id, c_messages)); scope.send_control_message(new messages.MultipleMessage(controller.scope.client_id, c_messages));
controller.changeState(Selected2); controller.changeState(Selected2);

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

@@ -5,7 +5,6 @@ import networkDetailsDirective from './network-details/main';
import networkZoomWidget from './zoom-widget/main'; import networkZoomWidget from './zoom-widget/main';
import awxNetStrings from './network.ui.strings'; import awxNetStrings from './network.ui.strings';
//console.log = function () { };
var NetworkUIController = require('./network.ui.controller.js'); var NetworkUIController = require('./network.ui.controller.js');
var cursor = require('./cursor.directive.js'); var cursor = require('./cursor.directive.js');
var router = require('./router.directive.js'); var router = require('./router.directive.js');

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

@@ -194,17 +194,17 @@ var NetworkUIController = function($scope,
}; };
//Define the FSMs //Define the FSMs
$scope.hotkeys_controller = new fsm.FSMController($scope, "hotkeys_fsm", hotkeys.Start, $scope); $scope.hotkeys_controller = new fsm.FSMController($scope, "hotkeys_fsm", hotkeys.Start, $scope, $log);
$scope.keybindings_controller = new fsm.FSMController($scope, "keybindings_fsm", keybindings.Start, $scope); $scope.keybindings_controller = new fsm.FSMController($scope, "keybindings_fsm", keybindings.Start, $scope, $log);
$scope.view_controller = new fsm.FSMController($scope, "view_fsm", view.Start, $scope); $scope.view_controller = new fsm.FSMController($scope, "view_fsm", view.Start, $scope, $log);
$scope.move_controller = new fsm.FSMController($scope, "move_fsm", move.Start, $scope); $scope.move_controller = new fsm.FSMController($scope, "move_fsm", move.Start, $scope, $log);
$scope.move_readonly_controller = new fsm.FSMController($scope, "move_readonly_fsm", move_readonly.Start, $scope); $scope.move_readonly_controller = new fsm.FSMController($scope, "move_readonly_fsm", move_readonly.Start, $scope, $log);
$scope.details_panel_controller = new fsm.FSMController($scope, "details_panel_fsm", details_panel_fsm.Start, $scope); $scope.details_panel_controller = new fsm.FSMController($scope, "details_panel_fsm", details_panel_fsm.Start, $scope, $log);
$scope.buttons_controller = new fsm.FSMController($scope, "buttons_fsm", buttons.Start, $scope); $scope.buttons_controller = new fsm.FSMController($scope, "buttons_fsm", buttons.Start, $scope, $log);
$scope.time_controller = new fsm.FSMController($scope, "time_fsm", time.Start, $scope); $scope.time_controller = new fsm.FSMController($scope, "time_fsm", time.Start, $scope, $log);
$scope.test_controller = new fsm.FSMController($scope, "test_fsm", test_fsm.Start, $scope); $scope.test_controller = new fsm.FSMController($scope, "test_fsm", test_fsm.Start, $scope, $log);
$scope.inventory_toolbox_controller = new fsm.FSMController($scope, "toolbox_fsm", toolbox_fsm.Start, $scope); $scope.inventory_toolbox_controller = new fsm.FSMController($scope, "toolbox_fsm", toolbox_fsm.Start, $scope, $log);
var toolboxTopMargin = $('.Networking-top').height(); var toolboxTopMargin = $('.Networking-top').height();
var toolboxTitleMargin = toolboxTopMargin + 35; var toolboxTitleMargin = toolboxTopMargin + 35;

10
awx/ui/client/src/network-ui/test.fsm.js
View File

@@ -117,7 +117,7 @@ _Reporting.prototype.start = function (controller) {
new Date().toISOString(), new Date().toISOString(),
controller.scope.version); controller.scope.version);
controller.scope.test_results.push(test_result); controller.scope.test_results.push(test_result);
console.log(["Reporting test", test_result.name, test_result.id]); controller.log.debug(["Reporting test", test_result.name, test_result.id]);
controller.scope.send_test_message(new messages.TestResult(controller.scope.client_id, controller.scope.send_test_message(new messages.TestResult(controller.scope.client_id,
test_result.id, test_result.id,
test_result.name, test_result.name,
@@ -125,7 +125,7 @@ _Reporting.prototype.start = function (controller) {
test_result.date, test_result.date,
test_result.code_under_test)); test_result.code_under_test));
if (typeof(window.__coverage__) !== "undefined" && window.__coverage__ !== null) { if (typeof(window.__coverage__) !== "undefined" && window.__coverage__ !== null) {
console.log(["Reporting coverage", test_result.name, test_result.id]); controller.log.debug(["Reporting coverage", test_result.name, test_result.id]);
controller.scope.send_test_message(new messages.Coverage(controller.scope.client_id, window.__coverage__, test_result.id)); controller.scope.send_test_message(new messages.Coverage(controller.scope.client_id, window.__coverage__, test_result.id));
} }
controller.changeState(Loading); controller.changeState(Loading);
@@ -138,7 +138,7 @@ _Loading.prototype.start = function (controller) {
if (controller.scope.current_tests.length === 0) { if (controller.scope.current_tests.length === 0) {
controller.changeState(Disabled); controller.changeState(Disabled);
} else { } else {
console.log("Starting test"); controller.log.debug("Starting test");
controller.scope.reset_coverage(); controller.scope.reset_coverage();
controller.scope.current_test = controller.scope.current_tests.shift(); controller.scope.current_test = controller.scope.current_tests.shift();
controller.scope.reset_toolboxes(); controller.scope.reset_toolboxes();
@@ -169,7 +169,7 @@ _Ready.prototype.start = function (controller) {
var load_id = controller.scope.test_result_id_seq(); var load_id = controller.scope.test_result_id_seq();
console.log(["Reporting Load", load_id]); controller.log.debug(["Reporting Load", load_id]);
controller.scope.send_test_message(new messages.TestResult(controller.scope.client_id, controller.scope.send_test_message(new messages.TestResult(controller.scope.client_id,
load_id, load_id,
"Load", "Load",
@@ -177,7 +177,7 @@ _Ready.prototype.start = function (controller) {
new Date().toISOString(), new Date().toISOString(),
controller.scope.version)); controller.scope.version));
if (typeof(window.__coverage__) !== "undefined" && window.__coverage__ !== null) { if (typeof(window.__coverage__) !== "undefined" && window.__coverage__ !== null) {
console.log(["Reporting Load Coverage", load_id]); controller.log.debug(["Reporting Load Coverage", load_id]);
controller.scope.send_test_message(new messages.Coverage(controller.scope.client_id, window.__coverage__, load_id)); controller.scope.send_test_message(new messages.Coverage(controller.scope.client_id, window.__coverage__, load_id));
} }

6
awx/ui/client/src/network-ui/vendor/svg-crowbar.js vendored
View File

@@ -30,7 +30,7 @@ function svg_crowbar () {
documents.push(el.contentDocument); documents.push(el.contentDocument);
} }
} catch(err) { } catch(err) {
console.log(err); controller.log.debug(err);
} }
}); });
@@ -40,7 +40,7 @@ function svg_crowbar () {
documents.push(el.contentDocument); documents.push(el.contentDocument);
} }
} catch(err) { } catch(err) {
console.log(err); controller.log.debug(err);
} }
}); });
@@ -124,7 +124,7 @@ function svg_crowbar () {
button.textContent = "Download"; button.textContent = "Download";
button.onclick = function() { button.onclick = function() {
// console.log(el, d, i, sources) // controller.log.debug(el, d, i, sources)
download(d); download(d);
}; };

2
awx/ui/client/src/shared/socket/socket.service.js
View File

@@ -150,7 +150,7 @@ export default
if(this.socket){ if(this.socket){
this.socket.close(); this.socket.close();
delete this.socket; delete this.socket;
console.log("Socket deleted: "+this.socket); $log.debug("Socket deleted: "+this.socket);
} }
}, },
subscribe: function(state){ subscribe: function(state){