@perses-dev/plugin-system 0.0.0-snapshot-scatterplot-fix-imports-95e1b59 → 0.0.0-snapshot-histogram-types-78c5104

package/dist/cjs/components/{TimeSeriesQueryEditor/TimeSeriesQueryEditor.js → MultiQueryEditor/MultiQueryEditor.js}

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// Copyright 2024 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
@@ -14,10 +14,10 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "TimeSeriesQueryEditor", {
+Object.defineProperty(exports, "MultiQueryEditor", {
     enumerable: true,
     get: function() {
-        return TimeSeriesQueryEditor;
+        return MultiQueryEditor;
     }
 });
 const _jsxruntime = require("react/jsx-runtime");
@@ -26,36 +26,43 @@ const _immer = require("immer");
 const _material = require("@mui/material");
 const _Plus = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Plus"));
 const _runtime = require("../../runtime");
-const _TimeSeriesQueryInput = require("./TimeSeriesQueryInput");
+const _QueryEditorContainer = require("./QueryEditorContainer");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function TimeSeriesQueryEditor({ queries = [], onChange }) {
-    var _timeSeriesPlugins_;
+function useDefaultQueryDefinition(queryTypes) {
     // Build the default query plugin
+    // This will be used only if the queries are empty, to open a starting query
+    // Firs the default query type
+    const defaultQueryType = queryTypes[0];
+    // Then the default plugin kind
     // Use as default the plugin kind explicitly set as default or the first in the list
+    const { data: queryPlugins, isLoading } = (0, _runtime.useListPluginMetadata)(queryTypes);
     const { defaultPluginKinds } = (0, _runtime.usePluginRegistry)();
-    const { data: timeSeriesPlugins } = (0, _runtime.useListPluginMetadata)(_runtime.TIME_SERIES_QUERY_KEY);
-    var _defaultPluginKinds_TIME_SERIES_QUERY_KEY, _ref;
-    const defaultTimeSeriesQueryKind = (_ref = (_defaultPluginKinds_TIME_SERIES_QUERY_KEY = defaultPluginKinds === null || defaultPluginKinds === void 0 ? void 0 : defaultPluginKinds[_runtime.TIME_SERIES_QUERY_KEY]) !== null && _defaultPluginKinds_TIME_SERIES_QUERY_KEY !== void 0 ? _defaultPluginKinds_TIME_SERIES_QUERY_KEY : timeSeriesPlugins === null || timeSeriesPlugins === void 0 ? void 0 : (_timeSeriesPlugins_ = timeSeriesPlugins[0]) === null || _timeSeriesPlugins_ === void 0 ? void 0 : _timeSeriesPlugins_.kind) !== null && _ref !== void 0 ? _ref : '';
-    const { data: defaultQueryPlugin } = (0, _runtime.usePlugin)(_runtime.TIME_SERIES_QUERY_KEY, defaultTimeSeriesQueryKind, {
-        useErrorBoundary: true,
+    const defaultQueryKind = defaultPluginKinds?.[defaultQueryType] ?? queryPlugins?.[0]?.spec.name ?? '';
+    const { data: defaultQueryPlugin } = (0, _runtime.usePlugin)(defaultQueryType, defaultQueryKind, {
+        throwOnError: true,
         enabled: true
     });
     // This default query definition is used if no query is provided initially or when we add a new query
-    const defaultInitialQueryDefinition = {
-        kind: _runtime.TIME_SERIES_QUERY_KEY,
-        spec: {
-            plugin: {
-                kind: defaultTimeSeriesQueryKind,
-                spec: (defaultQueryPlugin === null || defaultQueryPlugin === void 0 ? void 0 : defaultQueryPlugin.createInitialOptions()) || {}
+    return {
+        defaultInitialQueryDefinition: {
+            kind: defaultQueryType,
+            spec: {
+                plugin: {
+                    kind: defaultQueryKind,
+                    spec: defaultQueryPlugin?.createInitialOptions() || {}
+                }
             }
-        }
+        },
+        isLoading
     };
+}
+function MultiQueryEditor({ queryTypes, queries = [], onChange }) {
+    const { defaultInitialQueryDefinition, isLoading } = useDefaultQueryDefinition(queryTypes);
     // State for which queries are collapsed
-    // TODO: Would be easier if we had IDs for queries.
     const [queriesCollapsed, setQueriesCollapsed] = (0, _react.useState)(queries.map(()=>false));
     // Query handlers
     const handleQueryChange = (index, queryDef)=>{
@@ -70,7 +77,6 @@ function TimeSeriesQueryEditor({ queries = [], onChange }) {
         }));
     };
     const handleQueryAdd = ()=>{
-        if (!defaultQueryPlugin) return;
         onChange((0, _immer.produce)(queries, (draft)=>{
             if (draft) {
                 draft.push(defaultInitialQueryDefinition);
@@ -108,14 +114,15 @@ function TimeSeriesQueryEditor({ queries = [], onChange }) {
         });
     };
     // show one query input if queries is empty
-    const queryDefinitions = queries.length ? queries : [
+    const queryDefinitions = queries.length ? queries : !isLoading ? [
         defaultInitialQueryDefinition
-    ];
+    ] : [];
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
         children: [
             /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Stack, {
                 spacing: 1,
-                children: queryDefinitions.map((query, i)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_TimeSeriesQueryInput.TimeSeriesQueryInput, {
+                children: queryDefinitions.map((query, i)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_QueryEditorContainer.QueryEditorContainer, {
+                        queryTypes: queryTypes,
                         index: i,
                         query: query,
                         isCollapsed: !!queriesCollapsed[i],

package/dist/cjs/components/{TimeSeriesQueryEditor/TimeSeriesQueryInput.js → MultiQueryEditor/QueryEditorContainer.js}

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// Copyright 2024 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
@@ -14,14 +14,14 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "TimeSeriesQueryInput", {
+Object.defineProperty(exports, "QueryEditorContainer", {
     enumerable: true,
     get: function() {
-        return TimeSeriesQueryInput;
+        return QueryEditorContainer;
     }
 });
 const _jsxruntime = require("react/jsx-runtime");
-const _immer = /*#__PURE__*/ _interop_require_default(require("immer"));
+const _immer = require("immer");
 const _material = require("@mui/material");
 const _DeleteOutline = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/DeleteOutline"));
 const _ChevronDown = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/ChevronDown"));
@@ -32,7 +32,7 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-const TimeSeriesQueryInput = ({ index, query, isCollapsed, onDelete, onChange, onCollapseExpand })=>{
+const QueryEditorContainer = ({ queryTypes, index, query, isCollapsed, onDelete, onChange, onCollapseExpand })=>{
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
         spacing: 1,
         children: [
@@ -51,7 +51,7 @@ const TimeSeriesQueryInput = ({ index, query, isCollapsed, onDelete, onChange, o
                         variant: "overline",
                         component: "h4",
                         children: [
-                            "Query ",
+                            "Query #",
                             index + 1
                         ]
                     }),
@@ -68,6 +68,7 @@ const TimeSeriesQueryInput = ({ index, query, isCollapsed, onDelete, onChange, o
                 ]
             }),
             !isCollapsed && /*#__PURE__*/ (0, _jsxruntime.jsx)(QueryEditor, {
+                queryTypes: queryTypes,
                 value: query,
                 onChange: (next)=>onChange(index, next)
             })
@@ -75,21 +76,32 @@ const TimeSeriesQueryInput = ({ index, query, isCollapsed, onDelete, onChange, o
     }, index);
 };
 /**
- * Displays an editor for TimeSeriesQueryDefinition objects.
+ * 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
+ * spec for this plugin.
+ * @param props
+ * @constructor
  */ function QueryEditor(props) {
-    const { value, onChange, ...others } = props;
-    const { spec: { plugin } } = value;
+    const { value, onChange, queryTypes, ...others } = props;
     const handlePluginChange = (next)=>{
-        onChange((0, _immer.default)(value, (draft)=>{
-            draft.spec.plugin = next;
+        onChange((0, _immer.produce)(value, (draft)=>{
+            draft.kind = next.selection.type;
+            draft.spec.plugin.kind = next.selection.kind;
+            draft.spec.plugin.spec = next.spec;
         }));
     };
     return /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Box, {
         ...others,
         children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_PluginEditor.PluginEditor, {
-            pluginType: "TimeSeriesQuery",
+            pluginTypes: queryTypes,
             pluginKindLabel: "Query Type",
-            value: plugin,
+            value: {
+                selection: {
+                    kind: value.spec.plugin.kind,
+                    type: value.kind
+                },
+                spec: value.spec.plugin.spec
+            },
             onChange: handlePluginChange
         })
     });

package/dist/cjs/{stories/shared-utils → components/MultiQueryEditor}/index.js

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// Copyright 2024 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
@@ -14,7 +14,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-_export_star(require("./decorators"), exports);
+_export_star(require("./MultiQueryEditor"), 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/PanelSpecEditor/PanelSpecEditor.js

@@ -22,95 +22,87 @@ Object.defineProperty(exports, "PanelSpecEditor", {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _components = require("@perses-dev/components");
+const _reacthookform = require("react-hook-form");
 const _runtime = require("../../runtime");
 const _OptionsEditorTabs = require("../OptionsEditorTabs");
-const _TimeSeriesQueryEditor = require("../TimeSeriesQueryEditor");
-const _TraceQueryEditor = require("../TraceQueryEditor");
+const _MultiQueryEditor = require("../MultiQueryEditor");
 function PanelSpecEditor(props) {
-    const { panelDefinition, onJSONChange, onQueriesChange, onPluginSpecChange } = props;
+    const { control, panelDefinition, onJSONChange, onQueriesChange, onPluginSpecChange } = props;
     const { kind } = panelDefinition.spec.plugin;
-    const { data: plugin, isLoading, error } = (0, _runtime.usePlugin)('Panel', kind);
+    const { data: plugin, isPending, error } = (0, _runtime.usePlugin)('Panel', kind);
     if (error) {
         return /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.ErrorAlert, {
             error: error
         });
     }
     // TODO: Proper loading indicator
-    if (isLoading) {
+    if (isPending) {
         return null;
     }
     if (plugin === undefined) {
         throw new Error(`Missing implementation for panel plugin with kind '${kind}'`);
     }
-    const getQueryType = ()=>{
-        var _panelDefinition_spec, _queriesList_;
-        const queriesList = panelDefinition === null || panelDefinition === void 0 ? void 0 : (_panelDefinition_spec = panelDefinition.spec) === null || _panelDefinition_spec === void 0 ? void 0 : _panelDefinition_spec.queries;
-        if (queriesList === undefined) {
-            return '';
-        }
-        const queryType = (_queriesList_ = queriesList[0]) === null || _queriesList_ === void 0 ? void 0 : _queriesList_.kind;
-        return queryType;
-    };
-    // Get the corresponding queryEditor depending on the queryType
-    const getQueryEditorComponent = ()=>{
-        const queryType = getQueryType();
-        // default case handles cause where there is no queryType yet (e.g. UI > 'editing' mode > 'Add Panel')
-        switch(queryType){
-            case 'TimeSeriesQuery':
-                var _panelDefinition_spec_queries;
-                return /*#__PURE__*/ (0, _jsxruntime.jsx)(_TimeSeriesQueryEditor.TimeSeriesQueryEditor, {
-                    queries: (_panelDefinition_spec_queries = panelDefinition.spec.queries) !== null && _panelDefinition_spec_queries !== void 0 ? _panelDefinition_spec_queries : [],
-                    onChange: onQueriesChange
-                });
-            case 'TraceQuery':
-                var _panelDefinition_spec_queries1;
-                return /*#__PURE__*/ (0, _jsxruntime.jsx)(_TraceQueryEditor.TraceQueryEditor, {
-                    queries: (_panelDefinition_spec_queries1 = panelDefinition.spec.queries) !== null && _panelDefinition_spec_queries1 !== void 0 ? _panelDefinition_spec_queries1 : [],
-                    onChange: onQueriesChange
-                });
-            default:
-                // ScatterChart only handles trace queries for now
-                if (kind === 'ScatterChart') {
-                    var _panelDefinition_spec_queries2;
-                    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_TraceQueryEditor.TraceQueryEditor, {
-                        queries: (_panelDefinition_spec_queries2 = panelDefinition.spec.queries) !== null && _panelDefinition_spec_queries2 !== void 0 ? _panelDefinition_spec_queries2 : [],
-                        onChange: onQueriesChange
-                    });
-                }
-                var _panelDefinition_spec_queries3;
-                return /*#__PURE__*/ (0, _jsxruntime.jsx)(_TimeSeriesQueryEditor.TimeSeriesQueryEditor, {
-                    queries: (_panelDefinition_spec_queries3 = panelDefinition.spec.queries) !== null && _panelDefinition_spec_queries3 !== void 0 ? _panelDefinition_spec_queries3 : [],
-                    onChange: onQueriesChange
-                });
-        }
-    };
     const { panelOptionsEditorComponents, hideQueryEditor } = plugin;
     let tabs = [];
     if (!hideQueryEditor) {
         tabs.push({
             label: 'Query',
-            content: getQueryEditorComponent()
+            content: /*#__PURE__*/ (0, _jsxruntime.jsx)(_reacthookform.Controller, {
+                control: control,
+                name: "panelDefinition.spec.queries",
+                render: ({ field })=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_MultiQueryEditor.MultiQueryEditor, {
+                        queryTypes: plugin.supportedQueryTypes ?? [],
+                        queries: panelDefinition.spec.queries ?? [],
+                        onChange: (queries)=>{
+                            field.onChange(queries);
+                            onQueriesChange(queries);
+                        }
+                    })
+            })
         });
     }
     if (panelOptionsEditorComponents !== undefined) {
         tabs = tabs.concat(panelOptionsEditorComponents.map(({ label, content: OptionsEditorComponent })=>({
                 label,
-                content: /*#__PURE__*/ (0, _jsxruntime.jsx)(OptionsEditorComponent, {
-                    value: panelDefinition.spec.plugin.spec,
-                    onChange: onPluginSpecChange
+                content: /*#__PURE__*/ (0, _jsxruntime.jsx)(_reacthookform.Controller, {
+                    control: control,
+                    name: "panelDefinition.spec.plugin.spec",
+                    render: ({ field })=>/*#__PURE__*/ (0, _jsxruntime.jsx)(OptionsEditorComponent, {
+                            value: panelDefinition.spec.plugin.spec,
+                            onChange: (spec)=>{
+                                field.onChange(spec);
+                                onPluginSpecChange(spec);
+                            }
+                        })
                 })
             })));
     }
-    // always show json editor by default
+    // always show json editor and links editor by default
+    tabs.push({
+        label: 'Links',
+        content: /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.LinksEditor, {
+            control: control
+        })
+    });
     tabs.push({
         label: 'JSON',
-        content: /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.JSONEditor, {
-            maxHeight: "80vh",
-            value: panelDefinition,
-            onChange: onJSONChange
+        content: /*#__PURE__*/ (0, _jsxruntime.jsx)(_reacthookform.Controller, {
+            control: control,
+            name: "panelDefinition",
+            render: ({ field })=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_components.JSONEditor, {
+                    maxHeight: "80vh",
+                    value: panelDefinition,
+                    onChange: (json)=>{
+                        field.onChange(JSON.parse(json));
+                        onJSONChange(json);
+                    }
+                })
         })
     });
-    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_OptionsEditorTabs.OptionsEditorTabs, {
-        tabs: tabs
-    }, tabs.length);
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_runtime.QueryCountProvider, {
+        queryCount: (panelDefinition.spec.queries ?? []).length,
+        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_OptionsEditorTabs.OptionsEditorTabs, {
+            tabs: tabs
+        }, tabs.length)
+    });
 }

package/dist/cjs/components/PluginEditor/PluginEditor.js

@@ -22,40 +22,43 @@ Object.defineProperty(exports, "PluginEditor", {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _material = require("@mui/material");
+const _components = require("@perses-dev/components");
 const _PluginKindSelect = require("../PluginKindSelect");
 const _PluginSpecEditor = require("../PluginSpecEditor");
 const _plugineditorapi = require("./plugin-editor-api");
 function PluginEditor(props) {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { value, pluginType, pluginKindLabel, onChange: _, isReadonly, ...others } = props;
-    const { pendingKind, isLoading, error, onKindChange, onSpecChange } = (0, _plugineditorapi.usePluginEditor)(props);
+    const { value, pluginTypes, pluginKindLabel, onChange: _, isReadonly, ...others } = props;
+    const { pendingSelection, isLoading, error, onSelectionChange, onSpecChange } = (0, _plugineditorapi.usePluginEditor)(props);
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Box, {
         ...others,
         children: [
             /*#__PURE__*/ (0, _jsxruntime.jsx)(_PluginKindSelect.PluginKindSelect, {
                 fullWidth: false,
                 sx: {
-                    mb: 1,
+                    mb: 2,
                     minWidth: 120
                 },
                 margin: "dense",
                 label: pluginKindLabel,
-                pluginType: pluginType,
+                pluginTypes: pluginTypes,
                 disabled: isLoading,
-                value: pendingKind !== '' ? pendingKind : value.kind,
+                value: pendingSelection ? pendingSelection : value.selection,
                 InputProps: {
                     readOnly: isReadonly
                 },
                 error: !!error,
-                helperText: error === null || error === void 0 ? void 0 : error.message,
-                onChange: onKindChange
+                helperText: error?.message,
+                onChange: onSelectionChange
             }),
-            /*#__PURE__*/ (0, _jsxruntime.jsx)(_PluginSpecEditor.PluginSpecEditor, {
-                pluginType: pluginType,
-                pluginKind: value.kind,
-                value: value.spec,
-                onChange: onSpecChange,
-                isReadonly: isReadonly
+            /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.ErrorBoundary, {
+                FallbackComponent: _components.ErrorAlert,
+                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_PluginSpecEditor.PluginSpecEditor, {
+                    pluginSelection: value.selection,
+                    value: value.spec,
+                    onChange: onSpecChange,
+                    isReadonly: isReadonly
+                })
             })
         ]
     });

package/dist/cjs/components/PluginEditor/plugin-editor-api.js

@@ -26,84 +26,95 @@ const _immer = require("immer");
 const _runtime = require("../../runtime");
 function usePluginEditor(props) {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
-    const { pluginType, value, onHideQueryEditorChange = ()=>{} } = props; // setting onHideQueryEditorChange to empty function here because useEvent requires a function
-    // Keep a stable reference so we don't run the effect below when we don't need to
+    const { pluginTypes, value, onHideQueryEditorChange = ()=>{} } = props; // setting onHideQueryEditorChange to empty function here because useEvent requires a function
+    // Keep a stable reference, so we don't run the effect below when we don't need to
     const onChange = (0, _core.useEvent)(props.onChange);
     const onHideQuery = (0, _core.useEvent)(onHideQueryEditorChange);
     // The previous spec state for PluginType and kind and a helper function for remembering current values
     const prevSpecState = (0, _react.useRef)({
-        [pluginType]: {
-            [value.kind]: value.spec
+        [value.selection.type]: {
+            [value.selection.kind]: value.spec
         }
     });
     const rememberCurrentSpecState = (0, _core.useEvent)(()=>{
-        let byPluginType = prevSpecState.current[pluginType];
+        let byPluginType = prevSpecState.current[value.selection.type];
         if (byPluginType === undefined) {
             byPluginType = {};
-            prevSpecState.current[pluginType] = byPluginType;
+            prevSpecState.current[value.selection.type] = byPluginType;
         }
-        byPluginType[value.kind] = value.spec;
+        byPluginType[value.selection.kind] = value.spec;
     });
     // The previous hide query state for each panel kind
     const hideQueryState = (0, _react.useRef)({
-        [value.kind]: false
+        [value.selection.kind]: false
     });
     const { defaultPluginKinds } = (0, _runtime.usePluginRegistry)();
-    const defaultPluginKind = defaultPluginKinds === null || defaultPluginKinds === void 0 ? void 0 : defaultPluginKinds[pluginType];
-    const initPendingKind = !value.kind && defaultPluginKind ? defaultPluginKind : '';
+    const defaultPluginType = pluginTypes[0];
+    const defaultPluginKind = defaultPluginType ? defaultPluginKinds?.[defaultPluginType] : undefined;
+    const defaultPluginSelection = defaultPluginType && defaultPluginKind ? {
+        type: defaultPluginType,
+        kind: defaultPluginKind
+    } : undefined;
+    const initPendingSelection = !value.selection && defaultPluginSelection ? defaultPluginSelection : undefined;
     // When kind changes and we haven't loaded that plugin before, we will need to enter a "pending" state so that we
     // can generate proper initial spec values that match the new plugin kind
-    const [pendingKind, setPendingKind] = (0, _react.useState)(initPendingKind);
-    const { data: plugin, isFetching, error } = (0, _runtime.usePlugin)(pluginType, pendingKind);
+    const [pendingSelection, setPendingSelection] = (0, _react.useState)(initPendingSelection);
+    // Take a default kind in case user write explicitly an empty kind in the initial value
+    (0, _react.useEffect)(()=>{
+        if (value.selection.kind === '') {
+            value.selection.kind = defaultPluginKind || '';
+        }
+    }, [
+        value.selection,
+        defaultPluginKind
+    ]);
+    const { data: plugin, isFetching, error } = (0, _runtime.usePlugin)(pendingSelection?.type, pendingSelection?.kind || '');
     (0, _react.useEffect)(()=>{
         // Nothing to do if no new plugin kind is pending
-        if (pendingKind === '') return;
+        if (!pendingSelection) return;
         // Can't get spec value until we have a plugin
         if (plugin === undefined) return;
         // Fire an onChange to change to the pending kind with initial values from the plugin
         rememberCurrentSpecState();
         onChange({
-            kind: pendingKind,
-            spec: plugin.createInitialOptions()
+            selection: pendingSelection,
+            spec: plugin.createInitialOptions ? plugin.createInitialOptions() : {}
         });
-        if (pluginType === 'Panel') {
+        if (pendingSelection.type === 'Panel') {
             const panelPlugin = plugin;
-            hideQueryState.current[pendingKind] = !!panelPlugin.hideQueryEditor;
-            if (!!panelPlugin.hideQueryEditor !== hideQueryState.current[value.kind]) {
+            hideQueryState.current[pendingSelection.kind] = !!panelPlugin.hideQueryEditor;
+            if (!!panelPlugin.hideQueryEditor !== hideQueryState.current[value.selection.kind]) {
                 onHideQuery(!!panelPlugin.hideQueryEditor);
             }
         }
-        setPendingKind('');
+        setPendingSelection(undefined);
     }, [
-        pendingKind,
+        pendingSelection,
         plugin,
         rememberCurrentSpecState,
         onChange,
         onHideQuery,
         hideQueryState,
-        pluginType,
-        value.kind
+        value.selection
     ]);
     /**
    * When the user tries to change the plugin kind, make sure we have the correct spec for that plugin kind before we
    * make the switch.
-   */ const onKindChange = (e)=>{
-        var _prevSpecState_current_pluginType;
-        const nextKind = e.target.value;
+   */ const onSelectionChange = (nextSelection)=>{
         // If we already have state for this plugin type/kind from a previous selection, just use it
-        const previousState = (_prevSpecState_current_pluginType = prevSpecState.current[pluginType]) === null || _prevSpecState_current_pluginType === void 0 ? void 0 : _prevSpecState_current_pluginType[nextKind];
+        const previousState = prevSpecState.current[nextSelection.type]?.[nextSelection.kind];
         if (previousState !== undefined) {
             rememberCurrentSpecState();
             onChange({
-                kind: nextKind,
+                selection: nextSelection,
                 spec: previousState
             });
         } else {
             // Otherwise, kick off the async loading process
-            setPendingKind(nextKind);
+            setPendingSelection(nextSelection);
         }
-        if (pluginType === 'Panel' && hideQueryState.current[nextKind] !== undefined && hideQueryState.current[value.kind] !== hideQueryState.current[nextKind]) {
-            onHideQuery(!!hideQueryState.current[nextKind]);
+        if (nextSelection.type === 'Panel' && hideQueryState.current[nextSelection.kind] !== undefined && hideQueryState.current[value.selection.kind] !== hideQueryState.current[nextSelection.kind]) {
+            onHideQuery(!!hideQueryState.current[nextSelection.kind]);
         }
     };
     /**
@@ -114,10 +125,10 @@ function usePluginEditor(props) {
         }));
     };
     return {
-        pendingKind,
+        pendingSelection,
         isLoading: isFetching,
         error,
-        onKindChange,
+        onSelectionChange,
         onSpecChange,
         rememberCurrentSpecState
     };

package/dist/cjs/components/PluginKindSelect/PluginKindSelect.js

@@ -25,28 +25,76 @@ const _material = require("@mui/material");
 const _react = require("react");
 const _runtime = require("../../runtime");
 const PluginKindSelect = /*#__PURE__*/ (0, _react.forwardRef)((props, ref)=>{
-    const { pluginType, value: propValue, ...others } = props;
-    const { data, isLoading } = (0, _runtime.useListPluginMetadata)(pluginType);
+    const { pluginTypes, value: propValue, onChange, ...others } = props;
+    const { data, isLoading } = (0, _runtime.useListPluginMetadata)(pluginTypes);
     // Pass an empty value while options are still loading so MUI doesn't complain about us using an "out of range" value
-    const value = propValue !== '' && isLoading ? '' : propValue;
+    const value = !propValue || isLoading ? '' : selectionToOptionValue(propValue);
+    const handleChange = (event)=>{
+        onChange?.(optionValueToSelection(event.target.value));
+    };
+    const renderValue = (0, _react.useCallback)((selected)=>{
+        if (selected === '') {
+            return '';
+        }
+        const selectedValue = optionValueToSelection(selected);
+        return data?.find((v)=>v.kind === selectedValue.type && v.spec.name === selectedValue.kind)?.spec.display.name;
+    }, [
+        data
+    ]);
     // TODO: Does this need a loading indicator of some kind?
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.TextField, {
         select: true,
         inputRef: ref,
         ...others,
         value: value,
+        "aria-label": value,
+        onChange: handleChange,
+        SelectProps: {
+            renderValue
+        },
         "data-testid": "plugin-kind-select",
         children: [
             isLoading && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.MenuItem, {
                 value: "",
                 children: "Loading..."
             }),
-            data === null || data === void 0 ? void 0 : data.map((metadata)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_material.MenuItem, {
+            data?.map((metadata)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_material.MenuItem, {
                     "data-testid": "option",
-                    value: metadata.kind,
-                    children: metadata.display.name
-                }, metadata.kind))
+                    value: selectionToOptionValue({
+                        type: metadata.kind,
+                        kind: metadata.spec.name
+                    }),
+                    children: metadata.spec.display.name
+                }, metadata.kind + metadata.spec.name))
         ]
     });
 });
 PluginKindSelect.displayName = 'PluginKindSelect';
+// Delimiter used to stringify/parse option values
+const OPTION_VALUE_DELIMITER = '_____';
+/**
+ * Given a PluginEditorSelection,
+ * returns a string value like `{type}_____{kind}` that can be used as a Select input value.
+ * @param selector
+ */ function selectionToOptionValue(selector) {
+    return [
+        selector.type,
+        selector.kind
+    ].join(OPTION_VALUE_DELIMITER);
+}
+/**
+ * Given an option value name like `{type}_____{kind}`,
+ * returns a PluginEditorSelection to be used by the query data model.
+ * @param optionValue
+ */ function optionValueToSelection(optionValue) {
+    const words = optionValue.split(OPTION_VALUE_DELIMITER);
+    const type = words[0];
+    const kind = words[1];
+    if (type === undefined || kind === undefined) {
+        throw new Error('Invalid optionValue string');
+    }
+    return {
+        type,
+        kind
+    };
+}