@perses-dev/plugin-system 0.54.0-beta.8 → 0.54.0-beta.9

package/dist/cjs/components/MultiQueryEditor/QueryEditorContainer.js

@@ -29,7 +29,11 @@ const _ChevronRight = /*#__PURE__*/ _interop_require_default(require("mdi-materi
 const _react = require("react");
 const _Alert = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Alert"));
 const _components = require("@perses-dev/components");
+const _Pencil = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Pencil"));
+const _Check = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Check"));
+const _Close = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Close"));
 const _PluginEditor = require("../PluginEditor");
+const _utils = require("./utils");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -37,6 +41,16 @@ function _interop_require_default(obj) {
 }
 const QueryEditorContainer = /*#__PURE__*/ (0, _react.forwardRef)((props, ref)=>{
     const { queryTypes, index, query, queryResult, filteredQueryPlugins, isCollapsed, onDelete, onChange, onQueryRun, onCollapseExpand } = props;
+    // The displayed name is always derived from props so it stays in sync with the
+    // current query/index, even when queries are added, removed or reordered.
+    const displayedName = query.spec.name ?? (0, _utils.defaultQueryName)(index);
+    const [isEditingName, setIsEditingName] = (0, _react.useState)(false);
+    function handleNameSave(name) {
+        setIsEditingName(false);
+        onChange(index, (0, _immer.produce)(query, (draft)=>{
+            draft.spec.name = name;
+        }));
+    }
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
         spacing: 1,
         children: [
@@ -49,19 +63,40 @@ const QueryEditorContainer = /*#__PURE__*/ (0, _react.forwardRef)((props, ref)=>
                 children: [
                     /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
                         direction: "row",
+                        gap: 1,
+                        sx: {
+                            width: '100%'
+                        },
                         children: [
                             /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
                                 size: "small",
+                                sx: {
+                                    width: 'fit-content',
+                                    height: 'fit-content'
+                                },
                                 onClick: ()=>onCollapseExpand(index),
                                 children: isCollapsed ? /*#__PURE__*/ (0, _jsxruntime.jsx)(_ChevronRight.default, {}) : /*#__PURE__*/ (0, _jsxruntime.jsx)(_ChevronDown.default, {})
                             }),
-                            /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Typography, {
-                                variant: "overline",
-                                component: "h4",
-                                children: [
-                                    "Query #",
-                                    index + 1
-                                ]
+                            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Stack, {
+                                direction: "row",
+                                gap: 1,
+                                alignItems: "center",
+                                alignContent: "center",
+                                sx: {
+                                    width: '100%',
+                                    '&:hover button': {
+                                        visibility: 'visible'
+                                    }
+                                },
+                                children: isEditingName ? /*#__PURE__*/ (0, _jsxruntime.jsx)(QueryNameInput, {
+                                    initialName: displayedName,
+                                    onSave: handleNameSave,
+                                    onCancel: ()=>setIsEditingName(false)
+                                }, displayedName) : /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Typography, {
+                                    variant: "overline",
+                                    component: "h4",
+                                    children: displayedName
+                                })
                             })
                         ]
                     }),
@@ -105,11 +140,24 @@ const QueryEditorContainer = /*#__PURE__*/ (0, _react.forwardRef)((props, ref)=>
                                     ]
                                 })
                             }),
-                            onDelete && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
-                                "aria-label": "delete query",
-                                size: "small",
-                                onClick: ()=>onDelete && onDelete(index),
-                                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_DeleteOutline.default, {})
+                            /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
+                                direction: "row",
+                                children: [
+                                    !isEditingName && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                                        "aria-label": "edit query name",
+                                        size: "small",
+                                        onClick: ()=>setIsEditingName(true),
+                                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Pencil.default, {
+                                            fontSize: "small"
+                                        })
+                                    }),
+                                    onDelete && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                                        "aria-label": "delete query",
+                                        size: "small",
+                                        onClick: ()=>onDelete && onDelete(index),
+                                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_DeleteOutline.default, {})
+                                    })
+                                ]
                             })
                         ]
                     })
@@ -127,6 +175,43 @@ const QueryEditorContainer = /*#__PURE__*/ (0, _react.forwardRef)((props, ref)=>
     }, index);
 });
 QueryEditorContainer.displayName = 'QueryEditorContainer';
