Skip to content

S
slapos.core
Commit 65cfd8d9 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

slapos_jio: Improve intent gadget to be handle Error better 

   Dont fail if the Software Release couldnt be found, just stop (display error explanation) and allow the user to return where he came from.
parent f9f4510e
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 87 deletions
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_intent_html.html
View file @ 65cfd8d9
......@@ -8,7 +8,7 @@
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, user-scalable=no" />
<title>Site List</title>
<title>Intent page</title>
<!-- renderjs -->
<script src="rsvp.js" type="text/javascript"></script>
......@@ -19,7 +19,9 @@
</head>
<body>
<p> Wait, you are going to be redirected automatically. </p>
<div class="message">
<p> Wait, you are going to be redirected automatically. </p>
</div>
<form class="save_form ui-body-c" novalidate>
<button type="submit" class="ui-btn ui-btn-b ui-btn-inline
ui-icon-edit ui-btn-icon-right ui-screen-hidden"></button>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_intent_html.xml
View file @ 65cfd8d9
......@@ -242,7 +242,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>982.16656.9604.44475</string> </value>
<value> <string>1008.12324.34619.3993</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>1583501586.17</float>
<float>1683223974.87</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_intent_js.js
View file @ 65cfd8d9
......@@ -27,32 +27,6 @@
return this.triggerSubmit();
})
.onEvent('submit', function () {
var gadget = this;
return gadget.notifySubmitting()
.push(function () {
return gadget.getDeclaredGadget('form_view');
})
.push(function (form_gadget) {
return form_gadget.getContent();
})
.push(function (doc) {
return gadget.getSetting("hateoas_url")
.push(function (url) {
return gadget.jio_putAttachment(doc.relative_url,
url + doc.relative_url + "/SoftwareRelease_requestInstanceTree", doc);
});
})
.push(function () {
return gadget.notifySubmitted({message: gadget.message_tranlation, status: 'success'})
.push(function () {
// Workaround, find a way to open document without break gadget.
return gadget.redirect({"command": "change",
"options": {"jio_key": "/", "page": "slap_service_list"}});
});
});
})
.declareMethod("triggerSubmit", function () {
return this.element.querySelector('button[type="submit"]').click();
})
......@@ -90,7 +64,7 @@
});
})
.onStateChange(function (options) {
this.deferRender(options);
return this.deferRender(options);
})
.declareJob("deferRender", function (options) {
var gadget = this;
......@@ -99,9 +73,13 @@
}
return new RSVP.Queue()
.push(function () {
return gadget.updateHeader({
page_title: gadget.page_title_translation
});
return gadget.getUrlFor({command: 'history_previous'})
.push(function (selection_url) {
return gadget.updateHeader({
page_title: gadget.page_title_translation,
selection_url: selection_url
});
});
})
.push(function () {
return gadget.getSetting("hateoas_url")
......@@ -114,6 +92,12 @@
});
})
.push(function (jio_key) {
var div;
if ((jio_key === undefined) || (jio_key === "")) {
div = gadget.element.querySelector("div.message");
div.textContent = gadget.error_translation + ": could not find software release";
return div;
}
if (options.auto === undefined) {
return gadget.redirect({"command": "change",
"options": {"jio_key": jio_key, "page": "slap_add_instance_tree",
......@@ -121,58 +105,61 @@
}
// The auto is set, so we move foward to auto request the SR
options.jio_key = jio_key;
return RSVP.all([
gadget.getDeclaredGadget('form_view'),
gadget.jio_get(jio_key),
gadget.getSetting("hateoas_url")
]);
})
.push(function (result) {
var software_release = result[1],
url = result[2],
doc = {
url_string: software_release.url_string,
title: options.software_title ? options.software_title: gadget.software_title_translation + "{uid}",
relative_url: options.jio_key
};
if (options.software_type) {
doc.software_type = options.software_type;
}
if (options.text_content) {
doc.text_content = options.text_content;
}
if (options.shared) {
doc.shared = options.shared;
}
if (options.sla_xml) {
doc.sla_xml = options.sla_xml;
}
return gadget.notifySubmitting()
return new RSVP.Queue()
.push(function () {
var query = [];
query.push("title=" + encodeURIComponent(doc.title));
if (doc.software_type) {
query.push("software_type=" + encodeURIComponent(doc.software_type));
return RSVP.all([
gadget.getDeclaredGadget('form_view'),
gadget.jio_get(jio_key),
gadget.getSetting("hateoas_url")
]);
})
.push(function (result) {
var software_release = result[1],
url = result[2],
doc = {
url_string: software_release.url_string,
title: options.software_title ? options.software_title: gadget.software_title_translation + "{uid}",
relative_url: options.jio_key
};
if (options.software_type) {
doc.software_type = options.software_type;
}
if (doc.shared) {
query.push("shared:int=" + encodeURIComponent(doc.shared));
if (options.text_content) {
doc.text_content = options.text_content;
}
if (doc.text_content) {
query.push("text_content=" + encodeURIComponent(doc.text_content));
if (options.shared) {
doc.shared = options.shared;
}
if (doc.sla_xml) {
query.push("sla_xml=" + encodeURIComponent(doc.sla_xml));
if (options.sla_xml) {
doc.sla_xml = options.sla_xml;
}
return gadget.jio_getAttachment(doc.relative_url,
url + doc.relative_url + "/SoftwareRelease_requestInstanceTree?" + query.join("&"));
})
.push(function (key) {
return gadget.notifySubmitted({message: gadget.message_tranlation, status: 'success'})
return gadget.notifySubmitting()
.push(function () {
// Workaround, find a way to open document without break gadget.
return gadget.redirect({"command": "change",
"options": {"jio_key": key, "page": "slap_controller"}});
var query = [];
query.push("title=" + encodeURIComponent(doc.title));
if (doc.software_type) {
query.push("software_type=" + encodeURIComponent(doc.software_type));
}
if (doc.shared) {
query.push("shared:int=" + encodeURIComponent(doc.shared));
}
if (doc.text_content) {
query.push("text_content=" + encodeURIComponent(doc.text_content));
}
if (doc.sla_xml) {
query.push("sla_xml=" + encodeURIComponent(doc.sla_xml));
}
return gadget.jio_getAttachment(doc.relative_url,
url + doc.relative_url + "/SoftwareRelease_requestInstanceTree?" + query.join("&"));
})
.push(function (key) {
return gadget.notifySubmitted({message: gadget.message_tranlation, status: 'success'})
.push(function () {
// Workaround, find a way to open document without break gadget.
return gadget.redirect({"command": "change",
"options": {"jio_key": key, "page": "slap_controller"}});
});
});
});
});
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_intent_js.xml
View file @ 65cfd8d9
......@@ -283,7 +283,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>986.45437.22132.61764</string> </value>
<value> <string>1008.12332.26729.18090</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -303,7 +303,7 @@
</tuple>
<state>
<tuple>
<float>1602259520.17</float>
<float>1683224657.13</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/SoftwareProduct_getSoftwareReleaseAsHateoas.py
View file @ 65cfd8d9
import json
software_release_relative_url = ""
kw = {
"software_release_url" : software_release,
"strict": strict
}
if software_release.startswith("product."):
software_release_list = context.SoftwareProduct_getSortedSoftwareReleaseList(software_product_reference=software_release[8:])
else:
software_release_list = context.SoftwareProduct_getSortedSoftwareReleaseList(software_release_url=software_release, strict=strict)
kw = {"software_product_reference": software_release[8:]}
software_release_list = context.SoftwareProduct_getSortedSoftwareReleaseList(**kw)
if len(software_release_list):
software_release_document = software_release_list[0]
software_release_relative_url = software_release_list[0].getRelativeUrl()
return json.dumps(software_release_document.getRelativeUrl())
return json.dumps(software_release_relative_url)
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