Change constants names, implement remove

git-svn-id: https://svn.argeo.org/slc/trunk@2736 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcApi.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcApi.js
index b5604d4d59d2763358d5a237267f4764ed4a6379..cffbcd8b175cf628955a7830d6c926f1f13b872b 100644 (file)
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcApi.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcApi.js
@@ -31,7 +31,8 @@ qx.Class.define("org.argeo.slc.ria.SlcApi",
        AMQ_SERVICE : "amq",\r
        \r
        LIST_MODULAR_DISTRIB_SERVICE : "listModularDistributions.service",\r
-       UPLOAD_MODULAR_DISTRIB_SERVICE : "uploadModularDistrib.service",\r
+       INSTALL_MODULE_SERVICE : "installModule.service",\r
+       UNINSTALL_MODULE_SERVICE : "uninstallModule.service",\r
        \r
        /**\r
         * Standard Request getter\r
@@ -220,10 +221,30 @@ qx.Class.define("org.argeo.slc.ria.SlcApi",
                );\r
        },\r
        \r
-       getUploadModularDistributionsService : function(){\r
-               return org.argeo.slc.ria.SlcApi.UPLOAD_MODULAR_DISTRIB_SERVICE;\r
+       getInstallModuleService : function(){\r
+               return org.argeo.slc.ria.SlcApi.DEFAULT_CONTEXT +"/"+ org.argeo.slc.ria.SlcApi.INSTALL_MODULE_SERVICE;\r
        },\r
 \r
+       /**\r
+        * Load a result test\r
+        * @param resultId {String} Id of the test result to load\r
+        * @param fireReloadEventType {String} Whether query should trigger a ReloadEvent\r
+        * @param iLoadStatusables {org.argeo.ria.components.ILoadStatusables[]} Gui parts to update\r
+        * @return {qx.io.remote.Request}\r
+        */\r
+       getUninstallModuleService : function(moduleName, moduleVersion, fireReloadEventType, iLoadStatusables){\r
+               var request = org.argeo.slc.ria.SlcApi.getServiceRequest(\r
+                       org.argeo.slc.ria.SlcApi.UNINSTALL_MODULE_SERVICE, \r
+                       fireReloadEventType, \r
+                       iLoadStatusables\r
+               );\r
+               request.setParameter("name", moduleName);\r
+               request.setParameter("version", moduleVersion);\r
+               return request;\r
+       },\r
+\r
+       \r
+       \r
        /**\r
         * New SlcExecution\r
         * @param agentId {String} Agent id target\r

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/DistListView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/DistListView.js
index a444bdadbd3b4ee3e47094abd89804e0fb1eb013..d537031ec4bec296f5523a290a0e8b63ba32e456 100644 (file)
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/DistListView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/DistListView.js
@@ -20,6 +20,26 @@ qx.Class.define("org.argeo.slc.ria.monitor.DistListView", {
                                                this.load();\r
                                        },\r
                                        command : null\r
+                               },\r
+                               "uninstall" : {\r
+                                       label   : "Uninstall",\r
+                                       icon    : "org.argeo.slc.ria/window-close.png",\r
+                                       shortcut: null,\r
+                                       enabled : false,\r
+                                       menu    : "Distributions",\r
+                                       toolbar : "list",\r
+                                       callback: function(e){\r
+                                               var selection = this.getViewSelection();\r
+                                               var node = selection.getNodes()[0];\r
+                                               var request = org.argeo.slc.ria.SlcApi.getUninstallModuleService(node[0], node[1]);\r
+                                               request.addListener("completed", this.load, this);\r
+                                               request.send();\r
+                                       },\r
+                                       selectionChange : function(viewId, selection){\r
+                                               if(viewId != "distrib") return;\r
+                                               this.setEnabled((selection!=null && selection.length==1));\r
+                                       },\r
+                                       command : null\r
                                }\r
                        }\r
                },\r
@@ -86,6 +106,16 @@ qx.Class.define("org.argeo.slc.ria.monitor.DistListView", {
                        };\r
                        columnModel.setCellEditorFactory(2, new qx.ui.table.celleditor.Dynamic(factory));\r
                        columnModel.setCellEditorFactory(3, new qx.ui.table.celleditor.Dynamic(factory));\r
+                       \r
+                       var selectionModel = this.list.getSelectionModel();\r
+                       selectionModel.addListener("changeSelection", function(e){\r
+                               var viewSelection = this.getViewSelection();\r
+                               viewSelection.clear();\r
+                               selectionModel.iterateSelection(function(index){\r
+                                       viewSelection.addNode(this.tableModel.getRowData(index));\r
+                               }, this);\r
+                       }, this);                       \r
+                       \r
                        this.add(this.list, {top:0,left:0,width:'100%',height:'100%'});                 \r
                },\r
                /**\r

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/UploadView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/UploadView.js
index f5d5da3e89aacd69eb2050b31e7dd66ab7a9eee8..a6bb544be8eed7d4c163815b0d793e926dedba02 100644 (file)
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/UploadView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/UploadView.js
@@ -38,7 +38,7 @@ qx.Class.define("org.argeo.slc.ria.monitor.UploadView", {
                init : function(viewPane, data){\r
                        this.setView(viewPane);                 \r
                        this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));\r
-                       this.form = new org.argeo.ria.components.upload.UploadForm("uploadFrm", org.argeo.slc.ria.SlcApi.getUploadModularDistributionsService());\r
+                       this.form = new org.argeo.ria.components.upload.UploadForm("uploadFrm", org.argeo.slc.ria.SlcApi.getInstallModuleService());\r
                        this.form.setLayout(new qx.ui.layout.HBox(5));\r
                        this.fileWidget = new org.argeo.ria.components.upload.UploadField("uploadFile", "Choose a file");\r
                        \r