remove frontend side shown_as usage

PostHog · Oct 5, 2023 · f58ec3b · f58ec3b
1 parent 3e3b560
commit f58ec3b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 32 deletions.
diff --git a/frontend/src/queries/nodes/InsightQuery/utils/filtersToQueryNode.test.ts b/frontend/src/queries/nodes/InsightQuery/utils/filtersToQueryNode.test.ts
@@ -319,7 +319,6 @@ describe('filtersToQueryNode', () => {
                     aggregation_axis_prefix: '£',
                     aggregation_axis_postfix: '%',
                     formula: 'A+B',
-                    shown_as: ShownAsValue.VOLUME,
                     display: ChartDisplayType.ActionsAreaGraph,
                 },
                 breakdown: {
@@ -486,7 +485,6 @@ describe('filtersToQueryNode', () => {
                     compare: true,
                     show_legend: true,
                     hidden_legend_indexes: [0, 10],
-                    shown_as: ShownAsValue.STICKINESS,
                     display: ChartDisplayType.ActionsLineGraph,
                 },
             }
@@ -507,7 +505,6 @@ describe('filtersToQueryNode', () => {
             const query: Partial<LifecycleQuery> = {
                 kind: NodeKind.LifecycleQuery,
                 lifecycleFilter: {
-                    shown_as: ShownAsValue.LIFECYCLE,
                     toggledLifecycles: ['new', 'dormant'],
                 },
             }
@@ -643,9 +640,7 @@ describe('filtersToQueryNode', () => {
                     },
                 ],
                 interval: 'day',
-                lifecycleFilter: {
-                    shown_as: ShownAsValue.LIFECYCLE,
-                },
+                lifecycleFilter: {},
             }
             expect(result).toEqual(query)
         })

diff --git a/frontend/src/queries/nodes/InsightViz/utils.ts b/frontend/src/queries/nodes/InsightViz/utils.ts
@@ -11,7 +11,6 @@ import {
 } from '~/queries/utils'
 import { filtersToQueryNode } from '../InsightQuery/utils/filtersToQueryNode'
 import equal from 'fast-deep-equal'
-import { ShownAsValue } from 'lib/constants'
 
 export const getAllEventNames = (query: InsightQueryNode, allActions: ActionType[]): string[] => {
     const { actions, events } = seriesToActionsAndEvents((query as TrendsQuery).series || [])
@@ -82,18 +81,6 @@ export const getBreakdown = (query: InsightQueryNode): BreakdownFilter | undefin
     }
 }
 
-export const getShownAs = (query: InsightQueryNode): ShownAsValue | undefined => {
-    if (isLifecycleQuery(query)) {
-        return query.lifecycleFilter?.shown_as
-    } else if (isStickinessQuery(query)) {
-        return query.stickinessFilter?.shown_as
-    } else if (isTrendsQuery(query)) {
-        return query.trendsFilter?.shown_as
-    } else {
-        return undefined
-    }
-}
-
 export const getShowLegend = (query: InsightQueryNode): boolean | undefined => {
     if (isStickinessQuery(query)) {
         return query.stickinessFilter?.show_legend

diff --git a/frontend/src/scenes/insights/insightVizDataLogic.ts b/frontend/src/scenes/insights/insightVizDataLogic.ts
@@ -36,7 +36,6 @@ import {
     getFormula,
     getInterval,
     getSeries,
-    getShownAs,
     getShowLegend,
     getShowPercentStackView,
     getShowValueOnSeries,
@@ -122,7 +121,6 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
         interval: [(s) => [s.querySource], (q) => (q ? getInterval(q) : null)],
         properties: [(s) => [s.querySource], (q) => (q ? q.properties : null)],
         samplingFactor: [(s) => [s.querySource], (q) => (q ? q.samplingFactor : null)],
-        shownAs: [(s) => [s.querySource], (q) => (q ? getShownAs(q) : null)],
         showLegend: [(s) => [s.querySource], (q) => (q ? getShowLegend(q) : null)],
         showValueOnSeries: [(s) => [s.querySource], (q) => (q ? getShowValueOnSeries(q) : null)],
         showPercentStackView: [(s) => [s.querySource], (q) => (q ? getShowPercentStackView(q) : null)],

diff --git a/frontend/src/scenes/trends/viz/ActionsLineGraph.tsx b/frontend/src/scenes/trends/viz/ActionsLineGraph.tsx
@@ -24,7 +24,6 @@ export function ActionsLineGraph({
         compare,
         display,
         interval,
-        shownAs,
         showValueOnSeries,
         showPercentStackView,
         supportsPercentStackView,
@@ -84,19 +83,18 @@ export function ActionsLineGraph({
                           const urls = urlsForDatasets(crossDataset, index)
 
                           if (urls?.length) {
-                              const title =
-                                  shownAs === 'Stickiness' ? (
+                              const title = isStickiness ? (
+                                  <>
+                                      <PropertyKeyInfo value={label || ''} disablePopover /> stickiness on day {day}
+                                  </>
+                              ) : (
+                                  (label: string) => (
                                       <>
-                                          <PropertyKeyInfo value={label || ''} disablePopover /> stickiness on day {day}
+                                          {label} on{' '}
+                                          <DateDisplay interval={interval || 'day'} date={day?.toString() || ''} />
                                       </>
-                                  ) : (
-                                      (label: string) => (
-                                          <>
-                                              {label} on{' '}
-                                              <DateDisplay interval={interval || 'day'} date={day?.toString() || ''} />
-                                          </>
-                                      )
                                   )
+                              )
 
                               openPersonsModal({
                                   urls,