Skip to content

Commit

Permalink
fix: removed unused Broker field
Browse files Browse the repository at this point in the history
  • Loading branch information
fstagni committed Feb 21, 2024
1 parent 687f187 commit 1d077f3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 20 deletions.
11 changes: 0 additions & 11 deletions src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
name: "BenchMark",
type: "float",
},
{
name: "Broker",
},
{
name: "GridSite",
},
Expand Down Expand Up @@ -184,7 +181,13 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
computingElement: "Computing Element",
VO: "VO",
owner: "Owner",
broker: "Broker",
};

var textFields = {
pilotId: {
name: "Pilot Job Reference",
type: "originalText",
},
};

var map = [
Expand All @@ -193,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", {
Expand Down Expand Up @@ -347,9 +349,6 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
ComputingElement: {
dataIndex: "DestinationSite",
},
Broker: {
dataIndex: "Broker",
},
CurrentJobID: {
dataIndex: "CurrentJobID",
},
Expand Down Expand Up @@ -435,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",
Expand Down

0 comments on commit 1d077f3

Please sign in to comment.