Commit 41a7da9c authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch...

Merge branch '219819-replace-gl-deprecated-button-with-gl-button-in-ee-app-assets-javascripts-epic-components' into 'master'

Replace GlDeprecatedButton with GlButton in sidebar datepicker

Closes #219819

See merge request gitlab-org/gitlab!37602
parents 1b247fc9 b2af99d6
<script> <script>
import { uniqueId } from 'lodash'; import { uniqueId } from 'lodash';
import { GlLoadingIcon, GlDeprecatedButton } from '@gitlab/ui'; import { GlLoadingIcon, GlButton } from '@gitlab/ui';
import { __, s__ } from '~/locale'; import { __, s__ } from '~/locale';
import { dateInWords } from '~/lib/utils/datetime_utility'; import { dateInWords } from '~/lib/utils/datetime_utility';
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,7 @@ export default {
CollapsedCalendarIcon, CollapsedCalendarIcon,
ToggleSidebar, ToggleSidebar,
GlLoadingIcon, GlLoadingIcon,
GlDeprecatedButton, GlButton,
}, },
props: { props: {
sidebarCollapsed: { sidebarCollapsed: {
...@@ -201,7 +201,7 @@ export default { ...@@ -201,7 +201,7 @@ export default {
<gl-loading-icon v-if="dateSaveInProgress" :inline="true" /> <gl-loading-icon v-if="dateSaveInProgress" :inline="true" />
<div class="float-right d-flex"> <div class="float-right d-flex">
<icon v-popover="popoverOptions" name="question-o" class="help-icon gl-mr-2" tabindex="0" /> <icon v-popover="popoverOptions" name="question-o" class="help-icon gl-mr-2" tabindex="0" />
<gl-deprecated-button <gl-button
v-show="canUpdate && !editing" v-show="canUpdate && !editing"
ref="editButton" ref="editButton"
variant="link" variant="link"
...@@ -209,7 +209,8 @@ export default { ...@@ -209,7 +209,8 @@ export default {
@click="startEditing" @click="startEditing"
> >
{{ __('Edit') }} {{ __('Edit') }}
</gl-deprecated-button> </gl-button>
<toggle-sidebar <toggle-sidebar
v-if="showToggleSidebar" v-if="showToggleSidebar"
:collapsed="sidebarCollapsed" :collapsed="sidebarCollapsed"
...@@ -249,14 +250,14 @@ export default { ...@@ -249,14 +250,14 @@ export default {
/> />
<span v-if="selectedAndEditable" class="no-value d-flex"> <span v-if="selectedAndEditable" class="no-value d-flex">
&nbsp;&ndash;&nbsp; &nbsp;&ndash;&nbsp;
<gl-deprecated-button <gl-button
ref="removeButton" ref="removeButton"
variant="link" variant="link"
class="btn-sidebar-date-remove" class="btn-sidebar-date-remove"
@click="newDateSelected(null)" @click="newDateSelected(null)"
> >
{{ __('remove') }} {{ __('remove') }}
</gl-deprecated-button> </gl-button>
</span> </span>
</template> </template>
<span v-else class="no-value"> {{ __('None') }} </span> <span v-else class="no-value"> {{ __('None') }} </span>
......
---
title: Replace GlDeprecatedButton with GlButton
merge_request: 37602
author:
type: other
...@@ -30,15 +30,17 @@ exports[`SidebarDatePicker renders expected template 1`] = ` ...@@ -30,15 +30,17 @@ exports[`SidebarDatePicker renders expected template 1`] = `
tabindex="0" tabindex="0"
/> />
<gl-deprecated-button-stub <gl-button-stub
category="tertiary"
class="btn-sidebar-action" class="btn-sidebar-action"
size="md" icon=""
size="medium"
variant="link" variant="link"
> >
Edit Edit
</gl-deprecated-button-stub> </gl-button-stub>
<!----> <!---->
</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