Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/khaki-adults-study.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@hyperdx/app": minor
---

feat: Add metrics attribute explorer in chart builder
70 changes: 64 additions & 6 deletions packages/app/src/components/DBEditTimeChartForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ import { SQLInlineEditorControlled } from '@/components/SQLInlineEditor';
import { TimePicker } from '@/components/TimePicker';
import { IS_LOCAL_MODE } from '@/config';
import { GranularityPickerControlled } from '@/GranularityPicker';
import { useFetchMetricResourceAttrs } from '@/hooks/useFetchMetricResourceAttrs';
import { useFetchMetricMetadata } from '@/hooks/useFetchMetricMetadata';
import {
parseAttributeKeysFromSuggestions,
useFetchMetricResourceAttrs,
} from '@/hooks/useFetchMetricResourceAttrs';
import SearchInputV2 from '@/SearchInputV2';
import { getFirstTimestampValueExpression, useSource } from '@/source';
import {
Expand Down Expand Up @@ -112,6 +116,7 @@ import {
InputControlled,
TextInputControlled,
} from './InputControlled';
import { MetricAttributeHelperPanel } from './MetricAttributeHelperPanel';
import { MetricNameSelect } from './MetricNameSelect';
import SaveToDashboardModal from './SaveToDashboardModal';
import SourceSchemaPreview from './SourceSchemaPreview';
Expand Down Expand Up @@ -248,15 +253,54 @@ function ChartSeriesEditorComponent({
: _tableName;

const metricName = useWatch({ control, name: `${namePrefix}metricName` });
const { data: attributeKeys } = useFetchMetricResourceAttrs({
const aggCondition = useWatch({
control,
name: `${namePrefix}aggCondition`,
});
const groupBy = useWatch({ control, name: 'groupBy' });

const { data: attributeSuggestions, isLoading: isLoadingAttributes } =
useFetchMetricResourceAttrs({
databaseName,
metricType,
metricName,
tableSource,
isSql: aggConditionLanguage === 'sql',
});

const attributeKeys = useMemo(
() => parseAttributeKeysFromSuggestions(attributeSuggestions ?? []),
[attributeSuggestions],
);

const { data: metricMetadata } = useFetchMetricMetadata({
databaseName,
tableName: tableName || '',
metricType,
metricName,
tableSource,
isSql: aggConditionLanguage === 'sql',
});

const handleAddToWhere = useCallback(
(clause: string) => {
const currentValue = aggCondition || '';

const newValue = currentValue ? `${currentValue} AND ${clause}` : clause;
setValue(`${namePrefix}aggCondition`, newValue);
onSubmit();
},
[aggCondition, namePrefix, setValue, onSubmit],
);

const handleAddToGroupBy = useCallback(
(clause: string) => {
const currentValue = groupBy || '';
const newValue = currentValue ? `${currentValue}, ${clause}` : clause;
setValue('groupBy', newValue);
onSubmit();
},
[groupBy, setValue, onSubmit],
);

const showWhere = aggFn !== 'none';

const tableConnection = useMemo(
Expand Down Expand Up @@ -414,7 +458,7 @@ function ChartSeriesEditorComponent({
onLanguageChange={lang =>
setValue(`${namePrefix}aggConditionLanguage`, lang)
}
additionalSuggestions={attributeKeys}
additionalSuggestions={attributeSuggestions}
language="sql"
onSubmit={onSubmit}
/>
Expand All @@ -429,7 +473,7 @@ function ChartSeriesEditorComponent({
language="lucene"
placeholder="Search your events w/ Lucene ex. column:foo"
onSubmit={onSubmit}
additionalSuggestions={attributeKeys}
additionalSuggestions={attributeSuggestions}
/>
)}
</div>
Expand Down Expand Up @@ -480,6 +524,20 @@ function ChartSeriesEditorComponent({
</div>
)}
</Flex>
{tableSource?.kind === SourceKind.Metric && metricName && (
<MetricAttributeHelperPanel
databaseName={databaseName}
metricType={metricType}
metricName={metricName}
tableSource={tableSource}
attributeKeys={attributeKeys}
isLoading={isLoadingAttributes}
language={aggConditionLanguage === 'sql' ? 'sql' : 'lucene'}
metricMetadata={metricMetadata}
onAddToWhere={handleAddToWhere}
onAddToGroupBy={handleAddToGroupBy}
/>
)}
</>
);
}
Expand Down
Loading
Loading