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.

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

fix(insights): Remove "queries unsupported here" from UI #21940

Merged
merged 3 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 1 addition & 6 deletions frontend/src/exporter/ExportedInsight/ExportedInsight.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import './ExportedInsight.scss'
import clsx from 'clsx'
import { BindLogic } from 'kea'
import { FilterBasedCardContent } from 'lib/components/Cards/InsightCard/InsightCard'
import { QueriesUnsupportedHere } from 'lib/components/Cards/InsightCard/QueriesUnsupportedHere'
import { TopHeading } from 'lib/components/Cards/InsightCard/TopHeading'
import { InsightLegend } from 'lib/components/InsightLegend/InsightLegend'
import { SINGLE_SERIES_DISPLAY_TYPES } from 'lib/constants'
Expand Down Expand Up @@ -87,11 +86,7 @@ export function ExportedInsight({
})}
>
{query ? (
insight.result ? (
<Query query={query} cachedResults={insight.result} readOnly />
) : (
<QueriesUnsupportedHere />
)
<Query query={query} cachedResults={insight.result} readOnly />
) : (
<FilterBasedCardContent insight={insight as any} insightProps={insightLogicProps} />
)}
Expand Down
30 changes: 30 additions & 0 deletions frontend/src/exporter/Exporter.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ const Template: StoryFn<typeof Exporter> = (props) => {
export const TrendsLineInsight: Story = Template.bind({})
TrendsLineInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsLine.json') }

/** This should not happen in the exporter, but if it does, it shouldn't error out - we want a clear message. */
export const TrendsLineInsightNoResults: Story = Template.bind({})
// @ts-expect-error
TrendsLineInsightNoResults.args = { insight: { ...TrendsLineInsight.args.insight, result: null } }

export const TrendsLineMultiInsight: Story = Template.bind({})
TrendsLineMultiInsight.args = {
insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsLineMulti.json'),
Expand Down Expand Up @@ -108,6 +113,11 @@ FunnelLeftToRightInsight.args = {
insight: require('../mocks/fixtures/api/projects/team_id/insights/funnelLeftToRight.json'),
}

/** This should not happen in the exporter, but if it does, it shouldn't error out - we want a clear message. */
export const FunnelLeftToRightInsightNoResults: Story = Template.bind({})
// @ts-expect-error
FunnelLeftToRightInsightNoResults.args = { insight: { ...FunnelLeftToRightInsight.args.insight, result: null } }

export const FunnelLeftToRightBreakdownInsight: Story = Template.bind({})
FunnelLeftToRightBreakdownInsight.args = {
insight: require('../mocks/fixtures/api/projects/team_id/insights/funnelLeftToRightBreakdown.json'),
Expand All @@ -117,6 +127,10 @@ export const FunnelTopToBottomInsight: Story = Template.bind({})
FunnelTopToBottomInsight.args = {
insight: require('../mocks/fixtures/api/projects/team_id/insights/funnelTopToBottom.json'),
}
/** This should not happen in the exporter, but if it does, it shouldn't error out - we want a clear message. */
export const FunnelTopToBottomInsightNoResults: Story = Template.bind({})
// @ts-expect-error
FunnelTopToBottomInsightNoResults.args = { insight: { ...FunnelTopToBottomInsight.args.insight, result: null } }

export const FunnelTopToBottomBreakdownInsight: Story = Template.bind({})
FunnelTopToBottomBreakdownInsight.args = {
Expand Down Expand Up @@ -152,3 +166,19 @@ UserPathsInsight.args = { insight: require('../mocks/fixtures/api/projects/team_

export const Dashboard: Story = Template.bind({})
Dashboard.args = { dashboard }

export const EventTableInsight: Story = Template.bind({})
EventTableInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/dataTableEvents.json') }

/** This should not happen in the exporter, but if it does, it shouldn't error out - we want a clear message. */
export const EventTableInsightNoResults: Story = Template.bind({})
// @ts-expect-error
EventTableInsightNoResults.args = { insight: { ...EventTableInsight.args.insight, result: null } }

export const SQLInsight: Story = Template.bind({})
SQLInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/dataTableHogQL.json') }

/** This should not happen in the exporter, but if it does, it shouldn't error out - we want a clear message. */
export const SQLInsightNoResults: Story = Template.bind({})
// @ts-expect-error
SQLInsightNoResults.args = { insight: { ...SQLInsight.args.insight, result: null } }
15 changes: 1 addition & 14 deletions frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import './InsightCard.scss'
import clsx from 'clsx'
import { BindLogic, useValues } from 'kea'
import { Resizeable } from 'lib/components/Cards/CardMeta'
import { QueriesUnsupportedHere } from 'lib/components/Cards/InsightCard/QueriesUnsupportedHere'
import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
import { SpinnerOverlay } from 'lib/lemon-ui/Spinner/Spinner'
import React, { useState } from 'react'
Expand Down Expand Up @@ -289,12 +288,6 @@ function InsightCardInternal(

const [areDetailsShown, setAreDetailsShown] = useState(false)

const canMakeQueryAPICalls =
placement === 'SavedInsightGrid' ||
[DashboardPlacement.Dashboard, DashboardPlacement.ProjectHomepage, DashboardPlacement.FeatureFlag].includes(
placement
)

return (
<div
className={clsx('InsightCard border', highlighted && 'InsightCard--highlighted', className)}
Expand Down Expand Up @@ -325,13 +318,7 @@ function InsightCardInternal(
/>
{insight.query ? (
<div className="InsightCard__viz">
{insight.result ? (
<Query query={insight.query} cachedResults={insight.result} readOnly />
) : canMakeQueryAPICalls ? (
<Query query={insight.query} readOnly />
) : (
<QueriesUnsupportedHere />
)}
<Query query={insight.query} cachedResults={insight.result} readOnly />
</div>
) : insight.filters?.insight ? (
<FilterBasedCardContent
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": 14,
"short_id": "PSWiXI9H",
"name": "",
"derived_name": "from HogQL into a data table.",
"derived_name": "SQL query",
"filters": {},
"query": {
"full": true,
Expand Down