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

package/dist/cjs/components/LinksEditor/LinksEditor.js

@@ -0,0 +1,162 @@
+// 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
+});
+Object.defineProperty(exports, "LinksEditor", {
+    enumerable: true,
+    get: function() {
+        return LinksEditor;
+    }
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _react = require("react");
+const _material = require("@mui/material");
+const _reacthookform = require("react-hook-form");
+const _Plus = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Plus"));
+const _Minus = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Minus"));
+const _components = require("@perses-dev/components");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function LinksEditor({ control, ...props }) {
+    const { fields, append, remove } = (0, _reacthookform.useFieldArray)({
+        control: control,
+        name: 'panelDefinition.spec.links'
+    });
+    return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
+        ...props,
+        gap: 3,
+        children: [
+            fields && fields.length > 0 ? fields.map((field, index)=>/*#__PURE__*/ (0, _jsxruntime.jsxs)(_react.Fragment, {
+                    children: [
+                        /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
+                            direction: "row",
+                            gap: 1,
+                            alignItems: "center",
+                            children: [
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(LinkControl, {
+                                    control: control,
+                                    index: index
+                                }),
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                                    style: {
+                                        width: 'fit-content',
+                                        height: 'fit-content'
+                                    },
+                                    onClick: ()=>remove(index),
+                                    children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Minus.default, {})
+                                })
+                            ]
+                        }),
+                        /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Divider, {})
+                    ]
+                }, field.id)) : /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Typography, {
+                variant: "subtitle1",
+                mb: 2,
+                fontStyle: "italic",
+                children: "No links defined"
+            }),
+            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                style: {
+                    width: 'fit-content',
+                    height: 'fit-content'
+                },
+                onClick: ()=>append({
+                        url: '',
+                        name: '',
+                        tooltip: '',
+                        renderVariables: false,
+                        targetBlank: false
+                    }),
+                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Plus.default, {})
+            })
+        ]
+    });
+}
+function LinkControl({ control, index }) {
+    const defaultLink = {
+        url: '',
+        name: '',
+        tooltip: '',
+        renderVariables: false,
+        targetBlank: false
+    };
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_reacthookform.Controller, {
+        control: control,
+        name: `panelDefinition.spec.links.${index}`,
+        render: ({ field, field: { value: link }, fieldState })=>{
+            const safeLink = link ?? defaultLink;
+            return /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.LinkEditorForm, {
+                mode: "inline",
+                url: {
+                    value: safeLink.url,
+                    label: 'URL',
+                    error: {
+                        hasError: !!fieldState.error,
+                        helperText: fieldState.error?.message
+                    },
+                    onChange: (url)=>{
+                        field.onChange({
+                            ...link,
+                            url
+                        });
+                    }
+                },
+                newTabOpen: {
+                    value: !!safeLink.targetBlank,
+                    onChange: (targetBlank)=>{
+                        field.onChange({
+                            ...link,
+                            targetBlank
+                        });
+                    },
+                    label: 'Open in new tab'
+                },
+                name: {
+                    value: safeLink.name ?? '',
+                    label: 'Name',
+                    onChange: (name)=>{
+                        field.onChange({
+                            ...link,
+                            name
+                        });
+                    }
+                },
+                renderVariables: {
+                    value: !!safeLink.renderVariables,
+                    label: 'Render variables',
+                    onChange: (renderVariables)=>{
+                        field.onChange({
+                            ...link,
+                            renderVariables
+                        });
+                    }
+                },
+                tooltip: {
+                    value: safeLink.tooltip ?? '',
+                    label: 'Tooltip',
+                    onChange: (tooltip)=>{
+                        field.onChange({
+                            ...link,
+                            tooltip
+                        });
+                    }
+                }
+            });
+        }
+    });
+}

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

@@ -0,0 +1,30 @@
+// 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
+});
+_export_star(require("./LinksEditor"), exports);
+function _export_star(from, to) {
+    Object.keys(from).forEach(function(k) {
+        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+            Object.defineProperty(to, k, {
+                enumerable: true,
+                get: function() {
+                    return from[k];
+                }
+            });
+        }
+    });
+    return from;
+}

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

@@ -47,7 +47,7 @@ function useDefaultQueryDefinition(queryTypes, filteredQueryPlugins) {
     } else {
         defaultQueryKind = defaultPluginKinds?.[defaultQueryType] ?? queryPlugins?.[0]?.spec.name ?? '';
     }
-    const { data: defaultQueryPlugin } = (0, _runtime.usePlugin)(defaultQueryType, defaultQueryKind, {
+    const { data: defaultQueryPlugin, isLoading: isPluginLoading } = (0, _runtime.usePlugin)(defaultQueryType, defaultQueryKind, {
         useErrorBoundary: true,
         enabled: true
     });
@@ -62,7 +62,7 @@ function useDefaultQueryDefinition(queryTypes, filteredQueryPlugins) {
                 }
             }
         },
