@perses-dev/plugin-system 0.37.2 → 0.39.0

package/dist/cjs/components/Variables/VariableEditorForm/VariablePreview.js

@@ -0,0 +1,178 @@
+// Copyright 2023 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: all[name]
+    });
+}
+_export(exports, {
+    VariablePreview: ()=>VariablePreview,
+    VariableListPreview: ()=>VariableListPreview
+});
+const _jsxRuntime = require("react/jsx-runtime");
+const _react = /*#__PURE__*/ _interopRequireWildcard(require("react"));
+const _material = require("@mui/material");
+const _components = require("@perses-dev/components");
+const _refresh = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/Refresh"));
+const _clipboardOutline = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/ClipboardOutline"));
+const _constants = require("../../../constants");
+const _variableModel = require("../variable-model");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interopRequireWildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {};
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+const DEFAULT_MAX_PREVIEW_VALUES = 50;
+function VariablePreview(props) {
+    const { values , onRefresh , isLoading , error  } = props;
+    const [maxValues, setMaxValues] = (0, _react.useState)(DEFAULT_MAX_PREVIEW_VALUES);
+    const { infoSnackbar  } = (0, _components.useSnackbar)();
+    const showAll = ()=>{
+        setMaxValues(undefined);
+    };
+    let notShown = 0;
+    if (values && (values === null || values === void 0 ? void 0 : values.length) > 0 && maxValues) {
+        notShown = values.length - maxValues;
+    }
+    return /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.Box, {
+        children: [
+            /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.Stack, {
+                direction: "row",
+                spacing: 1,
+                alignItems: "center",
+                mb: 1,
+                children: [
+                    /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Typography, {
+                        variant: "h4",
+                        children: "Preview Values"
+                    }),
+                    onRefresh && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components.InfoTooltip, {
+                        description: _constants.TOOLTIP_TEXT.refreshVariableValues,
+                        children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.IconButton, {
+                            onClick: onRefresh,
+                            size: "small",
+                            children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_refresh.default, {})
+                        })
+                    }),
+                    /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components.InfoTooltip, {
+                        description: _constants.TOOLTIP_TEXT.copyVariableValues,
+                        children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.IconButton, {
+                            onClick: async ()=>{
+                                if (values === null || values === void 0 ? void 0 : values.length) {
+                                    await navigator.clipboard.writeText(values.map((value)=>value).join(', '));
+                                    infoSnackbar('Preview values copied to clipboard!');
+                                }
+                            },
+                            size: "small",
+                            children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_clipboardOutline.default, {})
+                        })
+                    })
+                ]
+            }),
+            /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Card, {
+                variant: "outlined",
+                children: /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.Box, {
+                    sx: {
+                        display: 'flex',
+                        flexWrap: 'wrap',
+                        gap: 1,
+                        m: 2
+                    },
+                    children: [
+                        error && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Alert, {
+                            severity: "error",
+                            children: error
+                        }),
+                        (values === null || values === void 0 ? void 0 : values.length) === 0 && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Alert, {
+                            severity: "info",
+                            children: "No results"
+                        }),
+                        isLoading && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Stack, {
+                            width: "100%",
+                            sx: {
+                                alignItems: 'center',
+                                justifyContent: 'center'
+                            },
+                            children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.CircularProgress, {})
+                        }),
+                        values === null || values === void 0 ? void 0 : values.slice(0, maxValues).map((val)=>/*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Chip, {
+                                size: "small",
+                                label: val
+                            }, val)),
+                        notShown > 0 && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Chip, {
+                            onClick: showAll,
+                            variant: "outlined",
+                            size: "small",
+                            label: `+${notShown} more`
+                        })
+                    ]
+                })
+            })
+        ]
+    });
+}
+function VariableListPreview(props) {
+    const { definition , onRefresh  } = props;
+    const { data , isFetching , error  } = (0, _variableModel.useListVariablePluginValues)(definition);
+    const errorMessage = error === null || error === void 0 ? void 0 : error.message;
+    return /*#__PURE__*/ (0, _jsxRuntime.jsx)(VariablePreview, {
+        values: (data === null || data === void 0 ? void 0 : data.map((val)=>val.value)) || [],
+        onRefresh: onRefresh,
+        isLoading: isFetching,
+        error: errorMessage
+    });
+}

