+
setActiveTab(key)}
@@ -143,76 +144,82 @@ export const SidePanelActivity = (): JSX.Element => {
key: SidePanelActivityTab.All,
label: 'All activity',
},
+ ...(featureFlags[FEATURE_FLAGS.METALYTICS]
+ ? [
+ {
+ key: SidePanelActivityTab.Metalytics,
+ label: 'Analytics',
+ },
+ ]
+ : []),
]}
/>
{/* Controls */}
-
- {activeTab === SidePanelActivityTab.Unread ? (
- <>
-
- Notifications shows you changes others make to{' '}
-
+ {activeTab === SidePanelActivityTab.Unread ? (
+
+
+ Notifications shows you changes others make to{' '}
+
-
- {toggleExtendedDescription}
- {hasUnread ? (
- markAllAsRead()}>
- Mark all as read
-
- ) : null}
-
-
- ) : activeTab === SidePanelActivityTab.All ? (
-
- {toggleExtendedDescription}
- {allActivityResponseLoading ?
+ {toggleExtendedDescription}
+ {hasUnread ? (
+
markAllAsRead()}>
+ Mark all as read
+
+ ) : null}
+
+
+ ) : activeTab === SidePanelActivityTab.All ? (
+
+
+ {toggleExtendedDescription}
+ {allActivityResponseLoading ?
-
-
Filter for activity on:
-
- setFilters({
- ...filters,
- scope: value ?? undefined,
- item_id: undefined,
- })
- }
- dropdownMatchSelectWidth={false}
- />
+
+ Filter for activity on:
+
+ setFilters({
+ ...filters,
+ scope: value ?? undefined,
+ item_id: undefined,
+ })
+ }
+ dropdownMatchSelectWidth={false}
+ />
- by
-
- setFilters({
- ...filters,
- user: user?.id ?? undefined,
- })
- }
- />
-
+ by
+
+ setFilters({
+ ...filters,
+ user: user?.id ?? undefined,
+ })
+ }
+ />
- ) : null}
-
+
+ ) : null}
{activeTab === SidePanelActivityTab.Unread ? (
<>
{importantChangesLoading && !hasNotifications ? (
- {
/>
))
) : (
-
+
You're all caught up!
)}
@@ -230,7 +237,7 @@ export const SidePanelActivity = (): JSX.Element => {
) : activeTab === SidePanelActivityTab.All ? (
<>
{allActivityResponseLoading && !allActivity.length ? (
-
+
) : allActivity.length ? (
<>
{allActivity.map((logItem, index) => (
@@ -241,7 +248,7 @@ export const SidePanelActivity = (): JSX.Element => {
/>
))}
-
+
{allActivityResponseLoading ? (
<>
) : (
-
+
No activity yet
{filters ? (
setFilters(null)}>
@@ -271,6 +278,8 @@ export const SidePanelActivity = (): JSX.Element => {
)}
+ ) : activeTab === SidePanelActivityTab.Metalytics ? (
+
) : null}
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/SidePanelActivityMetalytics.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/SidePanelActivityMetalytics.tsx
new file mode 100644
index 0000000000000..146cb6f96f5fa
--- /dev/null
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/SidePanelActivityMetalytics.tsx
@@ -0,0 +1,74 @@
+import { Spinner, Tooltip } from '@posthog/lemon-ui'
+import { useValues } from 'kea'
+import { humanizeScope } from 'lib/components/ActivityLog/humanizeActivity'
+import { metalyticsLogic } from 'lib/components/Metalytics/metalyticsLogic'
+import { ProfileBubbles } from 'lib/lemon-ui/ProfilePicture/ProfileBubbles'
+
+export function SidePanelActivityMetalytics(): JSX.Element {
+ const { scope, instanceId, viewCount, recentUserMembers, viewCountLoading, recentUsersLoading } =
+ useValues(metalyticsLogic)
+
+ if (!instanceId) {
+ return (
+
+ You can see internal analytics of how your Organization members are using PostHog for things such as
+ Dashboards, Insights, Playlists etc. Open an app to see the viewership data here.
+
+ )
+ }
+
+ const humanizedScope = `this ${scope ? humanizeScope(scope, true) : 'app'}`
+
+ return (
+
+
+ You are viewing "meta" analytics of how your organization members are interacting with{' '}
+ {humanizedScope} .
+
+
+
+
+
Views
+
+ {viewCountLoading ?
+
+
+
+
+
Viewers
+
+ {viewCountLoading ?
+
+
+
+
+
Recent viewers (30 days)
+ {recentUsersLoading ? (
+
+ ) : (
+
({
+ email: member.user.email,
+ name: member.user.first_name,
+ title: member.user.email,
+ }))}
+ limit={3}
+ />
+ )}
+
+
+
+ )
+}
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/activityForSceneLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/activityForSceneLogic.ts
index 180461c465996..641c0900638ef 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/activityForSceneLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/activityForSceneLogic.ts
@@ -37,6 +37,7 @@ export const activityForSceneLogic = kea
([
connect({
values: [sceneLogic, ['sceneConfig']],
}),
+
selectors({
sceneActivityFilters: [
(s) => [
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelActivityLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelActivityLogic.tsx
index 69554124d4fbf..81b31df645706 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelActivityLogic.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelActivityLogic.tsx
@@ -10,6 +10,7 @@ import { toParams } from 'lib/utils'
import posthog from 'posthog-js'
import { projectLogic } from 'scenes/projectLogic'
+import { sidePanelStateLogic } from '../../sidePanelStateLogic'
import { ActivityFilters, activityForSceneLogic } from './activityForSceneLogic'
import type { sidePanelActivityLogicType } from './sidePanelActivityLogicType'
@@ -29,12 +30,14 @@ export interface ChangesResponse {
export enum SidePanelActivityTab {
Unread = 'unread',
All = 'all',
+ Metalytics = 'metalytics',
}
export const sidePanelActivityLogic = kea([
path(['scenes', 'navigation', 'sidepanel', 'sidePanelActivityLogic']),
connect({
values: [activityForSceneLogic, ['sceneActivityFilters'], projectLogic, ['currentProjectId']],
+ actions: [sidePanelStateLogic, ['openSidePanel']],
}),
actions({
togglePolling: (pageIsVisible: boolean) => ({ pageIsVisible }),
@@ -183,6 +186,11 @@ export const sidePanelActivityLogic = kea([
actions.loadOlderActivity()
}
},
+ openSidePanel: ({ options }) => {
+ if (options) {
+ actions.setActiveTab(options as SidePanelActivityTab)
+ }
+ },
})),
selectors({
allActivity: [
diff --git a/frontend/src/lib/api.mock.ts b/frontend/src/lib/api.mock.ts
index 0dacdcfa74554..e6dac16290e92 100644
--- a/frontend/src/lib/api.mock.ts
+++ b/frontend/src/lib/api.mock.ts
@@ -84,6 +84,7 @@ export const MOCK_DEFAULT_TEAM: TeamType = {
autocapture_web_vitals_opt_in: false,
autocapture_exceptions_errors_to_ignore: [],
effective_membership_level: OrganizationMembershipLevel.Admin,
+ user_access_level: 'admin',
access_control: true,
has_group_types: true,
primary_dashboard: 1,
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index 7be5df3d764d6..81587232b3b07 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -921,6 +921,10 @@ class ApiRequest {
return await api.update(this.assembleFullUrl(), options?.data, options)
}
+ public async put(options?: ApiMethodOptions & { data: any }): Promise {
+ return await api.put(this.assembleFullUrl(), options?.data, options)
+ }
+
public async create(options?: ApiMethodOptions & { data: any }): Promise {
return await api.create(this.assembleFullUrl(), options?.data, options)
}
@@ -2554,14 +2558,19 @@ const api = {
})
},
- async update(url: string, data: any, options?: ApiMethodOptions): Promise {
+ async _update(
+ method: 'PATCH' | 'PUT',
+ url: string,
+ data: P,
+ options?: ApiMethodOptions
+ ): Promise {
url = prepareUrl(url)
ensureProjectIdNotInvalid(url)
const isFormData = data instanceof FormData
- const response = await handleFetch(url, 'PATCH', async () => {
+ const response = await handleFetch(url, method, async () => {
return await fetch(url, {
- method: 'PATCH',
+ method: method,
headers: {
...objectClean(options?.headers ?? {}),
...(isFormData ? {} : { 'Content-Type': 'application/json' }),
@@ -2576,7 +2585,15 @@ const api = {
return await getJSONOrNull(response)
},
- async create(url: string, data?: any, options?: ApiMethodOptions): Promise {
+ async update(url: string, data: P, options?: ApiMethodOptions): Promise {
+ return api._update('PATCH', url, data, options)
+ },
+
+ async put(url: string, data: P, options?: ApiMethodOptions): Promise {
+ return api._update('PUT', url, data, options)
+ },
+
+ async create(url: string, data?: P, options?: ApiMethodOptions): Promise {
const res = await api.createResponse(url, data, options)
return await getJSONOrNull(res)
},
diff --git a/frontend/src/lib/components/AuthorizedUrlList/AuthorizedUrlList.tsx b/frontend/src/lib/components/AuthorizedUrlList/AuthorizedUrlList.tsx
index 1169702c255fa..aa95376c5fa9c 100644
--- a/frontend/src/lib/components/AuthorizedUrlList/AuthorizedUrlList.tsx
+++ b/frontend/src/lib/components/AuthorizedUrlList/AuthorizedUrlList.tsx
@@ -186,7 +186,7 @@ export function AuthorizedUrlList({
type === AuthorizedUrlListType.TOOLBAR_URLS
? launchUrl(keyedURL.url)
: // other urls are simply opened directly
- keyedURL.url + query
+ `${keyedURL.url}${query ? query : ''}`
}
targetBlank
tooltip={
diff --git a/frontend/src/lib/components/Metalytics/MetalyticsSummary.tsx b/frontend/src/lib/components/Metalytics/MetalyticsSummary.tsx
new file mode 100644
index 0000000000000..67230d017641c
--- /dev/null
+++ b/frontend/src/lib/components/Metalytics/MetalyticsSummary.tsx
@@ -0,0 +1,39 @@
+import { IconPulse } from '@posthog/icons'
+import { LemonBadge, LemonButton } from '@posthog/lemon-ui'
+import { useActions, useValues } from 'kea'
+
+import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
+import { SidePanelTab } from '~/types'
+
+import { metalyticsLogic } from './metalyticsLogic'
+
+export function MetalyticsSummary(): JSX.Element | null {
+ const { instanceId, viewCount, viewCountLoading } = useValues(metalyticsLogic)
+ const safeViewCount = viewCount?.views ?? 0
+ const safeUniqueUsers = viewCount?.users ?? 0
+ const { openSidePanel } = useActions(sidePanelStateLogic)
+
+ if (!instanceId || viewCountLoading) {
+ return null
+ }
+
+ return (
+
+
+ )
+}
diff --git a/frontend/src/lib/components/Metalytics/metalyticsLogic.ts b/frontend/src/lib/components/Metalytics/metalyticsLogic.ts
new file mode 100644
index 0000000000000..8ddc838701121
--- /dev/null
+++ b/frontend/src/lib/components/Metalytics/metalyticsLogic.ts
@@ -0,0 +1,97 @@
+import { connect, kea, path, selectors } from 'kea'
+import { loaders } from 'kea-loaders'
+import { subscriptions } from 'kea-subscriptions'
+import api from 'lib/api'
+import { membersLogic } from 'scenes/organization/membersLogic'
+
+import { activityForSceneLogic } from '~/layout/navigation-3000/sidepanel/panels/activity/activityForSceneLogic'
+import { HogQLQuery, NodeKind } from '~/queries/schema'
+import { hogql } from '~/queries/utils'
+
+import type { metalyticsLogicType } from './metalyticsLogicType'
+
+export const metalyticsLogic = kea([
+ path(['lib', 'components', 'metalytics', 'metalyticsLogic']),
+ connect({
+ values: [activityForSceneLogic, ['sceneActivityFilters'], membersLogic, ['members']],
+ }),
+
+ loaders(({ values }) => ({
+ viewCount: [
+ null as { views: number; users: number } | null,
+ {
+ loadViewCount: async () => {
+ const query: HogQLQuery = {
+ kind: NodeKind.HogQLQuery,
+ query: hogql`SELECT SUM(count) AS count, COUNT(DISTINCT app_source_id) AS unique_users
+ FROM app_metrics
+ WHERE app_source = 'metalytics'
+ AND instance_id = ${values.instanceId}`,
+ }
+
+ // NOTE: I think this gets cached heavily - how to correctly invalidate?
+ const response = await api.query(query, undefined, undefined, true)
+ const result = response.results as number[][]
+ return {
+ views: result[0][0],
+ users: result[0][1],
+ }
+ },
+ },
+ ],
+ recentUsers: [
+ [] as string[],
+ {
+ loadUsersLast30days: async () => {
+ const query: HogQLQuery = {
+ kind: NodeKind.HogQLQuery,
+ query: hogql`SELECT DISTINCT app_source_id
+ FROM app_metrics
+ WHERE app_source = 'metalytics'
+ AND instance_id = ${values.instanceId}
+ AND timestamp >= NOW() - INTERVAL 30 DAY
+ ORDER BY timestamp DESC`,
+ }
+
+ const response = await api.query(query, undefined, undefined, true)
+ return response.results.map((result) => result[0]) as string[]
+ },
+ },
+ ],
+ })),
+
+ selectors({
+ instanceId: [
+ (s) => [s.sceneActivityFilters],
+ (sceneActivityFilters) =>
+ sceneActivityFilters?.item_id ? `${sceneActivityFilters.scope}:${sceneActivityFilters.item_id}` : null,
+ ],
+ scope: [(s) => [s.sceneActivityFilters], (sceneActivityFilters) => sceneActivityFilters?.scope],
+
+ recentUserMembers: [
+ (s) => [s.recentUsers, s.members],
+ (recentUsers, members) => {
+ if (!members || !recentUsers) {
+ return []
+ }
+ // Filter members whose IDs match the recentUsers array
+ const filteredMembers = members.filter((member) => recentUsers.includes(String(member.user.id)))
+ return filteredMembers
+ },
+ ],
+ }),
+
+ subscriptions(({ actions }) => ({
+ instanceId: async (instanceId) => {
+ if (instanceId) {
+ actions.loadViewCount()
+ actions.loadUsersLast30days()
+
+ await api.create('/api/projects/@current/metalytics/', {
+ metric_name: 'viewed',
+ instance_id: instanceId,
+ })
+ }
+ },
+ })),
+])
diff --git a/frontend/src/lib/components/Playlist/Playlist.tsx b/frontend/src/lib/components/Playlist/Playlist.tsx
index 7e95122e77b68..41853e0600a2b 100644
--- a/frontend/src/lib/components/Playlist/Playlist.tsx
+++ b/frontend/src/lib/components/Playlist/Playlist.tsx
@@ -26,7 +26,7 @@ export type PlaylistSection = {
export type PlaylistProps = {
sections: PlaylistSection[]
listEmptyState: JSX.Element
- content: ({ activeItem }: { activeItem: T | null }) => JSX.Element
+ content: (({ activeItem }: { activeItem: T | null }) => JSX.Element) | null
title?: string
notebooksHref?: string
embedded?: boolean
@@ -149,7 +149,7 @@ export function Playlist<
onDoubleClick={() => setListCollapsed(!listCollapsed)}
/>
-
{content({ activeItem })}
+ {content &&
{content({ activeItem })}
}
sourceQuery?: AnyDataNode
globals?: Record
schema?: Record | null
+
+ onError?: (error: string | null, isValidView: boolean) => void
}
let codeEditorIndex = 0
+export function initModel(model: editor.ITextModel, builtCodeEditorLogic: BuiltLogic): void {
+ ;(model as any).codeEditorLogic = builtCodeEditorLogic
+}
+
function initEditor(
monaco: Monaco,
editor: importedEditor.IStandaloneCodeEditor,
@@ -44,7 +50,9 @@ function initEditor(
): void {
// This gives autocomplete access to the specific editor
const model = editor.getModel()
- ;(model as any).codeEditorLogic = builtCodeEditorLogic
+ if (model) {
+ initModel(model, builtCodeEditorLogic)
+ }
if (editorProps?.language === 'hog') {
initHogLanguage(monaco)
@@ -112,6 +120,7 @@ export function CodeEditor({
globals,
sourceQuery,
schema,
+ onError,
...editorProps
}: CodeEditorProps): JSX.Element {
const { isDarkModeOn } = useValues(themeLogic)
@@ -130,6 +139,7 @@ export function CodeEditor({
sourceQuery,
monaco: monaco,
editor: editor,
+ onError,
})
useMountedLogic(builtCodeEditorLogic)
diff --git a/frontend/src/lib/monaco/codeEditorLogic.tsx b/frontend/src/lib/monaco/codeEditorLogic.tsx
index 05506028c1c93..63290fa0012b7 100644
--- a/frontend/src/lib/monaco/codeEditorLogic.tsx
+++ b/frontend/src/lib/monaco/codeEditorLogic.tsx
@@ -1,6 +1,7 @@
import type { Monaco } from '@monaco-editor/react'
import { actions, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
import { loaders } from 'kea-loaders'
+import { subscriptions } from 'kea-subscriptions'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
// Note: we can oly import types and not values from monaco-editor, because otherwise some Monaco code breaks
@@ -48,6 +49,7 @@ export interface CodeEditorLogicProps {
editor?: editor.IStandaloneCodeEditor | null
globals?: Record
multitab?: boolean
+ onError?: (error: string | null, isValidView: boolean) => void
}
export const codeEditorLogic = kea([
@@ -270,6 +272,14 @@ export const codeEditorLogic = kea([
},
],
}),
+ subscriptions(({ props, values }) => ({
+ isValidView: (isValidView) => {
+ props.onError?.(values.error, isValidView)
+ },
+ error: (error) => {
+ props.onError?.(error, values.isValidView)
+ },
+ })),
propsChanged(({ actions, props }, oldProps) => {
if (
props.query !== oldProps.query ||
diff --git a/frontend/src/models/dashboardsModel.tsx b/frontend/src/models/dashboardsModel.tsx
index 99c4cdf01ea96..2c23d08675c2a 100644
--- a/frontend/src/models/dashboardsModel.tsx
+++ b/frontend/src/models/dashboardsModel.tsx
@@ -114,10 +114,10 @@ export const dashboardsModel = kea([
const beforeChange = { ...values.rawDashboards[id] }
- const response = (await api.update(
+ const response = await api.update(
`api/environments/${teamLogic.values.currentTeamId}/dashboards/${id}`,
payload
- )) as DashboardType
+ )
const updatedAttribute = Object.keys(payload)[0]
if (updatedAttribute === 'name' || updatedAttribute === 'description' || updatedAttribute === 'tags') {
eventUsageLogic.actions.reportDashboardFrontEndUpdate(
@@ -134,10 +134,10 @@ export const dashboardsModel = kea([
button: {
label: 'Undo',
action: async () => {
- const reverted = (await api.update(
+ const reverted = await api.update(
`api/environments/${teamLogic.values.currentTeamId}/dashboards/${id}`,
beforeChange
- )) as DashboardType
+ )
actions.updateDashboardSuccess(getQueryBasedDashboard(reverted))
lemonToast.success('Dashboard change reverted')
},
@@ -160,31 +160,34 @@ export const dashboardsModel = kea([
})
) as DashboardType,
pinDashboard: async ({ id, source }) => {
- const response = (await api.update(
+ const response = await api.update(
`api/environments/${teamLogic.values.currentTeamId}/dashboards/${id}`,
{
pinned: true,
}
- )) as DashboardType
+ )
eventUsageLogic.actions.reportDashboardPinToggled(true, source)
return getQueryBasedDashboard(response)!
},
unpinDashboard: async ({ id, source }) => {
- const response = (await api.update(
+ const response = await api.update(
`api/environments/${teamLogic.values.currentTeamId}/dashboards/${id}`,
{
pinned: false,
}
- )) as DashboardType
+ )
eventUsageLogic.actions.reportDashboardPinToggled(false, source)
return getQueryBasedDashboard(response)!
},
duplicateDashboard: async ({ id, name, show, duplicateTiles }) => {
- const result = (await api.create(`api/environments/${teamLogic.values.currentTeamId}/dashboards/`, {
- use_dashboard: id,
- name: `${name} (Copy)`,
- duplicate_tiles: duplicateTiles,
- })) as DashboardType
+ const result = await api.create(
+ `api/environments/${teamLogic.values.currentTeamId}/dashboards/`,
+ {
+ use_dashboard: id,
+ name: `${name} (Copy)`,
+ duplicate_tiles: duplicateTiles,
+ }
+ )
if (show) {
router.actions.push(urls.dashboard(result.id))
}
diff --git a/frontend/src/scenes/actions/actionLogic.ts b/frontend/src/scenes/actions/actionLogic.ts
index e3a7791b6cdc1..a3101cb8d9daf 100644
--- a/frontend/src/scenes/actions/actionLogic.ts
+++ b/frontend/src/scenes/actions/actionLogic.ts
@@ -5,7 +5,8 @@ import { DataManagementTab } from 'scenes/data-management/DataManagementScene'
import { Scene } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
-import { ActionType, Breadcrumb, HogFunctionType } from '~/types'
+import { ActivityFilters } from '~/layout/navigation-3000/sidepanel/panels/activity/activityForSceneLogic'
+import { ActionType, ActivityScope, Breadcrumb, HogFunctionType } from '~/types'
import { actionEditLogic } from './actionEditLogic'
import type { actionLogicType } from './actionLogicType'
@@ -104,6 +105,18 @@ export const actionLogic = kea([
(s) => [s.action],
(action) => action?.steps?.some((step) => step.properties?.find((p) => p.type === 'cohort')) ?? false,
],
+
+ activityFilters: [
+ (s) => [s.action],
+ (action): ActivityFilters | null => {
+ return action?.id
+ ? {
+ scope: ActivityScope.ACTION,
+ item_id: String(action.id),
+ }
+ : null
+ },
+ ],
}),
listeners(({ actions, values }) => ({
checkIsFinished: ({ action }) => {
diff --git a/frontend/src/scenes/authentication/login2FALogic.ts b/frontend/src/scenes/authentication/login2FALogic.ts
index 6232f6225312a..6b6e63cde3f5f 100644
--- a/frontend/src/scenes/authentication/login2FALogic.ts
+++ b/frontend/src/scenes/authentication/login2FALogic.ts
@@ -54,7 +54,7 @@ export const login2FALogic = kea([
submit: async ({ token }, breakpoint) => {
breakpoint()
try {
- return await api.create('api/login/token', { token })
+ return await api.create('api/login/token', { token })
} catch (e) {
const { code, detail } = e as Record
actions.setGeneralError(code, detail)
diff --git a/frontend/src/scenes/authentication/loginLogic.ts b/frontend/src/scenes/authentication/loginLogic.ts
index 19d73edc00158..6ace53926171f 100644
--- a/frontend/src/scenes/authentication/loginLogic.ts
+++ b/frontend/src/scenes/authentication/loginLogic.ts
@@ -86,7 +86,7 @@ export const loginLogic = kea([
}
breakpoint()
- const response = await api.create('api/login/precheck', { email })
+ const response = await api.create('api/login/precheck', { email })
return { status: 'completed', ...response }
},
},
@@ -102,7 +102,7 @@ export const loginLogic = kea([
submit: async ({ email, password }, breakpoint) => {
breakpoint()
try {
- return await api.create('api/login', { email, password })
+ return await api.create('api/login', { email, password })
} catch (e) {
const { code } = e as Record
let { detail } = e as Record
diff --git a/frontend/src/scenes/authentication/setup2FALogic.ts b/frontend/src/scenes/authentication/setup2FALogic.ts
index 7ea0f4a498510..03b7a4957a4f4 100644
--- a/frontend/src/scenes/authentication/setup2FALogic.ts
+++ b/frontend/src/scenes/authentication/setup2FALogic.ts
@@ -86,7 +86,7 @@ export const setup2FALogic = kea([
null as { backup_codes: string[] } | null,
{
generateBackupCodes: async () => {
- return await api.create('api/users/@me/two_factor_backup_codes/')
+ return await api.create('api/users/@me/two_factor_backup_codes/')
},
},
],
@@ -95,7 +95,7 @@ export const setup2FALogic = kea([
{
disable2FA: async () => {
try {
- await api.create('api/users/@me/two_factor_disable/')
+ await api.create('api/users/@me/two_factor_disable/')
return true
} catch (e) {
const { code, detail } = e as Record
@@ -114,7 +114,7 @@ export const setup2FALogic = kea([
submit: async ({ token }, breakpoint) => {
breakpoint()
try {
- return await api.create('api/users/@me/validate_2fa/', { token })
+ return await api.create('api/users/@me/validate_2fa/', { token })
} catch (e) {
const { code, detail } = e as Record
actions.setGeneralError(code, detail)
diff --git a/frontend/src/scenes/data-warehouse/editor/EditorScene.tsx b/frontend/src/scenes/data-warehouse/editor/EditorScene.tsx
index 3576303ebddd9..edf174a7cf216 100644
--- a/frontend/src/scenes/data-warehouse/editor/EditorScene.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/EditorScene.tsx
@@ -8,6 +8,7 @@ import { useRef } from 'react'
import { Sidebar } from '~/layout/navigation-3000/components/Sidebar'
import { navigation3000Logic } from '~/layout/navigation-3000/navigationLogic'
+import { ViewLinkModal } from '../ViewLinkModal'
import { editorSceneLogic } from './editorSceneLogic'
import { editorSizingLogic } from './editorSizingLogic'
import { QueryWindow } from './QueryWindow'
@@ -47,6 +48,7 @@ export function EditorScene(): JSX.Element {
)}
+
)
}
diff --git a/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx b/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx
index 988323bd02093..af571d78b8aa7 100644
--- a/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx
@@ -3,7 +3,7 @@ import 'react-data-grid/lib/styles.css'
import { IconGear } from '@posthog/icons'
import { LemonButton, LemonTabs, Spinner } from '@posthog/lemon-ui'
import clsx from 'clsx'
-import { BindLogic, useActions, useValues } from 'kea'
+import { useActions, useValues } from 'kea'
import { router } from 'kea-router'
import { AnimationType } from 'lib/animations/animations'
import { Animation } from 'lib/components/Animation/Animation'
@@ -11,51 +11,49 @@ import { ExportButton } from 'lib/components/ExportButton/ExportButton'
import { useMemo } from 'react'
import DataGrid from 'react-data-grid'
import { InsightErrorState } from 'scenes/insights/EmptyStates'
-import { insightDataLogic } from 'scenes/insights/insightDataLogic'
-import { insightLogic } from 'scenes/insights/insightLogic'
import { HogQLBoldNumber } from 'scenes/insights/views/BoldNumber/BoldNumber'
import { KeyboardShortcut } from '~/layout/navigation-3000/components/KeyboardShortcut'
import { themeLogic } from '~/layout/navigation-3000/themeLogic'
-import { dataNodeLogic, DataNodeLogicProps } from '~/queries/nodes/DataNode/dataNodeLogic'
+import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { LineGraph } from '~/queries/nodes/DataVisualization/Components/Charts/LineGraph'
import { SideBar } from '~/queries/nodes/DataVisualization/Components/SideBar'
import { Table } from '~/queries/nodes/DataVisualization/Components/Table'
import { TableDisplay } from '~/queries/nodes/DataVisualization/Components/TableDisplay'
-import { variableModalLogic } from '~/queries/nodes/DataVisualization/Components/Variables/variableModalLogic'
+import { AddVariableButton } from '~/queries/nodes/DataVisualization/Components/Variables/AddVariableButton'
import { VariablesForInsight } from '~/queries/nodes/DataVisualization/Components/Variables/Variables'
import { variablesLogic } from '~/queries/nodes/DataVisualization/Components/Variables/variablesLogic'
import { DataTableVisualizationProps } from '~/queries/nodes/DataVisualization/DataVisualization'
-import {
- dataVisualizationLogic,
- DataVisualizationLogicProps,
-} from '~/queries/nodes/DataVisualization/dataVisualizationLogic'
-import { displayLogic } from '~/queries/nodes/DataVisualization/displayLogic'
+import { dataVisualizationLogic } from '~/queries/nodes/DataVisualization/dataVisualizationLogic'
import { DataVisualizationNode, HogQLQueryResponse, NodeKind } from '~/queries/schema'
-import { ChartDisplayType, ExporterFormat, ItemMode } from '~/types'
+import { ChartDisplayType, ExportContext, ExporterFormat } from '~/types'
-import { DATAWAREHOUSE_EDITOR_ITEM_ID } from '../external/dataWarehouseExternalSceneLogic'
import { dataWarehouseViewsLogic } from '../saved_queries/dataWarehouseViewsLogic'
import { multitabEditorLogic } from './multitabEditorLogic'
import { outputPaneLogic, OutputTab } from './outputPaneLogic'
interface OutputPaneProps {
- onSave: () => void
+ onSaveInsight: () => void
+ onSaveView: () => void
saveDisabledReason?: string
onQueryInputChange: () => void
- logicKey: string
+ onQueryChange: (query: DataVisualizationNode) => void
query: string
+ exportContext?: ExportContext
}
export function OutputPane({
onQueryInputChange,
- onSave,
+ onQueryChange,
+ onSaveView,
+ onSaveInsight,
saveDisabledReason,
- logicKey,
query,
+ exportContext,
}: OutputPaneProps): JSX.Element {
const { activeTab } = useValues(outputPaneLogic)
const { setActiveTab } = useActions(outputPaneLogic)
+ const { variablesForInsight } = useValues(variablesLogic)
const codeEditorKey = `hogQLQueryEditor/${router.values.location.pathname}`
@@ -65,31 +63,12 @@ export function OutputPane({
})
)
const { isDarkModeOn } = useValues(themeLogic)
- const { response, responseLoading } = useValues(
- dataNodeLogic({
- key: logicKey,
- query: {
- kind: NodeKind.HogQLQuery,
- query,
- },
- doNotLoad: !query,
- })
- )
+ const { response, responseLoading } = useValues(dataNodeLogic)
const { dataWarehouseSavedQueriesLoading } = useValues(dataWarehouseViewsLogic)
const { updateDataWarehouseSavedQuery } = useActions(dataWarehouseViewsLogic)
+ const { visualizationType } = useValues(dataVisualizationLogic)
- const { insightProps } = useValues(
- insightLogic({
- dashboardItemId: DATAWAREHOUSE_EDITOR_ITEM_ID,
- cachedInsight: null,
- doNotLoad: true,
- })
- )
- const { setQuery } = useActions(
- insightDataLogic({
- ...insightProps,
- })
- )
+ const vizKey = `SQLEditorScene`
const columns = useMemo(() => {
return (
@@ -138,8 +117,8 @@ export function OutputPane({
)
@@ -158,6 +141,11 @@ export function OutputPane({
return (