Commit 6eb72a7e authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 're-align-register-and-cancel-buttons-in-agent-installation-modal' into 'master'

Re-align "Register" and "Cancel" buttons in Agent installation modal

See merge request gitlab-org/gitlab!79188
parents 233d3597 17fe351f
...@@ -111,6 +111,9 @@ export default { ...@@ -111,6 +111,9 @@ export default {
canCancel() { canCancel() {
return !this.registered && !this.registering && this.isAgentRegistrationModal; return !this.registered && !this.registering && this.isAgentRegistrationModal;
}, },
canRegister() {
return !this.registered && this.isAgentRegistrationModal;
},
agentRegistrationCommand() { agentRegistrationCommand() {
return generateAgentRegistrationCommand(this.agentToken, this.kasAddress); return generateAgentRegistrationCommand(this.agentToken, this.kasAddress);
}, },
...@@ -383,7 +386,16 @@ export default { ...@@ -383,7 +386,16 @@ export default {
</gl-button> </gl-button>
<gl-button <gl-button
v-else-if="isAgentRegistrationModal" v-if="canCancel"
:data-track-action="$options.EVENT_ACTIONS_CLICK"
:data-track-label="$options.EVENT_LABEL_MODAL"
data-track-property="cancel"
@click="closeModal"
>{{ i18n.cancel }}
</gl-button>
<gl-button
v-if="canRegister"
:disabled="!nextButtonDisabled" :disabled="!nextButtonDisabled"
variant="confirm" variant="confirm"
category="primary" category="primary"
...@@ -394,15 +406,6 @@ export default { ...@@ -394,15 +406,6 @@ export default {
>{{ i18n.registerAgentButton }} >{{ i18n.registerAgentButton }}
</gl-button> </gl-button>
<gl-button
v-if="canCancel"
:data-track-action="$options.EVENT_ACTIONS_CLICK"
:data-track-label="$options.EVENT_LABEL_MODAL"
data-track-property="cancel"
@click="closeModal"
>{{ i18n.cancel }}
</gl-button>
<gl-button <gl-button
v-if="isEmptyStateModal" v-if="isEmptyStateModal"
variant="confirm" variant="confirm"
......
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