package/dist/cjs/components/Variables/VariableEditorForm/index.js

@@ -0,0 +1,29 @@
+// Copyright 2023 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
+});
+_exportStar(require("./VariableEditorForm"), exports);
+_exportStar(require("./VariablePreview"), exports);
+function _exportStar(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/Variables/VariableEditorForm/variable-editor-form-model.js

@@ -0,0 +1,102 @@
+// Copyright 2023 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: all[name]
+    });
+}
+_export(exports, {
+    getInitialState: ()=>getInitialState,
+    getVariableDefinitionFromState: ()=>getVariableDefinitionFromState
+});
+function getInitialState(initialVariableDefinition) {
+    var ref, ref1;
+    var _value;
+    const textVariableFields = {
+        value: (_value = initialVariableDefinition.spec.value) !== null && _value !== void 0 ? _value : ''
+    };
+    const listVariableFields = {
+        allowMultiple: false,
+        allowAll: false,
+        capturing_regexp: undefined,
+        plugin: {
+            kind: '',
+            spec: {}
+        },
+        customAllValue: undefined
+    };
+    if (initialVariableDefinition.kind === 'ListVariable') {
+        var _allow_all_value;
+        listVariableFields.allowMultiple = (_allow_all_value = initialVariableDefinition.spec.allow_all_value) !== null && _allow_all_value !== void 0 ? _allow_all_value : false;
+        var _allow_all_value1;
+        listVariableFields.allowAll = (_allow_all_value1 = initialVariableDefinition.spec.allow_all_value) !== null && _allow_all_value1 !== void 0 ? _allow_all_value1 : false;
+        listVariableFields.capturing_regexp = initialVariableDefinition.spec.capturing_regexp;
+        listVariableFields.plugin = initialVariableDefinition.spec.plugin;
+        listVariableFields.customAllValue = initialVariableDefinition.spec.custom_all_value;
+    }
+    return {
+        name: initialVariableDefinition.spec.name,
+        title: (ref = initialVariableDefinition.spec.display) === null || ref === void 0 ? void 0 : ref.name,
+        kind: initialVariableDefinition.kind,
+        description: (ref1 = initialVariableDefinition.spec.display) === null || ref1 === void 0 ? void 0 : ref1.description,
+        listVariableFields,
+        textVariableFields
+    };
+}
+function getVariableDefinitionFromState(state) {
+    const { name , title , kind , description  } = state;
+    let display = title ? {
+        name: title
+    } : undefined;
+    if (description) {
+        if (display) {
+            display.description = description;
+        } else {
+            // Name is mandatory if you want to add a description, autofilled by the metadata name if undefined
+            display = {
+                name: name,
+                description: description
+            };
+        }
+    }
+    if (kind === 'TextVariable') {
+        return {
+            kind,
+            spec: {
+                name,
+                display,
+                ...state.textVariableFields
+            }
+        };
+    }
+    if (kind === 'ListVariable') {
+        return {
+            kind,
+            spec: {
+                name,
+                display,
+                allow_multiple: state.listVariableFields.allowMultiple,
+                allow_all_value: state.listVariableFields.allowAll,
+                capturing_regexp: state.listVariableFields.capturing_regexp,
+                plugin: state.listVariableFields.plugin,
+                custom_all_value: state.listVariableFields.customAllValue
+            }
+        };
+    }
+    throw new Error(`Unknown variable kind: ${kind}`);
+}

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

