Skip to content

UI: Filter menu UX improvements #5994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvazquez merged 4 commits into from
Feb 18, 2022
Merged

UI: Filter menu UX improvements #5994

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ee4e86
fix filter menu
Feb 15, 2022
7593a7b
fixes
Feb 15, 2022
10842eb
fixes
Feb 15, 2022
8cec205
fixes
Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions ui/src/components/view/SearchView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
initialValue: fieldValues[field.name] || null
}]"
showSearch
:dropdownMatchSelectWidth="false"
optionFilterProp="children"
:filterOption="(input, option) => {
return option.componentOptions.propsData.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
Expand All @@ -82,7 +83,7 @@
</span>
<a-icon v-else type="block" style="margin-right: 5px" />
</span>
{{ $t(opt.name) }}
{{ $t(opt.path || opt.name) }}
</div>
</a-select-option>
</a-select>
Expand Down Expand Up @@ -309,25 +310,25 @@ export default {
if (zoneIndex > -1) {
const zones = response.filter(item => item.type === 'zoneid')
if (zones && zones.length > 0) {
this.fields[zoneIndex].opts = zones[0].data
this.fields[zoneIndex].opts = this.sortArray(zones[0].data)
}
}
if (domainIndex > -1) {
const domain = response.filter(item => item.type === 'domainid')
if (domain && domain.length > 0) {
this.fields[domainIndex].opts = domain[0].data
this.fields[domainIndex].opts = this.sortArray(domain[0].data, 'path')
}
}
if (podIndex > -1) {
const pod = response.filter(item => item.type === 'podid')
if (pod && pod.length > 0) {
this.fields[podIndex].opts = pod[0].data
this.fields[podIndex].opts = this.sortArray(pod[0].data)
}
}
if (clusterIndex > -1) {
const cluster = response.filter(item => item.type === 'clusterid')
if (cluster && cluster.length > 0) {
this.fields[clusterIndex].opts = cluster[0].data
this.fields[clusterIndex].opts = this.sortArray(cluster[0].data)
}
}
this.$forceUpdate()
Expand All @@ -347,6 +348,14 @@ export default {
this.fillFormFieldValues()
})
},
sortArray (data, key = 'name') {
return data.sort(function (a, b) {
if (a[key] < b[key]) { return -1 }
if (a[key] > b[key]) { return 1 }

return 0
})
},
fillFormFieldValues () {
this.fieldValues = {}
if (Object.keys(this.$route.query).length > 0) {
Expand Down