Merge pull request #754 from fstagni/remove_proxy_persistency

feat: removed proxies persistency flag
DIRACGrid · Feb 7, 2024 · a230fe5 · a230fe5
2 parents 0c1146e + 82de574
commit a230fe5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py b/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py
@@ -65,13 +65,12 @@ def web_getProxyManagerData(
         sortField="UserName",
         username="[]",
         usergroup="[]",
-        persistent="",
         expiredBefore=0,
         expiredAfter=0,
     ):
         if self.getUserName().lower() == "anonymous":
             return {"success": "false", "error": "You are not authorize to access these data"}
-        req = self.__prepareParameters(username, usergroup, persistent, expiredBefore, expiredAfter)
+        req = self.__prepareParameters(username, usergroup, expiredBefore, expiredAfter)
         gLogger.info("!!!  S O R T : ", sort := [[sortField, sortDirection]])
         # pylint: disable=no-member
         result = gProxyManager.getDBContents(req, sort, start, limit)
@@ -89,7 +88,6 @@ def web_getProxyManagerData(
                     "UserDN": record[1],
                     "UserGroup": record[2],
                     "ExpirationTime": str(record[3]),
-                    "PersistentFlag": str(record[4]),
                 }
             )
         timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
@@ -147,14 +145,13 @@ def __humanize_time(self, sec=False):
         elif day > 0:
             return f"{day} days"
 
-    def __prepareParameters(self, username, usergroup, persistent, expiredBefore, expiredAfter):
+    def __prepareParameters(self, username, usergroup, expiredBefore, expiredAfter):
         req = {}
         if users := list(json.loads(username)):
             req["UserName"] = users
         if usersgroup := list(json.loads(usergroup)):
             req["UserGroup"] = usersgroup
-        if usersgroup and persistent in ["True", "False"]:
-            req["PersistentFlag"] = persistent
+
         if expiredBefore > expiredAfter:
             expiredBefore, expiredAfter = expiredAfter, expiredBefore
         if expiredBefore:

diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/ProxyManager/classes/ProxyManager.js b/src/WebAppDIRAC/WebApp/static/DIRAC/ProxyManager/classes/ProxyManager.js
@@ -61,9 +61,6 @@ Ext.define("DIRAC.ProxyManager.classes.ProxyManager", {
       type: "date",
       dateFormat: "Y-m-d H:i:s",
     },
-    {
-      name: "PersistentFlag",
-    },
   ],
 
   initComponent: function () {
@@ -197,13 +194,6 @@ Ext.define("DIRAC.ProxyManager.classes.ProxyManager", {
           }
         },
       },
-      Persistent: {
-        dataIndex: "PersistentFlag",
-        properties: {
-          width: 100,
-          sortable: true,
-        },
-      },
     };
 
     me.grid = Ext.create("Ext.dirac.utils.DiracGridPanel", {