Consolidate insight api

cypress/integration/funnels.js

@@ -23,6 +23,9 @@ describe('Funnels', () => {
         cy.get('[data-attr=date-filter]').click()
         cy.contains('Last 30 days').click()
 
+        cy.get('[data-attr=date-filter]').click()
+        cy.contains('Last 30 days').click()
+
         cy.get('[data-attr=funnel-viz]').should('exist')
     })
 

frontend/src/lib/components/AppEditorLink/appUrlsLogic.js

@@ -23,7 +23,7 @@ export const appUrlsLogic = kea({
                     events: [{ id: '$pageview', name: '$pageview', type: 'events' }],
                     breakdown: '$current_url',
                 }
-                let data = await api.get('api/action/trends/?' + toParams(params))
+                let data = await api.get('api/insight/trend/?' + toParams(params))
                 if (data[0]?.count === 0) return []
                 let domainsSeen = []
                 return data

frontend/src/models/funnelsModel.ts

@@ -3,9 +3,9 @@ import api from 'lib/api'
 import { toParams } from 'lib/utils'
 import { ViewType } from 'scenes/insights/insightLogic'
 import { SavedFunnel } from '~/types'
-import { funnelsModelType } from './funnelsModelType'
 import { insightHistoryLogic } from 'scenes/insights/InsightHistoryPanel/insightHistoryLogic'
 import { funnelLogic } from 'scenes/funnels/funnelLogic'
+import { funnelsModelType } from 'types/models/funnelsModelType'
 
 const parseSavedFunnel = (result: Record<string, any>): SavedFunnel => {
     return {
@@ -25,7 +25,7 @@ export const funnelsModel = kea<funnelsModelType<SavedFunnel>>({
             __default: [] as SavedFunnel[],
             loadFunnels: async () => {
                 const response = await api.get(
-                    'api/dashboard_item/?' +
+                    'api/insight/?' +
                         toParams({
                             order: '-created_at',
                             saved: true,

frontend/src/scenes/funnels/funnelLogic.js

@@ -12,12 +12,12 @@ function wait(ms = 1000) {
 const SECONDS_TO_POLL = 120
 
 export async function pollFunnel(params = {}) {
-    let result = await api.get('api/action/funnel/?' + toParams(params))
+    let result = await api.get('api/insight/funnel/?' + toParams(params))
     let count = 0
     while (result.loading && count < SECONDS_TO_POLL) {
         await wait()
         const { refresh: _, ...restParams } = params
-        result = await api.get('api/action/funnel/?' + toParams(restParams))
+        result = await api.get('api/insight/funnel/?' + toParams(restParams))
         count += 1
     }
     // if endpoint is still loading after 2 minutes just return default
@@ -139,7 +139,7 @@ export const funnelLogic = kea({
             actions.setSteps(result)
         },
         saveFunnelInsight: async ({ name }) => {
-            await api.create('api/dashboard_item', {
+            await api.create('api/insight', {
                 filters: values.filters,
                 name,
                 saved: true,

frontend/src/scenes/insights/InsightHistoryPanel/InsightHistoryPanel.tsx

@@ -61,7 +61,7 @@ export const determineFilters = (
     } else if (viewType === ViewType.RETENTION) {
         if (filters.target) result.push({ key: 'Target', value: `${filters.target.name}` })
     } else if (viewType === ViewType.PATHS) {
-        if (filters.type) result.push({ key: 'Path Type', value: `${filters.type}` })
+        if (filters.type) result.push({ key: 'Path Type', value: `${filters.type || filters.path_type}` })
         if (filters.start) result.push({ key: 'Start Point', value: `Specified` })
     } else if (viewType === ViewType.FUNNELS) {
         let count = 0

frontend/src/scenes/insights/InsightHistoryPanel/insightHistoryLogic.ts

@@ -40,7 +40,7 @@ export const insightHistoryLogic = kea<insightHistoryLogicType<InsightHistory>>(
             __default: [] as InsightHistory[],
             loadInsights: async () => {
                 const response = await api.get(
-                    'api/dashboard_item/?' +
+                    'api/insight/?' +
                         toParams({
                             order: '-created_at',
                             limit: 6,
@@ -57,7 +57,7 @@ export const insightHistoryLogic = kea<insightHistoryLogicType<InsightHistory>>(
             __default: [] as InsightHistory[],
             loadSavedInsights: async () => {
                 const response = await api.get(
-                    'api/dashboard_item/?' +
+                    'api/insight/?' +
                         toParams({
                             order: '-created_at',
                             saved: true,
@@ -75,7 +75,7 @@ export const insightHistoryLogic = kea<insightHistoryLogicType<InsightHistory>>(
             __default: [] as InsightHistory[],
             loadTeamInsights: async () => {
                 const response = await api.get(
-                    'api/dashboard_item/?' +
+                    'api/insight/?' +
                         toParams({
                             order: '-created_at',
                             saved: true,
@@ -156,13 +156,13 @@ export const insightHistoryLogic = kea<insightHistoryLogicType<InsightHistory>>(
     }),
     listeners: ({ actions, values }) => ({
         createInsight: async ({ filters }) => {
-            await api.create('api/dashboard_item', {
+            await api.create('api/insight', {
                 filters,
             })
             actions.loadInsights()
         },
         saveInsight: async ({ insight: { id }, name }) => {
-            await api.update(`api/dashboard_item/${id}`, {
+            await api.update(`api/insight/${id}`, {
                 name,
                 saved: true,
             })
@@ -172,7 +172,7 @@ export const insightHistoryLogic = kea<insightHistoryLogicType<InsightHistory>>(
         },
         deleteInsight: ({ insight }) => {
             deleteWithUndo({
-                endpoint: 'dashboard_item',
+                endpoint: 'insight',
                 object: { name: insight.name, id: insight.id },
                 callback: () => actions.loadSavedInsights(),
             })

frontend/src/scenes/insights/InsightTabs/PathTab.tsx

@@ -22,10 +22,10 @@ export function PathTab(): JSX.Element {
         <>
             <h4 className="secondary">Path Type</h4>
             <Select
-                value={filter?.type || PAGEVIEW}
+                value={filter?.path_type || PAGEVIEW}
                 defaultValue={PAGEVIEW}
                 dropdownMatchSelectWidth={false}
-                onChange={(value): void => setFilter({ type: value, start: null })}
+                onChange={(value): void => setFilter({ path_type: value, start_point: null })}
                 style={{ paddingTop: 2 }}
             >
                 {Object.entries(pathOptionsToLabels).map(([value, name], index) => {
@@ -39,18 +39,18 @@ export function PathTab(): JSX.Element {
             <hr />
             <h4 className="secondary">Start Point</h4>
             <PropertyValue
-                endpoint={filter?.type === AUTOCAPTURE && 'api/paths/elements'}
+                endpoint={filter?.path_type === AUTOCAPTURE && 'api/paths/elements'}
                 outerOptions={
                     filter.type === CUSTOM_EVENT &&
                     customEventNames.map((name) => ({
                         name,
                     }))
                 }
-                onSet={(value): void => setFilter({ start: value })}
-                propertyKey={pathOptionsToProperty[filter.type]}
+                onSet={(value): void => setFilter({ start_point: value })}
+                propertyKey={pathOptionsToProperty[filter.path_type]}
                 type="event"
                 style={{ width: 200, paddingTop: 2 }}
-                value={filter.start}
+                value={filter.start_point}
                 placeholder={'Select start element'}
             ></PropertyValue>
             <hr />

frontend/src/scenes/insights/trendsLogic.js

@@ -125,14 +125,14 @@ export const trendsLogic = kea({
                 let response
                 if (props.view === ViewType.SESSIONS || props.filters?.session) {
                     response = await api.get(
-                        'api/event/sessions/?' +
+                        'api/insight/session/?' +
                             (refresh ? 'refresh=true&' : '') +
                             toAPIParams(filterClientSideParams(values.filters))
                     )
                     response = response.result
                 } else {
                     response = await api.get(
-                        'api/action/trends/?' +
+                        'api/insight/trend/?' +
                             (refresh ? 'refresh=true&' : '') +
                             toAPIParams(filterClientSideParams(values.filters))
                     )

frontend/src/scenes/paths/Paths.js

@@ -189,14 +189,14 @@ export function Paths() {
                     : stripHTTP(d.name)
             )
             .on('click', async (node) => {
-                if (filter.type == AUTOCAPTURE) {
+                if (filter.path_type == AUTOCAPTURE) {
                     setModalVisible(true)
                     setEventelements(null)
                     let result = await api.get('api/event/' + node.id)
                     setEventelements(result)
                 }
             })
-            .style('cursor', filter.type == AUTOCAPTURE ? 'pointer' : 'auto')
+            .style('cursor', filter.path_type == AUTOCAPTURE ? 'pointer' : 'auto')
 
         textSelection
             .append('tspan')
@@ -210,7 +210,9 @@ export function Paths() {
 
     return (
         <div>
-            {filter.type == AUTOCAPTURE && <div style={{ margin: 10 }}>Click on a tag to see related DOM tree</div>}
+            {filter.path_type == AUTOCAPTURE && (
+                <div style={{ margin: 10 }}>Click on a tag to see related DOM tree</div>
+            )}
             <div ref={canvas} className="paths" style={{ height: '90vh' }} data-attr="paths-viz">
                 {!pathsLoading && paths && paths.nodes.length === 0 ? (
                     <NoData />

frontend/src/scenes/paths/pathsLogic.js

@@ -35,8 +35,8 @@ function checkRoot(nodeToVerify, paths, start) {
 
 function cleanPathParams(filters, properties) {
     return {
-        start: filters.start,
-        type: filters.type,
+        start_point: filters.start_point,
+        path_type: filters.path_type,
         date_from: filters.date_from,
         date_to: filters.date_to,
         properties: properties,
@@ -53,12 +53,12 @@ export const pathsLogic = kea({
             },
             loadPaths: async (_, breakpoint) => {
                 const params = toParams({ ...values.filter, properties: values.properties })
-                let paths = await api.get(`api/paths${params ? `/?${params}` : ''}`)
-                if (values.filter.start) {
+                let paths = await api.get(`api/insight/path${params ? `/?${params}` : ''}`)
+                if (values.filter.start_point) {
                     paths = paths.filter((checkingNode) => {
                         return (
-                            checkingNode.source.includes(values.filter.start) ||
-                            checkRoot(checkingNode, paths, values.filter.start)
+                            checkingNode.source.includes(values.filter.start_point) ||
+                            checkRoot(checkingNode, paths, values.filter.start_point)
                         )
                     })
                 }
@@ -81,7 +81,7 @@ export const pathsLogic = kea({
         initialPathname: [(state) => router.selectors.location(state).pathname, { noop: (a) => a }],
         filter: [
             {
-                type: '$pageview',
+                path_type: '$pageview',
             },
             {
                 setFilter: (state, filter) => ({ ...state, ...filter }),
@@ -106,8 +106,8 @@ export const pathsLogic = kea({
         },
         setFilter: () => {
             if (
-                values.filter.type !== AUTOCAPTURE ||
-                (values.filter.type === AUTOCAPTURE && !isNaN(values.filter.start))
+                values.filter.path_type !== AUTOCAPTURE ||
+                (values.filter.path_type === AUTOCAPTURE && !isNaN(values.filter.start_point))
             )
                 actions.loadPaths()
 

frontend/src/scenes/sessions/sessionsTableLogic.js

@@ -9,7 +9,7 @@ export const sessionsTableLogic = kea({
             __default: [],
             loadSessions: async (selectedDate) => {
                 const response = await api.get(
-                    'api/event/sessions' + (selectedDate ? '/?date_from=' + values.selectedDateURLparam : '')
+                    'api/insight/session' + (selectedDate ? '/?date_from=' + values.selectedDateURLparam : '')
                 )
                 if (response.offset) actions.setOffset(response.offset)
                 if (response.date_from) actions.setDate(moment(response.date_from).startOf('day'))
@@ -43,7 +43,7 @@ export const sessionsTableLogic = kea({
     listeners: ({ values, actions }) => ({
         fetchNextSessions: async () => {
             const response = await api.get(
-                'api/event/sessions/?' + toParams({ date_from: values.selectedDateURLparam, offset: values.offset })
+                'api/insight/session/?' + toParams({ date_from: values.selectedDateURLparam, offset: values.offset })
             )
             if (response.offset) actions.setOffset(response.offset)
             else actions.setOffset(null)

posthog/api/__init__.py

@@ -9,6 +9,7 @@
     event,
     feature_flag,
     funnel,
+    insight,
     paths,
     person,
     personal_api_key,
@@ -29,3 +30,4 @@
 router.register(r"paths", paths.PathsViewSet, basename="paths")
 router.register(r"personal_api_keys", personal_api_key.PersonalAPIKeyViewSet, basename="personal_api_keys")
 router.register(r"team/user", team_user.TeamUserViewSet)
+router.register(r"insight", insight.InsightViewSet)

posthog/api/event.py

@@ -12,6 +12,7 @@
 from rest_framework import exceptions, request, response, serializers, viewsets
 from rest_framework.decorators import action
 
+from posthog.constants import DATE_FROM, OFFSET
 from posthog.models import (
     Action,
     Element,
@@ -269,20 +270,15 @@ def values(self, request: request.Request) -> response.Response:
     @action(methods=["GET"], detail=False)
     def sessions(self, request: request.Request) -> response.Response:
         team = self.request.user.team_set.get()
-        session_type = self.request.GET.get("session")
 
         filter = Filter(request=request)
-        result: Dict[str, Any] = {
-            "result": Sessions().run(
-                filter, team, session_type=self.request.GET.get("session"), offset=self.request.GET.get("offset")
-            )
-        }
+        result: Dict[str, Any] = {"result": Sessions().run(filter, team)}
 
         # add pagination
-        if session_type is None:
-            offset = int(request.GET.get("offset", "0")) + 50
+        if filter.session_type is None:
+            offset = filter.offset + 50
             if len(result["result"]) > 49:
                 date_from = result["result"][0]["start_time"].isoformat()
-                result.update({"offset": offset})
-                result.update({"date_from": date_from})
+                result.update({OFFSET: offset})
+                result.update({DATE_FROM: date_from})
         return response.Response(result)