Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 19 additions & 0 deletions ami/main/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1187,6 +1187,24 @@ def filter_queryset(self, request, queryset, view):
return queryset


class TaxonUnknownSpeciesFilter(filters.BaseFilterBackend):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work implementing this filter! This follows all of my favorite conventions.

"""
Filter taxa that is or is not marked as "Unknown species".
"""

query_param = "unknown_species"

def filter_queryset(self, request: Request, queryset, view):
if self.query_param in request.query_params:
unknown_species = BooleanField(required=False).clean(request.query_params.get(self.query_param))
if unknown_species:
queryset = queryset.filter(unknown_species=True)
else:
queryset = queryset.exclude(unknown_species=True)

return queryset


class TaxonViewSet(DefaultViewSet, ProjectMixin):
"""
API endpoint that allows taxa to be viewed or edited.
Expand All @@ -1198,6 +1216,7 @@ class TaxonViewSet(DefaultViewSet, ProjectMixin):
CustomTaxonFilter,
TaxonCollectionFilter,
TaxonTaxaListFilter,
TaxonUnknownSpeciesFilter,
]
filterset_fields = [
"name",
Expand Down
2 changes: 2 additions & 0 deletions ui/src/components/filtering/filter-control.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { TaxaListFilter } from './filters/taxa-list-filter'
import { TaxonFilter } from './filters/taxon-filter'
import { TypeFilter } from './filters/type-filter'
import { FilterProps } from './filters/types'
import { UnknownSpeciesFilter } from './filters/unknown-species-filter'
import { VerificationStatusFilter } from './filters/verification-status-filter'
import { VerifiedByFilter } from './filters/verified-by-filter'

Expand All @@ -40,6 +41,7 @@ const ComponentMap: {
taxa_list_id: TaxaListFilter,
verified_by_me: VerifiedByFilter,
verified: VerificationStatusFilter,
unknown_species: UnknownSpeciesFilter,
}

interface FilterControlProps {
Expand Down
30 changes: 30 additions & 0 deletions ui/src/components/filtering/filters/unknown-species-filter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { Select } from 'nova-ui-kit'
import { booleanToString, stringToBoolean } from '../utils'
import { FilterProps } from './types'

const OPTIONS = [
{ value: true, label: 'Unknown species' },
{ value: false, label: 'Known species' },
]

export const UnknownSpeciesFilter = ({ value: string, onAdd }: FilterProps) => {
const value = stringToBoolean(string)

return (
<Select.Root value={booleanToString(value)} onValueChange={onAdd}>
<Select.Trigger>
<Select.Value placeholder="Select a value" />
</Select.Trigger>
<Select.Content className="max-h-72">
{OPTIONS.map((option) => (
<Select.Item
key={booleanToString(option.value)}
value={booleanToString(option.value)}
>
{option.label}
</Select.Item>
))}
</Select.Content>
</Select.Root>
)
}
1 change: 1 addition & 0 deletions ui/src/pages/species/species.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export const Species = () => {
<FilterControl field="event" readonly />
<FilterControl field="deployment" />
<FilterControl field="taxon" />
<FilterControl field="unknown_species" />
{taxaLists.length > 0 && (
<FilterControl data={taxaLists} field="taxa_list_id" />
)}
Expand Down
4 changes: 4 additions & 0 deletions ui/src/utils/useFilters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ export const AVAILABLE_FILTERS: {
label: 'Taxon',
field: 'taxon',
},
{
label: 'Known status',
field: 'unknown_species',
},
{
label: 'Taxa list',
field: 'taxa_list_id',
Expand Down