Merge branch 'main' into drew/show-pinned-filters-while-loading

Author: kodiakhq[bot]

.changeset/blue-hairs-serve.md

@@ -0,0 +1,5 @@
+---
+"@hyperdx/app": patch
+---
+
+fix: Fix pattern sample query for sources with multi-column timestamp expressions

packages/app/src/components/PatternSidePanel.tsx

@@ -13,6 +13,7 @@ import {
   TIMESTAMP_COLUMN_ALIAS,
 } from '@/hooks/usePatterns';
 import useRowWhere from '@/hooks/useRowWhere';
+import { getFirstTimestampValueExpression } from '@/source';
 import { useZIndex, ZIndexContext } from '@/zIndex';
 
 import styles from '../../styles/LogSidePanel.module.scss';
@@ -74,7 +75,7 @@ export default function PatternSidePanel({
     ],
     aliasMap: {
       body: bodyValueExpression,
-      ts: source.timestampValueExpression,
+      ts: getFirstTimestampValueExpression(source.timestampValueExpression),
     },
   });
 

packages/app/src/hooks/usePatterns.tsx

@@ -13,6 +13,7 @@ import {
   useConfigWithPrimaryAndPartitionKey,
 } from '@/components/DBRowTable';
 import { useQueriedChartConfig } from '@/hooks/useChartConfig';
+import { getFirstTimestampValueExpression } from '@/source';
 
 // We don't want to load pyodide over and over again, use react query to cache the async instance
 function usePyodide(options: { enabled: boolean }) {
@@ -131,7 +132,7 @@ function usePatterns({
     // TODO: User-configurable pattern columns and non-pattern/group by columns
     select: [
       `${bodyValueExpression} as ${PATTERN_COLUMN_ALIAS}`,
-      `${config.timestampValueExpression} as ${TIMESTAMP_COLUMN_ALIAS}`,
+      `${getFirstTimestampValueExpression(config.timestampValueExpression)} as ${TIMESTAMP_COLUMN_ALIAS}`,
       ...(severityTextExpression
         ? [`${severityTextExpression} as ${SEVERITY_TEXT_COLUMN_ALIAS}`]
         : []),