Skip to content

Update sorting controls for Dandisets page #2358

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
merged 5 commits into from
Apr 30, 2025
Merged

Update sorting controls for Dandisets page #2358

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a355854
Update sorting controls for Dandisets page
naglepuff Apr 22, 2025
440e781
Use active prop for sorting option list
naglepuff Apr 28, 2025
cfdb5a6
Use v-item-group to reduce logic in template
naglepuff Apr 28, 2025
601a3cd
Use single button for sorting options
naglepuff Apr 29, 2025
01f1eae
Make sort dropdown easier to visually parse
naglepuff Apr 29, 2025
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
144 changes: 110 additions & 34 deletions web/src/components/DandisetsPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<template #activator="{ props: menuProps }">
<v-icon
v-bind="menuProps"
class="mr-6"
>
mdi-cog
</v-icon>
Expand Down Expand Up @@ -39,33 +40,106 @@
</v-list-item>
</v-list>
</v-menu>
<div class="mx-6">
Sort By:
</div>
<v-chip-group
:model-value="sortOption"
selected-class="white text-light-blue bg-white"
dark
mandatory
style="min-width: 25%"
<DandisetSearchField class="flex-grow-1 mr-2" />
<v-btn
variant="flat"
>
<v-chip
v-for="(option, i) in sortingOptions"
:key="option.name"
@click="changeSort(i)"
<span class="pr-2">
<span
v-if="sortDir === 1"
>
<v-icon>mdi-sort-reverse-variant</v-icon>
<v-icon>mdi-arrow-up-thin</v-icon>
</span>
<span v-else>
<v-icon>mdi-sort-variant</v-icon>
<v-icon>mdi-arrow-down-thin</v-icon>
</span>
</span>
<span
class="d-none d-sm-inline"
>
{{ option.name }}
<v-icon end>
<template v-if="sortDir === -1 || sortOption !== i">
mdi-sort-variant
</template>
<template v-else>
mdi-sort-reverse-variant
</template>
</v-icon>
</v-chip>
</v-chip-group>
<DandisetSearchField class="flex-grow-1" />
{{ sortingOptions[sortOption].name }}
</span>
<v-tooltip
location="top"
activator="parent"
>
<span>Sorting Options</span>
</v-tooltip>
<v-menu activator="parent">
<v-list>
<v-item-group v-model="sortOption">
<v-list-subheader
class="text-high-emphasis font-weight-bold"
>
Sort by
</v-list-subheader>
<v-item
v-for="(option, i) in sortingOptions"
:key="option.name"
v-slot="{ isSelected, toggle }"
:value="i"
>
<v-list-item
class="pl-8"
:active="isSelected"
@click="toggle"
>
<template #append>
<v-icon v-if="isSelected">
mdi-check
</v-icon>
</template>
<v-list-item-title>{{ option.name }}</v-list-item-title>
</v-list-item>
</v-item>
</v-item-group>
<v-divider />
<v-item-group v-model="sortDir">
<v-list-subheader
class="text-high-emphasis font-weight-bold"
>
Order
</v-list-subheader>
<v-item
v-slot="{ isSelected, toggle }"
:value="1"
>
<v-list-item
class="pl-8"
:active="isSelected"
@click="toggle"
>
<template #append>
<v-icon v-if="sortDir === 1">
mdi-check
</v-icon>
</template>
<v-list-item-title>Ascending</v-list-item-title>
</v-list-item>
</v-item>
<v-item
v-slot="{ isSelected, toggle }"
:value="-1"
>
<v-list-item
class="pl-8"
:active="isSelected"
@click="toggle"
>
<template #append>
<v-icon v-if="sortDir === -1">
mdi-check
</v-icon>
</template>
<v-list-item-title>Descending</v-list-item-title>
</v-list-item>
</v-item>
</v-item-group>
</v-list>
</v-menu>
</v-btn>
</v-toolbar>
<div
v-if="props.search && djangoDandisetRequest"
Expand Down Expand Up @@ -203,16 +277,18 @@ watch(queryParams, (params) => {
},
});
});
</script>

function changeSort(index: number) {
if (sortOption.value === index) {
sortDir.value *= -1;
} else {
sortOption.value = index;
sortDir.value = -1;
}
<style scoped>
.btn-group--sort-options {
min-width: 84px;
}

page.value = 1;
.btn--sort-option {
min-width: 56px;
}

</script>
.btn--sort-order {
min-width: 28px;
}
</style>