web app updates for deleting a node and disabling node context options
This commit is contained in:
Blake J. Harnden
parent
8c31b75c39
commit
f004d20b79
5 changed files with 104 additions and 35 deletions
|
|
@ -250,6 +250,23 @@ def get_node(session_id, node_id):
|
|||
)
|
||||
|
||||
|
||||
@app.route("/sessions/<int:session_id>/nodes/<node_id>/terminal")
|
||||
def node_terminal(session_id, node_id):
|
||||
session = coreemu.sessions.get(session_id)
|
||||
if not session:
|
||||
return jsonify(error="session does not exist"), 404
|
||||
|
||||
if node_id.isdigit():
|
||||
node_id = int(node_id)
|
||||
node = session.objects.get(node_id)
|
||||
if not node:
|
||||
return jsonify(error="node does not exist"), 404
|
||||
|
||||
node.client.term("bash")
|
||||
|
||||
return jsonify()
|
||||
|
||||
|
||||
@app.route("/sessions/<int:session_id>/nodes/<node_id>", methods=["DELETE"])
|
||||
@synchronized
|
||||
def delete_node(session_id, node_id):
|
||||
|
|
|
|||
|
|
@ -177,10 +177,9 @@ class CoreNetwork {
|
|||
}
|
||||
};
|
||||
this.network = new vis.Network(this.container, this.networkData, this.networkOptions);
|
||||
this.network.on('doubleClick', this.addNode.bind(this));
|
||||
this.network.on('doubleClick', this.doubleClick.bind(this));
|
||||
this.network.on('dragEnd', this.dragEnd.bind(this));
|
||||
this.edges.on('add', this.addEdge.bind(this));
|
||||
this.nodesEnabled = false;
|
||||
}
|
||||
|
||||
async initialSession() {
|
||||
|
|
@ -197,6 +196,29 @@ class CoreNetwork {
|
|||
return session;
|
||||
}
|
||||
|
||||
deleteNode(nodeId) {
|
||||
// remove node from graph
|
||||
this.nodes.remove(nodeId);
|
||||
|
||||
// remove node links
|
||||
const edges = this.edges.get();
|
||||
for (let edge of edges) {
|
||||
const link = edge.link;
|
||||
|
||||
if (edge.from === nodeId) {
|
||||
this.edges.remove(edge);
|
||||
const otherNode = this.getCoreNode(edge.to);
|
||||
delete otherNode.interfaces[link.interfaceTwo.id];
|
||||
delete this.links[edge.linkId]
|
||||
} else if (edge.to === nodeId) {
|
||||
this.edges.remove(edge);
|
||||
const otherNode = this.getCoreNode(edge.from);
|
||||
delete otherNode.interfaces[link.interfaceOne.id];
|
||||
delete this.links[edge.linkId]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
getCoreNode(nodeId) {
|
||||
return this.nodes.get(nodeId).coreNode;
|
||||
}
|
||||
|
|
@ -223,11 +245,6 @@ class CoreNetwork {
|
|||
this.links = {};
|
||||
}
|
||||
|
||||
enableNodeCreation(enabled) {
|
||||
console.log('node created enabled: ', enabled);
|
||||
this.nodesEnabled = enabled;
|
||||
}
|
||||
|
||||
getCoreNodes() {
|
||||
const coreNodes = [];
|
||||
for (let node of this.nodes.get()) {
|
||||
|
|
@ -359,9 +376,19 @@ class CoreNetwork {
|
|||
return await coreRest.setSessionState(SessionStates.instantiation);
|
||||
}
|
||||
|
||||
addNode(properties) {
|
||||
if (!this.nodesEnabled) {
|
||||
console.log('node creation disabled');
|
||||
async doubleClick(properties) {
|
||||
const isRunning = await this.coreRest.isRunning();
|
||||
|
||||
// check for terminal interaction
|
||||
if (isRunning && properties.nodes.length === 1) {
|
||||
const nodeId = properties.nodes[0];
|
||||
await this.coreRest.nodeTerminal(nodeId);
|
||||
console.log('launched node terminal: ', nodeId);
|
||||
return;
|
||||
}
|
||||
|
||||
if (isRunning) {
|
||||
console.log('node creation disabled, while running');
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -77,6 +77,10 @@ class CoreRest {
|
|||
});
|
||||
}
|
||||
|
||||
async nodeTerminal(nodeId) {
|
||||
return await $.getJSON(`/sessions/${this.currentSession}/nodes/${nodeId}/terminal`);
|
||||
}
|
||||
|
||||
async createLink(link) {
|
||||
return await postJson(`/sessions/${this.currentSession}/links`, link);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ class ServicesModal {
|
|||
this.$servicesList.html('');
|
||||
this.serviceOptions.clear();
|
||||
|
||||
this.$servicesModal.find('.modal-title').text(`Services: ${this.node.name}`);
|
||||
|
||||
for (let group in this.serviceGroups) {
|
||||
const $option = $('<option>', {value: group, text: group});
|
||||
this.$serviceGroup.append($option);
|
||||
|
|
@ -149,17 +151,27 @@ class SessionsModal {
|
|||
}
|
||||
|
||||
class NodeContext {
|
||||
constructor(coreNetwork, nodeEditModal, servicesModal) {
|
||||
constructor(coreNetwork, coreRest, nodeEditModal, servicesModal) {
|
||||
this.coreNetwork = coreNetwork;
|
||||
this.coreRest = coreRest;
|
||||
this.nodeEditModal = nodeEditModal;
|
||||
this.servicesModal = servicesModal;
|
||||
this.$nodeContext = $('#node-context');
|
||||
this.$deleteButton = this.$nodeContext.find('button[data-option="delete"]');
|
||||
this.onClick();
|
||||
}
|
||||
|
||||
show(nodeId, x, y) {
|
||||
const node = this.coreNetwork.nodes.get(nodeId);
|
||||
console.log('context node: ', node);
|
||||
this.coreRest.isRunning()
|
||||
.then(isRunning => {
|
||||
if (isRunning) {
|
||||
this.$deleteButton.attr('disabled', 'disabled');
|
||||
} else {
|
||||
this.$deleteButton.removeAttr('disabled');
|
||||
}
|
||||
|
||||
this.$nodeContext.data('node', nodeId);
|
||||
this.$nodeContext.css({
|
||||
position: 'absolute',
|
||||
|
|
@ -167,6 +179,10 @@ class NodeContext {
|
|||
top: y
|
||||
});
|
||||
this.$nodeContext.removeClass('d-none');
|
||||
})
|
||||
.catch(function(err) {
|
||||
console.log('error checking is session is running: ', err);
|
||||
});
|
||||
}
|
||||
|
||||
hide() {
|
||||
|
|
@ -182,13 +198,19 @@ class NodeContext {
|
|||
const $target = $(event.target);
|
||||
const option = $target.data('option');
|
||||
console.log('node context: ', nodeId, option);
|
||||
if (option === 'edit') {
|
||||
switch (option) {
|
||||
case 'edit':
|
||||
self.nodeEditModal.show(nodeId);
|
||||
} else if (option === 'services') {
|
||||
break;
|
||||
case 'services':
|
||||
self.servicesModal.show(nodeId)
|
||||
.catch(function (err) {
|
||||
console.log('error showing services modal: ', err);
|
||||
});
|
||||
break;
|
||||
case 'delete':
|
||||
self.coreNetwork.deleteNode(nodeId);
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,14 +114,15 @@
|
|||
{% include 'linkedit_modal.html' %}
|
||||
{% include 'services_modal.html' %}
|
||||
|
||||
<ul id="node-context" class="list-group context d-none">
|
||||
<a class="list-group-item list-group-item-action" href="#" data-option="edit">Edit Node</a>
|
||||
<a class="list-group-item list-group-item-action" href="#" data-option="services">Services</a>
|
||||
</ul>
|
||||
<div id="node-context" class="list-group context d-none">
|
||||
<button type="button" class="list-group-item list-group-item-action" href="#" data-option="edit">Edit Node</button>
|
||||
<button type="button" class="list-group-item list-group-item-action" href="#" data-option="services">Services</button>
|
||||
<button type="button" class="list-group-item list-group-item-action" href="#" data-option="delete">Delete</button>
|
||||
</div>
|
||||
|
||||
<ul id="edge-context" class="list-group context d-none">
|
||||
<a class="list-group-item list-group-item-action" href="#" data-option="edit">Edit Link</a>
|
||||
</ul>
|
||||
<div id="edge-context" class="list-group context d-none">
|
||||
<button type="button" class="list-group-item list-group-item-action" href="#" data-option="edit">Edit Link</button>
|
||||
</div>
|
||||
|
||||
<script src="static/jquery-3.3.1.min.js"></script>
|
||||
<script src="static/popper.min.js"></script>
|
||||
|
|
@ -162,7 +163,7 @@
|
|||
const servicesModal = new ServicesModal(coreRest, coreNetwork);
|
||||
const sessionsModal = new SessionsModal(coreRest, coreNetwork, joinSession);
|
||||
const nodeEditModal = new NodeEditModal(coreNetwork);
|
||||
const nodeContext = new NodeContext(coreNetwork, nodeEditModal, servicesModal);
|
||||
const nodeContext = new NodeContext(coreNetwork, coreRest, nodeEditModal, servicesModal);
|
||||
const edgeEditModal = new EdgeEditModal(coreNetwork, coreRest);
|
||||
const edgeContext = new EdgeContext(coreNetwork, edgeEditModal);
|
||||
const infoPanel = new InfoPanel(coreNetwork);
|
||||
|
|
@ -183,13 +184,11 @@
|
|||
$runButton.text('Start');
|
||||
$runButton.addClass('btn-success');
|
||||
$linkButton.removeAttr('disabled');
|
||||
coreNetwork.enableNodeCreation(true);
|
||||
} else {
|
||||
$runButton.text('Stop');
|
||||
$runButton.addClass('btn-danger');
|
||||
$linkButton.removeClass('active');
|
||||
$linkButton.attr('disabled', 'disabled');
|
||||
coreNetwork.enableNodeCreation(false);
|
||||
coreNetwork.linkMode(false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue