diff --git a/frontend/__snapshots__/filters-property-filter-button--button--dark.png b/frontend/__snapshots__/filters-property-filter-button--button--dark.png index c2d1c89cd07f7..001393e384f4e 100644 Binary files a/frontend/__snapshots__/filters-property-filter-button--button--dark.png and b/frontend/__snapshots__/filters-property-filter-button--button--dark.png differ diff --git a/frontend/__snapshots__/filters-property-filter-button--button--light.png b/frontend/__snapshots__/filters-property-filter-button--button--light.png index bbdc379252ca9..f9592c86d9dd4 100644 Binary files a/frontend/__snapshots__/filters-property-filter-button--button--light.png and b/frontend/__snapshots__/filters-property-filter-button--button--light.png differ diff --git a/frontend/__snapshots__/filters-property-filter-button--filter-types--dark.png b/frontend/__snapshots__/filters-property-filter-button--filter-types--dark.png index 3ba92c88fc6b0..4a17d48ef0b90 100644 Binary files a/frontend/__snapshots__/filters-property-filter-button--filter-types--dark.png and b/frontend/__snapshots__/filters-property-filter-button--filter-types--dark.png differ diff --git a/frontend/__snapshots__/filters-property-filter-button--filter-types--light.png b/frontend/__snapshots__/filters-property-filter-button--filter-types--light.png index 4653fbafd38af..c33e26e363705 100644 Binary files a/frontend/__snapshots__/filters-property-filter-button--filter-types--light.png and b/frontend/__snapshots__/filters-property-filter-button--filter-types--light.png differ diff --git a/frontend/__snapshots__/filters-property-filter-button--pseudo-states--dark.png b/frontend/__snapshots__/filters-property-filter-button--pseudo-states--dark.png index 7c35a6b510db3..43880da1a2b5f 100644 Binary files a/frontend/__snapshots__/filters-property-filter-button--pseudo-states--dark.png and b/frontend/__snapshots__/filters-property-filter-button--pseudo-states--dark.png differ diff --git a/frontend/__snapshots__/filters-property-filter-button--pseudo-states--light.png b/frontend/__snapshots__/filters-property-filter-button--pseudo-states--light.png index 55a7a5088447c..55bcf5a6f656e 100644 Binary files a/frontend/__snapshots__/filters-property-filter-button--pseudo-states--light.png and b/frontend/__snapshots__/filters-property-filter-button--pseudo-states--light.png differ diff --git a/frontend/__snapshots__/filters-propertyfilters--comparing-property-filters--dark.png b/frontend/__snapshots__/filters-propertyfilters--comparing-property-filters--dark.png index 321afbd834523..7f844b8eea43a 100644 Binary files a/frontend/__snapshots__/filters-propertyfilters--comparing-property-filters--dark.png and b/frontend/__snapshots__/filters-propertyfilters--comparing-property-filters--dark.png differ diff --git a/frontend/__snapshots__/filters-propertyfilters--comparing-property-filters--light.png b/frontend/__snapshots__/filters-propertyfilters--comparing-property-filters--light.png index 2799319731178..99511d25ec6d2 100644 Binary files a/frontend/__snapshots__/filters-propertyfilters--comparing-property-filters--light.png and b/frontend/__snapshots__/filters-propertyfilters--comparing-property-filters--light.png differ diff --git a/frontend/__snapshots__/filters-propertyfilters--with-no-close-button--dark.png b/frontend/__snapshots__/filters-propertyfilters--with-no-close-button--dark.png index 14eb5313de525..2cb20c99faafe 100644 Binary files a/frontend/__snapshots__/filters-propertyfilters--with-no-close-button--dark.png and b/frontend/__snapshots__/filters-propertyfilters--with-no-close-button--dark.png differ diff --git a/frontend/__snapshots__/filters-propertyfilters--with-no-close-button--light.png b/frontend/__snapshots__/filters-propertyfilters--with-no-close-button--light.png index 598876e91a831..c0f86cb57fbf9 100644 Binary files a/frontend/__snapshots__/filters-propertyfilters--with-no-close-button--light.png and b/frontend/__snapshots__/filters-propertyfilters--with-no-close-button--light.png differ diff --git a/frontend/src/lib/components/PropertiesTable/PropertiesTable.tsx b/frontend/src/lib/components/PropertiesTable/PropertiesTable.tsx index e6dad8c3cbea3..756844702c3e5 100644 --- a/frontend/src/lib/components/PropertiesTable/PropertiesTable.tsx +++ b/frontend/src/lib/components/PropertiesTable/PropertiesTable.tsx @@ -241,6 +241,7 @@ export function PropertiesTable({ [PropertyDefinitionType.Group]: TaxonomicFilterGroupType.GroupsPrefix, [PropertyDefinitionType.Session]: TaxonomicFilterGroupType.SessionProperties, [PropertyDefinitionType.LogEntry]: TaxonomicFilterGroupType.LogEntries, + [PropertyDefinitionType.Meta]: TaxonomicFilterGroupType.Metadata, } const propertyType = propertyTypeMap[type] || TaxonomicFilterGroupType.EventProperties diff --git a/frontend/src/lib/taxonomy.tsx b/frontend/src/lib/taxonomy.tsx index 2635ea05a00f7..cf327fb765a54 100644 --- a/frontend/src/lib/taxonomy.tsx +++ b/frontend/src/lib/taxonomy.tsx @@ -219,9 +219,21 @@ export const CORE_FILTER_DEFINITIONS_BY_GROUP = { metadata: { distinct_id: { label: 'Distinct ID', - description: 'The current distinct ID of the user', + description: 'The current distinct ID of the user.', examples: ['16ff262c4301e5-0aa346c03894bc-39667c0e-1aeaa0-16ff262c431767'], }, + timestamp: { + label: 'Timestamp', + description: 'Time the event happened.', + examples: ['2023-05-20T15:30:00Z'], + system: true, + }, + event: { + label: 'Event', + description: 'The name of the event.', + examples: ['$pageview'], + system: true, + }, }, event_properties: { distinct_id: {} as CoreFilterDefinition, // Copied from `metadata` down below @@ -750,9 +762,11 @@ export const CORE_FILTER_DEFINITIONS_BY_GROUP = { system: true, }, $timestamp: { - label: 'Timestamp', - description: 'Time the event happened.', - examples: [new Date().toISOString()], + label: 'Timestamp (deprecated)', + description: + 'Use the HogQL field `timestamp` instead. This field was previously set on some client side events.', + examples: ['2023-05-20T15:30:00Z'], + system: true, }, $sent_at: { label: 'Sent At', diff --git a/frontend/src/scenes/activity/explore/EventDetails.tsx b/frontend/src/scenes/activity/explore/EventDetails.tsx index dce845889c984..1b7a1733cf48f 100644 --- a/frontend/src/scenes/activity/explore/EventDetails.tsx +++ b/frontend/src/scenes/activity/explore/EventDetails.tsx @@ -45,6 +45,33 @@ export function EventDetails({ event, tableProps }: EventDetailsProps): JSX.Elem } const tabs = [ + { + key: 'raw', + label: 'Raw', + content: ( +
+ +
+ ), + }, + { + key: 'metadata', + label: 'Metadata', + content: ( +
+ +
+ ), + }, { key: 'properties', label: 'Properties', @@ -72,15 +99,6 @@ export function EventDetails({ event, tableProps }: EventDetailsProps): JSX.Elem ), }, - { - key: 'json', - label: 'JSON', - content: ( -
- -
- ), - }, ] if (event.elements && event.elements.length > 0) { diff --git a/frontend/src/types.ts b/frontend/src/types.ts index b19486531a11c..bd0cc3e26d4d7 100644 --- a/frontend/src/types.ts +++ b/frontend/src/types.ts @@ -3214,6 +3214,7 @@ export enum PropertyDefinitionType { Group = 'group', Session = 'session', LogEntry = 'log_entry', + Meta = 'meta', } export interface PropertyDefinition {