From e0be1cede09ad3163fd389e327191cac8ccea575 Mon Sep 17 00:00:00 2001 From: Charles du Jeu Date: Fri, 3 Jul 2009 11:38:26 +0000 Subject: [PATCH] Implement preferred host via preferences git-svn-id: https://svn.argeo.org/slc/trunk@2681 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org/argeo/slc/ria/FlowsSelectorView.js | 83 +++++++++++++++++- .../argeo/slc/ria/execution/BatchEntrySpec.js | 3 +- .../slc/ria/monitor/FlowsSelectorView.js | 8 ++ .../org.argeo.slc.ria/computer_bookmarked.png | Bin 0 -> 3876 bytes 4 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 server/org.argeo.slc.ria/src/argeo-ria-lib/slc/resource/org.argeo.slc.ria/computer_bookmarked.png diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js index d7d6eafec..c9b3b108b 100644 --- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js +++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js @@ -5,6 +5,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", { extend : qx.ui.container.Composite, implement : [org.argeo.ria.components.IView], + include : [org.argeo.ria.session.MPrefHolder], construct : function() { this.base(arguments); @@ -91,6 +92,36 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", { }, command : null }, + "preferredHost" : { + label : "Toggle 'Preferred Host'", + icon : "ria/bookmark.png", + shortcut : null, + enabled : true, + menu : null, + toolbar : null, + callback : function(e) { + if (this.tree.isSelectionEmpty()) { + return; + } + var selection = this.tree.getSelection(); + if(selection.length != 1) return; + var agentNode = selection[0]; + if(!agentNode.getUserData("agentHost")) return; + this.togglePreferredHost(agentNode); + }, + selectionChange : function(viewId, selection) { + if (viewId != "form:tree") + return; + if (!selection || selection.length != 1) + return; + var item = selection[0]; + this.setEnabled(false); + if(item.getUserData("agentHost")){ + this.setEnabled(true); + } + }, + command : null + }, "reloadfull" : { label : "Reload Agents", icon : "org.argeo.slc.ria/view-refresh.png", @@ -173,6 +204,14 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", { }, statics : { + + riaPreferences : { + "flowSelector.preferred.hosts" : { + label : "Preferred Hosts (Execution View)", + type : "string" + } + }, + /** * Static loader for the "agent" level (first level) * @@ -181,6 +220,10 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", { */ agentLoader : function(folder) { + var preferredHosts = org.argeo.ria.session.MPrefHolder.loadRiaPreferenceValue("flowSelector.preferred.hosts"); + if(preferredHosts && preferredHosts!=""){ + preferredHosts = preferredHosts.split(","); + } var req = org.argeo.slc.ria.SlcApi.getListAgentsService("agents"); var agents = {}; if(folder.getState() == "loaded" && folder.getUserData("agentsMap")){ @@ -207,9 +250,17 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", { host, modulesLoader, "Loading Modules...", folder.getDragData()); org.argeo.slc.ria.FlowsSelectorView.attachToolTip(agentFolder, uuid); agentFolder.setPersistentTreeID(folder.getPersistentTreeID()+"_"+uuid); + agentFolder.setUserData("agentHost", host); // Used by bookmark system agentFolder.setUserData("agentUuid", uuid); - agentFolder.setIcon("org.argeo.slc.ria/computer.png"); - folder.add(agentFolder); + if(preferredHosts && preferredHosts instanceof Array && qx.lang.Array.contains(preferredHosts, uuid)){ + folder.addAtBegin(agentFolder); + agentFolder.setIcon("org.argeo.slc.ria/computer_bookmarked.png"); + agentFolder.setUserData("preferredHost", true); + }else{ + folder.add(agentFolder); + agentFolder.setIcon("org.argeo.slc.ria/computer.png"); + agentFolder.setUserData("preferredHost", false); + } } if(newAgents){ // Make sure some agents should not be removed @@ -467,6 +518,32 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", { this.remoteNotifier.stopPolling(); }, + /** + * + * @param agentNode {qx.ui.tree.AbstractTreeItem} + */ + togglePreferredHost : function(agentNode){ + var hostName = agentNode.getUserData("agentUuid"); + var pref = this.getRiaPreferenceValue("flowSelector.preferred.hosts"); + var prefArray = []; + if(pref){ + prefArray = pref.split(","); + } + if(qx.lang.Array.contains(prefArray, hostName)){ + qx.lang.Array.remove(prefArray, hostName); + agentNode.setIcon("org.argeo.slc.ria/computer.png"); + agentFolder.setUserData("preferredHost", false); + }else{ + prefArray.push(hostName); + agentNode.setIcon("org.argeo.slc.ria/computer_bookmarked.png"); + agentFolder.setUserData("preferredHost", true); + var parent = agentNode.getParent(); + parent.remove(agentNode); + parent.addAtBegin(agentNode); + } + this.setRiaPreferenceValue("flowSelector.preferred.hosts", prefArray.join(",")); + }, + /** * Creates the main applet layout. */ @@ -495,7 +572,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", { this.rootNode.setOpen(true); this.tree.setContextMenu(org.argeo.ria.event.CommandsManager .getInstance().createMenuFromIds(["addtobatch", - "reloadtree"])); + "reloadtree", "preferredHost"])); this.tree.addListener("changeSelection", function(e) { var viewSelection = this.getViewSelection(); diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js index 91231a8b8..b21749b10 100644 --- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js +++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js @@ -87,8 +87,7 @@ qx.Class.define("org.argeo.slc.ria.execution.BatchEntrySpec", { } instanceValues[key] = instValue; } - this.setValues(instanceValues); - this.debug(instanceValues); + this.setValues(instanceValues); } } }); \ No newline at end of file diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/FlowsSelectorView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/FlowsSelectorView.js index 46cf61e15..b049c2ee0 100644 --- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/FlowsSelectorView.js +++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/FlowsSelectorView.js @@ -88,6 +88,14 @@ qx.Class.define("org.argeo.slc.ria.monitor.FlowsSelectorView", { }, statics : { + + riaPreferences : { + "flowSelector.monitor.preferred.hosts" : { + label : "Preferred Hosts (Monitoring View)", + type : "string" + } + }, + /** * Static loader for the "agent" level (first level) * diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/resource/org.argeo.slc.ria/computer_bookmarked.png b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/resource/org.argeo.slc.ria/computer_bookmarked.png new file mode 100644 index 0000000000000000000000000000000000000000..9441678e98daa91e43b5453fc1d4dff5f14f15f4 GIT binary patch literal 3876 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