Skip to content

🎨 [Frontend] Create Functions: Make default input values editable #7951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 23, 2025
Merged

🎨 [Frontend] Create Functions: Make default input values editable #7951

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
612354b
TextField instead of Label
odeimaiz Jun 23, 2025
8a0c4cb
make default value editable
odeimaiz Jun 23, 2025
b9ea604
Merge branch 'master' into feature/function-default-values
odeimaiz Jun 23, 2025
82b5479
rename
odeimaiz Jun 23, 2025
62bdcf5
pass default values
odeimaiz Jun 23, 2025
6bebe88
minor
odeimaiz Jun 23, 2025
34c3b3d
Merge branch 'master' into feature/function-default-values
odeimaiz Jun 23, 2025
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
54 changes: 37 additions & 17 deletions services/static-webserver/client/source/class/osparc/study/CreateFunction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qx.Class.define("osparc.study.CreateFunction", {
},

statics: {
createFunctionData: function(projectData, name, description, exposedInputs, exposedOutputs) {
createFunctionData: function(projectData, name, description, defaultInputs = {}, exposedInputs = {}, exposedOutputs = {}) {
const functionData = {
"projectId": projectData["uuid"],
"title": name,
Expand All @@ -60,18 +60,19 @@ qx.Class.define("osparc.study.CreateFunction", {

const parameters = osparc.study.Utils.extractFunctionableParameters(projectData["workbench"]);
parameters.forEach(parameter => {
const parameterLabel = parameter["label"];
if (exposedInputs[parameterLabel]) {
const parameterKey = parameter["label"];
if (exposedInputs[parameterKey]) {
const parameterMetadata = osparc.store.Services.getMetadata(parameter["key"], parameter["version"]);
if (parameterMetadata) {
const type = osparc.service.Utils.getParameterType(parameterMetadata);
functionData["inputSchema"]["schema_content"]["properties"][parameterLabel] = {
functionData["inputSchema"]["schema_content"]["properties"][parameterKey] = {
"type": type,
};
functionData["inputSchema"]["schema_content"]["required"].push(parameterLabel);
functionData["inputSchema"]["schema_content"]["required"].push(parameterKey);
}
} else {
functionData["defaultInputs"][parameterLabel] = osparc.service.Utils.getParameterValue(parameter);
}
if (defaultInputs[parameterKey]) {
functionData["defaultInputs"][parameterKey] = defaultInputs[parameterKey];
}
});

Expand Down Expand Up @@ -120,11 +121,12 @@ qx.Class.define("osparc.study.CreateFunction", {
form.add(description, this.tr("Description"), null, "description");


const defaultInputs = {};
const exposedInputs = {};
const exposedOutputs = {};

// INPUTS
const inGrid = new qx.ui.layout.Grid(10, 6);
const inGrid = new qx.ui.layout.Grid(12, 6);
const inputsLayout = new qx.ui.container.Composite(inGrid).set({
allowGrowX: false,
alignX: "left",
Expand Down Expand Up @@ -163,7 +165,8 @@ qx.Class.define("osparc.study.CreateFunction", {

const parameters = osparc.study.Utils.extractFunctionableParameters(this.__studyData["workbench"]);
parameters.forEach(parameter => {
const parameterLabel = new qx.ui.basic.Label(parameter["label"]);
const parameterKey = parameter["label"];
const parameterLabel = new qx.ui.basic.Label(parameterKey);
inputsLayout.add(parameterLabel, {
row,
column,
Expand All @@ -185,11 +188,28 @@ qx.Class.define("osparc.study.CreateFunction", {
row,
column,
});
exposedInputs[parameter["label"]] = true;
parameterExposed.addListener("changeValue", e => exposedInputs[parameter["label"]] = e.getData());
exposedInputs[parameterKey] = true;
parameterExposed.addListener("changeValue", e => exposedInputs[parameterKey] = e.getData());
column++;

const parameterDefaultValue = new qx.ui.basic.Label(String(osparc.service.Utils.getParameterValue(parameter)));
const paramValue = osparc.service.Utils.getParameterValue(parameter);
defaultInputs[parameterKey] = paramValue;
let parameterDefaultValue = null;
if (parameterMetadata && osparc.service.Utils.getParameterType(parameterMetadata) === "number") {
parameterDefaultValue = new qx.ui.form.TextField(String(paramValue));
parameterDefaultValue.addListener("changeValue", e => {
const newValue = e.getData();
const oldValue = e.getOldData();
if (newValue === oldValue) {
return;
}
const curatedValue = (!isNaN(parseFloat(newValue))) ? parseFloat(newValue) : parseFloat(oldValue);
defaultInputs[parameterKey] = curatedValue;
parameterDefaultValue.setValue(String(curatedValue));
});
} else {
parameterDefaultValue = new qx.ui.basic.Label(String(paramValue));
}
inputsLayout.add(parameterDefaultValue, {
row,
column,
Expand Down Expand Up @@ -274,12 +294,12 @@ qx.Class.define("osparc.study.CreateFunction", {
});
createFunctionBtn.addListener("execute", () => {
if (this.__form.validate()) {
this.__createFunction(exposedInputs, exposedOutputs);
this.__createFunction(defaultInputs, exposedInputs, exposedOutputs);
}
}, this);
},

__createFunction: function(exposedInputs, exposedOutputs) {
__createFunction: function(defaultInputs, exposedInputs, exposedOutputs) {
this.__createFunctionBtn.setFetching(true);

// first publish it as a hidden template
Expand All @@ -300,7 +320,7 @@ qx.Class.define("osparc.study.CreateFunction", {
task.addListener("resultReceived", e => {
const templateData = e.getData();
this.__updateTemplateMetadata(templateData);
this.__registerFunction(templateData, exposedInputs, exposedOutputs);
this.__registerFunction(templateData, defaultInputs, exposedInputs, exposedOutputs);
});
})
.catch(err => {
Expand All @@ -325,11 +345,11 @@ qx.Class.define("osparc.study.CreateFunction", {
.catch(err => console.error(err));
},

__registerFunction: function(templateData, exposedInputs, exposedOutputs) {
__registerFunction: function(templateData, defaultInputs, exposedInputs, exposedOutputs) {
const nameField = this.__form.getItem("name");
const descriptionField = this.__form.getItem("description");

const functionData = this.self().createFunctionData(templateData, nameField.getValue(), descriptionField.getValue(), exposedInputs, exposedOutputs);
const functionData = this.self().createFunctionData(templateData, nameField.getValue(), descriptionField.getValue(), defaultInputs, exposedInputs, exposedOutputs);
const params = {
data: functionData,
};
Expand Down
Loading