Commit 7a874689 authored by Fatih Acet's avatar Fatih Acet

Merge branch '55487-enable-group-terminals-button' into 'master'

Enable terminals button for group clusters

Closes #55487

See merge request gitlab-org/gitlab-ce!30255
parents 96efba34 2b1dcc81
...@@ -15,7 +15,6 @@ import MonitoringButtonComponent from './environment_monitoring.vue'; ...@@ -15,7 +15,6 @@ import MonitoringButtonComponent from './environment_monitoring.vue';
import CommitComponent from '../../vue_shared/components/commit.vue'; import CommitComponent from '../../vue_shared/components/commit.vue';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { CLUSTER_TYPE } from '~/clusters/constants';
/** /**
* Environment Item Component * Environment Item Component
...@@ -80,15 +79,6 @@ export default { ...@@ -80,15 +79,6 @@ export default {
return this.model && this.model.is_protected; 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. * Returns whether the environment can be stopped.
* *
...@@ -581,7 +571,6 @@ export default { ...@@ -581,7 +571,6 @@ export default {
<terminal-button-component <terminal-button-component
v-if="model && model.terminal_path" v-if="model && model.terminal_path"
:terminal-path="model.terminal_path" :terminal-path="model.terminal_path"
:disabled="disableGroupClusterFeatures"
/> />
<rollback-component <rollback-component
......
---
title: Enable terminals button for group clusters
merge_request: 30255
author:
type: added
...@@ -12,7 +12,6 @@ describe('Stop Component', () => { ...@@ -12,7 +12,6 @@ describe('Stop Component', () => {
}).$mount(); }).$mount();
}; };
describe('enabled', () => {
beforeEach(() => { beforeEach(() => {
mountWithProps({ terminalPath }); mountWithProps({ terminalPath });
}); });
...@@ -33,15 +32,4 @@ describe('Stop Component', () => { ...@@ -33,15 +32,4 @@ describe('Stop Component', () => {
it('should render a non-disabled button', () => { it('should render a non-disabled button', () => {
expect(component.$el.classList).not.toContain('disabled'); expect(component.$el.classList).not.toContain('disabled');
}); });
});
describe('disabled', () => {
beforeEach(() => {
mountWithProps({ terminalPath, disabled: true });
});
it('should render a disabled button', () => {
expect(component.$el.classList).toContain('disabled');
});
});
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment