@parca/profile 0.16.122 → 0.16.124

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.16.124](https://github.com/parca-dev/parca/compare/@parca/profile@0.16.123...@parca/profile@0.16.124) (2023-02-22)
+
+**Note:** Version bump only for package @parca/profile
+
+## [0.16.123](https://github.com/parca-dev/parca/compare/@parca/profile@0.16.122...@parca/profile@0.16.123) (2023-02-22)
+
+**Note:** Version bump only for package @parca/profile
+
 ## [0.16.122](https://github.com/parca-dev/parca/compare/@parca/profile@0.16.121...@parca/profile@0.16.122) (2023-02-22)
 
 **Note:** Version bump only for package @parca/profile

package/dist/MetricsGraph/MetricsTooltip/index.js

@@ -98,7 +98,7 @@ var MetricsTooltip = function (_a) {
     }, [x, y, contextElement, update]);
     var nameLabel = highlighted === null || highlighted === void 0 ? void 0 : highlighted.labels.find(function (e) { return e.name === '__name__'; });
     var highlightedNameLabel = nameLabel !== undefined ? nameLabel : { name: '', value: '' };
-    return (_jsx("div", __assign({ ref: setPopperElement, style: styles.popper }, attributes.popper, { className: "z-10" }, { children: _jsx("div", __assign({ className: "flex max-w-md" }, { children: _jsx("div", __assign({ className: "m-auto" }, { children: _jsx("div", __assign({ className: "border-gray-300 dark:border-gray-500 bg-gray-50 dark:bg-gray-900 rounded-lg p-3 shadow-lg opacity-90", style: { borderWidth: 1 } }, { children: _jsx("div", __assign({ className: "flex flex-row" }, { children: _jsxs("div", __assign({ className: "ml-2 mr-6" }, { children: [_jsx("span", __assign({ className: "font-semibold" }, { children: highlightedNameLabel.value })), _jsx("span", __assign({ className: "block text-gray-700 dark:text-gray-300 my-2" }, { children: _jsx("table", __assign({ className: "table-auto" }, { children: _jsxs("tbody", { children: [_jsxs("tr", { children: [_jsx("td", __assign({ className: "w-1/4" }, { children: "Value" })), _jsx("td", __assign({ className: "w-3/4" }, { children: valueFormatter(highlighted.value, sampleUnit, 1) }))] }), _jsxs("tr", { children: [_jsx("td", __assign({ className: "w-1/4" }, { children: "At" })), _jsx("td", __assign({ className: "w-3/4" }, { children: formatDate(highlighted.timestamp, timeFormat) }))] })] }) })) })), _jsx("span", __assign({ className: "block text-gray-500 my-2" }, { children: highlighted.labels
+    return (_jsx("div", __assign({ ref: setPopperElement, style: styles.popper }, attributes.popper, { className: "z-10" }, { children: _jsx("div", __assign({ className: "flex max-w-md" }, { children: _jsx("div", __assign({ className: "m-auto" }, { children: _jsx("div", __assign({ className: "border-gray-300 dark:border-gray-500 bg-gray-50 dark:bg-gray-900 rounded-lg p-3 shadow-lg opacity-90", style: { borderWidth: 1 } }, { children: _jsx("div", __assign({ className: "flex flex-row" }, { children: _jsxs("div", __assign({ className: "ml-2 mr-6" }, { children: [_jsx("span", __assign({ className: "font-semibold" }, { children: highlightedNameLabel.value })), _jsx("span", __assign({ className: "block text-gray-700 dark:text-gray-300 my-2" }, { children: _jsx("table", __assign({ className: "table-auto" }, { children: _jsxs("tbody", { children: [_jsxs("tr", { children: [_jsx("td", __assign({ className: "w-1/4" }, { children: "Value" })), _jsx("td", __assign({ className: "w-3/4" }, { children: valueFormatter(highlighted.valuePerSecond, sampleUnit, 5) }))] }), _jsxs("tr", { children: [_jsx("td", __assign({ className: "w-1/4" }, { children: "Total" })), _jsx("td", __assign({ className: "w-3/4" }, { children: valueFormatter(highlighted.value, sampleUnit, 2) }))] }), _jsxs("tr", { children: [_jsx("td", __assign({ className: "w-1/4" }, { children: "At" })), _jsx("td", __assign({ className: "w-3/4" }, { children: formatDate(highlighted.timestamp, timeFormat) }))] })] }) })) })), _jsx("span", __assign({ className: "block text-gray-500 my-2" }, { children: highlighted.labels
                                         .filter(function (label) { return label.name !== '__name__'; })
                                         .map(function (label) {
                                         return (_jsx("button", __assign({ type: "button", className: "inline-block rounded-lg text-gray-700 bg-gray-200 dark:bg-gray-700 dark:text-gray-400 px-2 py-1 text-xs font-bold mr-3", onClick: function () { return onLabelClick(label.name, label.value); } }, { children: _jsx(TextWithTooltip, { text: "".concat(label.name, "=\"").concat(label.value, "\""), maxTextLength: 37, id: "tooltip-".concat(label.name, "-").concat(label.value) }) }), label.name));

package/dist/MetricsGraph/index.d.ts

@@ -17,6 +17,7 @@ export interface HighlightedSeries {
     labels: Label[];
     timestamp: number;
     value: number;
+    valuePerSecond: number;
     x: number;
     y: number;
 }

package/dist/MetricsGraph/index.js

@@ -68,9 +68,9 @@ export var RawMetricsGraph = function (_a) {
             agg.push({
                 metric: s.labelset.labels,
                 values: s.samples.reduce(function (agg, d) {
-                    if (d.timestamp !== undefined && d.value !== undefined) {
+                    if (d.timestamp !== undefined && d.valuePerSecond !== undefined) {
                         var t = (+d.timestamp.seconds * 1e9 + d.timestamp.nanos) / 1e6; // https://github.com/microsoft/TypeScript/issues/5710#issuecomment-157886246
-                        agg.push([t, parseFloat(d.value)]);
+                        agg.push([t, d.valuePerSecond, parseFloat(d.value)]);
                     }
                     return agg;
                 }, []),
@@ -122,7 +122,8 @@ export var RawMetricsGraph = function (_a) {
             seriesIndex: closestSeriesIndex,
             labels: series[closestSeriesIndex].metric,
             timestamp: point[0],
-            value: point[1],
+            valuePerSecond: point[1],
+            value: point[2],
             x: xScale(point[0]),
             y: yScale(point[1]),
         };
@@ -194,14 +195,14 @@ export var RawMetricsGraph = function (_a) {
         var s = null;
         var seriesIndex = -1;
         outer: for (var i = 0; i < series.length; i++) {
-            var keys = profile.labels.map(function (e) { return e.name; });
+            var keys = profile.query.matchers.map(function (e) { return e.key; });
             var _loop_1 = function (j) {
-                var labelName = keys[j];
-                var label = series[i].metric.find(function (e) { return e.name === labelName; });
+                var matcherKey = keys[j];
+                var label = series[i].metric.find(function (e) { return e.name === matcherKey; });
                 if (label === undefined) {
                     return "continue-outer";
                 }
-                if (profile.labels[j].value !== label.value) {
+                if (profile.query.matchers[j].value !== label.value) {
                     return "continue-outer";
                 }
             };
@@ -228,7 +229,8 @@ export var RawMetricsGraph = function (_a) {
             labels: [],
             seriesIndex: seriesIndex,
             timestamp: sample[0],
-            value: sample[1],
+            valuePerSecond: sample[1],
+            value: sample[2],
             x: xScale(sample[0]),
             y: yScale(sample[1]),
         };

package/dist/ProfileIcicleGraph/IcicleGraph/index.d.ts

@@ -8,7 +8,6 @@ interface IcicleGraphProps {
     curPath: string[];
     setCurPath: (path: string[]) => void;
     navigateTo?: NavigateFunction;
-    isTrimmed?: boolean;
 }
 export declare const IcicleGraph: import("react").NamedExoticComponent<IcicleGraphProps>;
 export default IcicleGraph;

package/dist/ProfileIcicleGraph/IcicleGraph/index.js

@@ -23,30 +23,22 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { memo, useEffect, useMemo, useRef, useState } from 'react';
-import cx from 'classnames';
 import { scaleLinear } from 'd3-scale';
-import { Button, useURLState } from '@parca/components';
 import { selectQueryParam } from '@parca/functions';
-import useUserPreference, { USER_PREFERENCES } from '@parca/functions/useUserPreference';
 import GraphTooltip from '../../GraphTooltip';
 import ColorStackLegend from './ColorStackLegend';
 import { IcicleNode, RowHeight } from './IcicleGraphNodes';
 import useColoredGraph from './useColoredGraph';
 export var IcicleGraph = memo(function IcicleGraph(_a) {
     var _b;
-    var graph = _a.graph, width = _a.width, setCurPath = _a.setCurPath, curPath = _a.curPath, sampleUnit = _a.sampleUnit, navigateTo = _a.navigateTo, _c = _a.isTrimmed, isTrimmed = _c === void 0 ? false : _c;
-    var _d = useState(), hoveringNode = _d[0], setHoveringNode = _d[1];
-    var _e = useState(0), height = _e[0], setHeight = _e[1];
+    var graph = _a.graph, width = _a.width, setCurPath = _a.setCurPath, curPath = _a.curPath, sampleUnit = _a.sampleUnit, navigateTo = _a.navigateTo;
+    var _c = useState(), hoveringNode = _c[0], setHoveringNode = _c[1];
+    var _d = useState(0), height = _d[0], setHeight = _d[1];
     var svg = useRef(null);
     var ref = useRef(null);
-    var rawDashboardItems = useURLState({
-        param: 'dashboard_items',
-    })[0];
-    var dashboardItems = rawDashboardItems;
     var coloredGraph = useColoredGraph(graph);
     var currentSearchString = (_b = selectQueryParam('search_string')) !== null && _b !== void 0 ? _b : '';
     var compareMode = selectQueryParam('compare_a') === 'true' && selectQueryParam('compare_b') === 'true';
-    var colorProfileName = useUserPreference(USER_PREFERENCES.FLAMEGRAPH_COLOR_PROFILE.key)[0];
     useEffect(function () {
         if (ref.current != null) {
             setHeight(ref === null || ref === void 0 ? void 0 : ref.current.getBoundingClientRect().height);
@@ -62,16 +54,6 @@ export var IcicleGraph = memo(function IcicleGraph(_a) {
     if (coloredGraph.root === undefined || width === undefined) {
         return _jsx(_Fragment, {});
     }
-    var isColorStackLegendVisible = colorProfileName !== 'default';
-    return (_jsxs("div", __assign({ onMouseLeave: function () { return setHoveringNode(undefined); } }, { children: [_jsx(ColorStackLegend, { navigateTo: navigateTo, compareMode: compareMode }), _jsx(GraphTooltip, { unit: sampleUnit, total: total, hoveringNode: hoveringNode, contextElement: svg.current, strings: coloredGraph.stringTable, mappings: coloredGraph.mapping, locations: coloredGraph.locations, functions: coloredGraph.function }), _jsx("div", __assign({ className: cx('flex justify-start absolute', {
-                    'top-[-48px]': dashboardItems.length <= 1 && !isTrimmed && !isColorStackLegendVisible,
-                    'top-[-69px]': dashboardItems.length <= 1 && !isTrimmed && isColorStackLegendVisible,
-                    'top-[-54px]': dashboardItems.length <= 1 && isTrimmed && isColorStackLegendVisible,
-                    'top-[-54px] ': dashboardItems.length <= 1 && isTrimmed && !isColorStackLegendVisible,
-                    'top-[-54px] left-[25px]': dashboardItems.length > 1 && isTrimmed && isColorStackLegendVisible,
-                    'top-[-54px] left-[25px] ': dashboardItems.length > 1 && isTrimmed && !isColorStackLegendVisible,
-                    'top-[-70px] left-[25px]': dashboardItems.length > 1 && !isTrimmed && isColorStackLegendVisible,
-                    'top-[-46px] left-[25px]': dashboardItems.length > 1 && !isTrimmed && !isColorStackLegendVisible,
-                }) }, { children: _jsx(Button, __assign({ color: "neutral", onClick: function () { return setCurPath([]); }, disabled: curPath.length === 0, className: "w-auto", variant: "neutral" }, { children: "Reset View" })) })), _jsx("svg", __assign({ className: "font-robotoMono", width: width, height: height, preserveAspectRatio: "xMinYMid", ref: svg }, { children: _jsx("g", __assign({ ref: ref }, { children: _jsx("g", __assign({ transform: 'translate(0, 0)' }, { children: _jsx(IcicleNode, { x: 0, y: 0, totalWidth: width, height: RowHeight, setCurPath: setCurPath, setHoveringNode: setHoveringNode, curPath: curPath, data: coloredGraph.root, strings: coloredGraph.stringTable, mappings: coloredGraph.mapping, locations: coloredGraph.locations, functions: coloredGraph.function, total: total, xScale: xScale, path: [], level: 0, isRoot: true, searchString: currentSearchString, compareMode: compareMode }) })) })) }))] })));
+    return (_jsxs("div", __assign({ onMouseLeave: function () { return setHoveringNode(undefined); } }, { children: [_jsx(ColorStackLegend, { navigateTo: navigateTo, compareMode: compareMode }), _jsx(GraphTooltip, { unit: sampleUnit, total: total, hoveringNode: hoveringNode, contextElement: svg.current, strings: coloredGraph.stringTable, mappings: coloredGraph.mapping, locations: coloredGraph.locations, functions: coloredGraph.function }), _jsx("svg", __assign({ className: "font-robotoMono", width: width, height: height, preserveAspectRatio: "xMinYMid", ref: svg }, { children: _jsx("g", __assign({ ref: ref }, { children: _jsx("g", __assign({ transform: 'translate(0, 0)' }, { children: _jsx(IcicleNode, { x: 0, y: 0, totalWidth: width, height: RowHeight, setCurPath: setCurPath, setHoveringNode: setHoveringNode, curPath: curPath, data: coloredGraph.root, strings: coloredGraph.stringTable, mappings: coloredGraph.mapping, locations: coloredGraph.locations, functions: coloredGraph.function, total: total, xScale: xScale, path: [], level: 0, isRoot: true, searchString: currentSearchString, compareMode: compareMode }) })) })) }))] })));
 });
 export default IcicleGraph;

package/dist/ProfileIcicleGraph/index.d.ts

@@ -10,6 +10,7 @@ interface ProfileIcicleGraphProps {
     onContainerResize?: ResizeHandler;
     navigateTo?: NavigateFunction;
     loading: boolean;
+    setActionButtons?: (buttons: JSX.Element) => void;
 }
-declare const ProfileIcicleGraph: ({ graph, curPath, setNewCurPath, sampleUnit, onContainerResize, navigateTo, loading, }: ProfileIcicleGraphProps) => JSX.Element;
+declare const ProfileIcicleGraph: ({ graph, curPath, setNewCurPath, sampleUnit, onContainerResize, navigateTo, loading, setActionButtons, }: ProfileIcicleGraphProps) => JSX.Element;
 export default ProfileIcicleGraph;

package/dist/ProfileIcicleGraph/index.js

@@ -23,13 +23,14 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { useEffect, useMemo } from 'react';
+import { Button } from '@parca/components';
 import { useContainerDimensions } from '@parca/dynamicsize';
 import { selectQueryParam } from '@parca/functions';
 import DiffLegend from '../components/DiffLegend';
-import IcicleGraph from './IcicleGraph';
+import { IcicleGraph } from './IcicleGraph';
 var numberFormatter = new Intl.NumberFormat('en-US');
 var ProfileIcicleGraph = function (_a) {
-    var graph = _a.graph, curPath = _a.curPath, setNewCurPath = _a.setNewCurPath, sampleUnit = _a.sampleUnit, onContainerResize = _a.onContainerResize, navigateTo = _a.navigateTo, loading = _a.loading;
+    var graph = _a.graph, curPath = _a.curPath, setNewCurPath = _a.setNewCurPath, sampleUnit = _a.sampleUnit, onContainerResize = _a.onContainerResize, navigateTo = _a.navigateTo, loading = _a.loading, setActionButtons = _a.setActionButtons;
     var compareMode = selectQueryParam('compare_a') === 'true' && selectQueryParam('compare_b') === 'true';
     var _b = useContainerDimensions(), ref = _b.ref, dimensions = _b.dimensions;
     useEffect(function () {
@@ -55,11 +56,17 @@ var ProfileIcicleGraph = function (_a) {
             numberFormatter.format(untrimmedTotal),
         ];
     }, [graph]), isTrimmed = _c[0], _ = _c[1], trimmedPercentage = _c[2], formattedTotal = _c[3], formattedUntrimmedTotal = _c[4];
+    useEffect(function () {
+        if (setActionButtons === undefined) {
+            return;
+        }
+        setActionButtons(_jsx(_Fragment, { children: _jsx(Button, __assign({ color: "neutral", onClick: function () { return setNewCurPath([]); }, disabled: curPath.length === 0, className: "w-auto", variant: "neutral" }, { children: "Reset View" })) }));
+    }, [setNewCurPath, curPath, setActionButtons]);
     if (graph === undefined)
         return _jsx("div", { children: "no data..." });
     var total = graph.total;
     if (parseFloat(total) === 0 && !loading)
         return _jsx(_Fragment, { children: "Profile has no samples" });
-    return (_jsxs("div", __assign({ className: "relative" }, { children: [compareMode && _jsx(DiffLegend, {}), isTrimmed ? (_jsxs("p", __assign({ className: "my-2 text-sm" }, { children: ["Showing ", formattedTotal, "(", trimmedPercentage, "%) out of ", formattedUntrimmedTotal, " samples"] }))) : null, _jsx("div", __assign({ ref: ref }, { children: _jsx(IcicleGraph, { width: dimensions === null || dimensions === void 0 ? void 0 : dimensions.width, graph: graph, curPath: curPath, setCurPath: setNewCurPath, sampleUnit: sampleUnit, navigateTo: navigateTo, isTrimmed: isTrimmed }) }))] })));
+    return (_jsxs("div", __assign({ className: "relative" }, { children: [compareMode && _jsx(DiffLegend, {}), isTrimmed ? (_jsxs("p", __assign({ className: "my-2 text-sm" }, { children: ["Showing ", formattedTotal, "(", trimmedPercentage, "%) out of ", formattedUntrimmedTotal, " samples"] }))) : null, _jsx("div", __assign({ ref: ref }, { children: _jsx(IcicleGraph, { width: dimensions === null || dimensions === void 0 ? void 0 : dimensions.width, graph: graph, curPath: curPath, setCurPath: setNewCurPath, sampleUnit: sampleUnit, navigateTo: navigateTo }) }))] })));
 };
 export default ProfileIcicleGraph;

package/dist/ProfileSelector/index.js

@@ -93,6 +93,7 @@ var ProfileSelector = function (_a) {
         var newValue = value.includes('\\') ? value.replaceAll('\\', '\\\\') : value;
         var _a = Query.parse(queryExpressionString).setMatcher(key, newValue), newQuery = _a[0], changed = _a[1];
         if (changed) {
+            // TODO: Change this to store the query object
             setNewQueryExpression(newQuery.toString());
         }
     };
@@ -130,12 +131,21 @@ var ProfileSelector = function (_a) {
                             timeSelection: range.getRangeKey(),
                         });
                     }, addLabelMatcher: addLabelMatcher, onPointClick: function (timestamp, labels, queryExpression) {
+                        // TODO: Pass the query object via click rather than queryExpression
+                        var query = Query.parse(queryExpression);
+                        labels.forEach(function (l) {
+                            var _a = query.setMatcher(l.name, l.value), newQuery = _a[0], updated = _a[1];
+                            if (updated) {
+                                query = newQuery;
+                            }
+                        });
                         var stepDuration = getStepDuration(querySelection.from, querySelection.to);
                         var stepDurationInMilliseconds = getStepDurationInMilliseconds(stepDuration);
-                        var isDeltaType = Query.parse(queryExpression).profileType().delta;
                         var mergeFrom = timestamp;
-                        var mergeTo = isDeltaType ? mergeFrom + stepDurationInMilliseconds : mergeFrom;
-                        selectProfile(new MergedProfileSelection(mergeFrom, mergeTo, labels, queryExpression));
+                        var mergeTo = query.profileType().delta
+                            ? mergeFrom + stepDurationInMilliseconds
+                            : mergeFrom;
+                        selectProfile(new MergedProfileSelection(mergeFrom, mergeTo, query));
                     } })) : (_jsx(_Fragment, { children: profileSelection == null && (_jsx("div", __assign({ className: "my-20 text-center" }, { children: _jsx("p", { children: "Run a query, and the result will be displayed here." }) }))) })) })] }));
 };
 export default ProfileSelector;

package/dist/ProfileSource.d.ts

@@ -1,5 +1,5 @@
 import { Label, ProfileDiffSelection, QueryRequest } from '@parca/client';
-import { ProfileType } from '@parca/parser';
+import { ProfileType, Query } from '@parca/parser';
 export interface ProfileSource {
     QueryRequest: () => QueryRequest;
     ProfileType: () => ProfileType;
@@ -30,10 +30,9 @@ export declare function ProfileSelectionFromParams(expression: string | undefine
 export declare class MergedProfileSelection implements ProfileSelection {
     mergeFrom: number;
     mergeTo: number;
-    query: string;
+    query: Query;
     filterQuery: string | undefined;
-    labels: Label[];
-    constructor(mergeFrom: number, mergeTo: number, labels: Label[], query: string, filterQuery?: string);
+    constructor(mergeFrom: number, mergeTo: number, query: Query, filterQuery?: string);
     ProfileName(): string;
     HistoryParams(): {
         [key: string]: any;
@@ -55,14 +54,13 @@ export declare class ProfileDiffSource implements ProfileSource {
 export declare class MergedProfileSource implements ProfileSource {
     mergeFrom: number;
     mergeTo: number;
-    labels: Label[];
-    query: string;
+    query: Query;
     filterQuery: string | undefined;
-    constructor(mergeFrom: number, mergeTo: number, labels: Label[], query: string, filterQuery?: string);
+    constructor(mergeFrom: number, mergeTo: number, query: Query, filterQuery?: string);
     DiffSelection(): ProfileDiffSelection;
     QueryRequest(): QueryRequest;
     ProfileType(): ProfileType;
     Describe(): JSX.Element;
-    stringLabels(): string[];
+    stringMatchers(): string[];
     toString(): string;
 }

package/dist/ProfileSource.js

@@ -30,7 +30,9 @@ export function SuffixParams(params, suffix) {
     }));
 }
 export function ParseLabels(labels) {
-    return labels.map(function (labelString) {
+    return labels
+        .filter(function (str) { return str !== ''; })
+        .map(function (labelString) {
         var parts = labelString.split('=', 2);
         return { name: parts[0], value: parts[1] };
     });
@@ -41,20 +43,27 @@ export function ProfileSelectionFromParams(expression, from, to, mergeFrom, merg
         mergeFrom !== undefined &&
         mergeTo !== undefined &&
         expression !== undefined) {
-        return new MergedProfileSelection(parseInt(mergeFrom), parseInt(mergeTo), ParseLabels(labels !== null && labels !== void 0 ? labels : ['']), expression, filterQuery);
+        // TODO: Refactor parsing the query and adding matchers
+        var query_1 = Query.parse(expression);
+        ParseLabels(labels !== null && labels !== void 0 ? labels : ['']).forEach(function (l) {
+            var _a = query_1.setMatcher(l.name, l.value), newQuery = _a[0], changed = _a[1];
+            if (changed) {
+                query_1 = newQuery;
+            }
+        });
+        return new MergedProfileSelection(parseInt(mergeFrom), parseInt(mergeTo), query_1, filterQuery);
     }
     return null;
 }
 var MergedProfileSelection = /** @class */ (function () {
-    function MergedProfileSelection(mergeFrom, mergeTo, labels, query, filterQuery) {
+    function MergedProfileSelection(mergeFrom, mergeTo, query, filterQuery) {
         this.mergeFrom = mergeFrom;
         this.mergeTo = mergeTo;
         this.query = query;
         this.filterQuery = filterQuery;
-        this.labels = labels;
     }
     MergedProfileSelection.prototype.ProfileName = function () {
-        return Query.parse(this.query).profileName();
+        return this.query.profileName();
     };
     MergedProfileSelection.prototype.HistoryParams = function () {
         return {
@@ -62,14 +71,14 @@ var MergedProfileSelection = /** @class */ (function () {
             merge_to: this.mergeTo.toString(),
             query: this.query,
             profile_name: this.ProfileName(),
-            labels: this.labels.map(function (label) { return "".concat(label.name, "=").concat(encodeURIComponent(label.value)); }),
+            labels: this.query.matchers.map(function (m) { return "".concat(m.key, "=").concat(encodeURIComponent(m.value)); }),
         };
     };
     MergedProfileSelection.prototype.Type = function () {
         return 'merge';
     };
     MergedProfileSelection.prototype.ProfileSource = function () {
-        return new MergedProfileSource(this.mergeFrom, this.mergeTo, this.labels, this.query, this.filterQuery);
+        return new MergedProfileSource(this.mergeFrom, this.mergeTo, this.query, this.filterQuery);
     };
     return MergedProfileSelection;
 }());
@@ -110,10 +119,9 @@ var ProfileDiffSource = /** @class */ (function () {
 }());
 export { ProfileDiffSource };
 var MergedProfileSource = /** @class */ (function () {
-    function MergedProfileSource(mergeFrom, mergeTo, labels, query, filterQuery) {
+    function MergedProfileSource(mergeFrom, mergeTo, query, filterQuery) {
         this.mergeFrom = mergeFrom;
         this.mergeTo = mergeTo;
-        this.labels = labels;
         this.query = query;
         this.filterQuery = filterQuery;
     }
@@ -124,7 +132,7 @@ var MergedProfileSource = /** @class */ (function () {
                 merge: {
                     start: Timestamp.fromDate(new Date(this.mergeFrom)),
                     end: Timestamp.fromDate(new Date(this.mergeTo)),
-                    query: this.query,
+                    query: this.query.toString(),
                 },
             },
             mode: ProfileDiffSelection_Mode.MERGE,
@@ -137,7 +145,7 @@ var MergedProfileSource = /** @class */ (function () {
                 merge: {
                     start: Timestamp.fromDate(new Date(this.mergeFrom)),
                     end: Timestamp.fromDate(new Date(this.mergeTo)),
-                    query: this.query,
+                    query: this.query.toString(),
                 },
             },
             reportType: QueryRequest_ReportType.FLAMEGRAPH_UNSPECIFIED,
@@ -146,18 +154,18 @@ var MergedProfileSource = /** @class */ (function () {
         };
     };
     MergedProfileSource.prototype.ProfileType = function () {
-        return ProfileType.fromString(Query.parse(this.query).profileName());
+        return ProfileType.fromString(Query.parse(this.query.toString()).profileName());
     };
     MergedProfileSource.prototype.Describe = function () {
-        return (_jsxs("a", { children: ["Merge of \"", this.query, "\" from ", formatDate(this.mergeFrom, timeFormat), " to", ' ', formatDate(this.mergeTo, timeFormat)] }));
+        return (_jsxs("a", { children: ["Merge of \"", this.query.toString(), "\" from ", formatDate(this.mergeFrom, timeFormat), ' ', "to ", formatDate(this.mergeTo, timeFormat)] }));
     };
-    MergedProfileSource.prototype.stringLabels = function () {
-        return this.labels
-            .filter(function (label) { return label.name !== '__name__'; })
-            .map(function (label) { return "".concat(label.name, "=").concat(label.value); });
+    MergedProfileSource.prototype.stringMatchers = function () {
+        return this.query.matchers
+            .filter(function (m) { return m.key !== '__name__'; })
+            .map(function (m) { return "".concat(m.key, "=").concat(m.value); });
     };
     MergedProfileSource.prototype.toString = function () {
-        return "merged profiles of query \"".concat(this.query, "\" from ").concat(formatDate(this.mergeFrom, timeFormat), " to ").concat(formatDate(this.mergeTo, timeFormat));
+        return "merged profiles of query \"".concat(this.query.toString(), "\" from ").concat(formatDate(this.mergeFrom, timeFormat), " to ").concat(formatDate(this.mergeTo, timeFormat));
     };
     return MergedProfileSource;
 }());

package/dist/ProfileView/VisualizationPanel.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import type { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd';
+import type { NavigateFunction } from '@parca/functions';
+interface Props {
+    dashboardItem: string;
+    index: number;
+    isMultiPanelView: boolean;
+    handleClosePanel: (dashboardItem: string) => void;
+    navigateTo: NavigateFunction | undefined;
+    dragHandleProps: DraggableProvidedDragHandleProps | null | undefined;
+    getDashboardItemByType: (props: {
+        type: string;
+        isHalfScreen: boolean;
+        setActionButtons: (actionButtons: JSX.Element) => void;
+    }) => JSX.Element;
+}
+export declare const VisualizationPanel: React.NamedExoticComponent<Props>;
+export {};

package/dist/ProfileView/VisualizationPanel.js

@@ -0,0 +1,38 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+// Copyright 2022 The Parca Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import React, { useState } from 'react';
+import { Icon } from '@iconify/react';
+import cx from 'classnames';
+import { CloseIcon } from '@parca/icons';
+import ViewSelector from './ViewSelector';
+export var VisualizationPanel = React.memo(function VisualizationPanel(_a) {
+    var dashboardItem = _a.dashboardItem, index = _a.index, isMultiPanelView = _a.isMultiPanelView, handleClosePanel = _a.handleClosePanel, navigateTo = _a.navigateTo, dragHandleProps = _a.dragHandleProps, getDashboardItemByType = _a.getDashboardItemByType;
+    var _b = useState(_jsx(_Fragment, {})), actionButtons = _b[0], setActionButtons = _b[1];
+    return (_jsxs(_Fragment, { children: [_jsxs("div", __assign({ className: "w-full flex justify-end pb-2" }, { children: [_jsxs("div", __assign({ className: "w-full flex justify-between items-center" }, { children: [_jsxs("div", __assign({ className: "flex" }, { children: [_jsx("div", __assign({ className: cx(isMultiPanelView ? 'visible' : 'invisible', 'flex items-center') }, dragHandleProps, { children: _jsx(Icon, { className: "text-xl", icon: "material-symbols:drag-indicator" }) })), _jsx(_Fragment, { children: actionButtons })] })), _jsx(ViewSelector, { defaultValue: dashboardItem, navigateTo: navigateTo, position: index })] })), isMultiPanelView && (_jsx("button", __assign({ type: "button", onClick: function () { return handleClosePanel(dashboardItem); }, className: "pl-2" }, { children: _jsx(CloseIcon, {}) })))] })), getDashboardItemByType({
+                type: dashboardItem,
+                isHalfScreen: isMultiPanelView,
+                setActionButtons: setActionButtons,
+            })] }));
+});

package/dist/ProfileView/index.js

@@ -33,14 +33,12 @@ import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-run
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { Profiler, useEffect, useMemo, useState } from 'react';
-import { Icon } from '@iconify/react';
 import cx from 'classnames';
 import { scaleLinear } from 'd3';
 import { DragDropContext, Draggable, Droppable, } from 'react-beautiful-dnd';
 import { Button, Card, ConditionalWrapper, KeyDownProvider, useParcaContext, useURLState, } from '@parca/components';
 import { useContainerDimensions } from '@parca/dynamicsize';
 import { getNewSpanColor } from '@parca/functions';
-import { CloseIcon } from '@parca/icons';
 import { selectDarkMode, useAppSelector } from '@parca/store';
 import { Callgraph } from '../';
 import ProfileIcicleGraph from '../ProfileIcicleGraph';
@@ -49,6 +47,7 @@ import ProfileShareButton from '../components/ProfileShareButton';
 import useDelayedLoader from '../useDelayedLoader';
 import FilterByFunctionButton from './FilterByFunctionButton';
 import ViewSelector from './ViewSelector';
+import { VisualizationPanel } from './VisualizationPanel';
 function arrayEquals(a, b) {
     return (Array.isArray(a) &&
         Array.isArray(b) &&
@@ -63,6 +62,7 @@ export var ProfileView = function (_a) {
         param: 'dashboard_items',
         navigateTo: navigateTo,
     }), rawDashboardItems = _d[0], setDashboardItems = _d[1];
+    var currentSearchString = useURLState({ param: 'search_string' })[0];
     var dashboardItems = rawDashboardItems;
     var isDarkMode = useAppSelector(selectDarkMode);
     var isMultiPanelView = dashboardItems.length > 1;
@@ -97,19 +97,19 @@ export var ProfileView = function (_a) {
     var minColor = scaleLinear([isDarkMode ? 'black' : 'white', maxColor])(0.3);
     var colorRange = [minColor, maxColor];
     var getDashboardItemByType = function (_a) {
-        var type = _a.type, isHalfScreen = _a.isHalfScreen;
+        var type = _a.type, isHalfScreen = _a.isHalfScreen, setActionButtons = _a.setActionButtons;
         switch (type) {
             case 'icicle': {
                 return (flamegraphData === null || flamegraphData === void 0 ? void 0 : flamegraphData.data) != null ? (_jsx(ConditionalWrapper, __assign({ condition: (perf === null || perf === void 0 ? void 0 : perf.onRender) != null, WrapperComponent: Profiler, wrapperProps: {
                         id: 'icicleGraph',
                         onRender: perf === null || perf === void 0 ? void 0 : perf.onRender,
-                    } }, { children: _jsx(ProfileIcicleGraph, { curPath: curPath, setNewCurPath: setNewCurPath, graph: flamegraphData.data, sampleUnit: sampleUnit, onContainerResize: onFlamegraphContainerResize, navigateTo: navigateTo, loading: flamegraphData.loading }) }))) : (_jsx(_Fragment, { children: " " }));
+                    } }, { children: _jsx(ProfileIcicleGraph, { curPath: curPath, setNewCurPath: setNewCurPath, graph: flamegraphData.data, sampleUnit: sampleUnit, onContainerResize: onFlamegraphContainerResize, navigateTo: navigateTo, loading: flamegraphData.loading, setActionButtons: setActionButtons }) }))) : (_jsx(_Fragment, { children: " " }));
             }
             case 'callgraph': {
                 return (callgraphData === null || callgraphData === void 0 ? void 0 : callgraphData.data) != null && (dimensions === null || dimensions === void 0 ? void 0 : dimensions.width) !== undefined ? (_jsx(Callgraph, { graph: callgraphData.data, sampleUnit: sampleUnit, width: isHalfScreen ? (dimensions === null || dimensions === void 0 ? void 0 : dimensions.width) / 2 : dimensions === null || dimensions === void 0 ? void 0 : dimensions.width, colorRange: colorRange })) : (_jsx(_Fragment, {}));
             }
             case 'table': {
-                return topTableData != null ? (_jsx(TopTable, { loading: topTableData.loading, data: topTableData.data, sampleUnit: sampleUnit, navigateTo: navigateTo })) : (_jsx(_Fragment, {}));
+                return topTableData != null ? (_jsx(TopTable, { loading: topTableData.loading, data: topTableData.data, sampleUnit: sampleUnit, navigateTo: navigateTo, setActionButtons: setActionButtons, currentSearchString: currentSearchString })) : (_jsx(_Fragment, {}));
             }
             default: {
                 return _jsx(_Fragment, {});
@@ -135,10 +135,6 @@ export var ProfileView = function (_a) {
                                                         onDownloadPProf();
                                                     } }, { children: "Download pprof" }))] })), _jsx(FilterByFunctionButton, { navigateTo: navigateTo })] })), _jsx("div", __assign({ className: "flex ml-auto gap-2" }, { children: _jsx(ViewSelector, { defaultValue: "", navigateTo: navigateTo, position: -1, placeholderText: "Add panel...", primary: true, addView: true, disabled: isMultiPanelView || dashboardItems.length < 1 }) }))] })), isLoaderVisible ? (_jsx(_Fragment, { children: loader })) : (_jsx(DragDropContext, __assign({ onDragEnd: onDragEnd }, { children: _jsx("div", __assign({ className: "w-full", ref: ref }, { children: _jsx(Droppable, __assign({ droppableId: "droppable", direction: "horizontal" }, { children: function (provided) { return (_jsx("div", __assign({ ref: provided.innerRef, className: "flex space-x-4 justify-between w-full" }, provided.droppableProps, { children: dashboardItems.map(function (dashboardItem, index) {
                                             return (_jsx(Draggable, __assign({ draggableId: dashboardItem, index: index, isDragDisabled: !isMultiPanelView }, { children: function (provided, snapshot) { return (_createElement("div", __assign({ ref: provided.innerRef }, provided.draggableProps, { key: dashboardItem, className: cx('border dark:bg-gray-700 rounded border-gray-300 dark:border-gray-500 p-3', isMultiPanelView ? 'w-1/2' : 'w-full', snapshot.isDragging ? 'bg-gray-200' : 'bg-white') }),
-                                                    _jsxs("div", __assign({ className: "w-full flex justify-end pb-2" }, { children: [_jsxs("div", __assign({ className: "w-full flex justify-between" }, { children: [_jsx("div", __assign({ className: cx(isMultiPanelView ? 'visible' : 'invisible', 'flex items-center') }, provided.dragHandleProps, { children: _jsx(Icon, { className: "text-xl", icon: "material-symbols:drag-indicator" }) })), _jsx(ViewSelector, { defaultValue: dashboardItem, navigateTo: navigateTo, position: index })] })), isMultiPanelView && (_jsx("button", __assign({ type: "button", onClick: function () { return handleClosePanel(dashboardItem); }, className: "pl-2" }, { children: _jsx(CloseIcon, {}) })))] })),
-                                                    getDashboardItemByType({
-                                                        type: dashboardItem,
-                                                        isHalfScreen: isMultiPanelView,
-                                                    }))); } }), dashboardItem));
+                                                    _jsx(VisualizationPanel, { handleClosePanel: handleClosePanel, isMultiPanelView: isMultiPanelView, dashboardItem: dashboardItem, getDashboardItemByType: getDashboardItemByType, dragHandleProps: provided.dragHandleProps, navigateTo: navigateTo, index: index }))); } }), dashboardItem));
                                         }) }))); } })) })) })))] }) }) })) }));
 };

package/dist/TopTable/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { Top, TopNodeMeta } from '@parca/client';
 import { type NavigateFunction } from '@parca/functions';
 interface TopTableProps {
@@ -5,7 +6,9 @@ interface TopTableProps {
     data?: Top;
     sampleUnit: string;
     navigateTo?: NavigateFunction;
+    currentSearchString?: string;
+    setActionButtons?: (buttons: JSX.Element) => void;
 }
 export declare const RowLabel: (meta: TopNodeMeta | undefined) => string;
-export declare const TopTable: ({ data: top, sampleUnit: unit, navigateTo, loading, }: TopTableProps) => JSX.Element;
+export declare const TopTable: React.NamedExoticComponent<TopTableProps>;
 export default TopTable;

package/dist/TopTable/index.js

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 // Copyright 2022 The Parca Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { useCallback, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { createColumnHelper } from '@tanstack/react-table';
 import { Button, Table, useURLState } from '@parca/components';
 import { getLastItem, isSearchMatch, parseParams, valueFormatter, } from '@parca/functions';
@@ -47,12 +47,11 @@ var addPlusSign = function (num) {
     }
     return "+".concat(num);
 };
-export var TopTable = function (_a) {
+export var TopTable = React.memo(function TopTable(_a) {
     var _b;
-    var top = _a.data, unit = _a.sampleUnit, navigateTo = _a.navigateTo, loading = _a.loading;
+    var top = _a.data, unit = _a.sampleUnit, navigateTo = _a.navigateTo, loading = _a.loading, currentSearchString = _a.currentSearchString, setActionButtons = _a.setActionButtons;
     var router = parseParams(window.location.search);
     var rawDashboardItems = useURLState({ param: 'dashboard_items' })[0];
-    var currentSearchString = useURLState({ param: 'search_string' })[0];
     var rawcompareMode = useURLState({ param: 'compare_a' })[0];
     var compareMode = rawcompareMode === undefined ? false : rawcompareMode === 'true';
     var dashboardItems = rawDashboardItems;
@@ -135,12 +134,18 @@ export var TopTable = function (_a) {
             navigateTo('/', __assign(__assign({}, router), { search_string: '' }), { replace: true });
         }
     }, [navigateTo, router]);
+    useEffect(function () {
+        if (setActionButtons === undefined) {
+            return;
+        }
+        setActionButtons(dashboardItems.length > 1 ? (_jsx(Button, __assign({ color: "neutral", onClick: clearSelection, className: "w-auto", variant: "neutral", disabled: currentSearchString === undefined || currentSearchString.length === 0 }, { children: "Clear selection" }))) : (_jsx(_Fragment, {})));
+    }, [dashboardItems, clearSelection, currentSearchString, setActionButtons]);
     var initialSorting = useMemo(function () {
         return [{ id: compareMode ? 'diff' : 'cumulative', desc: true }];
     }, [compareMode]);
     var total = top != null ? top.list.length : 0;
     if (total === 0 && !loading)
         return _jsx(_Fragment, { children: "Profile has no samples" });
-    return (_jsxs("div", __assign({ className: "relative" }, { children: [dashboardItems.length > 1 && (_jsx("div", __assign({ className: "left-[25px] top-[-45px] absolute" }, { children: _jsx(Button, __assign({ color: "neutral", onClick: clearSelection, className: "w-auto", variant: "neutral", disabled: currentSearchString === undefined || currentSearchString.length === 0 }, { children: "Clear selection" })) }))), _jsx("div", __assign({ className: "w-full font-robotoMono h-[80vh] overflow-scroll" }, { children: _jsx(Table, { data: (_b = top === null || top === void 0 ? void 0 : top.list) !== null && _b !== void 0 ? _b : [], columns: columns, initialSorting: initialSorting, onRowClick: onRowClick, enableHighlighting: enableHighlighting, shouldHighlightRow: shouldHighlightRow, usePointerCursor: dashboardItems.length > 1 }) }))] })));
-};
+    return (_jsx("div", __assign({ className: "relative" }, { children: _jsx("div", __assign({ className: "w-full font-robotoMono h-[80vh] overflow-scroll" }, { children: _jsx(Table, { data: (_b = top === null || top === void 0 ? void 0 : top.list) !== null && _b !== void 0 ? _b : [], columns: columns, initialSorting: initialSorting, onRowClick: onRowClick, enableHighlighting: enableHighlighting, shouldHighlightRow: shouldHighlightRow, usePointerCursor: dashboardItems.length > 1 }) })) })));
+});
 export default TopTable;