Skip to content
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

feat: allow sorting Lifecycle graph bars #16542

Merged
merged 9 commits into from
Jul 31, 2023
Merged

feat: allow sorting Lifecycle graph bars #16542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e0d3f66
order lifecycles & persist changes
nategrift Jul 12, 2023
b6f3278
added better styling to lifecycle dragging
nategrift Jul 12, 2023
0dfcf68
match posthog styling for lifecycle drag feat
nategrift Jul 12, 2023
e3d09b9
remove drag-drop
nategrift Jul 25, 2023
255f3c8
merge
nategrift Jul 25, 2023
2650b85
remove merge conflict error
nategrift Jul 25, 2023
4d19dbb
fix order in jest tests
thmsobrmlr Jul 26, 2023
37ba536
Merge branch 'master' into feat/order-lifecycle
nategrift Jul 28, 2023
b6af23e
Merge branch 'feat/order-lifecycle' of github.com:nategrift/posthog i…
nategrift Jul 28, 2023
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
16 changes: 8 additions & 8 deletions frontend/src/scenes/trends/trendsDataLogic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,24 +117,24 @@ describe('trendsDataLogic', () => {
builtDataNodeLogic.actions.loadDataSuccess(insight)
}).toMatchValues({
indexedResults: [
expect.objectContaining({
count: 35346.0,
status: 'new',
id: 0,
seriesIndex: 0,
}),
expect.objectContaining({
count: -50255.0,
status: 'dormant',
id: 1,
id: 0,
seriesIndex: 1,
}),
expect.objectContaining({
count: 11612.0,
status: 'resurrecting',
id: 2,
id: 1,
seriesIndex: 3,
}),
expect.objectContaining({
count: 35346.0,
status: 'new',
id: 2,
seriesIndex: 0,
}),
],
})
})
Expand Down
17 changes: 13 additions & 4 deletions frontend/src/scenes/trends/trendsDataLogic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,25 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
indexedResults: [
(s) => [s.results, s.display, s.lifecycleFilter],
(results, display, lifecycleFilter): IndexedTrendResult[] => {
const defaultLifecyclesOrder = ['new', 'resurrecting', 'returning', 'dormant']
let indexedResults = results.map((result, index) => ({ ...result, seriesIndex: index }))
if (
display &&
(display === ChartDisplayType.ActionsBarValue || display === ChartDisplayType.ActionsPie)
) {
indexedResults.sort((a, b) => b.aggregated_value - a.aggregated_value)
} else if (lifecycleFilter && lifecycleFilter.toggledLifecycles) {
indexedResults = indexedResults.filter((result) =>
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
lifecycleFilter.toggledLifecycles!.includes(String(result.status) as LifecycleToggle)
} else if (lifecycleFilter) {
if (lifecycleFilter.toggledLifecycles) {
indexedResults = indexedResults.filter((result) =>
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
lifecycleFilter.toggledLifecycles!.includes(String(result.status) as LifecycleToggle)
)
}

indexedResults = indexedResults.sort(
(a, b) =>
defaultLifecyclesOrder.indexOf(String(b.status)) -
defaultLifecyclesOrder.indexOf(String(a.status))
)
}
return indexedResults.map((result, index) => ({ ...result, id: index }))
Expand Down