Skip to content

feat: show a spinner when searching taxonomy #33190

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 1 commit into from
Jun 5, 2025
+65 −65
Merged

feat: show a spinner when searching taxonomy #33190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
130 changes: 65 additions & 65 deletions frontend/src/lib/components/TaxonomicFilter/InfiniteSelectResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,13 @@ function CategoryPill({
}): JSX.Element {
const logic = infiniteListLogic({ ...taxonomicFilterLogicProps, listGroupType: groupType })
const { taxonomicGroups } = useValues(taxonomicFilterLogic)
const { totalResultCount, totalListCount, isLoading, results, hasRemoteDataSource } = useValues(logic)
const { totalResultCount, totalListCount, isLoading, hasRemoteDataSource } = useValues(logic)

const group = taxonomicGroups.find((g) => g.type === groupType)

// :TRICKY: use `totalListCount` (results + extra) to toggle interactivity, while showing `totalResultCount`
const canInteract = totalListCount > 0 || taxonomicFilterGroupTypesWithEmptyStates.includes(groupType)
const hasOnlyDefaultItems = results?.length === 1 && (!results[0].id || results[0].id === '')
const showLoading = isLoading && (!results || results.length === 0 || hasOnlyDefaultItems) && hasRemoteDataSource
const showLoading = isLoading && hasRemoteDataSource

return (
<LemonTag
Expand Down Expand Up @@ -76,71 +75,72 @@ function TaxonomicGroupTitle({ openTab }: { openTab: TaxonomicFilterGroupType })
const { eventOrdering } = useValues(taxonomicFilterPreferencesLogic)
const { setEventOrdering } = useActions(taxonomicFilterPreferencesLogic)

if (openTab === TaxonomicFilterGroupType.Events) {
Copy link
Member Author

Choose a reason for hiding this comment

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

ah, i missed i had this change too.

this is just refactoring the method

const currentGroup = taxonomicGroups.find((g) => g.type === openTab)

return (
<div className="flex flex-row justify-between items-center w-full">
<span>{currentGroup?.name || openTab}</span>
<FlaggedFeature flag="taxonomic-event-sorting" match={true}>
<LemonMenu
items={[
{
label: (
<div className="flex flex-row gap-2">
{eventOrdering === 'name' ? <IconCheck /> : <IconBlank />}
<span>Name</span>
</div>
),
tooltip: 'Sort events alphabetically',
onClick: () => {
setEventOrdering('name')
return (
<div className="flex flex-row justify-between items-center w-full relative">
{openTab === TaxonomicFilterGroupType.Events ? (
<>
<span>{taxonomicGroups.find((g) => g.type === openTab)?.name || openTab}</span>
<FlaggedFeature flag="taxonomic-event-sorting" match={true}>
<LemonMenu
items={[
{
label: (
<div className="flex flex-row gap-2">
{eventOrdering === 'name' ? <IconCheck /> : <IconBlank />}
<span>Name</span>
</div>
),
tooltip: 'Sort events alphabetically',
onClick: () => {
setEventOrdering('name')
},
},
},
{
label: (
<div className="flex flex-row gap-2">
{eventOrdering === '-last_seen_at' ? <IconCheck /> : <IconBlank />}
<span>Recently seen</span>
</div>
),
tooltip: 'Show the most recent events first',
onClick: () => {
setEventOrdering('-last_seen_at')
{
label: (
<div className="flex flex-row gap-2">
{eventOrdering === '-last_seen_at' ? <IconCheck /> : <IconBlank />}
<span>Recently seen</span>
</div>
),
tooltip: 'Show the most recent events first',
onClick: () => {
setEventOrdering('-last_seen_at')
},
},
},
{
label: (
<div className="flex flex-row gap-2">
{!eventOrdering ? <IconCheck /> : <IconBlank />}
<span>Both</span>
</div>
),
tooltip:
'Sorts events by the day they were last seen, and then by name. The default option.',
onClick: () => {
setEventOrdering(null)
{
label: (
<div className="flex flex-row gap-2">
{!eventOrdering ? <IconCheck /> : <IconBlank />}
<span>Both</span>
Comment on lines +113 to +114
Copy link
Contributor

Choose a reason for hiding this comment

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

style: 'Both' is not descriptive enough for the sorting option. Consider 'Recently seen + Name' for clarity.

</div>
),
tooltip:
'Sorts events by the day they were last seen, and then by name. The default option.',
onClick: () => {
setEventOrdering(null)
},
},
},
]}
>
<LemonButton
icon={<IconSort />}
size="small"
tooltip={`Sorting by ${
eventOrdering === '-last_seen_at'
? 'recently seen'
: eventOrdering === 'name'
? 'name'
: 'recently seen and then name'
}`}
/>
</LemonMenu>
</FlaggedFeature>
</div>
)
}
return <>{taxonomicGroups.find((g) => g.type === openTab)?.name || openTab}</>
]}
>
<LemonButton
icon={<IconSort />}
size="small"
tooltip={`Sorting by ${
eventOrdering === '-last_seen_at'
? 'recently seen'
: eventOrdering === 'name'
? 'name'
: 'recently seen and then name'
}`}
/>
</LemonMenu>
</FlaggedFeature>
</>
) : (
<>{taxonomicGroups.find((g) => g.type === openTab)?.name || openTab}</>
)}
</div>
)
}

export function InfiniteSelectResults({
Expand Down
Loading