From 0a57ad10e83c0303d412112d9ec89b0914c7afd9 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nmacdougall@suse.com>
Date: Thu, 3 Jun 2021 14:34:30 +0100
Subject: [PATCH] Cluster Tools: Don't allow v1 to be installed when v2 is
 already installed

---
 assets/styles/global/_button.scss         | 4 ++++
 pages/c/_cluster/explorer/tools/index.vue | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/assets/styles/global/_button.scss b/assets/styles/global/_button.scss
index 48d25fb66c..783fcacc2c 100644
--- a/assets/styles/global/_button.scss
+++ b/assets/styles/global/_button.scss
@@ -79,6 +79,10 @@ button,
   color: var(--primary) !important;
   border: solid 1px var(--primary);
   line-height: $btn-height - 2px;
+
+  &.btn-sm {
+    line-height: $btn-sm-height;
+  }
 }
 
 .role-tertiary {
diff --git a/pages/c/_cluster/explorer/tools/index.vue b/pages/c/_cluster/explorer/tools/index.vue
index 96d2dc69a8..0c0f687804 100644
--- a/pages/c/_cluster/explorer/tools/index.vue
+++ b/pages/c/_cluster/explorer/tools/index.vue
@@ -187,7 +187,10 @@ export default {
             // Move the app data to the v1 chart
             v1.app = v2.app;
             v2.app = undefined;
-            v2.blockedV1 = true;
+            v2.blocked = true;
+          } else {
+            // V2 is installed, so block V1
+            v1.blocked = true;
           }
         }
       }
@@ -358,7 +361,7 @@ export default {
           <AppSummaryGraph :row="opt.app" label-key="generic.resourceCount" :link-to="opt.app.detailLocation" />
         </div>
         <div class="action">
-          <template v-if="opt.blockedV1">
+          <template v-if="opt.blocked">
             <button disabled="true" class="btn btn-sm role-primary" v-html="t('catalog.tools.action.install')" />
           </template>
           <template v-else-if="opt.app && opt.chart.legacy">