Commit fdafc413 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'Replace-deprecated-dropdown-date-picker' into 'master'

Replacing deprecated dropdown on time/date picker

Closes #233585

See merge request gitlab-org/gitlab!42103
parents f8cf223c dd164d86
<script> <script>
import { import { GlIcon, GlButton, GlDropdown, GlDropdownItem, GlFormGroup } from '@gitlab/ui';
GlIcon,
GlButton,
GlDeprecatedDropdown,
GlDeprecatedDropdownItem,
GlFormGroup,
} from '@gitlab/ui';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import { convertToFixedRange, isEqualTimeRanges, findTimeRange } from '~/lib/utils/datetime_range'; import { convertToFixedRange, isEqualTimeRanges, findTimeRange } from '~/lib/utils/datetime_range';
...@@ -29,8 +23,8 @@ export default { ...@@ -29,8 +23,8 @@ export default {
components: { components: {
GlIcon, GlIcon,
GlButton, GlButton,
GlDeprecatedDropdown, GlDropdown,
GlDeprecatedDropdownItem, GlDropdownItem,
GlFormGroup, GlFormGroup,
TooltipOnTruncate, TooltipOnTruncate,
DateTimePickerInput, DateTimePickerInput,
...@@ -212,7 +206,7 @@ export default { ...@@ -212,7 +206,7 @@ export default {
placement="top" placement="top"
class="d-inline-block" class="d-inline-block"
> >
<gl-deprecated-dropdown <gl-dropdown
ref="dropdown" ref="dropdown"
:text="timeWindowText" :text="timeWindowText"
v-bind="$attrs" v-bind="$attrs"
...@@ -269,7 +263,7 @@ export default { ...@@ -269,7 +263,7 @@ export default {
<span class="gl-pl-7">{{ __('Quick range') }}</span> <span class="gl-pl-7">{{ __('Quick range') }}</span>
</template> </template>
<gl-deprecated-dropdown-item <gl-dropdown-item
v-for="(option, index) in options" v-for="(option, index) in options"
:key="index" :key="index"
data-qa-selector="quick_range_item" data-qa-selector="quick_range_item"
...@@ -283,9 +277,9 @@ export default { ...@@ -283,9 +277,9 @@ export default {
:class="{ invisible: !isOptionActive(option) }" :class="{ invisible: !isOptionActive(option) }"
/> />
{{ option.label }} {{ option.label }}
</gl-deprecated-dropdown-item> </gl-dropdown-item>
</gl-form-group> </gl-form-group>
</div> </div>
</gl-deprecated-dropdown> </gl-dropdown>
</tooltip-on-truncate> </tooltip-on-truncate>
</template> </template>
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