fix: Transformation and Pilots: from DN to owner

DIRACGrid · Aug 3, 2023 · 47aab25 · 47aab25
1 parent 6144bc1
commit 47aab25
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py
@@ -3,7 +3,6 @@
 
 from DIRAC import gConfig, S_OK, gLogger
 from DIRAC.Core.Utilities.Graphs.Palette import Palette
-from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getUsernameForDN
 from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
 from WebAppDIRAC.Lib.WebHandler import WebHandler
 
@@ -214,8 +213,6 @@ def web_getStatisticsData(self, statsField):
  selector = "DestinationSite"
  elif statsField == "Owner Group":
  selector = "OwnerGroup"
- elif statsField == "Owner":
- selector = "OwnerDN"
  else:
  selector = statsField
 
@@ -232,9 +229,6 @@ def web_getStatisticsData(self, statsField):
  statistics = {}
  if (result := RPC.getCounters("PilotAgents", [selector], req))["OK"]:
  for status, count in result["Value"]:
- if "OwnerDN" in status:
- if (userName := getUsernameForDN(status["OwnerDN"]))["OK"]:
- status["OwnerDN"] = userName["Value"]
  statistics[status[selector]] = count
 
  result = S_OK(statistics)

diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js b/src/WebAppDIRAC/WebApp/static/DIRAC/PilotMonitor/classes/PilotMonitor.js
@@ -106,9 +106,6 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
  {
  name: "Broker",
  },
- {
- name: "OwnerDN",
- },
  {
  name: "GridSite",
  },
@@ -385,12 +382,6 @@ Ext.define("DIRAC.PilotMonitor.classes.PilotMonitor", {
  hidden: true,
  },
  },
- OwnerDN: {
- dataIndex: "OwnerDN",
- properties: {
- hidden: true,
- },
- },
  OwnerGroup: {
  dataIndex: "OwnerGroup",
  },

diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/TransformationMonitor/classes/TransformationMonitor.js b/src/WebAppDIRAC/WebApp/static/DIRAC/TransformationMonitor/classes/TransformationMonitor.js
@@ -81,7 +81,7 @@ Ext.define("DIRAC.TransformationMonitor.classes.TransformationMonitor", {
  name: "EventsPerJob",
  },
  {
- name: "AuthorDN",
+ name: "Author",
  },
  {
  name: "AuthorGroup",
@@ -553,8 +553,8 @@ Ext.define("DIRAC.TransformationMonitor.classes.TransformationMonitor", {
  hidden: true,
  },
  },
- AuthorDN: {
- dataIndex: "AuthorDN",
+ Author: {
+ dataIndex: "Author",
  properties: {
  hidden: true,
  },