+/**
+ * Self-contained input to edit a query name. The draft value is local state seeded from
+ * `initialName`; callers reset it by changing the `key` (remounting) rather than syncing
+ * with an useEffect.
+ */ function QueryNameInput({ initialName, onSave, onCancel }) {
+    const [draftName, setDraftName] = (0, _react.useState)(initialName);
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.TextField, {
+        size: "small",
+        variant: "outlined",
+        label: "Query name",
+        "aria-label": "query name",
+        value: draftName,
+        onChange: (e)=>setDraftName(e.target.value),
+        fullWidth: true,
+        InputProps: {
+            endAdornment: /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.InputAdornment, {
+                position: "end",
+                children: [
+                    /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                        size: "small",
+                        "aria-label": "cancel edit",
+                        onClick: onCancel,
+                        edge: "end",
+                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Close.default, {})
+                    }),
+                    /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                        size: "small",
+                        "aria-label": "save query name",
+                        onClick: ()=>onSave(draftName),
+                        edge: "end",
+                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Check.default, {})
+                    })
+                ]
+            })
+        }
+    });
+}
 /**
  * Editor for a query definition. This component is responsible for rendering the plugin editor for the given query.
  * This will allow user to select a plugin extending from the given supported query types, and then edit the plugin

package/dist/cjs/components/MultiQueryEditor/index.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 _export_star(require("./MultiQueryEditor"), exports);
+_export_star(require("./utils"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/dist/cjs/components/MultiQueryEditor/utils.js

@@ -0,0 +1,36 @@
+// Copyright The Perses 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.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get defaultQueryName () {
+        return defaultQueryName;
+    },
+    get generateQueryNames () {
+        return generateQueryNames;
+    }
+});
+function defaultQueryName(index) {
+    return `Query #${index + 1}`;
+}
+function generateQueryNames(definitions) {
+    return definitions.map((queryDef, index)=>queryDef.spec.name ?? defaultQueryName(index));
+}

package/dist/cjs/components/PanelSpecEditor/PanelSpecEditor.js

@@ -109,11 +109,8 @@ const PanelSpecEditor = /*#__PURE__*/ (0, _react.forwardRef)((props, ref)=>{
                 })
         })
     });
-    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_runtime.QueryCountProvider, {
-        queryCount: (panelDefinition.spec.queries ?? []).length,
-        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_OptionsEditorTabs.OptionsEditorTabs, {
-            tabs: tabs
-        }, tabs.length)
-    });
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_OptionsEditorTabs.OptionsEditorTabs, {
+        tabs: tabs
+    }, tabs.length);
 });
 PanelSpecEditor.displayName = 'PanelSpecEditor';

package/dist/cjs/runtime/DataQueriesProvider/DataQueriesProvider.js

