Bugfixes (#2193)

Fix TSR annotations
Fix Inputs access level

Author: odeimaiz

services/web/client/source/class/osparc/component/form/renderer/PropForm.js

@@ -94,11 +94,20 @@ qx.Class.define("osparc.component.form.renderer.PropForm", {
     // overridden
     setAccessLevel: function(data) {
       const entry = this.self().gridPos;
+      const disableables = osparc.component.form.renderer.PropFormBase.getDisableables();
       Object.entries(data).forEach(([portId, visibility]) => {
-        Object.values(entry).forEach(entryVal => {
-          const layoutElement = this._getLayoutChild(portId, entryVal);
-          if (layoutElement) {
-            this.__changeControlVisibility(layoutElement.child, visibility);
+        Object.values(entry).forEach(entryPos => {
+          const layoutElement = this._getLayoutChild(portId, entryPos);
+          if (layoutElement && layoutElement.child) {
+            const control = layoutElement.child;
+            if (control) {
+              const vis = visibility === this._visibility.hidden ? "excluded" : "visible";
+              const enabled = visibility === this._visibility.readWrite;
+              control.setVisibility(vis);
+              if (disableables.includes(entryPos)) {
+                control.setEnabled(enabled);
+              }
+            }
           }
         });
       });
@@ -573,24 +582,6 @@ qx.Class.define("osparc.component.form.renderer.PropForm", {
     },
     /* /PARAMETERS */
 
-    __changeControlVisibility: function(control, visibility) {
-      if (control === null) {
-        return;
-      }
-
-      switch (visibility) {
-        case this._visibility.hidden:
-          control.setVisibility("excluded");
-          break;
-        case this._visibility.readOnly:
-          control.setVisibility("visible");
-          break;
-        case this._visibility.readWrite:
-          control.setVisibility("visible");
-          break;
-      }
-    },
-
     __getRetrieveFieldChild: function(portId) {
       return this._getLayoutChild(portId, this.self().gridPos.retrieveStatus);
     }

services/web/client/source/class/osparc/component/form/renderer/PropFormBase.js

@@ -61,6 +61,14 @@ qx.Class.define("osparc.component.form.renderer.PropFormBase", {
       ctrlField: 2,
       unit: 3,
       menu: 4
+    },
+
+    getDisableables: function() {
+      return [
+        this.gridPos.label,
+        this.gridPos.ctrlField,
+        this.gridPos.menu
+      ];
     }
   },
 
@@ -281,7 +289,9 @@ qx.Class.define("osparc.component.form.renderer.PropFormBase", {
         });
         osparc.data.model.Sweeper.isSweeperEnabled()
           .then(isSweeperEnabled => {
-            menuBtn.setVisibility(isSweeperEnabled ? "visible" : "excluded");
+            field.bind("visibility", menuBtn, "visibility", {
+              converter: visibility => (visibility === "visible" && isSweeperEnabled) ? "visible" : "excluded"
+            });
           });
         return menuBtn;
       }

services/web/client/source/class/osparc/component/form/renderer/PropFormEditor.js

@@ -179,30 +179,18 @@ qx.Class.define("osparc.component.form.renderer.PropFormEditor", {
     __setAccessLevel: function(data) {
       for (const key in data) {
         const label = this._getLabelFieldChild(key).child;
-        const control = this._form.getControl(key);
-        switch (data[key]) {
-          case this._visibility.hidden: {
-            const newLabel = this.__addDelTag(label.getValue());
-            label.setValue(newLabel);
-            label.setEnabled(false);
-            control.setEnabled(false);
-            break;
+        const newLabel = data[key] === this._visibility.hidden ? this.__addDelTag(label.getValue()) : this.__removeDelTag(label.getValue());
+        label.setValue(newLabel);
+
+        const enabled = data[key] === this._visibility.readWrite;
+        const disableables = osparc.component.form.renderer.PropFormBase.getDisableables();
+        const ctrls = [];
+        disableables.forEach(disableable => ctrls.push(this._getLayoutChild(key, disableable)));
+        ctrls.forEach(ctrl => {
+          if (ctrl) {
+            ctrl.child.setEnabled(enabled);
           }
-          case this._visibility.readOnly: {
-            const newLabel = this.__removeDelTag(label.getValue());
-            label.setValue(newLabel);
-            label.setEnabled(false);
-            control.setEnabled(false);
-            break;
-          }
-          case this._visibility.readWrite: {
-            const newLabel = this.__removeDelTag(label.getValue());
-            label.setValue(newLabel);
-            label.setEnabled(true);
-            control.setEnabled(true);
-            break;
-          }
-        }
+        });
       }
     },
 

services/web/client/source/class/osparc/component/metadata/QualityEditor.js

@@ -487,7 +487,7 @@ qx.Class.define("osparc.component.metadata.QualityEditor", {
         column: 1
       });
 
-      const buttonCL = this.__getEditButton(copyMetadataAnnotations.certificationLink, annotationCL);
+      const buttonCL = this.__getEditButton(copyMetadataAnnotations, "certificationLink", annotationCL);
       certificationBox.bind("selection", buttonCL, "visibility", {
         converter: selection => (this.getMode() === "edit" && selection[0].getLabel() !== "Uncertified") ? "visible" : "excluded"
       }, this);
@@ -514,7 +514,7 @@ qx.Class.define("osparc.component.metadata.QualityEditor", {
         column: 1
       });
 
-      const buttonVV = this.__getEditButton(copyMetadataAnnotations.certificationLink, annotationCL);
+      const buttonVV = this.__getEditButton(copyMetadataAnnotations, "vandv", annotationVV);
       this.bind("mode", buttonVV, "visibility", {
         converter: mode => mode === "edit" ? "visible" : "excluded"
       });
@@ -549,7 +549,7 @@ qx.Class.define("osparc.component.metadata.QualityEditor", {
         column: 1
       });
 
-      const buttonL = this.__getEditButton(copyMetadataAnnotations.certificationLink, annotationCL);
+      const buttonL = this.__getEditButton(copyMetadataAnnotations, "limitations", annotationLimitations, serviceLimitations);
       this.bind("mode", buttonL, "visibility", {
         converter: mode => mode === "edit" ? "visible" : "excluded"
       });
@@ -571,18 +571,18 @@ qx.Class.define("osparc.component.metadata.QualityEditor", {
       return header;
     },
 
-    __getEditButton: function(fieldValue, viewMD, suffixText = "") {
+    __getEditButton: function(annotationsObj, fieldKey, viewMD, suffixText = "") {
       const button = osparc.utils.Utils.getEditButton();
       button.addListener("execute", () => {
         const title = this.tr("Edit Annotations");
         const subtitle = this.tr("Supports Markdown");
-        const textEditor = new osparc.component.widget.TextEditor(fieldValue, subtitle, title);
+        const textEditor = new osparc.component.widget.TextEditor(annotationsObj[fieldKey], subtitle, title);
         textEditor.getChildControl("accept-button").setLabel(this.tr("Accept"));
         const win = osparc.ui.window.Window.popUpInWindow(textEditor, title, 400, 300);
         textEditor.addListener("textChanged", e => {
           const newText = e.getData();
           viewMD.setValue(newText + suffixText);
-          fieldValue = newText;
+          annotationsObj[fieldKey] = newText;
           win.close();
         }, this);
         textEditor.addListener("cancel", () => {