From 2b1dcc815b175bbe2a1d8619d3659edd7d4209c3 Mon Sep 17 00:00:00 2001
From: Tiger <twatson@gitlab.com>
Date: Tue, 2 Jul 2019 19:01:15 +1000
Subject: Enable terminals button for group clusters

---
 .../environments/components/environment_item.vue   | 11 ------
 .../55487-enable-group-terminals-button.yml        |  5 +++
 .../environment_terminal_button_spec.js            | 40 ++++++++--------------
 3 files changed, 19 insertions(+), 37 deletions(-)
 create mode 100644 changelogs/unreleased/55487-enable-group-terminals-button.yml

diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue
index dc68443493c..813045cb5e4 100644
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -15,7 +15,6 @@ import MonitoringButtonComponent from './environment_monitoring.vue';
 import CommitComponent from '../../vue_shared/components/commit.vue';
 import eventHub from '../event_hub';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
-import { CLUSTER_TYPE } from '~/clusters/constants';
 
 /**
  * Environment Item Component
@@ -80,15 +79,6 @@ export default {
       return this.model && this.model.is_protected;
     },
 
-    /**
-     * Hide group cluster features which are not currently implemented.
-     *
-     * @returns {Boolean}
-     */
-    disableGroupClusterFeatures() {
-      return this.model && this.model.cluster_type === CLUSTER_TYPE.GROUP;
-    },
-
     /**
      * Returns whether the environment can be stopped.
      *
@@ -581,7 +571,6 @@ export default {
         <terminal-button-component
           v-if="model && model.terminal_path"
           :terminal-path="model.terminal_path"
-          :disabled="disableGroupClusterFeatures"
         />
 
         <rollback-component
diff --git a/changelogs/unreleased/55487-enable-group-terminals-button.yml b/changelogs/unreleased/55487-enable-group-terminals-button.yml
new file mode 100644
index 00000000000..6bf16eaadd1
--- /dev/null
+++ b/changelogs/unreleased/55487-enable-group-terminals-button.yml
@@ -0,0 +1,5 @@
+---
+title: Enable terminals button for group clusters
+merge_request: 30255
+author:
+type: added
diff --git a/spec/javascripts/environments/environment_terminal_button_spec.js b/spec/javascripts/environments/environment_terminal_button_spec.js
index 56e18db59c5..fc98e656efe 100644
--- a/spec/javascripts/environments/environment_terminal_button_spec.js
+++ b/spec/javascripts/environments/environment_terminal_button_spec.js
@@ -12,36 +12,24 @@ describe('Stop Component', () => {
     }).$mount();
   };
 
-  describe('enabled', () => {
-    beforeEach(() => {
-      mountWithProps({ terminalPath });
-    });
-
-    describe('computed', () => {
-      it('title', () => {
-        expect(component.title).toEqual('Terminal');
-      });
-    });
-
-    it('should render a link to open a web terminal with the provided path', () => {
-      expect(component.$el.tagName).toEqual('A');
-      expect(component.$el.getAttribute('data-original-title')).toEqual('Terminal');
-      expect(component.$el.getAttribute('aria-label')).toEqual('Terminal');
-      expect(component.$el.getAttribute('href')).toEqual(terminalPath);
-    });
+  beforeEach(() => {
+    mountWithProps({ terminalPath });
+  });
 
-    it('should render a non-disabled button', () => {
-      expect(component.$el.classList).not.toContain('disabled');
+  describe('computed', () => {
+    it('title', () => {
+      expect(component.title).toEqual('Terminal');
     });
   });
 
-  describe('disabled', () => {
-    beforeEach(() => {
-      mountWithProps({ terminalPath, disabled: true });
-    });
+  it('should render a link to open a web terminal with the provided path', () => {
+    expect(component.$el.tagName).toEqual('A');
+    expect(component.$el.getAttribute('data-original-title')).toEqual('Terminal');
+    expect(component.$el.getAttribute('aria-label')).toEqual('Terminal');
+    expect(component.$el.getAttribute('href')).toEqual(terminalPath);
+  });
 
-    it('should render a disabled button', () => {
-      expect(component.$el.classList).toContain('disabled');
-    });
+  it('should render a non-disabled button', () => {
+    expect(component.$el.classList).not.toContain('disabled');
   });
 });
-- 
cgit v1.2.1