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