From 7d9e89756e8b70be91794bcc9330063944e6f3b6 Mon Sep 17 00:00:00 2001
From: Frederick Borges <fborges@opennebula.io>
Date: Wed, 19 May 2021 10:37:31 +0200
Subject: [PATCH] B #5402: Fix Cloud View Remote connection options (#1226)

(cherry picked from commit c9a3f9bc1f976102355a971da88797db0772cfdb)
---
 .../app/tabs/provision-tab/vms/info.hbs       |  6 +++
 .../public/app/tabs/provision-tab/vms/list.js | 43 +++++++++++--------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/info.hbs b/src/sunstone/public/app/tabs/provision-tab/vms/info.hbs
index d93a232d2c..e180032839 100644
--- a/src/sunstone/public/app/tabs/provision-tab/vms/info.hbs
+++ b/src/sunstone/public/app/tabs/provision-tab/vms/info.hbs
@@ -58,6 +58,12 @@
                       <div class="remote-logo-dropdown"><img src="images/remote_console/spice.png"/></div> SPICE
                     </a>
                   </li>
+                  <!-- VMRC button -->
+                  <li class="display-list margin-tlr-1">
+                    <a href="#" class="provision_vmrc_button">
+                      <div class="remote-logo-dropdown"><img src="images/remote_console/vmrc.png"/></div> VMRC
+                    </a>
+                  </li>
                   <!-- RDP button -->
                   <li class="display-list margin-tlr-1">
                     <a href="#" class="provision_rdp_button">
diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/list.js b/src/sunstone/public/app/tabs/provision-tab/vms/list.js
index e73d0fa343..eb1e56bcdd 100644
--- a/src/sunstone/public/app/tabs/provision-tab/vms/list.js
+++ b/src/sunstone/public/app/tabs/provision-tab/vms/list.js
@@ -327,38 +327,43 @@ define(function(require) {
           $(".provision_rdp_button", context).toggle(Boolean(OpenNebulaVM.isConnectionSupported(data, 'rdp')));
           $(".provision_wfile_button", context).toggle(Boolean(OpenNebulaVM.isWFileSupported(data)));
 
-          if (OpenNebulaVM.isVNCSupported(data) && !is_fireedge_configured) {
-            $(".provision_vnc_button", context).parent().show();
-          }else{
-            $(".provision_vnc_button", context).parent().hide();
-          }
+          var is_vnc_allowed = OpenNebulaVM.isVNCSupported(data);
+          var is_spice_allowed = OpenNebulaVM.isSPICESupported(data);
+          var is_vmrc_allowed = OpenNebulaVM.isVMRCSupported(data);
+          var is_virt_viewer_allowed = OpenNebulaVM.isWFileSupported(data);
 
-          if (OpenNebulaVM.isSPICESupported(data)) {
+          if (is_spice_allowed) {
             $(".provision_spice_button", context).parent().show();
           }else{
             $(".provision_spice_button", context).parent().hide();
           }
 
-          if (OpenNebulaVM.isVMRCSupported(data)) {
-            $(".provision_vmrc_button", context).parent().show();
-          }else{
-            $(".provision_vmrc_button", context).parent().hide();
-          }
-
-          if (OpenNebulaVM.isWFileSupported(data)) {
+          if (is_virt_viewer_allowed) {
             $(".provision_wfile_button", context).parent().show();
           }else{
             $(".provision_wfile_button", context).parent().hide();
           }
 
-          if (OpenNebulaVM.isVNCSupported(data) && is_fireedge_configured) {
-            $(".provision_guac_vnc_button", context).parent().show();
-            $(".provision_guac_rdp_button", context).parent().show();
-            $(".provision_guac_ssh_button", context).parent().show();
-          }else{
+          if (is_fireedge_configured){
+            $(".provision_vnc_button", context).parent().hide();
+            if (is_vmrc_allowed) {
+              $(".provision_vmrc_button", context).parent().show();
+              $(".provision_guac_vnc_button", context).parent().hide();
+              $(".provision_guac_rdp_button", context).parent().hide();
+              $(".provision_guac_ssh_button", context).parent().hide(); 
+            }else { // Guacamole connections
+              $(".provision_vmrc_button", context).parent().hide();
+              $(".provision_guac_vnc_button", context).parent().show();
+              $(".provision_guac_rdp_button", context).parent().show();
+              $(".provision_guac_ssh_button", context).parent().show();
+            }
+          }
+          else{
+            $(".provision_vnc_button", context).parent().show();
+            $(".provision_vmrc_button", context).parent().hide();
             $(".provision_guac_vnc_button", context).parent().hide();
             $(".provision_guac_rdp_button", context).parent().hide();
-            $(".provision_guac_ssh_button", context).parent().hide();
+            $(".provision_guac_ssh_button", context).parent().hide(); 
           }
 
           $(".provision_info_vm", context).attr("vm_id", data.ID);