@@ -0,0 +1,29 @@
+// Copyright 2023 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
+});
+_exportStar(require("./variable-model"), exports);
+_exportStar(require("./VariableEditorForm"), exports);
+function _exportStar(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/Variables/variable-model.js

@@ -0,0 +1,117 @@
+// Copyright 2023 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 name1 in all)Object.defineProperty(target, name1, {
+        enumerable: true,
+        get: all[name1]
+    });
+}
+_export(exports, {
+    filterVariableList: ()=>filterVariableList,
+    useListVariablePluginValues: ()=>useListVariablePluginValues,
+    getVariableValuesKey: ()=>getVariableValuesKey,
+    VARIABLE_TYPES: ()=>VARIABLE_TYPES
+});
+const _reactQuery = require("@tanstack/react-query");
+const _runtime = require("../../runtime");
+function filterVariableList(data, capturedRegexp) {
+    const result = [];
+    const filteredSet = new Set();
+    for (const variableValue of data){
+        const matches = variableValue.value.matchAll(capturedRegexp);
+        let concat = '';
+        for (const match of matches){
+            for(let i = 1; i < match.length; i++){
+                const m = match[i];
+                if (m !== undefined) {
+                    concat = `${concat}${m}`;
+                }
+            }
+        }
+        if (concat !== '' && !filteredSet.has(concat)) {
+            // like that we are avoiding to have duplicating variable value
+            filteredSet.add(concat);
+            result.push({
+                label: variableValue.label,
+                value: concat
+            });
+        }
+    }
+    return result;
+}
+function useListVariablePluginValues(definition) {
+    const { data: variablePlugin  } = (0, _runtime.usePlugin)('Variable', definition.spec.plugin.kind);
+    const datasourceStore = (0, _runtime.useDatasourceStore)();
+    const allVariables = (0, _runtime.useTemplateVariableValues)();
+    const { absoluteTimeRange: timeRange , refreshKey  } = (0, _runtime.useTimeRange)();
+    const variablePluginCtx = {
+        timeRange,
+        datasourceStore,
+        variables: allVariables
+    };
+    const spec = definition.spec.plugin.spec;
+    const capturingRegexp = definition.spec.capturing_regexp !== undefined ? new RegExp(definition.spec.capturing_regexp, 'g') : undefined;
+    let dependsOnVariables;
+    if (variablePlugin === null || variablePlugin === void 0 ? void 0 : variablePlugin.dependsOn) {
+        const dependencies = variablePlugin.dependsOn(spec, variablePluginCtx);
+        dependsOnVariables = dependencies.variables;
+    }
+    const variables = (0, _runtime.useTemplateVariableValues)(dependsOnVariables);
+    let waitToLoad = false;
+    if (dependsOnVariables) {
+        waitToLoad = dependsOnVariables.some((v)=>{
+            var ref;
+            return (ref = variables[v]) === null || ref === void 0 ? void 0 : ref.loading;
+        });
+    }
+    const variablesValueKey = getVariableValuesKey(variables);
+    return (0, _reactQuery.useQuery)([
+        name,
+        definition,
+        variablesValueKey,
+        timeRange,
+        refreshKey
+    ], async ()=>{
+        const resp = await (variablePlugin === null || variablePlugin === void 0 ? void 0 : variablePlugin.getVariableOptions(spec, {
+            datasourceStore,
+            variables,
+            timeRange
+        }));
+        if (resp === undefined) {
+            return [];
+        }
+        if (capturingRegexp === undefined) {
+            return resp.data;
+        }
+        return filterVariableList(resp.data, capturingRegexp);
+    }, {
+        enabled: !!variablePlugin || waitToLoad
+    });
+}
+function getVariableValuesKey(v) {
+    return Object.values(v).map((v)=>JSON.stringify(v.value)).join(',');
+}
+const VARIABLE_TYPES = [
+    {
+        label: 'List',
+        kind: 'ListVariable'
+    },
+    {
+        label: 'Text',
+        kind: 'TextVariable'
+    }
+];

package/dist/cjs/components/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", {
 _exportStar(require("./CalculationSelector"), exports);
 _exportStar(require("./DatasourceSelect"), exports);
 _exportStar(require("./LegendOptionsEditor"), exports);
+_exportStar(require("./OptionsEditorRadios"), exports);
 _exportStar(require("./OptionsEditorTabs"), exports);
 _exportStar(require("./PanelSpecEditor"), exports);
 _exportStar(require("./PluginEditor"), exports);
@@ -24,6 +25,7 @@ _exportStar(require("./PluginKindSelect"), exports);
 _exportStar(require("./PluginRegistry"), exports);
 _exportStar(require("./PluginSpecEditor"), exports);
 _exportStar(require("./TimeSeriesQueryEditor"), exports);
