From 9f4b660d3dcf04e3289d8247d27ead007086e359 Mon Sep 17 00:00:00 2001
From: Frederick Borges <fborges@opennebula.io>
Date: Fri, 25 Feb 2022 11:17:44 +0100
Subject: [PATCH] F #5745: present error information in Sunstone (#1814)

---
 src/sunstone/public/app/sunstone/panels.hbs     |  1 +
 .../public/app/tabs/vms-tab/panels/info.js      | 17 ++++++++++++-----
 .../app/tabs/vms-tab/panels/info/html.hbs       |  1 -
 .../app/tabs/vms-tab/utils/datatable-common.js  |  4 +++-
 .../public/app/utils/info-error/html.hbs        |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/sunstone/public/app/sunstone/panels.hbs b/src/sunstone/public/app/sunstone/panels.hbs
index d5f7a3eceb..16f95956e8 100644
--- a/src/sunstone/public/app/sunstone/panels.hbs
+++ b/src/sunstone/public/app/sunstone/panels.hbs
@@ -15,6 +15,7 @@
 {{! -------------------------------------------------------------------------- }}
 
 <div id="{{containerId}}">
+  <div id="{{containerId}}Errors"></div>
   <ul id="{{containerId}}Tabs" class="tabs sunstone-info-tabs text-center" data-tabs>
     {{#each panels}}
     <li class="{{class}} tabs-title {{#if active}}is-active{{/if}}">
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info.js b/src/sunstone/public/app/tabs/vms-tab/panels/info.js
index 58ea464eb2..2fa040d588 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/info.js
@@ -71,6 +71,7 @@ define(function(require) {
    */
 
   function _html() {
+    var that = this;
     var renameTrHTML = RenameTr.html(TAB_ID, RESOURCE, this.element.NAME);
     var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
     var prettyStartTime = Humanize.prettyTime(this.element.STIME);
@@ -124,7 +125,8 @@ define(function(require) {
               error_msg: this.element.USER_TEMPLATE.ERROR,
               error_title: Locale.tr("Driver Error"),
               canDismiss: true,
-              dismissId: "close_vm_async_error"
+              dismissId: "close_vm_async_error",
+              size: 12
             }
           );
     }
@@ -137,7 +139,8 @@ define(function(require) {
               error_msg: this.element.USER_TEMPLATE.SCHED_MESSAGE,
               error_title: Locale.tr("Scheduler Error"),
               canDismiss: true,
-              dismissId: "close_vm_scheduler_async_error"
+              dismissId: "close_vm_scheduler_async_error",
+              size: 12
             }
           );
     }
@@ -155,12 +158,15 @@ define(function(require) {
                 error_msg: lastErrorAndId.error,
                 error_title: Locale.tr("Scheduled Action Error") + " (ID: #" + lastErrorAndId.id + ")",
                 canDismiss: false,
-                dismissId: ""
+                dismissId: "",
+                size: 12
               }
             );
           }
     }
 
+    that.errorMessageHTML = errorMessageHTML;
+
     return TemplateInfo({
       "element": this.element,
       "renameTrHTML": renameTrHTML,
@@ -178,8 +184,7 @@ define(function(require) {
       "templateTableVcenterHTML": templateTableVcenterHTML,
       "templateTableHTML": templateTableHTML,
       "monitoringTableContentHTML": monitoringTableContentHTML,
-      "vrouterHTML": vrouterHTML,
-      "errorMessageHTML": errorMessageHTML
+      "vrouterHTML": vrouterHTML
     });
   }
 
@@ -247,5 +252,7 @@ define(function(require) {
     } else {
       $("button[href=\"VM.upload_marketplace_dialog\"]").removeAttr("disabled");
     }
+
+    $("#vms-tab-panelsErrors", context).html(that.errorMessageHTML);
   }
 });
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs
index 2d2b84758e..b37e930b57 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs
@@ -105,7 +105,6 @@
 </div>
 <div class="large-6 columns">{{{permissionsTableHTML}}}</div>
 </div>
-{{{errorMessageHTML}}}
 {{#isFeatureEnabled "show_attributes_info"}}
   <div class="row vcenter">
   <div class="large-9 columns">{{{templateTableVcenterHTML}}}</div>
diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
index 2a379a7470..ec93cb5137 100644
--- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
+++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
@@ -237,6 +237,8 @@ define(function(require) {
 
     var color_html = Status.state_lock_to_color("VM", value_state, element_json[RESOURCE.toUpperCase()]["LOCK"]);
 
+    var vm_name = element.USER_TEMPLATE.ERROR || element.USER_TEMPLATE.SCHED_MESSAGE ?  "<span class='warning-message'><i class='fas fa-exclamation-triangle'></i></span> " + element.NAME : element.NAME;
+
     return [
       "<input class=\"check_item\" "+
         "style=\"vertical-align: inherit;\""+
@@ -246,7 +248,7 @@ define(function(require) {
         "value=\"" + element.ID + "\" "+
         "state=\""+element.STATE+"\" lcm_state=\""+element.LCM_STATE+"\"/>"+color_html,
       element.ID,
-      element.NAME,
+      vm_name,
       element.UNAME,
       element.GNAME,
       state,
diff --git a/src/sunstone/public/app/utils/info-error/html.hbs b/src/sunstone/public/app/utils/info-error/html.hbs
index 6c92886f82..05e3583dd5 100644
--- a/src/sunstone/public/app/utils/info-error/html.hbs
+++ b/src/sunstone/public/app/utils/info-error/html.hbs
@@ -15,7 +15,7 @@
 {{! -------------------------------------------------------------------------- }}
 
 <div class='row'>
-    <div class='large-9 columns'>
+    <div class='large-{{#if size}}{{size}}{{else}}9{{/if}} columns'>
         <div class='callout warning warning-message' style='border-radius: .5em;' data-closable>
             <div class='row'>
                 <div class='columns large-1'>