@@ -54,46 +54,37 @@ function useDataQueriesContext() {
 }
 function useDataQueries(queryType) {
     const ctx = useDataQueriesContext();
+    // Filter query definitions based on the specified query type
+    const filteredQueryDefinitions = ctx.queryDefinitions.filter((definition)=>definition.kind === queryType);
     // Filter the query results based on the specified query type
     const filteredQueryResults = ctx.queryResults.filter((queryResult)=>queryResult?.definition?.kind === queryType);
     // Filter the errors based on the specified query type
     const filteredErrors = ctx.errors.filter((errors, index)=>ctx.queryResults[index]?.definition?.kind === queryType);
     // Create a new context object with the filtered results and errors
-    const filteredCtx = {
+    return {
+        queryDefinitions: filteredQueryDefinitions,
         queryResults: filteredQueryResults,
         isFetching: filteredQueryResults.some((result)=>result.isFetching),
         isLoading: filteredQueryResults.some((result)=>result.isLoading),
         refetchAll: ctx.refetchAll,
         errors: filteredErrors
     };
-    return filteredCtx;
 }
 function DataQueriesProvider(props) {
     const { definitions, options, children, queryOptions } = props;
-    // Returns a query kind, for example "TimeSeriesQuery" = getQueryType("PrometheusTimeSeriesQuery")
-    const getQueryType = (0, _model.useQueryType)();
-    const queryDefinitions = definitions.map((definition)=>{
-        const type = getQueryType(definition.kind);
-        return {
-            kind: type,
-            spec: {
-                plugin: definition
-            }
-        };
-    });
     const usageMetrics = (0, _UsageMetricsProvider.useUsageMetrics)();
     // Filter definitions for time series query and other future query plugins
-    const timeSeriesQueries = queryDefinitions.filter((definition)=>definition.kind === 'TimeSeriesQuery');
+    const timeSeriesQueries = definitions.filter((definition)=>definition.kind === 'TimeSeriesQuery');
     const timeSeriesResults = (0, _timeseriesqueries.useTimeSeriesQueries)(timeSeriesQueries, options, queryOptions);
-    const traceQueries = queryDefinitions.filter((definition)=>definition.kind === 'TraceQuery');
+    const traceQueries = definitions.filter((definition)=>definition.kind === 'TraceQuery');
     const traceResults = (0, _tracequeries.useTraceQueries)(traceQueries);
-    const profileQueries = queryDefinitions.filter((definition)=>definition.kind === 'ProfileQuery');
+    const profileQueries = definitions.filter((definition)=>definition.kind === 'ProfileQuery');
     const profileResults = (0, _profilequeries.useProfileQueries)(profileQueries);
-    const logQueries = queryDefinitions.filter((definition)=>definition.kind === 'LogQuery');
+    const logQueries = definitions.filter((definition)=>definition.kind === 'LogQuery');
     const logResults = (0, _logqueries.useLogQueries)(logQueries);
-    const alertsQueries = queryDefinitions.filter((definition)=>definition.kind === 'AlertsQuery');
+    const alertsQueries = definitions.filter((definition)=>definition.kind === 'AlertsQuery');
     const alertsResults = (0, _alertsqueries.useAlertsQueries)(alertsQueries);
-    const silencesQueries = queryDefinitions.filter((definition)=>definition.kind === 'SilencesQuery');
+    const silencesQueries = definitions.filter((definition)=>definition.kind === 'SilencesQuery');
     const silencesResults = (0, _silencesqueries.useSilencesQueries)(silencesQueries);
     const refetchAll = (0, _react.useCallback)(()=>{
         timeSeriesResults.forEach((result)=>result.refetch());
@@ -131,6 +122,7 @@ function DataQueriesProvider(props) {
             }
         }
         return {
+            queryDefinitions: definitions,
             queryResults: mergedQueryResults,
             isFetching: mergedQueryResults.some((result)=>result.isFetching),
             isLoading: mergedQueryResults.some((result)=>result.isLoading),
@@ -138,20 +130,21 @@ function DataQueriesProvider(props) {
             errors: mergedQueryResults.map((result)=>result.error)
         };
     }, [
-        timeSeriesQueries,
-        timeSeriesResults,
-        traceQueries,
-        traceResults,
-        profileQueries,
-        profileResults,
-        logQueries,
-        logResults,
         alertsQueries,
         alertsResults,
+        logQueries,
+        logResults,
+        profileQueries,
+        profileResults,
         silencesQueries,
         silencesResults,
-        refetchAll,
+        timeSeriesQueries,
+        timeSeriesResults,
+        traceQueries,
+        traceResults,
+        definitions,
         queryOptions?.enabled,
+        refetchAll,
         usageMetrics
     ]);
     return /*#__PURE__*/ (0, _jsxruntime.jsx)(DataQueriesContext.Provider, {

package/dist/cjs/runtime/DataQueriesProvider/model.js

@@ -14,22 +14,12 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get transformQueryResults () {
+Object.defineProperty(exports, "transformQueryResults", {
+    enumerable: true,
+    get: function() {
         return transformQueryResults;
-    },
-    get useQueryType () {
-        return useQueryType;
     }
 });
-const _react = require("react");
-const _pluginregistry = require("../plugin-registry");
 function transformQueryResults(results, definitions) {
     return results.map(({ data, isFetching, isLoading, refetch, error }, i)=>{
         return {
@@ -42,109 +32,3 @@ function transformQueryResults(results, definitions) {
         };
     });
 }
-function useQueryType() {
-    const { data: timeSeriesQueryPlugins, isLoading: isTimeSeriesQueryLoading } = (0, _pluginregistry.useListPluginMetadata)([
-        'TimeSeriesQuery'
-    ]);
-    const { data: traceQueryPlugins, isLoading: isTraceQueryPluginLoading } = (0, _pluginregistry.useListPluginMetadata)([
-        'TraceQuery'
-    ]);
-    const { data: profileQueryPlugins, isLoading: isProfileQueryPluginLoading } = (0, _pluginregistry.useListPluginMetadata)([
-        'ProfileQuery'
-    ]);
-    const { data: logQueries, isLoading: isLogQueryPluginLoading } = (0, _pluginregistry.useListPluginMetadata)([
-        'LogQuery'
-    ]);
-    const { data: alertsQueryPlugins, isLoading: isAlertsQueryPluginLoading } = (0, _pluginregistry.useListPluginMetadata)([
-        'AlertsQuery'
-    ]);
-    const { data: silencesQueryPlugins, isLoading: isSilencesQueryPluginLoading } = (0, _pluginregistry.useListPluginMetadata)([
-        'SilencesQuery'
-    ]);
-    // For example, `map: {"TimeSeriesQuery":["PrometheusTimeSeriesQuery"],"TraceQuery":["TempoTraceQuery"]}`
-    const queryTypeMap = (0, _react.useMemo)(()=>{
-        const map = {
-            TimeSeriesQuery: [],
-            TraceQuery: [],
-            ProfileQuery: [],
-            LogQuery: [],
-            AlertsQuery: [],
-            SilencesQuery: []
-        };
-        if (timeSeriesQueryPlugins) {
-            timeSeriesQueryPlugins.forEach((plugin)=>{
-                map[plugin.kind]?.push(plugin.spec.name);
-            });
-        }
-        if (traceQueryPlugins) {
-            traceQueryPlugins.forEach((plugin)=>{
-                map[plugin.kind]?.push(plugin.spec.name);
-            });
-        }
-        if (profileQueryPlugins) {
-            profileQueryPlugins.forEach((plugin)=>{
-                map[plugin.kind]?.push(plugin.spec.name);
-            });
-        }
-        if (logQueries) {
-            logQueries.forEach((plugin)=>{
-                map[plugin.kind]?.push(plugin.spec.name);
-            });
-        }
-        if (alertsQueryPlugins) {
-            alertsQueryPlugins.forEach((plugin)=>{
-                map[plugin.kind]?.push(plugin.spec.name);
-            });
-        }
-        if (silencesQueryPlugins) {
-            silencesQueryPlugins.forEach((plugin)=>{
-                map[plugin.kind]?.push(plugin.spec.name);
-            });
-        }
-        return map;
-    }, [
-        timeSeriesQueryPlugins,
-        traceQueryPlugins,
-        profileQueryPlugins,
-        logQueries,
-        alertsQueryPlugins,
-        silencesQueryPlugins
-    ]);
-    const getQueryType = (0, _react.useCallback)((pluginKind)=>{
-        const isLoading = (pluginKind)=>{
-            switch(pluginKind){
-                case 'PrometheusTimeSeriesQuery':
-                    return isTimeSeriesQueryLoading;
-                case 'TempoTraceQuery':
-                    return isTraceQueryPluginLoading;
-                case 'PyroscopeProfileQuery':
-                    return isProfileQueryPluginLoading;
-                case 'LokiLogQuery':
-                    return isLogQueryPluginLoading;
-                case 'AlertmanagerAlertsQuery':
-                    return isAlertsQueryPluginLoading;
-                case 'AlertmanagerSilencesQuery':
-                    return isSilencesQueryPluginLoading;
-            }
-            return isTraceQueryPluginLoading || isTimeSeriesQueryLoading || isProfileQueryPluginLoading || isLogQueryPluginLoading || isAlertsQueryPluginLoading || isSilencesQueryPluginLoading;
-        };
-        if (isLoading(pluginKind)) {
-            return undefined;
-        }
-        for(const queryType in queryTypeMap){
-            if (queryTypeMap[queryType]?.includes(pluginKind)) {
-                return queryType;
-            }
-        }
-        throw new Error(`Unable to determine the query type: ${pluginKind}`);
-    }, [
-        queryTypeMap,
-        isTimeSeriesQueryLoading,
-        isTraceQueryPluginLoading,
-        isProfileQueryPluginLoading,
-        isLogQueryPluginLoading,
-        isAlertsQueryPluginLoading,
-        isSilencesQueryPluginLoading
-    ]);
-    return getQueryType;
-}

package/dist/cjs/runtime/index.js

@@ -27,7 +27,6 @@ _export_star(require("./alerts-queries"), exports);
 _export_star(require("./silences-queries"), exports);
 _export_star(require("./item-actions"), exports);
 _export_star(require("./DataQueriesProvider"), exports);
-_export_star(require("./QueryCountProvider"), exports);
 _export_star(require("./RouterProvider"), exports);
 _export_star(require("./UsageMetricsProvider"), exports);
 function _export_star(from, to) {

package/dist/components/MultiQueryEditor/QueryEditorContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryEditorContainer.d.ts","sourceRoot":"","sources":["../../../src/components/MultiQueryEditor/QueryEditorContainer.tsx"],"names":[],"mappings":";AAcA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQpE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAmC,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEnF;;GAEG;AACH,UAAU,yBAAyB;IACjC,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,eAAe,CAAC;IACvB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC1D,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC5D,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED;;;;;;;;;;;GAWG;AAEH,eAAO,MAAM,oBAAoB,uHAqFhC,CAAC"}
+{"version":3,"file":"QueryEditorContainer.d.ts","sourceRoot":"","sources":["../../../src/components/MultiQueryEditor/QueryEditorContainer.tsx"],"names":[],"mappings":";AAcA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAoBpE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAmC,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGnF;;GAEG;AACH,UAAU,yBAAyB;IACjC,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,eAAe,CAAC;IACvB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC1D,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC5D,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED;;;;;;;;;;;GAWG;AAEH,eAAO,MAAM,oBAAoB,uHAyIhC,CAAC"}

package/dist/components/MultiQueryEditor/QueryEditorContainer.js

@@ -12,14 +12,18 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { produce } from 'immer';
-import { Stack, IconButton, Typography, Box, CircularProgress } from '@mui/material';
+import { Stack, IconButton, Typography, Box, CircularProgress, TextField, InputAdornment } from '@mui/material';
 import DeleteIcon from 'mdi-material-ui/DeleteOutline';
 import ChevronDown from 'mdi-material-ui/ChevronDown';
 import ChevronRight from 'mdi-material-ui/ChevronRight';
-import { forwardRef } from 'react';
+import { forwardRef, useState } from 'react';
 import AlertIcon from 'mdi-material-ui/Alert';
 import { InfoTooltip } from '@perses-dev/components';
+import PencilIcon from 'mdi-material-ui/Pencil';
+import CheckIcon from 'mdi-material-ui/Check';
+import CloseIcon from 'mdi-material-ui/Close';
 import { PluginEditor } from '../PluginEditor';
+import { defaultQueryName } from './utils';
 /**
  * Container for a query editor. This component is responsible for rendering the query editor, and make it collapsible
  * to not take too much space.
@@ -33,6 +37,16 @@ import { PluginEditor } from '../PluginEditor';
  * @constructor
  */ export const QueryEditorContainer = /*#__PURE__*/ forwardRef((props, ref)=>{
     const { queryTypes, index, query, queryResult, filteredQueryPlugins, isCollapsed, onDelete, onChange, onQueryRun, onCollapseExpand } = props;
+    // The displayed name is always derived from props so it stays in sync with the
+    // current query/index, even when queries are added, removed or reordered.
+    const displayedName = query.spec.name ?? defaultQueryName(index);
+    const [isEditingName, setIsEditingName] = useState(false);
+    function handleNameSave(name) {
+        setIsEditingName(false);
+        onChange(index, produce(query, (draft)=>{
+            draft.spec.name = name;
+        }));
+    }
     return /*#__PURE__*/ _jsxs(Stack, {
         spacing: 1,
         children: [
@@ -45,19 +59,40 @@ import { PluginEditor } from '../PluginEditor';
                 children: [
                     /*#__PURE__*/ _jsxs(Stack, {
                         direction: "row",
+                        gap: 1,
+                        sx: {
+                            width: '100%'
+                        },
                         children: [
                             /*#__PURE__*/ _jsx(IconButton, {
                                 size: "small",
+                                sx: {
+                                    width: 'fit-content',
+                                    height: 'fit-content'
+                                },
                                 onClick: ()=>onCollapseExpand(index),
                                 children: isCollapsed ? /*#__PURE__*/ _jsx(ChevronRight, {}) : /*#__PURE__*/ _jsx(ChevronDown, {})
                             }),
-                            /*#__PURE__*/ _jsxs(Typography, {
-                                variant: "overline",
-                                component: "h4",
-                                children: [
-                                    "Query #",
-                                    index + 1
-                                ]
+                            /*#__PURE__*/ _jsx(Stack, {
+                                direction: "row",
+                                gap: 1,
+                                alignItems: "center",
+                                alignContent: "center",
+                                sx: {
+                                    width: '100%',
+                                    '&:hover button': {
+                                        visibility: 'visible'
+                                    }
+                                },
+                                children: isEditingName ? /*#__PURE__*/ _jsx(QueryNameInput, {
+                                    initialName: displayedName,
+                                    onSave: handleNameSave,
+                                    onCancel: ()=>setIsEditingName(false)
+                                }, displayedName) : /*#__PURE__*/ _jsx(Typography, {
+                                    variant: "overline",
+                                    component: "h4",
+                                    children: displayedName
+                                })
                             })
                         ]
                     }),
@@ -101,11 +136,24 @@ import { PluginEditor } from '../PluginEditor';
                                     ]
                                 })
                             }),
-                            onDelete && /*#__PURE__*/ _jsx(IconButton, {
-                                "aria-label": "delete query",
-                                size: "small",
-                                onClick: ()=>onDelete && onDelete(index),
-                                children: /*#__PURE__*/ _jsx(DeleteIcon, {})
+                            /*#__PURE__*/ _jsxs(Stack, {
+                                direction: "row",
+                                children: [
+                                    !isEditingName && /*#__PURE__*/ _jsx(IconButton, {
+                                        "aria-label": "edit query name",
+                                        size: "small",
+                                        onClick: ()=>setIsEditingName(true),
+                                        children: /*#__PURE__*/ _jsx(PencilIcon, {
+                                            fontSize: "small"
+                                        })
+                                    }),
+                                    onDelete && /*#__PURE__*/ _jsx(IconButton, {
+                                        "aria-label": "delete query",
+                                        size: "small",
+                                        onClick: ()=>onDelete && onDelete(index),
+                                        children: /*#__PURE__*/ _jsx(DeleteIcon, {})
+                                    })
+                                ]
                             })
                         ]
                     })
@@ -123,6 +171,43 @@ import { PluginEditor } from '../PluginEditor';
     }, index);
 });
 QueryEditorContainer.displayName = 'QueryEditorContainer';
+/**
+ * Self-contained input to edit a query name. The draft value is local state seeded from
+ * `initialName`; callers reset it by changing the `key` (remounting) rather than syncing
+ * with an useEffect.
+ */ function QueryNameInput({ initialName, onSave, onCancel }) {
+    const [draftName, setDraftName] = useState(initialName);
+    return /*#__PURE__*/ _jsx(TextField, {
+        size: "small",
+        variant: "outlined",
+        label: "Query name",
+        "aria-label": "query name",
+        value: draftName,
+        onChange: (e)=>setDraftName(e.target.value),
+        fullWidth: true,
+        InputProps: {
+            endAdornment: /*#__PURE__*/ _jsxs(InputAdornment, {
+                position: "end",
+                children: [
+                    /*#__PURE__*/ _jsx(IconButton, {
+                        size: "small",
+                        "aria-label": "cancel edit",
+                        onClick: onCancel,
+                        edge: "end",
+                        children: /*#__PURE__*/ _jsx(CloseIcon, {})
+                    }),
+                    /*#__PURE__*/ _jsx(IconButton, {
+                        size: "small",
+                        "aria-label": "save query name",
+                        onClick: ()=>onSave(draftName),
+                        edge: "end",
+                        children: /*#__PURE__*/ _jsx(CheckIcon, {})
+                    })
+                ]
+            })
+        }
+    });
+}
 /**
  * Editor for a query definition. This component is responsible for rendering the plugin editor for the given query.
  * This will allow user to select a plugin extending from the given supported query types, and then edit the plugin