Skip to content

S
slapos.core
Commit 8b284f16 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

slapos_jio: Accept a list of software types to filter the values from the software.cfg.json 

  Accept a list of Software types for limit the user's choice for software type, keeping the actual value (at least) even if they aren't part of the list (in case of existing instances).

  The list DO not extend the software type options provided by the software release (software.cfg.json) only act as a filter.
parent 5aa5af44
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 60 deletions
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.js
View file @ 8b284f16
......@@ -790,7 +790,6 @@
var serialisation = gadget.state.serialisation,
json_url = gadget.state.json_url,
parameter_xml = gadget.state.parameter_xml,
restricted_softwaretype = gadget.state.restricted_softwaretype,
shared = gadget.state.shared,
softwaretype = gadget.state.softwaretype,
softwareindex = gadget.state.softwareindex,
......@@ -823,7 +822,7 @@
lowest_index = 999,
lowest_option_index;
if (!editable || restricted_softwaretype === true) {
if (!editable || gadget.state.restricted_softwaretype === true) {
input.classList.add("readonly");
input["aria-disabled"] = "true";
input["tab-index"] = "-1";
......@@ -834,13 +833,16 @@
// search by the lowest index
for (option_index in json['software-type']) {
if (json['software-type'].hasOwnProperty(option_index)) {
if (json['software-type'][option_index].index === undefined) {
json['software-type'][option_index].index = 999;
}
if ((gadget.state.software_type_list.length === 0) ||
(gadget.state.software_type_list.includes(option_index))) {
if (json['software-type'][option_index].index === undefined) {
json['software-type'][option_index].index = 999;
}
if (json['software-type'][option_index].index < lowest_index) {
lowest_index = json['software-type'][option_index].index;
lowest_option_index = option_index;
if (json['software-type'][option_index].index < lowest_index) {
lowest_index = json['software-type'][option_index].index;
lowest_option_index = option_index;
}
}
}
}
......@@ -848,63 +850,66 @@
for (option_index in json['software-type']) {
if (json['software-type'].hasOwnProperty(option_index)) {
if ((gadget.state.software_type_list.length === 0) ||
(gadget.state.software_type_list.includes(option_index))) {
if (json['software-type'][option_index].shared === undefined) {
json['software-type'][option_index].shared = false;
}
option = domsugar("option", {
text: json['software-type'][option_index].title,
value: option_index
});
option['data-id'] = option_index;
option['data-index'] = 999;
option['data-shared'] = json['software-type'][option_index].shared;
if (json['software-type'][option_index].shared === undefined) {
json['software-type'][option_index].shared = false;
}
if (json['software-type'][option_index]['software-type'] !== undefined) {
option.value = json['software-type'][option_index]['software-type'];
}
option = domsugar("option", {
text: json['software-type'][option_index].title,
value: option_index
});
option['data-id'] = option_index;
option['data-index'] = 999;
option['data-shared'] = json['software-type'][option_index].shared;
if (json['software-type'][option_index].index) {
option['data-index'] = json['software-type'][option_index].index;
}
if (json['software-type'][option_index]['software-type'] !== undefined) {
option.value = json['software-type'][option_index]['software-type'];
}
if (option_index === lowest_option_index) {
option_selected = option.value;
option.selected = true;
option_selected_index = option_index;
if (json['software-type'][option_index].shared === true) {
parameter_shared.value = true;
} else {
parameter_shared.value = false;
if (json['software-type'][option_index].index) {
option['data-index'] = json['software-type'][option_index].index;
}
if (shared === undefined) {
shared = parameter_shared.value;
if (option_index === lowest_option_index) {
option_selected = option.value;
option.selected = true;
option_selected_index = option_index;
if (json['software-type'][option_index].shared === true) {
parameter_shared.value = true;
} else {
parameter_shared.value = false;
}
if (shared === undefined) {
shared = parameter_shared.value;
}
}
}
if ((option_selected_index === undefined) &&
(option.value === option_selected) &&
(Boolean(shared) === Boolean(json['software-type'][option_index].shared))) {
option.selected = true;
option_selected_index = option_index;
if (json['software-type'][option_index].shared === true) {
parameter_shared.value = true;
} else {
parameter_shared.value = false;
if ((option_selected_index === undefined) &&
(option.value === option_selected) &&
(Boolean(shared) === Boolean(json['software-type'][option_index].shared))) {
option.selected = true;
option_selected_index = option_index;
if (json['software-type'][option_index].shared === true) {
parameter_shared.value = true;
} else {
parameter_shared.value = false;
}
}
}
if (restricted_softwaretype === true) {
if (option.value === softwaretype) {
if (Boolean(shared) === Boolean(json['software-type'][option_index].shared)) {
selection_option_list.push(option);
// We expect a single possible occurence per software type
break;
if (gadget.state.restricted_softwaretype === true) {
if (option.value === softwaretype) {
if (Boolean(shared) === Boolean(json['software-type'][option_index].shared)) {
selection_option_list.push(option);
// We expect a single possible occurence per software type
break;
}
}
} else {
selection_option_list.push(option);
}
} else {
selection_option_list.push(option);
}
}
}
......@@ -1069,8 +1074,9 @@
})
.declareMethod('render', function (options) {
var restricted_softwaretype,
parameter_hash = options.value.parameter.parameter_hash,
var restricted_softwaretype = false,
software_type_list = [],
parameter_hash = options.value.parameter.parameter_hash,
// XXX Do we directly get parameter_xml parameter?
parameter_xml = options.value.parameter.parameter_xml;
......@@ -1079,12 +1085,18 @@
parameter_xml = atob(parameter_hash);
}
if (options.value.parameter.software_type_list !== undefined) {
software_type_list = options.value.parameter.software_type_list;
}
if (options.value.parameter.softwaretype !== undefined) {
restricted_softwaretype = true;
} else {
restricted_softwaretype = false;
// exceptional situation where the default item must be in
// the list.
software_type_list.push(options.value.parameter.softwaretype);
}
return this.changeState({
// Not used parameters
// hidden: options.hidden,
......@@ -1095,6 +1107,7 @@
restricted_softwaretype: restricted_softwaretype,
shared: options.value.parameter.shared,
softwaretype: options.value.parameter.softwaretype,
software_type_list: software_type_list,
softwareindex: options.value.parameter.softwareindex,
editable: options.editable,
// Force refresh in any case
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml
View file @ 8b284f16
......@@ -280,7 +280,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>1004.35244.29312.7338</string> </value>
<value> <string>1004.35604.19918.32529</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -298,7 +298,7 @@
</tuple>
<state>
<tuple>
<float>1669310000.93</float>
<float>1669324961.21</float>
<string>UTC</string>
</tuple>
</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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7