Commit 185b5541 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch 'okr-fluentd-output-settings' into 'master'

Migrate button in fluentd_output_settings.vue

Closes #219786

See merge request gitlab-org/gitlab!43724
parents 9bcc657e cddfe6ab
<script> <script>
import { import {
GlAlert, GlAlert,
GlDeprecatedButton, GlButton,
GlDeprecatedDropdown, GlDeprecatedDropdown,
GlDeprecatedDropdownItem, GlDeprecatedDropdownItem,
GlFormCheckbox, GlFormCheckbox,
...@@ -16,7 +16,7 @@ const { UPDATING, UNINSTALLING, INSTALLING, INSTALLED, UPDATED } = APPLICATION_S ...@@ -16,7 +16,7 @@ const { UPDATING, UNINSTALLING, INSTALLING, INSTALLED, UPDATED } = APPLICATION_S
export default { export default {
components: { components: {
GlAlert, GlAlert,
GlDeprecatedButton, GlButton,
GlDeprecatedDropdown, GlDeprecatedDropdown,
GlDeprecatedDropdownItem, GlDeprecatedDropdownItem,
GlFormCheckbox, GlFormCheckbox,
...@@ -221,20 +221,21 @@ export default { ...@@ -221,20 +221,21 @@ export default {
<strong>{{ s__('ClusterIntegration|Send Container Network Policies Logs') }}</strong> <strong>{{ s__('ClusterIntegration|Send Container Network Policies Logs') }}</strong>
</gl-form-checkbox> </gl-form-checkbox>
</div> </div>
<div v-if="showButtons" class="mt-3"> <div v-if="showButtons" class="gl-mt-5 gl-display-flex">
<gl-deprecated-button <gl-button
ref="saveBtn" ref="saveBtn"
class="mr-1" class="gl-mr-3"
variant="success" variant="success"
category="primary"
:loading="isSaving" :loading="isSaving"
:disabled="saveButtonDisabled" :disabled="saveButtonDisabled"
@click="updateApplication" @click="updateApplication"
> >
{{ saveButtonLabel }} {{ saveButtonLabel }}
</gl-deprecated-button> </gl-button>
<gl-deprecated-button ref="cancelBtn" :disabled="saveButtonDisabled" @click="resetStatus"> <gl-button ref="cancelBtn" :disabled="saveButtonDisabled" @click="resetStatus">
{{ __('Cancel') }} {{ __('Cancel') }}
</gl-deprecated-button> </gl-button>
</div> </div>
</div> </div>
</div> </div>
......
---
title: Migrate button in fluentd_output_settings.vue
merge_request: 43724
author:
type: other
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