+_exportStar(require("./Variables"), exports);
 function _exportStar(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) Object.defineProperty(to, k, {

package/dist/cjs/constants/index.js

@@ -0,0 +1,28 @@
+// Copyright 2023 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
+});
+_exportStar(require("./user-interface-text"), exports);
+function _exportStar(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/constants/user-interface-text.js

@@ -0,0 +1,25 @@
+// Copyright 2023 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, "TOOLTIP_TEXT", {
+    enumerable: true,
+    get: ()=>TOOLTIP_TEXT
+});
+const TOOLTIP_TEXT = {
+    // Variable editor buttons
+    refreshVariableValues: 'Refresh values',
+    copyVariableValues: 'Copy values to clipboard'
+};

package/dist/cjs/index.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 _exportStar(require("./components"), exports);
+_exportStar(require("./constants"), exports);
 _exportStar(require("./model"), exports);
 _exportStar(require("./runtime"), exports);
 _exportStar(require("./test-utils"), exports);

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

@@ -21,18 +21,15 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    useDataQueries: ()=>useDataQueries,
     DataQueriesContext: ()=>DataQueriesContext,
     useDataQueriesContext: ()=>useDataQueriesContext,
+    useDataQueries: ()=>useDataQueries,
     DataQueriesProvider: ()=>DataQueriesProvider
 });
 const _jsxRuntime = require("react/jsx-runtime");
 const _react = require("react");
 const _timeSeriesQueries = require("../time-series-queries");
-function useDataQueries() {
-    const ctx = useDataQueriesContext();
-    return ctx;
-}
+const _model = require("./model");
 const DataQueriesContext = /*#__PURE__*/ (0, _react.createContext)(undefined);
 function useDataQueriesContext() {
     const ctx = (0, _react.useContext)(DataQueriesContext);
@@ -41,44 +38,59 @@ function useDataQueriesContext() {
     }
     return ctx;
 }
+function useDataQueries(queryType) {
+    const ctx = useDataQueriesContext();
+    // 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)=>{
+        var ref;
+        return ((ref = ctx.queryResults[index]) === null || ref === void 0 ? void 0 : ref.definition.kind) === queryType;
+    });
+    // Create a new context object with the filtered results and errors
+    const filteredCtx = {
+        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  } = props;
-    // For now we will map each query plugin definition to TimeSeriesQueryDefinition
-    // Later on when we add support for other query types,
-    // we will have to map each query maps to the correct QueryDefinition
-    const timeSeriesQueries = definitions.map((definition)=>({
-            kind: 'TimeSeriesQuery',
+    const getQueryType = (0, _model.useQueryType)();
+    const queryDefinitions = definitions.map((definition)=>{
+        const type = getQueryType(definition.kind);
+        return {
+            kind: type,
             spec: {
                 plugin: definition
             }
-        }));
-    const results = (0, _timeSeriesQueries.useTimeSeriesQueries)(timeSeriesQueries, options);
-    const data = results.map(({ data , isFetching , isLoading , refetch , error  }, i)=>{
-        return {
-            definition: definitions[i],
-            data,
-            isFetching,
-            isLoading,
-            refetch,
-            error
         };
     });
+    // Filter definitions for time series query and other future query plugins
+    const timeSeriesQueries = queryDefinitions.filter((definition)=>definition.kind === 'TimeSeriesQuery');
+    const timeSeriesResults = (0, _timeSeriesQueries.useTimeSeriesQueries)(timeSeriesQueries, options);
     const refetchAll = (0, _react.useCallback)(()=>{
-        results.forEach((result)=>result.refetch());
+        timeSeriesResults.forEach((result)=>result.refetch());
     }, [
-        results
+        timeSeriesResults
     ]);
     const ctx = (0, _react.useMemo)(()=>{
+        const mergedQueryResults = [
+            ...(0, _model.transformQueryResults)(timeSeriesResults, timeSeriesQueries)
+        ];
         return {
-            queryResults: data,
-            isFetching: results.some((result)=>result.isFetching),
-            isLoading: results.some((result)=>result.isLoading),
+            queryResults: mergedQueryResults,
+            isFetching: mergedQueryResults.some((result)=>result.isFetching),
+            isLoading: mergedQueryResults.some((result)=>result.isLoading),
             refetchAll,
-            errors: results.map((result)=>result.error)
+            errors: mergedQueryResults.map((result)=>result.error)
         };
     }, [
-        data,
-        results,
+        timeSeriesQueries,
+        timeSeriesResults,
         refetchAll
     ]);
     return /*#__PURE__*/ (0, _jsxRuntime.jsx)(DataQueriesContext.Provider, {