From a1d84489d7f069cf522c600073e741ba64dadc16 Mon Sep 17 00:00:00 2001
From: Boxiang Sun <boxiang.sun@nexedi.com>
Date: Mon, 23 Dec 2019 15:21:27 +0000
Subject: [PATCH] slapos_jio: Display "Status Unknown" if get status failed

There has an  "onLoop" function in some gadgets which re-render every 5 minutes. In case this refresh fail, an error page is displayed. This commit prevent this gadget fail, by displays "Status Unknown" in the state.
---
 .../rjs_gadget_slapos_computer_status_js.js              | 9 +++++++++
 .../rjs_gadget_slapos_computer_status_js.xml             | 7 +++++--
 .../rjs_gadget_slapos_hosting_subscription_status_js.js  | 9 +++++++++
 .../rjs_gadget_slapos_hosting_subscription_status_js.xml | 9 ++++++---
 .../rjs_gadget_slapos_installation_status_js.js          | 9 +++++++++
 .../rjs_gadget_slapos_installation_status_js.xml         | 7 +++++--
 .../rjs_gadget_slapos_instance_status_js.js              | 9 +++++++++
 .../rjs_gadget_slapos_instance_status_js.xml             | 9 ++++++---
 .../rjs_gadget_slapos_network_status_js.js               | 9 +++++++++
 .../rjs_gadget_slapos_network_status_js.xml              | 7 +++++--
 .../rjs_gadget_slapos_project_status_js.js               | 9 +++++++++
 .../rjs_gadget_slapos_project_status_js.xml              | 7 +++++--
 .../web_page_module/rjs_gadget_slapos_site_status_js.js  | 9 +++++++++
 .../web_page_module/rjs_gadget_slapos_site_status_js.xml | 7 +++++--
 14 files changed, 100 insertions(+), 16 deletions(-)

diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_computer_status_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_computer_status_js.js
index c4f0afc5e..7ef16add1 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_computer_status_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_computer_status_js.js
@@ -112,6 +112,15 @@
       })
       .push(function (result) {
         return getStatus(gadget, result);
+      })
+      .push(undefined, function (error) {
+        gadget.element.innerHTML = inline_status_template({
+          monitor_url: undefined,
+          status_class: 'ui-btn-error',
+          status_title: 'Status Unknown',
+          status_style: ""
+        });
+        return gadget;
       });
   }
 
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_computer_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_computer_status_js.xml
index fb1dc09f2..d18d04ae0 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_computer_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_computer_status_js.xml
@@ -237,6 +237,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -269,7 +270,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>978.25610.31873.42666</string> </value>
+                <value> <string>980.6847.33689.14199</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -287,7 +288,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1568302726.92</float>
+                        <float>1577111849.12</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
@@ -296,6 +297,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -353,6 +355,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.js
index edacc4d14..a4f388a2d 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.js
@@ -130,6 +130,15 @@
       })
       .push(function (result) {
         return getStatus(gadget, result);
+      })
+      .push(undefined, function (error) {
+        gadget.element.innerHTML = inline_status_template({
+          monitor_url: undefined,
+          status_class: 'ui-btn-error',
+          status_title: 'Status Unknown',
+          status_style: ""
+        });
+        return gadget;
       });
   }
 
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.xml
index 4a5afac4f..90c6013f4 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_hosting_subscription_status_js.xml
@@ -225,6 +225,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -243,7 +244,7 @@
             </item>
             <item>
                 <key> <string>actor</string> </key>
-                <value> <string>superrafael</string> </value>
+                <value> <string>zope</string> </value>
             </item>
             <item>
                 <key> <string>comment</string> </key>
@@ -257,7 +258,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>974.50748.25599.3686</string> </value>
+                <value> <string>980.44209.10969.41267</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -275,7 +276,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1554255778.44</float>
+                        <float>1577114201.29</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
@@ -284,6 +285,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -341,6 +343,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_installation_status_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_installation_status_js.js
index 4f4fb9cf3..be57d95ed 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_installation_status_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_installation_status_js.js
@@ -45,6 +45,15 @@
           status_style: status_style
         });
         return gadget;
