Commit 9a59d65a authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'reorganize-cluster-action-button-menu' into 'master'

Reorganize Kubernetes clusters action button menu

See merge request gitlab-org/gitlab!79305
parents 186caf33 04a4c42d
<script> <script>
import { GlDropdown, GlDropdownItem, GlModalDirective, GlTooltipDirective } from '@gitlab/ui'; import {
GlDropdown,
GlDropdownItem,
GlModalDirective,
GlTooltipDirective,
GlDropdownDivider,
GlDropdownSectionHeader,
} from '@gitlab/ui';
import { INSTALL_AGENT_MODAL_ID, CLUSTERS_ACTIONS } from '../constants'; import { INSTALL_AGENT_MODAL_ID, CLUSTERS_ACTIONS } from '../constants';
export default { export default {
...@@ -8,6 +16,8 @@ export default { ...@@ -8,6 +16,8 @@ export default {
components: { components: {
GlDropdown, GlDropdown,
GlDropdownItem, GlDropdownItem,
GlDropdownDivider,
GlDropdownSectionHeader,
}, },
directives: { directives: {
GlModalDirective, GlModalDirective,
...@@ -36,15 +46,18 @@ export default { ...@@ -36,15 +46,18 @@ export default {
split split
right right
> >
<gl-dropdown-item :href="newClusterPath" data-testid="new-cluster-link" @click.stop> <gl-dropdown-section-header>{{ $options.i18n.agent }}</gl-dropdown-section-header>
{{ $options.i18n.createNewCluster }}
</gl-dropdown-item>
<gl-dropdown-item <gl-dropdown-item
v-gl-modal-directive="$options.INSTALL_AGENT_MODAL_ID" v-gl-modal-directive="$options.INSTALL_AGENT_MODAL_ID"
data-testid="connect-new-agent-link" data-testid="connect-new-agent-link"
> >
{{ $options.i18n.connectWithAgent }} {{ $options.i18n.connectWithAgent }}
</gl-dropdown-item> </gl-dropdown-item>
<gl-dropdown-divider />
<gl-dropdown-section-header>{{ $options.i18n.certificate }}</gl-dropdown-section-header>
<gl-dropdown-item :href="newClusterPath" data-testid="new-cluster-link" @click.stop>
{{ $options.i18n.createNewCluster }}
</gl-dropdown-item>
<gl-dropdown-item :href="addClusterPath" data-testid="connect-cluster-link" @click.stop> <gl-dropdown-item :href="addClusterPath" data-testid="connect-cluster-link" @click.stop>
{{ $options.i18n.connectExistingCluster }} {{ $options.i18n.connectExistingCluster }}
</gl-dropdown-item> </gl-dropdown-item>
......
...@@ -234,6 +234,8 @@ export const CLUSTERS_ACTIONS = { ...@@ -234,6 +234,8 @@ export const CLUSTERS_ACTIONS = {
createNewCluster: s__('ClusterAgents|Create a new cluster'), createNewCluster: s__('ClusterAgents|Create a new cluster'),
connectWithAgent: s__('ClusterAgents|Connect with agent'), connectWithAgent: s__('ClusterAgents|Connect with agent'),
connectExistingCluster: s__('ClusterAgents|Connect with a certificate'), connectExistingCluster: s__('ClusterAgents|Connect with a certificate'),
agent: s__('ClusterAgents|Agent'),
certificate: s__('ClusterAgents|Certificate'),
dropdownDisabledHint: s__( dropdownDisabledHint: s__(
'ClusterAgents|Requires a Maintainer or greater role to perform these actions', 'ClusterAgents|Requires a Maintainer or greater role to perform these actions',
), ),
......
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