Merge pull request #753 from fstagni/JobMonitorSimpl

Job monitor simplification
DIRACGrid · Feb 9, 2024 · 6043358 · 6043358
2 parents 9a57881 + 024d086
commit 6043358
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 53 deletions.
diff --git a/src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py
@@ -4,7 +4,6 @@
 from DIRAC import gConfig, gLogger
 from DIRAC.Core.Utilities import DictCache
 from DIRAC.Core.Utilities.Graphs.Palette import Palette
-from DIRAC.RequestManagementSystem.Client.Request import Request
 from DIRAC.RequestManagementSystem.Client.ReqClient import ReqClient
 from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient
 from DIRAC.WorkloadManagementSystem.Client.JobManagerClient import JobManagerClient
@@ -256,6 +255,10 @@ def _request(self):
  if ownerGroup:
  req["OwnerGroup"] = ownerGroup
 
+ vo = list(json.loads(self.get_argument("vo", "[]")))
+ if vo:
+ req["vo"] = vo
+
  if self.get_argument("startDate", ""):
  req["FromDate"] = self.get_argument("startDate")
  if self.get_argument("startTime", ""):

diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js b/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js
@@ -79,13 +79,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  return oReturn;
  },
  dataFields: [
- {
- name: "SystemPriority",
- type: "float",
- },
- {
- name: "ApplicationNumStatus",
- },
  {
  name: "JobID",
  type: "int",
@@ -98,9 +91,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  {
  name: "VerifiedFlag",
  },
- {
- name: "RetrievedFlag",
- },
  {
  name: "Status",
  },
@@ -113,9 +103,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  name: "RescheduleCounter",
  type: "int",
  },
- {
- name: "JobSplitType",
- },
  {
  name: "MinorStatus",
  },
@@ -130,12 +117,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  {
  name: "JobType",
  },
- {
- name: "MasterJobID",
- },
- {
- name: "KilledFlag",
- },
  {
  name: "RescheduleTime",
  },
@@ -151,12 +132,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  {
  name: "JobName",
  },
- {
- name: "AccountedFlag",
- },
- {
- name: "OSandboxReadyFlag",
- },
  {
  name: "LastUpdateTime",
  type: "date",
@@ -171,23 +146,17 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  dateFormat: "Y-m-d H:i:s",
  },
  {
- name: "OwnerGroup",
+ name: "VO",
  },
  {
- name: "ISandboxReadyFlag",
+ name: "OwnerGroup",
  },
  {
  name: "UserPriority",
  },
  {
  name: "Owner",
  },
- {
- name: "DeletedFlag",
- },
- {
- name: "TaskQueueID",
- },
  {
  name: "JobType",
  },
@@ -258,6 +227,7 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  appStatus: "Application Status",
  owner: "Owner",
  OwnerGroup: "OwnerGroup",
+ VO: "VO",
  jobGroup: "Job Group",
  jobType: "Job Type",
  };
@@ -283,6 +253,7 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  ["status", "status"],
  ["types", "jobType"],
  ["OwnerGroup", "OwnerGroup"],
+ ["VO", "VO"],
  ];
 
  me.leftPanel = Ext.create("Ext.dirac.utils.DiracBaseSelector", {
@@ -414,6 +385,9 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  Site: {
  dataIndex: "Site",
  },
+ VO: {
+ dataIndex: "VO",
+ },
  JobName: {
  dataIndex: "JobName",
  properties: {
@@ -478,27 +452,9 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  hidden: true,
  },
  },
- AccountedFlag: {
- dataIndex: "AccountedFlag",
- properties: {
- hidden: true,
- },
- },
- OSandboxReadyFlag: {
- dataIndex: "OSandboxReadyFlag",
- properties: {
- hidden: true,
- },
- },
  Owner: {
  dataIndex: "Owner",
  },
- TaskQueueID: {
- dataIndex: "TaskQueueID",
- properties: {
- hidden: true,
- },
- },
  OwnerGroup: {
  dataIndex: "OwnerGroup",
  },
@@ -727,7 +683,7 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
  mode: "local",
  store: new Ext.data.ArrayStore({
  fields: ["category"],
- data: [["Status"], ["Site"], ["Minor Status"], ["Application Status"], ["Owner"], ["Owner Group"], ["Job Group"], ["Job Type"]],
+ data: [["Status"], ["Site"], ["Minor Status"], ["Application Status"], ["Owner"], ["Owner Group"], ["VO"], ["Job Group"], ["Job Type"]],
  }),
  triggerAction: "all",
  value: "Status",