-        isLoading
+        isLoading: isLoading || isPluginLoading
     };
 }
 const MultiQueryEditor = /*#__PURE__*/ (0, _react.forwardRef)((props, ref)=>{

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

@@ -24,6 +24,7 @@ const _jsxruntime = require("react/jsx-runtime");
 const _components = require("@perses-dev/components");
 const _reacthookform = require("react-hook-form");
 const _react = require("react");
+const _LinksEditor = require("../LinksEditor");
 const _runtime = require("../../runtime");
 const _OptionsEditorTabs = require("../OptionsEditorTabs");
 const _MultiQueryEditor = require("../MultiQueryEditor");
@@ -90,7 +91,7 @@ const PanelSpecEditor = /*#__PURE__*/ (0, _react.forwardRef)((props, ref)=>{
     // always show json editor and links editor by default
     tabs.push({
         label: 'Links',
-        content: /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.LinksEditor, {
+        content: /*#__PURE__*/ (0, _jsxruntime.jsx)(_LinksEditor.LinksEditor, {
             control: control
         })
     });
@@ -109,11 +110,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/components/index.js

@@ -21,6 +21,7 @@ _export_star(require("./DatasourceSelect"), exports);
 _export_star(require("./HTTPSettingsEditor"), exports);
 _export_star(require("./ItemSelectionActionsOptionsEditor"), exports);
 _export_star(require("./LegendOptionsEditor"), exports);
+_export_star(require("./LinksEditor"), exports);
 _export_star(require("./MultiQueryEditor"), exports);
 _export_star(require("./OptionsEditorRadios"), exports);
 _export_star(require("./OptionsEditorTabs"), exports);

package/dist/cjs/context/ValidationProvider.js

@@ -35,6 +35,7 @@ const _jsxruntime = require("react/jsx-runtime");
 const _react = require("react");
 const _spec = require("@perses-dev/spec");
 const _client = require("@perses-dev/client");
+const _schema = require("../schema");
 const ValidationSchemasContext = /*#__PURE__*/ (0, _react.createContext)(undefined);
 function useValidationSchemas() {
     const ctx = (0, _react.useContext)(ValidationSchemasContext);
@@ -45,14 +46,14 @@ function useValidationSchemas() {
 }
 function ValidationProvider({ children }) {
     const [datasourceEditorSchema, setDatasourceEditorSchema] = (0, _react.useState)(_client.datasourceDefinitionSchema);
-    const [panelEditorSchema, setPanelEditorSchema] = (0, _react.useState)(_spec.panelEditorSchema); // TODO I don't get why this does not compile
+    const [panelEditorSchema, setPanelEditorSchema] = (0, _react.useState)(_schema.panelEditorSchema); // TODO I don't get why this does not compile
     const [variableEditorSchema, setVariableEditorSchema] = (0, _react.useState)(_spec.variableDefinitionSchema);
     const [annotationEditorSchema, setAnnotationEditorSchema] = (0, _react.useState)(_spec.annotationSpecSchema);
     function setDatasourceEditorSchemaPlugin(pluginSchema) {
         setDatasourceEditorSchema((0, _client.buildDatasourceDefinitionSchema)(pluginSchema));
     }
     function setPanelEditorSchemaPlugin(pluginSchema) {
-        setPanelEditorSchema((0, _spec.buildPanelEditorSchema)(pluginSchema));
+        setPanelEditorSchema((0, _schema.buildPanelEditorSchema)(pluginSchema));
     }
     function setVariableEditorSchemaPlugin(pluginSchema) {
         setVariableEditorSchema((0, _spec.buildVariableDefinitionSchema)(pluginSchema));

package/dist/cjs/index.js

@@ -18,6 +18,7 @@ _export_star(require("./components"), exports);
 _export_star(require("./constants"), exports);
 _export_star(require("./model"), exports);
 _export_star(require("./runtime"), exports);
+_export_star(require("./schema"), exports);
 _export_star(require("./test-utils"), exports);
 _export_star(require("./utils"), exports);
 _export_star(require("./context"), exports);

package/dist/cjs/remote/PluginRuntime.js

@@ -148,11 +148,11 @@ const getPluginRuntime = ()=>{
                     }
                 },
                 '@perses-dev/spec': {
-                    version: '0.2.0-beta.2',
+                    version: '0.2.0-beta.9',
                     lib: ()=>require('@perses-dev/spec'),
                     shareConfig: {
                         singleton: true,
-                        requiredVersion: '^0.2.0-beta.2'
+                        requiredVersion: '^0.2.0-beta.9'
                     }
                 },
                 '@perses-dev/core': {
@@ -164,43 +164,43 @@ const getPluginRuntime = ()=>{
                     }
                 },
                 '@perses-dev/client': {
-                    version: '0.54.0-beta.1',
+                    version: '0.54.0-rc.0',
                     lib: ()=>require('@perses-dev/client'),
                     shareConfig: {
                         singleton: true,
-                        requiredVersion: '^0.54.0-beta.1'
+                        requiredVersion: '^0.54.0-rc.0'
                     }
                 },
                 '@perses-dev/components': {
-                    version: '0.53.1',
+                    version: '0.54.0-rc.0',
                     lib: ()=>require('@perses-dev/components'),
                     shareConfig: {
                         singleton: true,
-                        requiredVersion: '^0.53.1'
+                        requiredVersion: '^0.54.0-rc.0'
                     }
                 },
                 '@perses-dev/plugin-system': {
-                    version: '0.53.1',
+                    version: '0.54.0-rc.0',
                     lib: ()=>require('@perses-dev/plugin-system'),
                     shareConfig: {
                         singleton: true,
-                        requiredVersion: '^0.53.1'
+                        requiredVersion: '^0.54.0-rc.0'
                     }
                 },
                 '@perses-dev/explore': {
-                    version: '0.53.1',
+                    version: '0.54.0-rc.0',
                     lib: ()=>require('@perses-dev/explore'),
                     shareConfig: {
                         singleton: true,
-                        requiredVersion: '^0.53.1'
+                        requiredVersion: '^0.54.0-rc.0'
                     }
                 },
                 '@perses-dev/dashboards': {
-                    version: '0.53.1',
+                    version: '0.54.0-rc.0',
                     lib: ()=>require('@perses-dev/dashboards'),
                     shareConfig: {
                         singleton: true,
-                        requiredVersion: '^0.53.1'
+                        requiredVersion: '^0.54.0-rc.0'
                     }
                 },
                 // Below are the shared modules that are used by the plugins, this can be part of the SDK

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, {