Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pilots simplification #755

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Pilots simplification #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
687f187
fix: removed unused TaskQueueID field
fstagni Feb 9, 2024
1d077f3
fix: removed unused Broker field
fstagni Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py
View file
Open in desktop
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 @@ -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
Expand Down
20 changes: 1 addition & 19 deletions src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,13 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
{
name: "GridType",
},
{
name: "TaskQueueID",
},
{
name: "CurrentJobID",
},
{
name: "BenchMark",
type: "float",
},
{
name: "Broker",
},
{
name: "GridSite",
},
Expand Down Expand Up @@ -187,14 +181,9 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
computingElement: "Computing Element",
VO: "VO",
owner: "Owner",
broker: "Broker",
};

var textFields = {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like textFields is still used in the module:

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

Line 197 in 6d6ca9a

textFields: textFields,

Also, did you delete pilotId on purpose?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! fixed.

taskQueueId: {
name: "Task Queue ID",
type: "number",
},
pilotId: {
name: "Pilot Job Reference",
type: "originalText",
Expand All @@ -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", {
Expand Down Expand Up @@ -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",
},
Expand Down Expand Up @@ -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",
Expand Down
Loading