if(!selection || selection.length != 1) return;
var item = selection[0];
this.setEnabled(false);
- if(qx.Class.isSubClassOf(qx.Class.getByName(item.classname), qx.ui.tree.TreeFile)){
- this.setEnabled(true);
+ switch(item.classname){
+ case "qx.ui.tree.TreeFile" :
+ this.setEnabled(true);
+ break;
+ case "qx.ui.tree.TreeFolder" :
+ if(item.getTree().getRoot() == item) break;
+ this.setEnabled(true);
+ break;
+ case "org.argeo.ria.components.DynamicTreeFolder":
+ if(item.getTree().getRoot() == item) break;
+ if(item.getState() == "loaded") this.setEnabled(true);
+ break;
}
-
},
command : null
},
},
command : null
},
- "reloadagents" : {
- label : "Reload Agents",
- icon : "resource/slc/view-refresh.png",
- shortcut : "Control+r",
- enabled : true,
- menu : "Launcher",
- toolbar : "launcher",
- callback : function(e){
- //var req = org.argeo.slc.ria.SlcApi.getListAgentsService("agents");
- //req.send();
- this.rootNode.reload();
- },
- command : null
- },
"reloadtree" : {
label : "Reload",
icon : "resource/slc/view-refresh.png",
menu : "Launcher",
toolbar : "launcher",
callback : function(e){
- var selected = this.tree.getSelectedItem();
+ var selected = this.tree.getSelection()[0];
if(selected.classname == "org.argeo.ria.components.DynamicTreeFolder"){
if(selected.getUserData("moduleData")){
// It's a "module" node, first trigger the reloadBundle.service
},
selectionChange : function(viewId, selection){
if(viewId != "form:tree") return;
- if(!selection || selection.length != 1) return;
+ if(!selection) return;
+ if(selection.length > 1){
+ this.setEnabled(false);
+ return;
+ }
var item = selection[0];
if(!qx.Class.isSubClassOf(qx.Class.getByName(item.classname), qx.ui.tree.AbstractTreeItem)) return;
this.setEnabled(false);
* @param folder {qx.ui.tree.TreeFolder} A Tree folder containing in the key "moduleData" of its user data a map containing the keys {name,version}
*/
flowLoader : function(folder){
- var moduleData = folder.getUserData("moduleData");
+ var moduleData = folder.getUserData("moduleData");
+ var agentUuid = folder.getUserData("agentUuid");
//var pathStub = ["", "/test/toto/zobi", "loop"];
//var indexStub = 0;
- var req = org.argeo.slc.ria.SlcApi.getLoadExecutionDescriptorService(moduleData.name, moduleData.version);
+ var req = org.argeo.slc.ria.SlcApi.getLoadExecutionDescriptorService(agentUuid,moduleData.name, moduleData.version);
req.addListener("completed", function(response){
- var executionModule = new org.argeo.slc.ria.execution.Module();
- executionModule.setXmlNode(response.getContent());
+ var executionModule = new org.argeo.slc.ria.execution.Module();
+ try{
+ executionModule.setXmlNode(response.getContent());
+ }catch(e){
+ this.error(e);
+ }
var execFlows = executionModule.getExecutionFlows();
for(var key in execFlows){
var file = new qx.ui.tree.TreeFile(key);
//indexStub ++;
file.setUserData("executionModule", executionModule);
file.setUserData("executionFlow", execFlows[key]);
- file.setUserData("agentUuid", folder.getUserData("agentUuid"));
+ file.setUserData("agentUuid", agentUuid);
org.argeo.slc.ria.NewLauncherApplet.attachNodeByPath(
folder,
path,
init : function(viewPane){
this.setView(viewPane);
this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));
- this._amqClient = org.argeo.ria.remote.JmsClient.getInstance();
- this._amqClient.uri = "/org.argeo.slc.webapp/amq";
- this._amqClient.startPolling();
+ this.remoteNotifier = new org.argeo.ria.remote.RemoteNotifier(
+ "/org.argeo.slc.webapp/",
+ "pollEvent.service",
+ "addEventListener.service",
+ "removeEventListener.service"
+ );
+ this.remoteNotifier.setEventParamName("slc_eventType");
+ this.remoteNotifier.setEventXPath("/slc:slc-event");
+ this.remoteNotifier.setEventTypeXPath('slc:headers/slc:header[@name="slc_eventType"]');
+ this.remoteNotifier.setEventDataXPath('slc:headers/slc:header[@name="slc_agentId"]');
+ this.remoteNotifier.startPolling();
+ this.UIBus = org.argeo.ria.event.UIBus.getInstance();
+ this.UIBus.registerNotifier(this.remoteNotifier);
+
this._emptyAgentString = "Empty Batch";
this._crtAgentString = "Target Agent : ";
},
load : function(){
this._createLayout();
this.getView().setViewTitle("Execution Launcher");
- var reloadHandler = function(message){
- // Delay reload to be sure the jms was first integrated by the db, then ask the db.
- qx.event.Timer.once(function(){
- org.argeo.ria.event.CommandsManager.getInstance().getCommandById("reloadagents").execute();
- }, this, 1000);
+ this.reloadHandler = function(message){
+ this.rootNode.reload();
}
- this._amqClient.addListener("agentregister", "topic://agent.register", reloadHandler, this);
- this._amqClient.addListener("agentunregister", "topic://agent.unregister", reloadHandler, this);
- //reloadHandler();
+ this.UIBus.addListener("agentRegistered", this.reloadHandler, this);
+ this.UIBus.addListener("agentUnregistered", this.reloadHandler, this);
},
addScroll : function(){
},
close : function(){
- this._amqClient.removeListener("agentregister", "topic://agent.register");
- this._amqClient.removeListener("agentunregister", "topic://agent.unregister");
- this._amqClient.removeListener("modulesResponse", "topic://modulesManager.response");
- this.setRegisteredAgents({});
- this._amqClient.stopPolling();
+ this.UIBus.removeListener("agentRegistered", this.reloadHandler, this);
+ this.UIBus.removeListener("agentUnregistered", this.reloadHandler, this);
+ this.remoteNotifier.stopPolling();
},
/**
this.tree = new qx.ui.tree.Tree();
this.tree.setDecorator(null);
+ this.tree.setSelectionMode("multi");
var dragData = {
"file" : {
"type" : ["items"],
if(afterItem.classname != "qx.ui.form.ListItem") afterItem = null;
if(!target){
target = this.list.getSortedSelection()[0];
+ this._addFlowToBatch(target, afterItem);
+ }else{
+ this._addFlowToBatch(null, afterItem);
}
- this._addFlowToBatch(target, afterItem);
}, this);
this.listPane.add(this.list, {edge:"center"});
* @param target {mixed} The dropped target, can be a TreeFile (add) or a ListItem (reorder).
* @param after {qx.ui.form.ListItem} Optional list item : if set, the flow will be added as a new list item positionned after this one.
*/
- _addFlowToBatch : function(target, after){
-
- // Empty or list target
- if(!target){
- target = this.tree.getSelectedItem();
- if(!target) return;
- }else if(target.classname == "qx.ui.form.ListItem"){
+ _addFlowToBatch : function(target, after, skipAutoOpen){
+ if(target && target.classname == "qx.ui.form.ListItem"){
if(!after) return;
if(after == "first") this.list.addAt(target, 0);
else this.list.addAfter(target, after);
return;
}
- // Folder case, not really working yet.
+ if(!target){
+ if(this.tree.isSelectionEmpty()){
+ return;
+ }
+ selection = this.tree.getSelection();
+ if(selection.length > 1){
+ for(var i=0;i<selection.length;i++){
+ this._addFlowToBatch(selection[i], null, true);
+ }
+ return;
+ }else{
+ target = selection[0];
+ }
+ }
+
+ // Folder case
if(qx.Class.isSubClassOf(qx.Class.getByName(target.classname), qx.ui.tree.TreeFolder)){
- // Cancel auto-open
- var origAutoOpen = this.getAutoOpen();
- this.setAutoOpen(false);
var allChildren = target.getItems(true);
for(var i=0;i<allChildren.length;i++){
if(allChildren[i].getUserData("executionFlow")){
- this._addFlowToBatch(allChildren[i]);
+ this._addFlowToBatch(allChildren[i], null, true);
}
}
- this.setAutoOpen(origAutoOpen);
return;
}
this.list.add(item);
}
this.list.select(item);
- if(this.getAutoOpen()){
+ if(this.getAutoOpen() && !skipAutoOpen){
this.getCommands()["editexecutionspecs"].command.execute();
}
},
for(var i=0;i<selection.length;i++){
var batchEntrySpec = selection[i].getUserData("batchEntrySpec");
slcExecMessage.addBatchEntrySpec(batchEntrySpec);
- }
- this._amqClient.sendMessage(
- "topic://agent.newExecution",
- slcExecMessage.toXml(),
- {"slc-agentId":agentUuid}
- );
+ }
+ var req = org.argeo.slc.ria.SlcApi.getNewSlcExecutionService(agentUuid, slcExecMessage.toXml());
+ req.send();
// Force logs refresh right now!
qx.event.Timer.once(function(){
var command = org.argeo.ria.event.CommandsManager.getInstance().getCommandById("reloadlogs");
projects / gpl / argeo-slc.git / blobdiff