Skip to content

Commit

Permalink
Fixes issue with comboboxes not displaying multiple items with the sa…
Browse files Browse the repository at this point in the history
…me name. (#2084)
  • Loading branch information
kevgliss authored Mar 16, 2022
1 parent a7861b8 commit 3c895ed
Show file tree
Hide file tree
Showing 28 changed files with 31 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:search-input.sync="search"
@update:search-input="getFilteredData({ q: $event })"
item-text="name"
item-value="id"
clearable
v-model="query"
>
Expand Down
6 changes: 1 addition & 5 deletions src/dispatch/static/dispatch/src/data/query/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const getDefaultSelectedState = () => {
description: null,
source: null,
text: null,
project: null,
language: null,
}
}
Expand Down Expand Up @@ -39,11 +40,6 @@ const state = {
tag: [],
project: [],
tag_type: [],
query_environment: [],
query_status: [],
query_type: [],
query_transport: [],
query_data_format: [],
},
},
loading: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:search-input.sync="search"
@update:search-input="getFilteredData({ q: $event })"
item-text="name"
item-value="id"
clearable
v-model="source"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="dataFormats"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:search-input.sync="search"
@update:search-input="getFilteredData({ q: $event })"
item-text="name"
item-value="id"
clearable
v-model="dataFormat"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="environments"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:search-input.sync="search"
@update:search-input="getFilteredData({ q: $event })"
item-text="name"
item-value="id"
clearable
v-model="environment"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="statuses"
Expand All @@ -18,7 +19,7 @@
<v-list-item>
<v-list-item-content>
<v-list-item-title>
No Projects matching "
No statuses matching "
<strong>{{ search }}</strong
>".
</v-list-item-title>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
:search-input.sync="search"
@update:search-input="getFilteredData({ q: $event })"
item-text="name"
item-value="id"
clearable
v-model="status"
>
<template v-slot:no-data>
<v-list-item>
<v-list-item-content>
<v-list-item-title>
No statuss matching
No statuses matching
<strong>"{{ search }}"</strong>
</v-list-item-title>
</v-list-item-content>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="transports"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:search-input.sync="search"
@update:search-input="getFilteredData({ q: $event })"
item-text="name"
item-value="id"
clearable
v-model="transport"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="types"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:search-input.sync="search"
@update:search-input="getFilteredData({ q: $event })"
item-text="name"
item-value="id"
clearable
v-model="type"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
:search-input.sync="search"
:menu-props="{ maxHeight: '400' }"
item-text="name"
item-value="id"
:label="label"
placeholder="Start typing to search"
return-object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="incident"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="incidents"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:search-input.sync="search"
@update:search-input="getFilteredData({ q: $event })"
item-text="name"
item-value="id"
clearable
v-model="incident"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
no-filter
v-model="incident_cost_type"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="incidentType"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="individual"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:search-input.sync="search"
@update:search-input="fetchData({ q: $event })"
item-text="name"
item-value="id"
v-model="individual"
>
<template v-slot:no-data>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="project"
Expand Down
2 changes: 2 additions & 0 deletions src/dispatch/static/dispatch/src/project/ProjectSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:search-input.sync="search"
@update:search-input="getFilteredData({ q: $event })"
item-text="name"
item-value="id"
v-model="project"
>
<template v-slot:no-data>
Expand Down Expand Up @@ -89,6 +90,7 @@ export default {
this.error = null
this.loading = "error"
let filterOptions = {
q: this.search,
itemsPerPage: this.numItems,
sortBy: ["name"],
descending: [false],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
deletable-chips
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="searchFilters"
Expand Down
1 change: 1 addition & 0 deletions src/dispatch/static/dispatch/src/service/ServiceSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:search-input.sync="search"
:menu-props="{ maxHeight: '400' }"
item-text="name"
item-value="id"
:label="label"
placeholder="Start typing to search"
return-object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:search-input.sync="search"
:menu-props="{ maxHeight: '400' }"
item-text="name"
item-value="id"
:label="label"
placeholder="Start typing to search"
return-object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
chips
clearable
item-text="name"
item-value="id"
hide-selected
multiple
no-filter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
clearable
hide-selected
item-text="name"
item-value="id"
multiple
no-filter
v-model="tags"
Expand Down

0 comments on commit 3c895ed

Please sign in to comment.