Commit f4a072b6 authored by Tom Quirk's avatar Tom Quirk

Reposition and restyle integration reset button

Changelog: changed
parent e3d7c020
...@@ -216,62 +216,69 @@ export default { ...@@ -216,62 +216,69 @@ export default {
v-bind="propsSource.jiraIssuesProps" v-bind="propsSource.jiraIssuesProps"
@request-jira-issue-types="onRequestJiraIssueTypes" @request-jira-issue-types="onRequestJiraIssueTypes"
/> />
<div v-if="isEditable" class="footer-block row-content-block">
<template v-if="isInstanceOrGroupLevel"> <div
v-if="isEditable"
class="footer-block row-content-block gl-display-flex gl-justify-content-space-between"
>
<div>
<template v-if="isInstanceOrGroupLevel">
<gl-button
v-gl-modal.confirmSaveIntegration
category="primary"
variant="confirm"
:loading="isSaving"
:disabled="disableButtons"
data-testid="save-button-instance-group"
data-qa-selector="save_changes_button"
>
{{ __('Save changes') }}
</gl-button>
<confirmation-modal @submit="onSaveClick" />
</template>
<gl-button <gl-button
v-gl-modal.confirmSaveIntegration v-else
category="primary" category="primary"
variant="confirm" variant="confirm"
type="submit"
:loading="isSaving" :loading="isSaving"
:disabled="disableButtons" :disabled="disableButtons"
data-testid="save-button-instance-group" data-testid="save-button"
data-qa-selector="save_changes_button" data-qa-selector="save_changes_button"
@click.prevent="onSaveClick"
> >
{{ __('Save changes') }} {{ __('Save changes') }}
</gl-button> </gl-button>
<confirmation-modal @submit="onSaveClick" />
</template>
<gl-button
v-else
category="primary"
variant="confirm"
type="submit"
:loading="isSaving"
:disabled="disableButtons"
data-testid="save-button"
data-qa-selector="save_changes_button"
@click.prevent="onSaveClick"
>
{{ __('Save changes') }}
</gl-button>
<gl-button <gl-button
v-if="showTestButton" v-if="showTestButton"
category="secondary" category="secondary"
variant="confirm" variant="confirm"
:loading="isTesting" :loading="isTesting"
:disabled="disableButtons" :disabled="disableButtons"
data-testid="test-button" data-testid="test-button"
@click.prevent="onTestClick" @click.prevent="onTestClick"
> >
{{ __('Test settings') }} {{ __('Test settings') }}
</gl-button> </gl-button>
<gl-button :href="propsSource.cancelPath">{{ __('Cancel') }}</gl-button>
</div>
<template v-if="showResetButton"> <template v-if="showResetButton">
<gl-button <gl-button
v-gl-modal.confirmResetIntegration v-gl-modal.confirmResetIntegration
category="secondary" category="tertiary"
variant="confirm" variant="danger"
:loading="isResetting" :loading="isResetting"
:disabled="disableButtons" :disabled="disableButtons"
data-testid="reset-button" data-testid="reset-button"
> >
{{ __('Reset') }} {{ __('Reset') }}
</gl-button> </gl-button>
<reset-confirmation-modal @reset="onResetClick" /> <reset-confirmation-modal @reset="onResetClick" />
</template> </template>
<gl-button :href="propsSource.cancelPath">{{ __('Cancel') }}</gl-button>
</div> </div>
</div> </div>
</div> </div>
......
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