WebAppDIRAC 6.0.2__tar.gz → 6.0.3__tar.gz

{webappdirac-6.0.2/src/WebAppDIRAC.egg-info → webappdirac-6.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WebAppDIRAC
-Version: 6.0.2
+Version: 6.0.3
 Summary: WebAppDIRAC is a portal for the DIRAC software.
 Home-page: https://github.com/DIRACGrid/WebAppDIRAC/
 License: GPL-3.0-only

{webappdirac-6.0.2 → webappdirac-6.0.3}/release.notes

@@ -1,3 +1,10 @@
+[v6.0.3]
+
+FIX: (#795) Prefer https wherever possible, remove insecure iframe
+FIX: (#794) Hide top-level scrollbar on wrongly sized panels
+FIX: (#793) Correct logic in time selection panel
+FIX: (#792) Allow deletion of proxies without groups
+
 [v6.0.2]
 
 CHANGE: (#791) Only auto-reload webapp code in debug mode

{webappdirac-6.0.2 → webappdirac-6.0.3}/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py

@@ -83,17 +83,8 @@ class ProxyManagerHandler(WebHandler):
         if not (webIds := list(json.loads(idList))):
             return {"success": "false", "error": "No valid id's specified"}
 
-        idList = []
-        for id in webIds:
-            spl = id.split("@")
-            dn = "@".join(spl[:-1])
-            idList.append((dn,))
-        retVal = gProxyManager.deleteProxyBundle(idList)
-        # for uid in webIds:
-        #   spl = uid.split("@")
-        #   dn = "@".join(spl[:-1])
-        #   idList.append(dn)
-        # retVal = yield self.threadTask(ProxyManagerClient().deleteProxy, idList)  # pylint: disable=no-member
+        retVal = gProxyManager.deleteProxyBundle(webIds)
+
         if retVal["OK"]:
             return {"success": "true", "result": retVal["Value"]}
         return {"success": "false", "error": retVal["Message"]}

{webappdirac-6.0.2 → webappdirac-6.0.3}/src/WebAppDIRAC/WebApp/static/DIRAC/Notepad/classes/Notepad.js

@@ -6,7 +6,7 @@
 Ext.define("DIRAC.Notepad.classes.Notepad", {
   extend: "Ext.dirac.core.Module",
 
-  requires: ["Ext.form.field.HtmlEditor"],
+  requires: ["Ext.form.field.TextArea"],
 
   initComponent: function () {
     var me = this;
@@ -16,8 +16,11 @@ Ext.define("DIRAC.Notepad.classes.Notepad", {
     me.launcher.width = 400;
     me.launcher.height = 400;
 
-    me.editor = new Ext.form.field.HtmlEditor({
-      value: ['Some <b>rich</b> <font color="red">text</font> goes <u>here</u><br>', "Give it a try!"].join(""),
+    me.editor = new Ext.form.field.TextArea({
+      value: ["Some text goes here.", "Give it a try!"].join("\n"),
+      grow: true,
+      growMin: 200,
+      enableKeyEvents: true,
     });
 
     Ext.apply(me, {
@@ -32,10 +35,10 @@ Ext.define("DIRAC.Notepad.classes.Notepad", {
     var me = this;
 
     if ("helptext" in data) {
-      me.editor.setValue(data["helptext"]);
+      me.editor.setValue(String(data["helptext"] || ""));
     }
     if ("text" in data) {
-      me.editor.setValue(data["text"]);
+      me.editor.setValue(String(data["text"] || ""));
     }
   },
 

{webappdirac-6.0.2 → webappdirac-6.0.3}/src/WebAppDIRAC/WebApp/static/core/js/utils/DiracTimeSearchPanel.js

@@ -230,7 +230,7 @@ Ext.define("Ext.dirac.utils.DiracTimeSearchPanel", {
 
     var iSpanValue = me.cmbTimeSpan.getValue();
 
-    if (iSpanValue == null && iSpanValue == 0) {
+    if (iSpanValue == null || iSpanValue == 0) {
       sStartDate = null;
       sStartTime = null;
       sEndDate = null;

{webappdirac-6.0.2 → webappdirac-6.0.3}/src/WebAppDIRAC/WebApp/static/core/js/views/tabs/RightContainer.js

@@ -97,10 +97,12 @@ Ext.define("Ext.dirac.views.tabs.RightContainer", {
       layout: "fit",
       closable: false,
       xtype: "component",
+      /*
       autoEl: {
         tag: "iframe",
-        src: "http://diracgrid.org",
+        src: "https://diracgrid.org",
       },
+      */
     });
   },
   getStateData: function () {

{webappdirac-6.0.2 → webappdirac-6.0.3}/src/WebAppDIRAC/WebApp/static/core/js/views/tabs/TabPanel.js

@@ -21,7 +21,7 @@ Ext.define("Ext.dirac.views.tabs.TabPanel", {
   renderTo: Ext.getBody(),
   defaults: {
     bodyPadding: 0,
-    scrollable: true,
+    scrollable: false,
   },
   bodyStyle: {
     background: "#AAAAAA",

{webappdirac-6.0.2 → webappdirac-6.0.3}/src/WebAppDIRAC/WebApp/web.cfg

@@ -39,7 +39,7 @@ WebApp
 
   Schema
   {
-    Help = link|http://dirac.readthedocs.io/en/latest/UserGuide/index.html
+    Help = link|https://dirac.readthedocs.io/en/latest/UserGuide/index.html
     Tools
     {
       Application Wizard = DIRAC.ApplicationWizard
@@ -71,7 +71,7 @@ WebApp
       #ExampleApp = DIRAC.ExampleApp
     }
 
-    DIRAC = link|http://diracgrid.org
+    DIRAC = link|https://diracgrid.org
   }
 
 }

{webappdirac-6.0.2 → webappdirac-6.0.3/src/WebAppDIRAC.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WebAppDIRAC
-Version: 6.0.2
+Version: 6.0.3
 Summary: WebAppDIRAC is a portal for the DIRAC software.
 Home-page: https://github.com/DIRACGrid/WebAppDIRAC/
 License: GPL-3.0-only