mirrors/posthog
0
0
Fork 0
mirror of https://github.com/PostHog/posthog.git synced 2024-11-21 21:49:51 +01:00
Code Issues Releases Activity

wip

Browse Source
This commit is contained in:
Paul D'Ambra 2023-02-27 12:49:57 +00:00
parent b555b01823
commit e3b979c194
No known key found for this signature in database
3 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/queries/Query/Query.tsx
View File

@ -47,6 +47,8 @@ export function Query(props: QueryProps): JSX.Element {
}
}
console.log('Query', query)
let component
if (isLegacyQuery(query)) {
component = <LegacyInsightQuery query={query} />

36
frontend/src/scenes/insights/Insight.tsx
View File

@ -13,6 +13,9 @@ import { EditorFilters } from './EditorFilters/EditorFilters'
import clsx from 'clsx'
import { Query } from '~/queries/Query/Query'
import { InsightPageHeader } from 'scenes/insights/InsightPageHeader'
import { QueryEditor } from '~/queries/QueryEditor/QueryEditor'
import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
import { isInsightVizNode } from '~/queries/utils'
export interface InsightSceneProps {
insightId: InsightShortId | 'new'
@ -29,27 +32,15 @@ export function Insight({ insightId }: InsightSceneProps): JSX.Element {
insightLoading,
filtersKnown,
filters,
insight,
isUsingDataExploration,
erroredQueryId,
isFilterBasedInsight,
isQueryBasedInsight,
} = useValues(logic)
const { reportInsightViewedForRecentInsights, abortAnyRunningQuery, loadResults } = useActions(logic)
// insightDataLogic
const { query: insightVizQuery } = useValues(insightDataLogic(insightProps))
const { setQuery: insighVizSetQuery } = useActions(insightDataLogic(insightProps))
// TODO - separate presentation of insight with viz query from insight with query
let query = insightVizQuery
let setQuery = insighVizSetQuery
if (!!insight.query && isQueryBasedInsight) {
query = insight.query
setQuery = () => {
// don't support editing non-insight viz queries _yet_
}
}
const { query } = useValues(insightDataLogic(insightProps))
const { setQuery } = useActions(insightDataLogic(insightProps))
// other logics
useMountedLogic(insightCommandLogic(insightProps))
@ -78,6 +69,8 @@ export function Insight({ insightId }: InsightSceneProps): JSX.Element {
return <InsightSkeleton />
}
const showQueryEditorPanel = insightMode === ItemMode.Edit && !!query && !isInsightVizNode(query)
const insightScene = (
<div className={'insights-page'}>
<InsightPageHeader insightLogicProps={insightProps} />
@ -85,7 +78,20 @@ export function Insight({ insightId }: InsightSceneProps): JSX.Element {
{insightMode === ItemMode.Edit && <InsightsNav />}
{isUsingDataExploration ? (
<Query query={query} setQuery={setQuery} />
<>
{showQueryEditorPanel ? (
<>
<QueryEditor
query={JSON.stringify(query)}
setQuery={(stringQuery) => setQuery(JSON.parse(stringQuery))}
/>
<div className="my-4">
<LemonDivider />
</div>
</>
) : null}
<Query query={query} setQuery={setQuery} />
</>
) : (
<>
<div

22
frontend/src/scenes/insights/insightDataLogic.ts
View File

@ -175,17 +175,19 @@ export const insightDataLogic = kea<insightDataLogicType>([
return
}
const querySource = (query as InsightVizNode).source
if (isLifecycleQuery(querySource)) {
const filters = queryNodeToFilter(querySource)
actions.setFilters(filters)
if (isInsightVizNode(query)) {
const querySource = (query as InsightVizNode).source
if (isLifecycleQuery(querySource)) {
const filters = queryNodeToFilter(querySource)
actions.setFilters(filters)
if (querySource.lifecycleFilter?.toggledLifecycles !== values.trendsLifecycles) {
actions.setTrendsLifecycles(
querySource.lifecycleFilter?.toggledLifecycles
? querySource.lifecycleFilter.toggledLifecycles
: ['new', 'resurrecting', 'returning', 'dormant']
)
if (querySource.lifecycleFilter?.toggledLifecycles !== values.trendsLifecycles) {
actions.setTrendsLifecycles(
querySource.lifecycleFilter?.toggledLifecycles
? querySource.lifecycleFilter.toggledLifecycles
: ['new', 'resurrecting', 'returning', 'dormant']
)
}
}
}
},