Merge pull request #755 from fstagni/pilots_simpl

Pilots simplification

Author: fstagni

src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py

@@ -108,13 +108,6 @@ def web_getSelectionData(self):
             else:
                 site = [["Error during RPC call"]]
             callback["site"] = site
-            if "Broker" in result and len(result["Broker"]) > 0:
-                broker = []
-                for i in result["Broker"]:
-                    broker.append([str(i)])
-            else:
-                broker = [["Nothing to display"]]
-            callback["broker"] = broker
             if "Owner" in result and len(result["Owner"]) > 0:
                 owner = []
                 for i in result["Owner"]:
@@ -135,18 +128,10 @@ def __request(self):
         if site:
             req["GridSite"] = site
 
-        taskQueueId = list(json.loads(self.get_argument("taskQueueId", "[]")))
-        if taskQueueId:
-            req["TaskQueueID"] = taskQueueId
-
         pilotId = list(json.loads(self.get_argument("pilotId", "[]")))
         if pilotId:
             req["PilotJobReference"] = pilotId
 
-        broker = list(json.loads(self.get_argument("broker", "[]")))
-        if broker:
-            req["broker"] = broker
-
         status = list(json.loads(self.get_argument("status", "[]")))
         if status:
             req["Status"] = status

src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js

@@ -93,19 +93,13 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
     {
       name: "GridType",
     },
-    {
-      name: "TaskQueueID",
-    },
     {
       name: "CurrentJobID",
     },
     {
       name: "BenchMark",
       type: "float",
     },
-    {
-      name: "Broker",
-    },
     {
       name: "GridSite",
     },
@@ -187,14 +181,9 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
       computingElement: "Computing Element",
       VO: "VO",
       owner: "Owner",
-      broker: "Broker",
     };
 
     var textFields = {
-      taskQueueId: {
-        name: "Task Queue ID",
-        type: "number",
-      },
       pilotId: {
         name: "Pilot Job Reference",
         type: "originalText",
@@ -207,7 +196,6 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
       ["computingElement", "computingElement"],
       ["VO", "VO"],
       ["owner", "owner"],
-      ["broker", "broker"],
     ];
 
     me.leftPanel = Ext.create("Ext.dirac.utils.DiracBaseSelector", {
@@ -361,18 +349,12 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
       ComputingElement: {
         dataIndex: "DestinationSite",
       },
-      Broker: {
-        dataIndex: "Broker",
-      },
       CurrentJobID: {
         dataIndex: "CurrentJobID",
       },
       GridType: {
         dataIndex: "GridType",
       },
-      TaskQueueID: {
-        dataIndex: "TaskQueueID",
-      },
       BenchMark: {
         dataIndex: "BenchMark",
       },
@@ -452,7 +434,7 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
       mode: "local",
       store: new Ext.data.ArrayStore({
         fields: ["category"],
-        data: [["Status"], ["Site"], ["Computing Element"], ["VO"], ["Owner"], ["Broker"]],
+        data: [["Status"], ["Site"], ["Computing Element"], ["VO"], ["Owner"]],
       }),
       triggerAction: "all",
       value: "Status",