Fixup status gadget

See merge request nexedi/slapos.core!506

master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_compute_node_view_js.js

@@ -26,17 +26,18 @@
       var gadget = this;
       return gadget.jio_allDocs(param_list[0])
         .push(function (result) {
-          var i, value, len = result.data.total_rows;
+          var i, value, value_jio_key, len = result.data.total_rows;
           for (i = 0; i < len; i += 1) {
             if (1 || (result.data.rows[i].value.SoftwareInstallation_getNewsDict)) {
               value = result.data.rows[i].value.SoftwareInstallation_getNewsDict;
+              value_jio_key = result.data.rows[i].id;
               result.data.rows[i].value.SoftwareInstallation_getNewsDict = {
                 field_gadget_param : {
                   css_class: "",
                   description: "The Status",
                   hidden: 0,
                   "default": {
-                    jio_key: value,
+                    jio_key: value_jio_key,
                     result: value,
                     portal_type: "Software Installation"},
                   key: "status",

master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_compute_node_view_js.xml

@@ -267,7 +267,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>1006.26651.31767.25907</string> </value>
+                      <value> <string>1006.58340.40727.23620</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -287,7 +287,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1676577476.87</float>
+                              <float>1680014283.61</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_status_js.js

-/*globals console, window, rJS, i18n, domsugar */
+/*globals console, window, rJS, domsugar, JSON */
 /*jslint indent: 2, nomen: true, maxlen: 80 */
 
-(function (window, rJS, domsugar) {
+(function (window, rJS, domsugar, JSON) {
   "use strict";
   var gadget_klass = rJS(window);
 
@@ -338,7 +338,7 @@
 
     .onLoop(function () {
       var gadget = this;
-      if (gadget.state.jio_key) {
+      if (typeof gadget.state.jio_key === 'string' && gadget.state.jio_key !== '') {
         return gadget.jio_get(gadget.state.jio_key)
           .push(function (result) {
             var state_dict = result.news || {};
@@ -346,6 +346,10 @@
             return gadget.changeState(state_dict);
           });
       }
+      throw new Error(
+        'jio_key dont contains a proper value: ' +
+          JSON.stringify(gadget.state.jio_key)
+      );
     }, 300000)
 
     .onStateChange(function () {
@@ -360,4 +364,4 @@
       return this.changeState(state_dict);
     });
 
-}(window, rJS, domsugar));
+}(window, rJS, domsugar, JSON));
\ No newline at end of file

master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_status_js.xml

@@ -278,7 +278,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>1001.50668.64434.580</string> </value>
+                      <value> <string>1006.58340.40727.23620</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -298,7 +298,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1660581838.54</float>
+                              <float>1680031759.77</float>
                               <string>UTC</string>
                             </tuple>
                           </state>