Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,9 @@ qx.Class.define("osparc.data.model.Node", {
return this.getIframeHandler() ? this.getIframeHandler().getLoadingPage() : null;
},

__applyPropsForm: function() {
__applyPropsForm: function(propsForm) {
osparc.utils.Utils.setIdToWidget(propsForm, "settingsForm_" + this.getNodeId());

const checkIsPipelineRunning = () => {
const isPipelineRunning = this.getStudy().isPipelineRunning();
this.getPropsForm().setEnabled(!isPipelineRunning);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@ qx.Class.define("osparc.node.slideshow.NodeView", {

statics: {
LOGGER_HEIGHT: 28,

isPropsFormShowable: function(node) {
if (node && ("getPropsForm" in node) && node.getPropsForm()) {
return node.getPropsForm().hasVisibleInputs();
}
return false;
}
},

members: {
Expand Down Expand Up @@ -135,8 +128,8 @@ qx.Class.define("osparc.node.slideshow.NodeView", {
},

isSettingsGroupShowable: function() {
const node = this.getNode();
return this.self().isPropsFormShowable(node);
// do not show Settings in App Mode
return false;
},

__iFrameChanged: function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,6 @@ qx.Class.define("osparc.study.Utils", {
// the was to guess the TI type is to check the boot mode of the ti-postpro in the pipeline
const tiPostpro = Object.values(studyData["workbench"]).find(srv => srv.key.includes("ti-postpro"));
if (tiPostpro && tiPostpro["bootOptions"]) {
console.log(tiPostpro);
switch (tiPostpro["bootOptions"]["boot_mode"]) {
case "0":
// classic TI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
}
},

__createModelInfo: function(anatomicalModelsData) {
__createModelInfo: function(anatomicalModelsDataSource) {
const cardGrid = new qx.ui.layout.Grid(16, 16);
const cardLayout = new qx.ui.container.Composite(cardGrid);

const description = anatomicalModelsData["description"] || "";
const description = anatomicalModelsDataSource["description"] || "";
description.split(" - ").forEach((desc, idx) => {
const titleLabel = new qx.ui.basic.Label().set({
value: desc,
Expand All @@ -95,7 +95,7 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
});

const thumbnail = new qx.ui.basic.Image().set({
source: anatomicalModelsData["thumbnail"],
source: anatomicalModelsDataSource["thumbnail"],
alignY: "middle",
scale: true,
allowGrowX: true,
Expand All @@ -110,7 +110,7 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
row: 2,
});

const features = anatomicalModelsData["features"];
const features = anatomicalModelsDataSource["features"];
const featuresGrid = new qx.ui.layout.Grid(8, 8);
const featuresLayout = new qx.ui.container.Composite(featuresGrid);
let idx = 0;
Expand Down Expand Up @@ -176,7 +176,7 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
}
return doiLabel;
};
featuresLayout.add(doiToLink(anatomicalModelsData["doi"]), {
featuresLayout.add(doiToLink(anatomicalModelsDataSource["doi"]), {
column: 1,
row: idx,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,17 +182,15 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
this.__anatomicalModels = [];
licensedItems.forEach(licensedItem => {
const anatomicalModel = osparc.utils.Utils.deepCloneObject(licensedItem);
anatomicalModel["modelId"] = anatomicalModel["licensedResourceData"]["source"]["id"];
const anatomicalModelDataSource = anatomicalModel["licensedResourceData"]["source"];
anatomicalModel["modelId"] = anatomicalModelDataSource["id"];
anatomicalModel["thumbnail"] = "";
anatomicalModel["date"] = null;
if (anatomicalModel["licensedResourceData"] && anatomicalModel["licensedResourceData"]["source"]) {
const anatomicalModelSource = anatomicalModel["licensedResourceData"]["source"];
if (anatomicalModelSource["thumbnail"]) {
anatomicalModel["thumbnail"] = anatomicalModelSource["thumbnail"];
}
if (anatomicalModelSource["features"] && anatomicalModelSource["features"]["date"]) {
anatomicalModel["date"] = new Date(anatomicalModelSource["features"]["date"]);
}
if (anatomicalModelDataSource["thumbnail"]) {
anatomicalModel["thumbnail"] = anatomicalModelDataSource["thumbnail"];
}
if (anatomicalModelDataSource["features"] && anatomicalModelDataSource["features"]["date"]) {
anatomicalModel["date"] = new Date(anatomicalModelDataSource["features"]["date"]);
}
// attach license data
anatomicalModel["licensedItemId"] = licensedItem["licensedItemId"];
Expand Down
4 changes: 4 additions & 0 deletions tests/e2e-playwright/tests/tip/test_ti_plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ def test_classic_ti_plan( # noqa: PLR0915
page.wait_for_timeout(_ELECTRODE_SELECTOR_FLICKERING_WAIT_TIME)

with log_context(logging.INFO, "Configure selector"):
assert (
page.get_by_test_id("settingsForm_" + node_ids[0]).count() == 0
), "service settings should not be visible"

electrode_selector_iframe.get_by_test_id("TargetStructure_Selector").click()
electrode_selector_iframe.get_by_test_id(
"TargetStructure_Target_(Targets_combined) Hypothalamus"
Expand Down
Loading