Merge remote-tracking branch 'upstream/master' into is8496/use-prefork-pool-for-cpu-bound-celery-tasks

Author: giancarloromeo

services/static-webserver/client/Manifest.json

@@ -30,7 +30,7 @@
       "jsondiffpatch/jsondiffpatch-0.7.3.min.js",
       "jsontreeviewer/jsonTree.js",
       "marked/marked.min.js",
-      "DOMPurify/purify.min.js"
+      "DOMPurify/purify-3.2.7.min.js"
     ],
     "css": [
       "jsontreeviewer/jsonTree.css",

services/static-webserver/client/source/class/osparc/dashboard/FolderButtonNew.js

@@ -61,7 +61,6 @@ qx.Class.define("osparc.dashboard.FolderButtonNew", {
           control = new qx.ui.basic.Label(this.tr("New folder")).set({
             anonymous: true,
             font: "text-14",
-            rich: true,
           });
           this._add(control, {
             ...osparc.dashboard.FolderButtonBase.POS.TITLE,

services/static-webserver/client/source/class/osparc/dashboard/GridButtonBase.js

@@ -188,9 +188,10 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
           break;
         }
         case "title":
-          control = new qx.ui.basic.Label().set({
+          control = new osparc.ui.basic.SafeLabel().set({
             textColor: "contrasted-text-light",
             font: "text-14",
+            rich: false, // do not allow multi-line titles
           });
           layout = this.getChildControl("header");
           layout.add(control, this.self().HPOS.TITLE);
@@ -205,12 +206,11 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
           break;
         }
         case "subtitle-text": {
-          control = new qx.ui.basic.Label().set({
+          control = new osparc.ui.basic.SafeLabel().set({
             textColor: "contrasted-text-dark",
             alignY: "middle",
             allowGrowX: true,
             allowShrinkX: true,
-            rich: true,
             anonymous: true,
             font: "text-12",
             allowGrowY: false

services/static-webserver/client/source/class/osparc/dashboard/GridButtonTaskPlaceholder.js

@@ -62,11 +62,10 @@ qx.Class.define("osparc.dashboard.GridButtonTaskPlaceholder", {
       let layout;
       switch (id) {
         case "state-label": {
-          control = new qx.ui.basic.Label().set({
+          control = new osparc.ui.basic.SafeLabel().set({
             textColor: "contrasted-text-dark",
             allowGrowX: true,
             allowShrinkX: true,
-            rich: true,
             anonymous: true,
             font: "text-12",
             allowGrowY: true,

services/static-webserver/client/source/class/osparc/dashboard/GroupedCardContainer.js

@@ -101,10 +101,12 @@ qx.Class.define("osparc.dashboard.GroupedCardContainer", {
             allowGrowX: false
           });
           control.getChildControl("icon").set(osparc.utils.Utils.getThumbnailProps(32));
-          control.getChildControl("label").set({
+          const atomLabel = control.getChildControl("label");
+          atomLabel.set({
             rich: true,
             wrap: true
-          })
+          });
+          osparc.wrapper.DOMPurify.sanitizeLabel(atomLabel);
           control.getContentElement().setStyles({
             "border-top-left-radius": "4px",
             "border-top-right-radius": "4px"

services/static-webserver/client/source/class/osparc/dashboard/ListButtonBase.js

@@ -75,12 +75,11 @@ qx.Class.define("osparc.dashboard.ListButtonBase", {
           break;
         }
         case "title":
-          control = new qx.ui.basic.Label().set({
+          control = new osparc.ui.basic.SafeLabel().set({
             textColor: "contrasted-text-light",
             font: "text-14",
             alignY: "middle",
             maxWidth: 300,
-            rich: true,
           });
           this._add(control, {
             row: 0,

services/static-webserver/client/source/class/osparc/desktop/credits/CreditsServiceListItem.js

@@ -93,12 +93,11 @@ qx.Class.define("osparc.desktop.credits.CreditsServiceListItem", {
           break;
         }
         case "title":
-          control = new qx.ui.basic.Label().set({
+          control = new osparc.ui.basic.SafeLabel().set({
             font: "text-12",
             alignY: "middle",
             maxWidth: 200,
             allowGrowX: true,
-            rich: true,
           });
           this._add(control, this.self().GRID.NAME);
           break;

services/static-webserver/client/source/class/osparc/desktop/organizations/ServicesList.js

@@ -47,7 +47,6 @@ qx.Class.define("osparc.desktop.organizations.ServicesList", {
       const intro = new qx.ui.basic.Label().set({
         value: msg,
         alignX: "left",
-        rich: true,
         font: "text-13"
       });
       return intro;

services/static-webserver/client/source/class/osparc/desktop/organizations/TutorialsList.js

@@ -47,7 +47,6 @@ qx.Class.define("osparc.desktop.organizations.TutorialsList", {
       const intro = new qx.ui.basic.Label().set({
         value: msg,
         alignX: "left",
-        rich: true,
         font: "text-13"
       });
       return intro;

services/static-webserver/client/source/class/osparc/desktop/preferences/pages/TagsPage.js

@@ -23,6 +23,8 @@ qx.Class.define("osparc.desktop.preferences.pages.TagsPage", {
     Once the tags are created, they can be assigned to the ") + studyLabel + this.tr("  via 'More options...' on the ") + studyLabel + this.tr(" cards.");
     const intro = new qx.ui.basic.Label(msg).set({
       font: "text-13",
+      rich: true,
+      wrap: true
     });
     this._add(intro);