From 6d6ca9aac0c167b8479f7ca25ef08d4b525bee51 Mon Sep 17 00:00:00 2001 From: fstagni Date: Fri, 9 Feb 2024 17:00:57 +0100 Subject: [PATCH] fix: removed unused Broker field --- src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py | 11 ----------- .../static/DIRAC/PilotMonitor/classes/PilotMonitor.js | 10 +--------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py index 063e484f..6318d146 100644 --- a/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py +++ b/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"]: @@ -139,10 +132,6 @@ def __request(self): 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 diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js b/src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js index 908171e6..31f0c37b 100755 --- a/src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js +++ b/src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js @@ -100,9 +100,6 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", { name: "BenchMark", type: "float", }, - { - name: "Broker", - }, { name: "GridSite", }, @@ -184,7 +181,6 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", { computingElement: "Computing Element", VO: "VO", owner: "Owner", - broker: "Broker", }; var map = [ @@ -193,7 +189,6 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", { ["computingElement", "computingElement"], ["VO", "VO"], ["owner", "owner"], - ["broker", "broker"], ]; me.leftPanel = Ext.create("Ext.dirac.utils.DiracBaseSelector", { @@ -347,9 +342,6 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", { ComputingElement: { dataIndex: "DestinationSite", }, - Broker: { - dataIndex: "Broker", - }, CurrentJobID: { dataIndex: "CurrentJobID", }, @@ -435,7 +427,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",