X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2Fargeo-ria-lib%2Fslc%2Fclass%2Forg%2Fargeo%2Fslc%2Fria%2FNewLauncherApplet.js;h=6b401af56417df1a2f70900f9fe165fdc4e1d335;hb=859114a86e3d1073b7b7aba89cee4224b8e897bf;hp=4dac53ae200334083290069c0322a743a3469543;hpb=efe57fc34cd70f64a0d9e3cb812d7dbc9b82fb80;p=gpl%2Fargeo-slc.git
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
index 4dac53ae2..6b401af56 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
@@ -9,11 +9,7 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
construct : function(){
this.base(arguments);
- this.setLayout(new qx.ui.layout.Dock());
-
- this.COMMON_FORM_HEADER_LABEL = "Choose Agent";
- this.CHOOSE_AGENT_LABEL = "Agent Uuid";
- this.CHOOSE_FORM_PART_LABEL = "Test Type";
+ this.setLayout(new qx.ui.layout.Dock());
},
properties :
@@ -29,24 +25,116 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
check:"org.argeo.ria.components.ViewSelection"
},
instanceId : {init:""},
- instanceLabel : {init:""},
+ instanceLabel : {init:""},
+ /**
+ * A boolean registering whether the SpecEditor must autoOpen or not when a spec is added to the Batch.
+ */
+ autoOpen : {
+ init : true,
+ check : "Boolean"
+ },
/**
* Commands definition, see {@link org.argeo.ria.event.CommandsManager#definitions}
*/
commands : {
init : {
"submitform" : {
- label : "Execute",
+ label : "Execute Batch On...",
icon : "resource/slc/media-playback-start.png",
- shortcut : "Control+e",
+ shortcut : null,
enabled : true,
menu : "Launcher",
- toolbar : "launcher",
+ toolbar : null,
+ callback : function(e){},
+ submenu : [],
+ submenuCallback : function(commandId){
+ //alert("Execute Batch on Agent "+commandId);
+ this.executeBatchOnAgent(commandId);
+ },
+ command : null
+ },
+ "addtobatch" : {
+ label : "Add to batch",
+ icon : "resource/slc/list-add.png",
+ shortcut : null,
+ enabled : true,
+ menu : null,
+ toolbar : null,
callback : function(e){
- this.submitForm();
+ this._addFlowToBatch();
+ },
+ selectionChange : function(viewId, selection){
+ if(viewId != "form:tree") return;
+ 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);
+ }
+
+ },
+ command : null
+ },
+ "toggleopenonadd" : {
+ label : "Auto Open",
+ icon : "resource/slc/document-open.png",
+ shortcut : null,
+ enabled : true,
+ toggle : true,
+ toggleInitialState : true,
+ menu : "Launcher",
+ toolbar : "launcher",
+ callback : function(event){
+ var state = event.getTarget().getUserData("slc.command.toggleState");
+ this.setAutoOpen(state);
},
command : null
},
+ "editexecutionspecs" : {
+ label : "Edit Execution Specs",
+ icon : "resource/slc/document-open.png",
+ shortcut : null,
+ enabled : false,
+ menu : "Launcher",
+ toolbar : null,
+ callback : function(e){
+ var sel = this.list.getSortedSelection();
+ var item = sel[0];
+ var specEditor = new org.argeo.slc.ria.execution.SpecEditor(item.getUserData("batchEntrySpec"));
+ specEditor.attachAndShow();
+ },
+ selectionChange : function(viewId, selection){
+ if(viewId != "form:list") return;
+ this.setEnabled(false);
+ if((selection && selection.length == 1)) this.setEnabled(true);
+ },
+ command : null
+ },
+ "removefrombatch" : {
+ label : "Remove from batch",
+ icon : "resource/slc/edit-delete.png",
+ shortcut : null,
+ enabled : false,
+ menu : "Launcher",
+ toolbar : null,
+ callback : function(e){
+ var sel = this.list.getSortedSelection();
+ var modal = new org.argeo.ria.components.Modal("Confirm", null);
+ modal.addConfirm("Are you sure you want to remove
the selected test" + (sel.length>1?"s":"") + " from the Batch?");
+ modal.addListener("ok", function(){
+ for(var i=0;i 0)) this.setEnabled(true);
+ },
+ command : null
+ },
"reloadagents" : {
label : "Reload Agents",
icon : "resource/slc/view-refresh.png",
@@ -60,30 +148,28 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
},
command : null
},
- "testloadmodules" : {
- label : "Load Modules",
+ "reloadtree" : {
+ label : "Reload",
icon : "resource/slc/view-refresh.png",
shortcut : "Control+m",
- enabled : true,
+ enabled : false,
menu : "Launcher",
toolbar : "launcher",
callback : function(e){
- var req = org.argeo.ria.remote.RequestManager.getInstance().getRequest("stub.xml", "GET", "application/xml");
- req.addListener("completed", function(response){
- var executionModule = new org.argeo.slc.ria.module.ExecutionModule();
- executionModule.setXmlNode(response.getContent());
- this.debug(executionModule.getName());
- this.debug(qx.lang.Object.getLength(executionModule.getExecutionFlows()));
- this.debug(qx.lang.Object.getLength(executionModule.getExecutionSpecs()));
- }, this);
- req.send();
- /*
- this._amqClient.sendMessage("modulesManager.request", "", {
- "action":"getExecutionModuleDescriptor",
- "name" : "org.argeo.slc.demo.basic",
- "version" : "WHATEVER"
- });
- */
+ var selected = this.tree.getSelectedItem();
+ if(selected.classname == "org.argeo.ria.components.DynamicTreeFolder"){
+ selected.reload();
+ }
+ },
+ selectionChange : function(viewId, selection){
+ if(viewId != "form:tree") return;
+ if(!selection || selection.length != 1) return;
+ var item = selection[0];
+ if(!qx.Class.isSubClassOf(qx.Class.getByName(item.classname), qx.ui.tree.AbstractTreeItem)) return;
+ this.setEnabled(false);
+ if(qx.Class.isSubClassOf(qx.Class.getByName(item.classname), org.argeo.ria.components.DynamicTreeFolder)){
+ this.setEnabled(true);
+ }
},
command : null
}
@@ -99,6 +185,74 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
}
},
+ statics : {
+ /**
+ * Loader for the "flow" level : takes a folder containing "moduleData" and create its children.
+ * @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 req = org.argeo.ria.remote.RequestManager.getInstance().getRequest("../argeo-ria-src/stub.xml", "GET", "application/xml");
+ var req = org.argeo.slc.ria.SlcApi.getLoadExecutionDescriptorService(moduleData.name, moduleData.version);
+ req.addListener("completed", function(response){
+ var executionModule = new org.argeo.slc.ria.execution.Module();
+ executionModule.setXmlNode(response.getContent());
+ var execFlows = executionModule.getExecutionFlows();
+ for(var key in execFlows){
+ var file = new qx.ui.tree.TreeFile(key);
+ file.setUserData("executionModule", executionModule);
+ file.setUserData("executionFlow", execFlows[key]);
+ folder.add(file);
+ }
+ folder.setLoaded(true);
+ });
+ req.send();
+ },
+
+ /**
+ * Loader for the "modules" level : takes any tree folder, currently the root folder.
+ * @param folder {qx.ui.tree.TreeFolder} The root folder
+ */
+ modulesLoader : function(folder){
+ var req = org.argeo.slc.ria.SlcApi.getListModulesService();
+ req.addListener("completed", function(response){
+ var descriptors = org.argeo.ria.util.Element.selectNodes(response.getContent(), "slc:object-list/slc:execution-module-descriptor");
+ var mods = {};
+ // STUB
+ /*
+ var mods = {
+ "Module 1":["ver1.1", "ver1.2", "ver1.3"],
+ "Module 2":["ver2.1", "ver2.2", "ver2.3", "ver2.4"],
+ "Module 3":["ver3.1", "ver3.2"]
+ };
+ */
+ for(var i=0;i 1){
- // Add chooser
- this.partChooser = new qx.ui.form.SelectBox();
- for(var key in this.parts){
- this.partChooser.add(new qx.ui.form.ListItem(this.parts[key].label, null, key));
- }
- this._addFormEntry(commonForm, new qx.ui.basic.Label(this.CHOOSE_FORM_PART_LABEL), this.partChooser);
- this.partChooser.addListener("changeValue", function(ev){
- this._showSelectedPart(ev.getData());
- }, this);
- }
- this._showSelectedPart(qx.lang.Object.getKeys(this.parts)[0]);
- },
-
- /**
- * Show a form part given its id.
- * @param partId {String} The part id
- */
- _showSelectedPart : function(partId){
- if(!this.parts) return;
- if(!this.partsContainer){
- this.partsContainer = new qx.ui.container.Composite(new qx.ui.layout.Canvas());
- this.formPane.add(this.partsContainer);
- }
- for(var i in this.parts){
- var formObject = this.parts[i];
- if(!formObject.added){
- this.partsContainer.add(formObject.pane, {top:0, left:0});
- formObject.added = true;
+ this.list.addListener("changeSelection", function(e){
+ var viewSelection = this.getViewSelection();
+ viewSelection.setViewId("form:list");
+ viewSelection.clear();
+ var listSel = this.list.getSortedSelection();
+ for(var i=0;i'+content+'');
- header.setRich(true);
- if(!additionnalButton){
- header.setPaddingTop(10);
- formObject.pane.add(header);
+ var executionModule = target.getUserData("executionModule");
+ var executionFlow = target.getUserData("executionFlow");
+ var batchEntry = new org.argeo.slc.ria.execution.BatchEntrySpec(executionModule, executionFlow);
+ var label = batchEntry.getLabel();
+ var icon = target.getIcon();
+ var item = new qx.ui.form.ListItem(label, icon);
+ item.setUserData("batchEntrySpec", batchEntry);
+ item.setPaddingTop(1);
+ item.setPaddingBottom(2);
+ if(after){
+ if(after == "first") this.list.addAt(item, 0);
+ else this.list.addAfter(item, after);
}else{
- var pane = new qx.ui.container.Composite(new qx.ui.layout.Dock());
- pane.setPaddingTop(10);
- pane.setPaddingRight(10);
- pane.add(header, {edge:'center'});
- pane.add(additionnalButton, {edge:'east'});
- formObject.pane.add(pane);
- }
- },
-
- /**
- * Adds a label/input like entry in the form.
- * @param formObject {Map} The form part
- * @param labelElement {Object} Either a label or an input
- * @param fieldElement {Object} Any form input.
- */
- _addFormEntry : function(formObject, labelElement, fieldElement){
- var entryPane = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
- labelElement.setWidth(100);
- labelElement.setTextAlign("right");
- entryPane.add(labelElement);
- entryPane.add(new qx.ui.basic.Label(':'));
- fieldElement.setWidth(150);
- entryPane.add(fieldElement);
- formObject.pane.add(entryPane);
- },
-
- /*
- _refreshTopicsSubscriptions : function(changeTopicsEvent){
- var oldTopics = changeTopicsEvent.getOldData() || {};
- var newTopics = changeTopicsEvent.getData();
- var removed = [];
- var added = [];
- for(var key in oldTopics){
- if(!newTopics[key]) {
- //this._removeAmqListener(key);
- }
+ this.list.add(item);
}
- for(var key in newTopics){
- if(!oldTopics[key]) {
- //this._addAmqListener(key);
- }
+ this.list.select(item);
+ if(this.getAutoOpen()){
+ this.getCommands()["editexecutionspecs"].command.execute();
}
},
- */
-
+
/**
* Refresh the selector when the topics are updated.
* @param changeTopicsEvent {qx.event.type.DataEvent} The reload event.
*/
_feedSelector : function(changeTopicsEvent){
var topics = changeTopicsEvent.getData();
- this.agentSelector.removeAll();
- var emptyItem = new qx.ui.form.ListItem("", null, "");
- this.agentSelector.add(emptyItem);
- this.agentSelector.setSelected(emptyItem);
+ var command = this.getCommands()["submitform"].command;
+ command.setEnabled(false);
+ var menu = [];
for(var key in topics){
- var listItem = new qx.ui.form.ListItem(topics[key], null, key);
- this.agentSelector.add(listItem);
+ var submenu = {"label":topics[key],"icon":"resource/slc/mime-xsl.png", "commandId":key};
+ menu.push(submenu);
}
- },
-
- /*
- _addAmqListener: function(uuid){
- this._amqClient.addListener("slcExec", "topic://agent."+uuid+".newExecution", function(response){
- var message = org.argeo.ria.util.Element.selectSingleNode(response, "slc:slc-execution");
- var slcExec = new org.argeo.slc.ria.SlcExecutionMessage(message.getAttribute("uuid"));
- slcExec.fromXml(message);
- this.logModel.addRows([
- [new Date().toString(), slcExec.getHost()+' ('+slcExec.getUuid()+')', slcExec.getStatus()]
- ]);
- }, this);
- },
-
- _removeAmqListener : function(uuid){
- this._amqClient.removeListener("slcExec", "topic://agent."+uuid+".newExecution");
- },
- */
-
- /**
- * Make an SlcExecutionMessage from the currently displayed form.
- * @param crtPartId {String} The form part currently displayed
- * @param slcExec {org.argeo.slc.ria.SlcExecutionMessage} The message to fill.
- * @param fields {Map} The fields of the form
- * @param hiddenFields {Map} The hidden ones
- * @param freeFields {Array} The free fields.
- */
- _prepareSlcExecutionMessage : function(crtPartId, slcExec, fields, hiddenFields, freeFields){
- if(crtPartId == "standard"){
- slcExec.setStatus(fields.status.getValue());
- slcExec.setHost(fields.host.getValue());
- slcExec.setUser(fields.user.getValue());
- }else{
- slcExec.addAttribute("ant.file", fields["ant.file"].getValue());
+ // FAKE!!
+ if(!menu.length){
+ menu.push({"label":"Fake Agent", "icon":"resource/slc/mime-xsl.png", "commandId":"fake_agent_uuid"});
}
- for(var i=0;i