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

Jump to bottom

Pilots owner group2 vo #752

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Pilots owner group2 vo #752

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
5a6f183
fix: follow removals in DIRAC
fstagni Jan 16, 2024
6a17d22
fix: PIlotAgents: from OwnerGroup to VO
fstagni Jan 16, 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
22 changes: 11 additions & 11 deletions src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ def web_getSelectionData(self):
gridtype = [["Nothing to display"]]
callback["gridtype"] = gridtype

if "OwnerGroup" in result and len(result["OwnerGroup"]) > 0:
ownerGroup = []
for i in result["OwnerGroup"]:
ownerGroup.append([str(i)])
if "VO" in result and len(result["VO"]) > 0:
VO = []
for i in result["VO"]:
VO.append([str(i)])
else:
ownerGroup = [["Nothing to display"]]
callback["ownerGroup"] = ownerGroup
VO = [["Nothing to display"]]
callback["VO"] = VO

if "DestinationSite" in result and len(result["DestinationSite"]) > 0:
ce = []
Expand Down Expand Up @@ -159,9 +159,9 @@ def __request(self):
if owner:
req["Owner"] = owner

ownerGroup = list(json.loads(self.get_argument("ownerGroup", "[]")))
if ownerGroup:
req["OwnerGroup"] = ownerGroup
VO = list(json.loads(self.get_argument("VO", "[]")))
if VO:
req["VO"] = VO

sort = json.loads(self.get_argument("sort", "[]"))
if len(sort) > 0:
Expand Down Expand Up @@ -211,8 +211,8 @@ def web_getStatisticsData(self, statsField):
selector = "GridSite"
elif statsField == "Computing Element":
selector = "DestinationSite"
elif statsField == "Owner Group":
selector = "OwnerGroup"
elif statsField == "VO":
selector = "VO"
else:
selector = statsField

Expand Down
6 changes: 0 additions & 6 deletions src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
{
name: "CPUTime",
},
{
name: "OwnerDN",
},
{
name: "JobGroup",
},
Expand Down Expand Up @@ -202,9 +199,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
name: "StatusIcon",
mapping: "Status",
},
{
name: "OwnerGroup",
},
],

initComponent: function () {
Expand Down
12 changes: 6 additions & 6 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 @@ -80,7 +80,7 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
name: "Status",
},
{
name: "OwnerGroup",
name: "VO",
},
{
name: "LastUpdateTime",
Expand Down Expand Up @@ -185,7 +185,7 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
site: "Site",
status: "Status",
computingElement: "Computing Element",
ownerGroup: "Owner Group",
VO: "VO",
owner: "Owner",
broker: "Broker",
};
Expand All @@ -205,7 +205,7 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
["site", "site"],
["status", "status"],
["computingElement", "computingElement"],
["ownerGroup", "ownerGroup"],
["VO", "VO"],
["owner", "owner"],
["broker", "broker"],
];
Expand Down Expand Up @@ -382,8 +382,8 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
hidden: true,
},
},
OwnerGroup: {
dataIndex: "OwnerGroup",
VO: {
dataIndex: "VO",
},
PilotID: {
dataIndex: "PilotID",
Expand Down Expand Up @@ -452,7 +452,7 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
mode: "local",
store: new Ext.data.ArrayStore({
fields: ["category"],
data: [["Status"], ["Site"], ["Computing Element"], ["Owner Group"], ["Owner"], ["Broker"]],
data: [["Status"], ["Site"], ["Computing Element"], ["VO"], ["Owner"], ["Broker"]],
}),
triggerAction: "all",
value: "Status",
Expand Down
Loading