Merge pull request #728 from fstagni/51_fixes3

[5.1] one WebApp for one DIRAC Setup
DIRACGrid · Mar 30, 2023 · e513dc6 · e513dc6
2 parents 6c14a9a + 3264e6e
commit e513dc6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 66 deletions.
diff --git a/src/WebAppDIRAC/WebApp/handler/RootHandler.py b/src/WebAppDIRAC/WebApp/handler/RootHandler.py
@@ -24,13 +24,6 @@ def web_changeGroup(self, to: str):
         """
         return TornadoResponse().redirect(self.__change(group=to))  # pylint: disable=no-member
 
-    def web_changeSetup(self, to: str):
-        """Change setup
-
-        :return: TornadoResponse()
-        """
-        return TornadoResponse().redirect(self.__change(setup=to))  # pylint: disable=no-member
-
     def __change(self, setup: str = None, group: str = None) -> str:
         """Generate URL to change setup/group, set query"""
         root = Conf.rootURL().strip("/")

diff --git a/src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py b/src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py
@@ -22,13 +22,13 @@ def web_getSysInfo(self):
             return {"success": "false", "error": result.get("Message", "No system information found")}
 
         # Add the information about the extensions' versions, if available, to display along with the DIRAC version
-        for i in range(len(callback)):
-            callback[i]["Host"] = callback[i]["HostName"]
-            callback[i]["Timestamp"] = str(callback[i].get("Timestamp", "unknown"))
+        for _i, cb in enumerate(callback):
+            cb["Host"] = cb["HostName"]
+            cb["Timestamp"] = str(cb.get("Timestamp", "unknown"))
             # We have to keep the backward compatibility (this can heppen when we do not update one host to v6r15 ...
-            callback[i]["DIRAC"] = "{},{}".format(
-                callback[i].get("DIRACVersion", callback[i].get("DIRAC", "")),
-                callback[i].get("Extension", callback[i].get("Extensions", "")),
+            cb["DIRAC"] = "{},{}".format(
+                cb.get("DIRACVersion", cb.get("DIRAC", "")),
+                cb.get("Extension", cb.get("Extensions", "")),
             )
 
         return {"success": "true", "result": sorted(callback, key=lambda i: i["Host"]), "total": len(callback)}

diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js b/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js
@@ -139,9 +139,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
     {
       name: "RescheduleTime",
     },
-    {
-      name: "DIRACSetup",
-    },
     {
       name: "FailedFlag",
     },
@@ -451,12 +448,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
           width: 150,
         },
       },
-      DIRACSetup: {
-        dataIndex: "DIRACSetup",
-        properties: {
-          hidden: true,
-        },
-      },
       FailedFlag: {
         dataIndex: "FailedFlag",
         properties: {

diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/SystemAdministration/classes/SystemAdministration.js b/src/WebAppDIRAC/WebApp/static/DIRAC/SystemAdministration/classes/SystemAdministration.js
@@ -150,9 +150,6 @@ Ext.define("DIRAC.SystemAdministration.classes.SystemAdministration", {
         {
           name: "OpenSockets",
         },
-        {
-          name: "Setup",
-        },
         {
           name: "Uptime",
         },
@@ -394,12 +391,6 @@ Ext.define("DIRAC.SystemAdministration.classes.SystemAdministration", {
           header: "OpenSockets",
           sortable: true,
         },
-        {
-          align: "left",
-          dataIndex: "Setup",
-          header: "Setup",
-          sortable: true,
-        },
         {
           align: "left",
           dataIndex: "Uptime",
@@ -552,9 +543,6 @@ Ext.define("DIRAC.SystemAdministration.classes.SystemAdministration", {
         {
           name: "Name",
         },
-        {
-          name: "Setup",
-        },
         {
           name: "PID",
         },
@@ -924,12 +912,6 @@ Ext.define("DIRAC.SystemAdministration.classes.SystemAdministration", {
           return me.rendererGridColumn(value, record);
         },
       },
-      Setup: {
-        dataIndex: "Setup",
-        renderer: function (value, metaData, record, row, col, store, gridView) {
-          return me.rendererGridColumn(value, record);
-        },
-      },
       Port: {
         dataIndex: "Port",
         renderer: function (value, metaData, record, row, col, store, gridView) {
@@ -1036,9 +1018,6 @@ Ext.define("DIRAC.SystemAdministration.classes.SystemAdministration", {
         {
           name: "ComponentName",
         },
-        {
-          name: "Setup",
-        },
         {
           name: "Port",
         },

diff --git a/src/WebAppDIRAC/WebApp/static/core/js/views/tabs/SettingsPanel.js b/src/WebAppDIRAC/WebApp/static/core/js/views/tabs/SettingsPanel.js
@@ -80,11 +80,6 @@ Ext.define("Ext.dirac.views.tabs.SettingsPanel", {
           text: "Group:",
         },
         me.addGroupsButton(),
-        {
-          xtype: "label",
-          text: "Setup:",
-        },
-        me.addSetupButton(),
         {
           xtype: "label",
           text: "Theme:",
@@ -226,24 +221,6 @@ Ext.define("Ext.dirac.views.tabs.SettingsPanel", {
 
     return new Ext.button.Button(button_group);
   },
-  addSetupButton: function () {
-    var setup_data = {
-      text: GLOBAL.APP.configData["setup"],
-      menu: [],
-    };
-
-    for (var i = 0; i < GLOBAL.APP.configData["validSetups"].length; i++)
-      setup_data.menu.push({
-        text: GLOBAL.APP.configData["validSetups"][i],
-        handler: function () {
-          var me = this;
-
-          location.href = GLOBAL.BASE_URL + "changeSetup?to=" + me.text;
-        },
-      });
-
-    return new Ext.button.Button(setup_data);
-  },
   addThemeButton: function () {
     var me = this;