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: persons & events settings in notebooks #17866

Merged
merged 5 commits into from
Oct 11, 2023
Merged

feat: persons & events settings in notebooks #17866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7ec4a4
feat: persons & events settings
daibhin Oct 9, 2023
5944ff0
Merge branch 'master' into dn-feat/persons-events-settings
daibhin Oct 9, 2023
77f12f8
remove commented line
daibhin Oct 9, 2023
cc3e580
Merge branch 'master' into dn-feat/persons-events-settings
daibhin Oct 11, 2023
d2294a9
finalize params
daibhin Oct 11, 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
33 changes: 18 additions & 15 deletions frontend/src/queries/nodes/DataTable/DataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,40 +373,44 @@ export function DataTable({ uniqueKey, query, setQuery, context, cachedResults }

const firstRowLeft = [
showDateRange && sourceFeatures.has(QueryFeature.dateRangePicker) ? (
<DateRange query={query.source} setQuery={setQuerySource} />
<DateRange key="date-range" query={query.source} setQuery={setQuerySource} />
) : null,
showEventFilter && sourceFeatures.has(QueryFeature.eventNameFilter) ? (
<EventName query={query.source as EventsQuery} setQuery={setQuerySource} />
<EventName key="event-name" query={query.source as EventsQuery} setQuery={setQuerySource} />
) : null,
showSearch && sourceFeatures.has(QueryFeature.personsSearch) ? (
<PersonsSearch query={query.source as PersonsNode} setQuery={setQuerySource} />
<PersonsSearch key="persons-search" query={query.source as PersonsNode} setQuery={setQuerySource} />
) : null,
showPropertyFilter && sourceFeatures.has(QueryFeature.eventPropertyFilters) ? (
<EventPropertyFilters query={query.source as EventsQuery} setQuery={setQuerySource} />
<EventPropertyFilters key="event-property" query={query.source as EventsQuery} setQuery={setQuerySource} />
) : null,
showPropertyFilter && sourceFeatures.has(QueryFeature.personPropertyFilters) ? (
<PersonPropertyFilters query={query.source as PersonsNode} setQuery={setQuerySource} />
<PersonPropertyFilters
key="person-property"
query={query.source as PersonsNode}
setQuery={setQuerySource}
/>
) : null,
].filter((x) => !!x)

const firstRowRight = [
showSavedQueries && sourceFeatures.has(QueryFeature.savedEventsQueries) ? (
<SavedQueries query={query} setQuery={setQuery} />
<SavedQueries key="saved-queries" query={query} setQuery={setQuery} />
) : null,
].filter((x) => !!x)

const secondRowLeft = [
showReload ? <Reload /> : null,
showReload && canLoadNewData ? <AutoLoad /> : null,
showElapsedTime ? <ElapsedTime showTimings={showTimings} /> : null,
showReload ? <Reload key="reload" /> : null,
showReload && canLoadNewData ? <AutoLoad key="auto-load" /> : null,
showElapsedTime ? <ElapsedTime key="elapsed-time" showTimings={showTimings} /> : null,
].filter((x) => !!x)

const secondRowRight = [
(showColumnConfigurator || showPersistentColumnConfigurator) &&
sourceFeatures.has(QueryFeature.columnConfigurator) ? (
<ColumnConfigurator query={query} setQuery={setQuery} />
<ColumnConfigurator key="column-configurator" query={query} setQuery={setQuery} />
) : null,
showExport ? <DataTableExport query={query} setQuery={setQuery} /> : null,
showExport ? <DataTableExport key="data-table-export" query={query} setQuery={setQuery} /> : null,
].filter((x) => !!x)

const showFirstRow = !isReadOnly && (firstRowLeft.length > 0 || firstRowRight.length > 0)
Expand Down Expand Up @@ -437,10 +441,9 @@ export function DataTable({ uniqueKey, query, setQuery, context, cachedResults }
)}
{showFirstRow && showSecondRow && <LemonDivider className="my-0" />}
{showSecondRow && (
<div className="flex gap-4 items-center">
{secondRowLeft}
{secondRowLeft.length > 0 && secondRowRight.length > 0 ? <div className="flex-1" /> : null}
{secondRowRight}
<div className="flex gap-4 justify-between flex-wrap">
<div className="flex gap-4 items-center">{secondRowLeft}</div>
<div className="flex gap-4 items-center">{secondRowRight}</div>
</div>
)}
{showOpenEditorButton && inlineEditorButtonOnRow === 0 && !isReadOnly ? (
Expand Down
14 changes: 11 additions & 3 deletions frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ const Component = ({
const modifiedQuery = { ...query, full: false }

if (NodeKind.DataTableNode === modifiedQuery.kind || NodeKind.SavedInsightNode === modifiedQuery.kind) {
// We don't want to show the insights button for now
modifiedQuery.showOpenEditorButton = false
modifiedQuery.full = false
modifiedQuery.showHogQLEditor = false
Expand Down Expand Up @@ -108,13 +107,22 @@ export const Settings = ({
const modifiedQuery = { ...query, full: false }

if (NodeKind.DataTableNode === modifiedQuery.kind || NodeKind.SavedInsightNode === modifiedQuery.kind) {
// We don't want to show the insights button for now
modifiedQuery.showOpenEditorButton = false
modifiedQuery.showHogQLEditor = true
modifiedQuery.showResultsTable = false
modifiedQuery.showReload = false

modifiedQuery.showReload = true
modifiedQuery.showElapsedTime = false
modifiedQuery.showTimings = false

modifiedQuery.embedded = true
modifiedQuery.showActions = true

modifiedQuery.showDateRange = true
modifiedQuery.showEventFilter = true
modifiedQuery.showSearch = true
modifiedQuery.showPropertyFilter = true
modifiedQuery.showColumnConfigurator = true
}

if (NodeKind.InsightVizNode === modifiedQuery.kind || NodeKind.SavedInsightNode === modifiedQuery.kind) {
Expand Down
Loading