+      })
+      .push(undefined, function (error) {
+        gadget.element.innerHTML = inline_status_template({
+          monitor_url: undefined,
+          status_class: 'ui-btn-error',
+          status_title: 'Status Unknown',
+          status_style: ""
+        });
+        return gadget;
       });
   }
 
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_installation_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_installation_status_js.xml
index 4dc9212b7..69a8a8099 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_installation_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_installation_status_js.xml
@@ -225,6 +225,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -257,7 +258,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>972.38717.20279.51251</string> </value>
+                <value> <string>980.6847.33689.14199</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -275,7 +276,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1545928626.78</float>
+                        <float>1577111985.28</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
@@ -284,6 +285,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -341,6 +343,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.js
index 9cabf44a8..ae67b3f64 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.js
@@ -86,6 +86,15 @@
       })
       .push(function (result) {
         return getStatus(gadget, result);
+      })
+      .push(undefined, function (error) {
+        gadget.element.innerHTML = inline_status_template({
+          monitor_url: undefined,
+          status_class: 'ui-btn-error',
+          status_title: 'Status Unknown',
+          status_style: ""
+        });
+        return gadget;
       });
   }
 
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.xml
index b6503210c..c879a61ca 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_instance_status_js.xml
@@ -225,6 +225,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -243,7 +244,7 @@
             </item>
             <item>
                 <key> <string>actor</string> </key>
-                <value> <string>superrafael</string> </value>
+                <value> <string>zope</string> </value>
             </item>
             <item>
                 <key> <string>comment</string> </key>
@@ -257,7 +258,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>974.50363.35694.46455</string> </value>
+                <value> <string>980.6847.33689.14199</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -275,7 +276,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1554236784.11</float>
+                        <float>1577112018.19</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
@@ -284,6 +285,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -341,6 +343,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.js
index d4852555a..47461a8da 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.js
@@ -147,6 +147,15 @@
       })
       .push(function (result) {
         return getStatus(gadget, result);
+      })
+      .push(undefined, function (error) {
+        gadget.element.innerHTML = inline_status_template({
+          monitor_url: undefined,
+          status_class: 'ui-btn-error',
+          status_title: 'Status Unknown',
+          status_style: ""
+        });
+        return gadget;
       });
   }
 
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.xml
index 4af6fab4b..192f61be3 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_network_status_js.xml
@@ -225,6 +225,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -257,7 +258,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>974.62049.17150.785</string> </value>
+                <value> <string>980.6847.33689.14199</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -275,7 +276,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1555352227.27</float>
+                        <float>1577112055.21</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
@@ -284,6 +285,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -341,6 +343,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.js
index da6bb9880..cdd494408 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.js
@@ -165,6 +165,15 @@
       })
       .push(function (result) {
         return getStatus(gadget, result);
+      })
+      .push(undefined, function (error) {
+        gadget.element.innerHTML = inline_status_template({
+          monitor_url: undefined,
+          status_class: 'ui-btn-error',
+          status_title: 'Status Unknown',
+          status_style: ""
+        });
+        return gadget;
       });
   }
 
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.xml
index 6946f4f25..42d18511a 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_project_status_js.xml
@@ -225,6 +225,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -257,7 +258,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>978.25609.22500.25258</string> </value>
+                <value> <string>980.6847.33689.14199</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -275,7 +276,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1568302679.29</float>
+                        <float>1577112088.95</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
@@ -284,6 +285,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -341,6 +343,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.js
index 8064c29d4..b59a9d3e4 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.js
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.js
@@ -154,6 +154,15 @@
       })
       .push(function (result) {
         return getStatus(gadget, result);
+      })
+      .push(undefined, function (error) {
+        gadget.element.innerHTML = inline_status_template({
+          monitor_url: undefined,
+          status_class: 'ui-btn-error',
+          status_title: 'Status Unknown',
+          status_style: ""
+        });
+        return gadget;
       });
   }
 
diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.xml
index 946736b59..041178dfc 100644
--- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.xml
+++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_site_status_js.xml
@@ -236,6 +236,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -268,7 +269,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>974.62049.17150.785</string> </value>
+                <value> <string>980.6847.33689.14199</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -286,7 +287,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1555352069.34</float>
+                        <float>1577112140.01</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
@@ -295,6 +296,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
@@ -352,6 +354,7 @@
             </item>
           </dictionary>
         </list>
+        <none/>
       </tuple>
     </pickle>
   </record>
-- 
2.30.9