Commit ff725188 authored by Savas Vedova's avatar Savas Vedova

Merge branch '284471-misc-fixes' into 'master'

Fix duplicate request and use new template for vuln report filters

See merge request gitlab-org/gitlab!59376
parents d61c5521 83815342
<script>
import {
GlDropdown,
GlSearchBoxByType,
GlIcon,
GlLoadingIcon,
GlTruncate,
GlDropdownText,
} from '@gitlab/ui';
import { GlDropdown, GlSearchBoxByType, GlTruncate, GlDropdownText } from '@gitlab/ui';
export default {
components: {
GlDropdown,
GlSearchBoxByType,
GlIcon,
GlLoadingIcon,
GlTruncate,
GlDropdownText,
},
......@@ -82,8 +73,7 @@ export default {
@show="emitDropdownShow"
@hide="$emit('dropdown-hide')"
>
<template #button-content>
<gl-loading-icon v-if="loading" class="gl-mr-2" />
<template #button-text>
<gl-truncate
:text="firstSelectedOption"
class="gl-min-w-0 gl-mr-2"
......@@ -92,7 +82,6 @@ export default {
<span v-if="extraOptionCount" class="gl-mr-2">
{{ n__('+%d more', '+%d more', extraOptionCount) }}
</span>
<gl-icon name="chevron-down" class="gl-flex-shrink-0 gl-ml-auto" />
</template>
<template v-if="showSearchBox" #header>
......
......@@ -52,7 +52,7 @@ export default {
},
data() {
return {
filters: {},
filters: null,
projects: [],
};
},
......
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