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

chore(hogql): Add export CSV button that uses HogQL query export #19507

Merged
merged 3 commits into from
Jan 8, 2024
Merged

chore(hogql): Add export CSV button that uses HogQL query export #19507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0dc7d3
Add export CSV button that uses HogQL query export
webjunkie Dec 22, 2023
ca267c3
Update query snapshots
github-actions[bot] Jan 8, 2024
96deefe
Update query snapshots
github-actions[bot] Jan 8, 2024
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
8 changes: 4 additions & 4 deletions frontend/src/queries/nodes/DataTable/DataTableExport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ import {
} from '~/queries/nodes/DataTable/utils'
import { getPersonsEndpoint } from '~/queries/query'
import { DataNode, DataTableNode, NodeKind } from '~/queries/schema'
import { isEventsQuery, isHogQLQuery, isPersonsNode } from '~/queries/utils'
import { isActorsQuery, isEventsQuery, isHogQLQuery, isPersonsNode } from '~/queries/utils'
import { ExporterFormat } from '~/types'

import { dataTableLogic, DataTableRow } from './dataTableLogic'

const EXPORT_MAX_LIMIT = 10000
export const EXPORT_MAX_LIMIT = 10000

async function startDownload(query: DataTableNode, onlySelectedColumns: boolean): Promise<void> {
export async function startDownload(query: DataTableNode, onlySelectedColumns: boolean): Promise<void> {
const exportContext = isPersonsNode(query.source)
? { path: getPersonsEndpoint(query.source) }
: { source: query.source }
Expand All @@ -33,7 +33,7 @@ async function startDownload(query: DataTableNode, onlySelectedColumns: boolean)

if (onlySelectedColumns) {
exportContext['columns'] = (
(isEventsQuery(query.source) ? query.source.select : null) ??
(isEventsQuery(query.source) || isActorsQuery(query.source) ? query.source.select : null) ??
query.columns ??
defaultDataTableColumns(query.source.kind)
)?.filter((c) => c !== 'person.$delete')
Expand Down
55 changes: 41 additions & 14 deletions frontend/src/scenes/retention/RetentionModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ import { RetentionTableAppearanceType } from 'scenes/retention/types'
import { MissingPersonsAlert } from 'scenes/trends/persons-modal/PersonsModal'
import { urls } from 'scenes/urls'

import { EXPORT_MAX_LIMIT, startDownload } from '~/queries/nodes/DataTable/DataTableExport'
import { ExportWithConfirmation } from '~/queries/nodes/DataTable/ExportWithConfirmation'
import { DataTableNode, NodeKind } from '~/queries/schema'
import { ExporterFormat } from '~/types'

import { retentionLogic } from './retentionLogic'
Expand All @@ -25,9 +28,18 @@ export function RetentionModal(): JSX.Element | null {
const { results } = useValues(retentionLogic(insightProps))
const { people, peopleLoading, peopleLoadingMore } = useValues(retentionPeopleLogic(insightProps))
const { loadMorePeople } = useActions(retentionPeopleLogic(insightProps))
const { aggregationTargetLabel, selectedInterval, exploreUrl } = useValues(retentionModalLogic(insightProps))
const { aggregationTargetLabel, selectedInterval, exploreUrl, actorsQuery } = useValues(
retentionModalLogic(insightProps)
)
const { closeModal } = useActions(retentionModalLogic(insightProps))

const dataTableNodeQuery: DataTableNode | undefined = actorsQuery
? {
kind: NodeKind.DataTableNode,
source: actorsQuery,
}
: undefined

if (!results || selectedInterval === null) {
return null
}
Expand All @@ -41,19 +53,34 @@ export function RetentionModal(): JSX.Element | null {
footer={
<div className="flex justify-between gap-2 w-full">
<div className="flex gap-2">
<LemonButton
type="secondary"
onClick={() =>
void triggerExport({
export_format: ExporterFormat.CSV,
export_context: {
path: row?.people_url,
},
})
}
>
Download CSV
</LemonButton>
{!exploreUrl && (
<LemonButton
type="secondary"
onClick={() =>
void triggerExport({
export_format: ExporterFormat.CSV,
export_context: {
path: row?.people_url,
},
})
}
>
Download CSV
</LemonButton>
)}
{!!dataTableNodeQuery && (
<ExportWithConfirmation
key={1}
placement={'topRight'}
onConfirm={() => {
dataTableNodeQuery && void startDownload(dataTableNodeQuery, true)
}}
actor={'persons'}
limit={EXPORT_MAX_LIMIT}
>
<LemonButton type="secondary">Export all as CSV</LemonButton>
</ExportWithConfirmation>
)}
</div>
{exploreUrl && (
<LemonButton
Expand Down
Loading