Skip to content
Snippets Groups Projects
Commit 21d83a10 authored by Neil McCorrison's avatar Neil McCorrison Committed by Vitaly Slobodin
Browse files

Replaced GlDeprecatedDropdown with GlDropdown on dependencies page

parent 4f028edc
No related branches found
No related tags found
No related merge requests found
<script>
import { mapActions, mapState } from 'vuex';
import {
GlButton,
GlDeprecatedDropdown,
GlDeprecatedDropdownItem,
GlIcon,
GlTooltipDirective,
} from '@gitlab/ui';
import { GlButton, GlDropdown, GlDropdownItem, GlIcon, GlTooltipDirective } from '@gitlab/ui';
import { DEPENDENCY_LIST_TYPES } from '../store/constants';
import { SORT_FIELDS, SORT_ORDER } from '../store/modules/list/constants';
 
Loading
Loading
@@ -14,8 +8,8 @@ export default {
name: 'DependenciesActions',
components: {
GlButton,
GlDeprecatedDropdown,
GlDeprecatedDropdownItem,
GlDropdown,
GlDropdownItem,
GlIcon,
},
directives: {
Loading
Loading
@@ -72,12 +66,8 @@ export default {
<template>
<div class="btn-toolbar">
<div class="btn-group flex-grow-1 mr-2">
<gl-deprecated-dropdown :text="sortFieldName" class="flex-grow-1 text-center" right>
<gl-deprecated-dropdown-item
v-for="(name, id) in sortFields"
:key="id"
@click="setSortField(id)"
>
<gl-dropdown :text="sortFieldName" class="flex-grow-1 text-center" right>
<gl-dropdown-item v-for="(name, id) in sortFields" :key="id" @click="setSortField(id)">
<span class="d-flex">
<gl-icon
class="flex-shrink-0 gl-mr-2"
Loading
Loading
@@ -86,8 +76,8 @@ export default {
/>
{{ name }}
</span>
</gl-deprecated-dropdown-item>
</gl-deprecated-dropdown>
</gl-dropdown-item>
</gl-dropdown>
<gl-button
v-gl-tooltip
:title="__('Sort direction')"
Loading
Loading
Loading
Loading
@@ -7,12 +7,22 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
<div
class="btn-group flex-grow-1 mr-2"
>
<gl-deprecated-dropdown-stub
<gl-dropdown-stub
category="tertiary"
class="flex-grow-1 text-center"
headertext=""
right=""
size="medium"
text="Severity"
variant="default"
>
<gl-deprecated-dropdown-item-stub>
<gl-dropdown-item-stub
avatarurl=""
iconcolor=""
iconname=""
iconrightname=""
secondarytext=""
>
<span
class="d-flex"
>
Loading
Loading
@@ -25,8 +35,14 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
Component name
</span>
</gl-deprecated-dropdown-item-stub>
<gl-deprecated-dropdown-item-stub>
</gl-dropdown-item-stub>
<gl-dropdown-item-stub
avatarurl=""
iconcolor=""
iconname=""
iconrightname=""
secondarytext=""
>
<span
class="d-flex"
>
Loading
Loading
@@ -39,8 +55,14 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
Packager
</span>
</gl-deprecated-dropdown-item-stub>
<gl-deprecated-dropdown-item-stub>
</gl-dropdown-item-stub>
<gl-dropdown-item-stub
avatarurl=""
iconcolor=""
iconname=""
iconrightname=""
secondarytext=""
>
<span
class="d-flex"
>
Loading
Loading
@@ -53,8 +75,8 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
Severity
</span>
</gl-deprecated-dropdown-item-stub>
</gl-deprecated-dropdown-stub>
</gl-dropdown-item-stub>
</gl-dropdown-stub>
<gl-button-stub
category="primary"
Loading
Loading
import { shallowMount } from '@vue/test-utils';
import { GlDeprecatedDropdownItem } from '@gitlab/ui';
import { GlDropdownItem } from '@gitlab/ui';
import { TEST_HOST } from 'helpers/test_constants';
import createStore from 'ee/dependencies/store';
import { DEPENDENCY_LIST_TYPES } from 'ee/dependencies/store/constants';
Loading
Loading
@@ -39,7 +39,7 @@ describe('DependenciesActions component', () => {
});
 
it('dispatches the right setSortField action on clicking each item in the dropdown', () => {
const dropdownItems = wrapper.findAll(GlDeprecatedDropdownItem).wrappers;
const dropdownItems = wrapper.findAll(GlDropdownItem).wrappers;
 
dropdownItems.forEach(item => {
// trigger() does not work on stubbed/shallow mounted components
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment