Commit aa12be1d authored by Rafael Monnerat's avatar Rafael Monnerat

slapos_jio: Drop restricted parameter feature from editor

   The purpose of the restricted parameters were to keep hidden values which weren't part of the schema on the parameter form, for a simplified version of the form.

   Since the user can always edit the raw values (over XML) this feature is undesirable, since if produce inconsistent outcome.

   It is the duty of software release to produce a simplified version, with a restricted list of acceptable parameters.
parent 07b5e0ea
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
return domsugar('input', domsugar_input_dict); return domsugar('input', domsugar_input_dict);
} }
function render_subform(json_field, default_dict, root, path, restricted) { function render_subform(json_field, default_dict, root, path) {
var div_input, var div_input,
key, key,
div, div,
...@@ -210,26 +210,24 @@ ...@@ -210,26 +210,24 @@
title: json_field.description title: json_field.description
}); });
if (restricted !== true) {
div_input = domsugar("div", {
"class": "input"
}, [
domsugar('input', {
type: "text",
// Name is only meaningfull to automate tests
name: "ADD" + path
}),
domsugar('button', {
value: btoa(JSON.stringify(json_field.patternProperties['.*'])),
"class": "add-sub-form",
type: "button",
name: path,
text: "+"
})
]);
div.appendChild(div_input); div_input = domsugar("div", {
} "class": "input"
}, [
domsugar('input', {
type: "text",
// Name is only meaningfull to automate tests
name: "ADD" + path
}),
domsugar('button', {
value: btoa(JSON.stringify(json_field.patternProperties['.*'])),
"class": "add-sub-form",
type: "button",
name: path,
text: "+"
})
]);
div.appendChild(div_input);
for (default_value in default_dict) { for (default_value in default_dict) {
if (default_dict.hasOwnProperty(default_value)) { if (default_dict.hasOwnProperty(default_value)) {
...@@ -252,8 +250,7 @@ ...@@ -252,8 +250,7 @@
json_field.patternProperties['.*'], json_field.patternProperties['.*'],
default_dict[default_value], default_dict[default_value],
default_div, default_div,
path + "/" + default_value, path + "/" + default_value
restricted
)); ));
} }
} }
...@@ -279,8 +276,7 @@ ...@@ -279,8 +276,7 @@
div_input = render_subform(json_field.properties[key], div_input = render_subform(json_field.properties[key],
default_dict[key], default_dict[key],
div_input, div_input,
path + "/" + key, path + "/" + key);
restricted);
} else { } else {
input = render_field(json_field.properties[key], default_dict[key]); input = render_field(json_field.properties[key], default_dict[key]);
input.name = path + "/" + key; input.name = path + "/" + key;
...@@ -313,16 +309,7 @@ ...@@ -313,16 +309,7 @@
div_input = render_subform({}, div_input = render_subform({},
default_dict[key], default_dict[key],
div_input, div_input,
path + "/" + key, path + "/" + key);
restricted);
} else if (restricted === true) {
div_input = document.createElement("div");
div_input.setAttribute("class", "input");
input = render_field({"type": "hidden"}, default_dict[key]);
input.name = path + "/" + key;
input.setAttribute("class", "slapos-parameter");
input.setAttribute("placeholder", " ");
div_input.appendChild(input);
} else { } else {
div.setAttribute("class", "subfield"); div.setAttribute("class", "subfield");
label = document.createElement("label"); label = document.createElement("label");
...@@ -698,7 +685,6 @@ ...@@ -698,7 +685,6 @@
json_url = gadget.state.json_url, json_url = gadget.state.json_url,
parameter_xml = gadget.state.parameter_xml, parameter_xml = gadget.state.parameter_xml,
restricted_softwaretype = gadget.state.restricted_softwaretype, restricted_softwaretype = gadget.state.restricted_softwaretype,
restricted_parameter = gadget.state.restricted_parameter,
shared = gadget.state.shared, shared = gadget.state.shared,
softwaretype = gadget.state.softwaretype, softwaretype = gadget.state.softwaretype,
softwareindex = gadget.state.softwareindex, softwareindex = gadget.state.softwareindex,
...@@ -896,7 +882,7 @@ ...@@ -896,7 +882,7 @@
var fieldset_list = gadget.element.querySelectorAll('fieldset'), var fieldset_list = gadget.element.querySelectorAll('fieldset'),
fieldset = document.createElement("fieldset"); fieldset = document.createElement("fieldset");
fieldset = render_subform(json, parameter_dict, fieldset, undefined, restricted_parameter); fieldset = render_subform(json, parameter_dict, fieldset, undefined);
$(fieldset_list[1]).replaceWith(fieldset); $(fieldset_list[1]).replaceWith(fieldset);
return fieldset_list; return fieldset_list;
}); });
...@@ -976,7 +962,6 @@ ...@@ -976,7 +962,6 @@
json_url: options.value.parameter.json_url, json_url: options.value.parameter.json_url,
parameter_xml: parameter_xml, parameter_xml: parameter_xml,
restricted_softwaretype: options.value.parameter.restricted_softwaretype, restricted_softwaretype: options.value.parameter.restricted_softwaretype,
restricted_parameter: options.value.parameter.restricted_parameter,
shared: options.value.parameter.shared, shared: options.value.parameter.shared,
softwaretype: options.value.parameter.softwaretype, softwaretype: options.value.parameter.softwaretype,
softwareindex: options.value.parameter.softwareindex, softwareindex: options.value.parameter.softwareindex,
......
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>1000.18191.48252.54374</string> </value> <value> <string>1000.18290.33085.1843</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1652724487.39</float> <float>1652729515.46</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment