Commit 63ef0b87 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'dependencies-list-gl-icon-component' into 'master'

Replace shared Icon component with GlIcon in Dependencies List

See merge request gitlab-org/gitlab!23529
parents 785968a3 f0a392ed
<script>
import { mapActions, mapState } from 'vuex';
import { GlButton, GlDropdown, GlDropdownItem, GlTooltipDirective } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
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';
......@@ -11,7 +10,7 @@ export default {
GlButton,
GlDropdown,
GlDropdownItem,
Icon,
GlIcon,
},
directives: {
GlTooltip: GlTooltipDirective,
......@@ -70,7 +69,7 @@ export default {
<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">
<icon
<gl-icon
class="flex-shrink-0 append-right-4"
:class="{ invisible: !isCurrentSortField(id) }"
name="mobile-issue-close"
......@@ -85,7 +84,7 @@ export default {
class="flex-grow-0 js-sort-order"
@click="toggleSortOrder"
>
<icon :name="sortOrderIcon" />
<gl-icon :name="sortOrderIcon" />
</gl-button>
</div>
<gl-button
......@@ -95,7 +94,7 @@ export default {
:title="s__('Dependencies|Export as JSON')"
class="js-download"
>
<icon name="export" />
<gl-icon name="export" />
</gl-button>
</div>
</template>
......@@ -16,7 +16,7 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
<span
class="d-flex"
>
<icon-stub
<gl-icon-stub
class="flex-shrink-0 append-right-4"
name="mobile-issue-close"
size="16"
......@@ -30,7 +30,7 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
<span
class="d-flex"
>
<icon-stub
<gl-icon-stub
class="flex-shrink-0 append-right-4 invisible"
name="mobile-issue-close"
size="16"
......@@ -44,7 +44,7 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
<span
class="d-flex"
>
<icon-stub
<gl-icon-stub
class="flex-shrink-0 append-right-4 invisible"
name="mobile-issue-close"
size="16"
......@@ -62,7 +62,7 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
title="Sort direction"
variant="secondary"
>
<icon-stub
<gl-icon-stub
name="sort-lowest"
size="16"
/>
......@@ -77,7 +77,7 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
title="Export as JSON"
variant="secondary"
>
<icon-stub
<gl-icon-stub
name="export"
size="16"
/>
......
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