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

package/dist/cjs/components/Variables/{TemplateVariable.js → Variable.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
@@ -21,8 +21,8 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    TemplateVariable: function() {
-        return TemplateVariable;
+    Variable: function() {
+        return Variable;
     },
     useListVariableState: function() {
         return useListVariableState;
@@ -46,10 +46,9 @@ function variableOptionToVariableValue(options) {
     }
     return options.value;
 }
-function TemplateVariable({ name, source }) {
-    var _ctx_definition;
-    const ctx = (0, _context.useTemplateVariable)(name, source);
-    const kind = (_ctx_definition = ctx.definition) === null || _ctx_definition === void 0 ? void 0 : _ctx_definition.kind;
+function Variable({ name, source }) {
+    const ctx = (0, _context.useVariableDefinitionAndState)(name, source);
+    const kind = ctx.definition?.kind;
     switch(kind){
         case 'TextVariable':
             return /*#__PURE__*/ (0, _jsxruntime.jsx)(TextVariable, {
@@ -70,22 +69,16 @@ function TemplateVariable({ name, source }) {
     });
 }
 function useListVariableState(spec, state, variablesOptionsQuery) {
-    const allowMultiple = (spec === null || spec === void 0 ? void 0 : spec.allowMultiple) === true;
-    const allowAllValue = (spec === null || spec === void 0 ? void 0 : spec.allowAllValue) === true;
-    const sort = spec === null || spec === void 0 ? void 0 : spec.sort;
-    const loading = (0, _react.useMemo)(()=>{
-        var _variablesOptionsQuery_isFetching;
-        return (_variablesOptionsQuery_isFetching = variablesOptionsQuery.isFetching) !== null && _variablesOptionsQuery_isFetching !== void 0 ? _variablesOptionsQuery_isFetching : false;
-    }, [
+    const allowMultiple = spec?.allowMultiple === true;
+    const allowAllValue = spec?.allowAllValue === true;
+    const sort = spec?.sort;
+    const loading = (0, _react.useMemo)(()=>variablesOptionsQuery.isFetching ?? false, [
         variablesOptionsQuery.isFetching
     ]);
-    const options = (0, _react.useMemo)(()=>{
-        var _variablesOptionsQuery_data;
-        return (_variablesOptionsQuery_data = variablesOptionsQuery.data) !== null && _variablesOptionsQuery_data !== void 0 ? _variablesOptionsQuery_data : [];
-    }, [
+    const options = (0, _react.useMemo)(()=>variablesOptionsQuery.data ?? [], [
         variablesOptionsQuery.data
     ]);
-    let value = state === null || state === void 0 ? void 0 : state.value;
+    let value = state?.value;
     // Make sure value is an array if allowMultiple is true
     if (allowMultiple && !Array.isArray(value)) {
         value = typeof value === 'string' ? [
@@ -146,8 +139,7 @@ function useListVariableState(spec, state, variablesOptionsQuery) {
         allowMultiple
     ]);
     value = (0, _react.useMemo)(()=>{
-        var _viewOptions_;
-        const firstOptionValue = viewOptions === null || viewOptions === void 0 ? void 0 : (_viewOptions_ = viewOptions[allowAllValue ? 1 : 0]) === null || _viewOptions_ === void 0 ? void 0 : _viewOptions_.value;
+        const firstOptionValue = viewOptions?.[allowAllValue ? 1 : 0]?.value;
         // If there is no value but there are options, or the value is not in options, we set the value to the first option.
         if (firstOptionValue) {
             if (!valueIsInOptions || !value || value.length === 0) {
@@ -169,13 +161,12 @@ function useListVariableState(spec, state, variablesOptionsQuery) {
         // an array, hence this conditional
         if (Array.isArray(value)) {
             return viewOptions.filter((o)=>{
-                return value === null || value === void 0 ? void 0 : value.includes(o.value);
+                return value?.includes(o.value);
             });
         } else {
-            var _viewOptions_find;
-            return (_viewOptions_find = viewOptions.find((o)=>{
+            return viewOptions.find((o)=>{
                 return value === o.value;
-            })) !== null && _viewOptions_find !== void 0 ? _viewOptions_find : {
+            }) ?? {
                 value: '',
                 label: ''
             };
@@ -193,7 +184,6 @@ function useListVariableState(spec, state, variablesOptionsQuery) {
     };
 }
 const StyledPopper = (props)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Popper, {
-        placeholder: undefined,
         ...props,
         sx: {
             minWidth: 'fit-content'
@@ -203,28 +193,27 @@ const StyledPopper = (props)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Poppe
 const LETTER_HSIZE = 8; // approximation
 const ARROW_OFFSET = 40; // right offset for list variables (= take into account the dropdown toggle size)
 const getWidthPx = (inputValue, kind)=>{
-    const width = (inputValue.length + 1) * LETTER_HSIZE + (kind == 'list' ? ARROW_OFFSET : 0);
-    if (width < _constants.MIN_TEMPLATE_VARIABLE_WIDTH) {
-        return _constants.MIN_TEMPLATE_VARIABLE_WIDTH;
-    } else if (width > _constants.MAX_TEMPLATE_VARIABLE_WIDTH) {
-        return _constants.MAX_TEMPLATE_VARIABLE_WIDTH;
+    const width = (inputValue.length + 1) * LETTER_HSIZE + (kind === 'list' ? ARROW_OFFSET : 0);
+    if (width < _constants.MIN_VARIABLE_WIDTH) {
+        return _constants.MIN_VARIABLE_WIDTH;
+    } else if (width > _constants.MAX_VARIABLE_WIDTH) {
+        return _constants.MAX_VARIABLE_WIDTH;
     } else {
         return width;
     }
 };
 function ListVariable({ name, source }) {
-    var _definition_spec_display;
-    const ctx = (0, _context.useTemplateVariable)(name, source);
+    const ctx = (0, _context.useVariableDefinitionAndState)(name, source);
     const definition = ctx.definition;
     const variablesOptionsQuery = (0, _pluginsystem.useListVariablePluginValues)(definition);
-    const { setVariableValue, setVariableLoading, setVariableOptions } = (0, _context.useTemplateVariableActions)();
-    const { selectedOptions, value, loading, options, viewOptions } = useListVariableState(definition === null || definition === void 0 ? void 0 : definition.spec, ctx.state, variablesOptionsQuery);
+    const { setVariableValue, setVariableLoading, setVariableOptions } = (0, _context.useVariableDefinitionActions)();
+    const { selectedOptions, value, loading, options, viewOptions } = useListVariableState(definition?.spec, ctx.state, variablesOptionsQuery);
+    const [inputWidth, setInputWidth] = (0, _react.useState)(_constants.MIN_VARIABLE_WIDTH);
+    // Used for multiple value variables, it will not clear variable input when selecting an option
     const [inputValue, setInputValue] = (0, _react.useState)('');
-    const [inputWidth, setInputWidth] = (0, _react.useState)(_constants.MIN_TEMPLATE_VARIABLE_WIDTH);
-    var _definition_spec_display_name;
-    const title = (_definition_spec_display_name = definition === null || definition === void 0 ? void 0 : (_definition_spec_display = definition.spec.display) === null || _definition_spec_display === void 0 ? void 0 : _definition_spec_display.name) !== null && _definition_spec_display_name !== void 0 ? _definition_spec_display_name : name;
-    const allowMultiple = (definition === null || definition === void 0 ? void 0 : definition.spec.allowMultiple) === true;
-    const allowAllValue = (definition === null || definition === void 0 ? void 0 : definition.spec.allowAllValue) === true;
+    const title = definition?.spec.display?.name ?? name;
+    const allowMultiple = definition?.spec.allowMultiple === true;
+    const allowAllValue = definition?.spec.allowAllValue === true;
     // Update value when changed
     (0, _react.useEffect)(()=>{
         if (value) {
@@ -266,11 +255,14 @@ function ListVariable({ name, source }) {
                 limitTags: 3,
                 size: "small",
                 disableClearable: true,
-                PopperComponent: StyledPopper,
+                slots: {
+                    popper: StyledPopper
+                },
                 renderInput: (params)=>{
                     return allowMultiple ? /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.TextField, {
                         ...params,
-                        label: title
+                        label: title,
+                        onChange: (e)=>setInputValue(e.target.value)
                     }) : /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.TextField, {
                         ...params,
                         label: title,
@@ -283,9 +275,8 @@ function ListVariable({ name, source }) {
                     '& .MuiInputBase-root': {
                         minHeight: '38px'
                     },
-                    '& .MuiInputBase-root.MuiOutlinedInput-root.MuiInputBase-sizeSmall': {
-                        paddingY: '5px',
-                        paddingLeft: '5px'
+                    '& .MuiAutocomplete-tag': {
+                        margin: '1px 2px'
                     }
                 },
                 value: selectedOptions,
@@ -296,13 +287,17 @@ function ListVariable({ name, source }) {
                         setVariableValue(name, variableOptionToVariableValue(value), source);
                     }
                 },
-                inputValue: inputValue,
+                inputValue: allowMultiple ? inputValue : undefined,
                 onInputChange: (_, newInputValue)=>{
-                    setInputValue(newInputValue);
                     if (!allowMultiple) {
                         setInputWidth(getWidthPx(newInputValue, 'list'));
                     }
                 },
+                onBlur: ()=>{
+                    if (allowMultiple) {
+                        setInputValue('');
+                    }
+                },
                 options: viewOptions
             }),
             loading && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.LinearProgress, {})
@@ -310,34 +305,31 @@ function ListVariable({ name, source }) {
     });
 }
 function TextVariable({ name, source }) {
-    var _definition_spec_display;
-    const ctx = (0, _context.useTemplateVariable)(name, source);
+    const ctx = (0, _context.useVariableDefinitionAndState)(name, source);
     const state = ctx.state;
     const definition = ctx.definition;
-    var _state_value;
-    const [tempValue, setTempValue] = (0, _react.useState)((_state_value = state === null || state === void 0 ? void 0 : state.value) !== null && _state_value !== void 0 ? _state_value : '');
+    const [tempValue, setTempValue] = (0, _react.useState)(state?.value ?? '');
     const [inputWidth, setInputWidth] = (0, _react.useState)(getWidthPx(tempValue, 'text'));
-    const { setVariableValue } = (0, _context.useTemplateVariableActions)();
+    const { setVariableValue } = (0, _context.useVariableDefinitionActions)();
     (0, _react.useEffect)(()=>{
-        var _state_value;
-        setTempValue((_state_value = state === null || state === void 0 ? void 0 : state.value) !== null && _state_value !== void 0 ? _state_value : '');
+        setTempValue(state?.value ?? '');
     }, [
-        state === null || state === void 0 ? void 0 : state.value
+        state?.value
     ]);
-    var _definition_spec_display_name, _definition_spec_constant;
     return /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.TextField, {
         title: tempValue,
         value: tempValue,
-        //onChange={(e) => setTempValue(e.target.value)}
         onChange: (e)=>{
             setTempValue(e.target.value);
             setInputWidth(getWidthPx(e.target.value, 'text'));
         },
         onBlur: ()=>setVariableValue(name, tempValue, source),
         placeholder: name,
-        label: (_definition_spec_display_name = definition === null || definition === void 0 ? void 0 : (_definition_spec_display = definition.spec.display) === null || _definition_spec_display === void 0 ? void 0 : _definition_spec_display.name) !== null && _definition_spec_display_name !== void 0 ? _definition_spec_display_name : name,
-        InputProps: {
-            readOnly: (_definition_spec_constant = definition === null || definition === void 0 ? void 0 : definition.spec.constant) !== null && _definition_spec_constant !== void 0 ? _definition_spec_constant : false
+        label: definition?.spec.display?.name ?? name,
+        slotProps: {
+            input: {
+                readOnly: definition?.spec.constant ?? false
+            }
         },
         sx: {
             width: `${inputWidth}px`,

package/dist/cjs/components/Variables/VariableEditor.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
@@ -43,7 +43,7 @@ const _ChevronUp = /*#__PURE__*/ _interop_require_default(require("mdi-material-
 const _pluginsystem = require("@perses-dev/plugin-system");
 const _components = require("@perses-dev/components");
 const _context = require("../../context");
-const _hydrationUtils = require("../../context/TemplateVariableProvider/hydrationUtils");
+const _hydrationUtils = require("../../context/VariableProvider/hydrationUtils");
 const _BuiltinVariableAccordions = require("./BuiltinVariableAccordions");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -51,8 +51,7 @@ function _interop_require_default(obj) {
     };
 }
 function getVariableLabelByKind(kind) {
-    var _VARIABLE_TYPES_find;
-    return (_VARIABLE_TYPES_find = _pluginsystem.VARIABLE_TYPES.find((variableType)=>variableType.kind === kind)) === null || _VARIABLE_TYPES_find === void 0 ? void 0 : _VARIABLE_TYPES_find.label;
+    return _pluginsystem.VARIABLE_TYPES.find((variableType)=>variableType.kind === kind)?.label;
 }
 function getValidation(variableDefinitions) {
     const errors = [];
@@ -77,7 +76,7 @@ function VariableEditor(props) {
     ]);
     const [variableState] = (0, _react.useMemo)(()=>{
         return [
-            (0, _hydrationUtils.hydrateTemplateVariableStates)(variableDefinitions, {}, externalVariableDefinitions)
+            (0, _hydrationUtils.hydrateVariableDefinitionStates)(variableDefinitions, {}, externalVariableDefinitions)
         ];
     }, [
         externalVariableDefinitions,
@@ -166,22 +165,25 @@ function VariableEditor(props) {
     };
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
         children: [
-            currentEditingVariableDefinition && /*#__PURE__*/ (0, _jsxruntime.jsx)(_pluginsystem.VariableEditorForm, {
-                initialVariableDefinition: currentEditingVariableDefinition,
-                initialAction: variableFormAction,
-                isDraft: true,
-                onSave: (definition)=>{
-                    setVariableDefinitions((draft)=>{
-                        draft[variableEditIdx] = definition;
+            currentEditingVariableDefinition && /*#__PURE__*/ (0, _jsxruntime.jsx)(_pluginsystem.ValidationProvider, {
+                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_pluginsystem.VariableEditorForm, {
+                    initialVariableDefinition: currentEditingVariableDefinition,
+                    action: variableFormAction,
+                    isDraft: true,
+                    onActionChange: setVariableFormAction,
+                    onSave: (definition)=>{
+                        setVariableDefinitions((draft)=>{
+                            draft[variableEditIdx] = definition;
+                            setVariableEditIdx(null);
+                        });
+                    },
+                    onClose: ()=>{
+                        if (variableFormAction === 'create') {
+                            removeVariable(variableEditIdx);
+                        }
                         setVariableEditIdx(null);
-                    });
-                },
-                onClose: ()=>{
-                    if (variableFormAction === 'create') {
-                        removeVariable(variableEditIdx);
                     }
-                    setVariableEditIdx(null);
-                }
+                })
             }),
             !currentEditingVariableDefinition && /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
                 children: [
@@ -265,16 +267,13 @@ function VariableEditor(props) {
                                                         })
                                                     }),
                                                     /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.TableBody, {
-                                                        children: variableDefinitions.map((v, idx)=>/*#__PURE__*/ {
-                                                            var _v_spec_display, _v_spec_display1;
-                                                            var _getVariableLabelByKind, _v_spec_display_description;
-                                                            return (0, _jsxruntime.jsxs)(_material.TableRow, {
+                                                        children: variableDefinitions.map((v, idx)=>/*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.TableRow, {
                                                                 children: [
                                                                     /*#__PURE__*/ (0, _jsxruntime.jsx)(TableCell, {
                                                                         component: "th",
                                                                         scope: "row",
                                                                         children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Switch, {
-                                                                            checked: ((_v_spec_display = v.spec.display) === null || _v_spec_display === void 0 ? void 0 : _v_spec_display.hidden) !== true,
+                                                                            checked: v.spec.display?.hidden !== true,
                                                                             onChange: (e)=>{
                                                                                 toggleVariableVisibility(idx, e.target.checked);
                                                                             }
@@ -294,10 +293,10 @@ function VariableEditor(props) {
                                                                         })
                                                                     }),
                                                                     /*#__PURE__*/ (0, _jsxruntime.jsx)(TableCell, {
-                                                                        children: (_getVariableLabelByKind = getVariableLabelByKind(v.kind)) !== null && _getVariableLabelByKind !== void 0 ? _getVariableLabelByKind : v.kind
+                                                                        children: getVariableLabelByKind(v.kind) ?? v.kind
                                                                     }),
                                                                     /*#__PURE__*/ (0, _jsxruntime.jsx)(TableCell, {
-                                                                        children: (_v_spec_display_description = (_v_spec_display1 = v.spec.display) === null || _v_spec_display1 === void 0 ? void 0 : _v_spec_display1.description) !== null && _v_spec_display_description !== void 0 ? _v_spec_display_description : ''
+                                                                        children: v.spec.display?.description ?? ''
                                                                     }),
                                                                     /*#__PURE__*/ (0, _jsxruntime.jsxs)(TableCell, {
                                                                         align: "right",
@@ -326,8 +325,7 @@ function VariableEditor(props) {
                                                                         ]
                                                                     })
                                                                 ]
-                                                            }, v.spec.name);
-                                                        })
+                                                            }, v.spec.name))
                                                     })
                                                 ]
                                             })
@@ -427,16 +425,13 @@ function VariableEditor(props) {
                                                                 })
                                                             }),
                                                             /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.TableBody, {
-                                                                children: extVar.definitions.map((v)=>/*#__PURE__*/ {
-                                                                    var _v_spec_display, _v_spec_display1;
-                                                                    var _getVariableLabelByKind, _v_spec_display_description;
-                                                                    return (0, _jsxruntime.jsxs)(_material.TableRow, {
+                                                                children: extVar.definitions.map((v)=>/*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.TableRow, {
                                                                         children: [
                                                                             /*#__PURE__*/ (0, _jsxruntime.jsx)(TableCell, {
                                                                                 component: "th",
                                                                                 scope: "row",
                                                                                 children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Switch, {
-                                                                                    checked: ((_v_spec_display = v.spec.display) === null || _v_spec_display === void 0 ? void 0 : _v_spec_display.hidden) !== true,
+                                                                                    checked: v.spec.display?.hidden !== true,
                                                                                     disabled: true
                                                                                 })
                                                                             }),
@@ -455,10 +450,10 @@ function VariableEditor(props) {
                                                                                 })
                                                                             }),
                                                                             /*#__PURE__*/ (0, _jsxruntime.jsx)(TableCell, {
-                                                                                children: (_getVariableLabelByKind = getVariableLabelByKind(v.kind)) !== null && _getVariableLabelByKind !== void 0 ? _getVariableLabelByKind : v.kind
+                                                                                children: getVariableLabelByKind(v.kind) ?? v.kind
                                                                             }),
                                                                             /*#__PURE__*/ (0, _jsxruntime.jsx)(TableCell, {
-                                                                                children: (_v_spec_display_description = (_v_spec_display1 = v.spec.display) === null || _v_spec_display1 === void 0 ? void 0 : _v_spec_display1.description) !== null && _v_spec_display_description !== void 0 ? _v_spec_display_description : ''
+                                                                                children: v.spec.display?.description ?? ''
                                                                             }),
                                                                             /*#__PURE__*/ (0, _jsxruntime.jsxs)(TableCell, {
                                                                                 align: "right",
@@ -492,8 +487,7 @@ function VariableEditor(props) {
                                                                                 ]
                                                                             })
                                                                         ]
-                                                                    }, v.spec.name);
-                                                                })
+                                                                    }, v.spec.name))
                                                             })
                                                         ]
                                                     })
@@ -519,13 +513,13 @@ function VariableName(props) {
     const { name, state } = props;
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
         children: [
-            !(state === null || state === void 0 ? void 0 : state.overridden) && `${name} `,
-            !(state === null || state === void 0 ? void 0 : state.overridden) && (state === null || state === void 0 ? void 0 : state.overriding) && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Box, {
+            !state?.overridden && `${name} `,
+            !state?.overridden && state?.overriding && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Box, {
                 fontWeight: "normal",
                 color: (theme)=>theme.palette.primary.main,
                 children: "(overriding)"
             }),
-            (state === null || state === void 0 ? void 0 : state.overridden) && /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
+            state?.overridden && /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
                 children: [
                     /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Box, {
                         color: (theme)=>theme.palette.grey[500],

package/dist/cjs/components/Variables/VariableList.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
@@ -21,47 +21,48 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    TemplateVariableList: function() {
-        return TemplateVariableList;
+    VariableList: function() {
+        return VariableList;
     },
-    TemplateVariableListItem: function() {
-        return TemplateVariableListItem;
+    VariableListItem: function() {
+        return VariableListItem;
     }
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _material = require("@mui/material");
 const _context = require("../../context");
 const _constants = require("../../constants");
-const _TemplateVariable = require("./TemplateVariable");
-function TemplateVariableList() {
-    const variableDefinitions = (0, _context.useTemplateVariableDefinitions)();
-    const externalVariableDefinitions = (0, _context.useTemplateExternalVariableDefinitions)();
+const _Variable = require("./Variable");
+function VariableList() {
+    const variableDefinitions = (0, _context.useVariableDefinitions)();
+    const externalVariableDefinitions = (0, _context.useExternalVariableDefinitions)();
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
         children: [
             externalVariableDefinitions.slice().reverse() // We reverse to have the most prioritized on top
-            .map((def)=>def.definitions.map((v)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(TemplateVariableListItem, {
+            .map((def)=>def.definitions.map((v)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(VariableListItem, {
                         spec: v.spec,
                         source: def.source
                     }, v.spec.name + def.source))),
-            variableDefinitions.map((v)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(TemplateVariableListItem, {
+            variableDefinitions.map((v)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(VariableListItem, {
                     spec: v.spec
                 }, v.spec.name))
         ]
     });
 }
-function TemplateVariableListItem({ spec, source }) {
-    var _ctx_state, _spec_display;
-    const ctx = (0, _context.useTemplateVariable)(spec.name, source);
-    var _ref, _ref1;
+function VariableListItem({ spec, source }) {
+    const ctx = (0, _context.useVariableDefinitionAndState)(spec.name, source);
+    if (ctx.state?.overridden) {
+        return null;
+    }
     return /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Box, {
-        display: ((_ctx_state = ctx.state) === null || _ctx_state === void 0 ? void 0 : _ctx_state.overridden) || ((_spec_display = spec.display) === null || _spec_display === void 0 ? void 0 : _spec_display.hidden) ? 'none' : undefined,
-        minWidth: `${_constants.MIN_TEMPLATE_VARIABLE_WIDTH}px`,
-        maxWidth: `${_constants.MAX_TEMPLATE_VARIABLE_WIDTH}px`,
+        display: spec.display?.hidden ? 'none' : undefined,
+        minWidth: `${_constants.MIN_VARIABLE_WIDTH}px`,
+        maxWidth: `${_constants.MAX_VARIABLE_WIDTH}px`,
         flexShrink: 0,
-        "data-testid": 'template-variable-' + spec.name,
-        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_TemplateVariable.TemplateVariable, {
+        "data-testid": 'variable-' + spec.name,
+        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Variable.Variable, {
             name: spec.name,
             source: source
-        }, (_ref = spec.name + source) !== null && _ref !== void 0 ? _ref : '')
-    }, (_ref1 = spec.name + source) !== null && _ref1 !== void 0 ? _ref1 : '');
+        }, (spec.name + source) ?? '')
+    }, (spec.name + source) ?? '');
 }

package/dist/cjs/components/Variables/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
@@ -16,7 +16,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 _export_star(require("./BuiltinVariableAccordions"), exports);
 _export_star(require("./EditVariablesButton"), exports);
-_export_star(require("./TemplateVariable"), exports);
+_export_star(require("./Variable"), exports);
 _export_star(require("./VariableEditor"), exports);
 _export_star(require("./VariableList"), exports);
 function _export_star(from, to) {

package/dist/cjs/constants/styles.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
@@ -21,11 +21,20 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    MAX_TEMPLATE_VARIABLE_WIDTH: function() {
-        return MAX_TEMPLATE_VARIABLE_WIDTH;
+    HEADER_ACTIONS_CONTAINER_NAME: function() {
+        return HEADER_ACTIONS_CONTAINER_NAME;
     },
-    MIN_TEMPLATE_VARIABLE_WIDTH: function() {
-        return MIN_TEMPLATE_VARIABLE_WIDTH;
+    HEADER_MEDIUM_WIDTH: function() {
+        return HEADER_MEDIUM_WIDTH;
+    },
+    HEADER_SMALL_WIDTH: function() {
+        return HEADER_SMALL_WIDTH;
+    },
+    MAX_VARIABLE_WIDTH: function() {
+        return MAX_VARIABLE_WIDTH;
+    },
+    MIN_VARIABLE_WIDTH: function() {
+        return MIN_VARIABLE_WIDTH;
     },
     editButtonStyle: function() {
         return editButtonStyle;
@@ -38,5 +47,8 @@ const editButtonStyle = {
         marginRight: 0.5
     }
 };
-const MIN_TEMPLATE_VARIABLE_WIDTH = 120;
-const MAX_TEMPLATE_VARIABLE_WIDTH = 500;
+const MIN_VARIABLE_WIDTH = 120;
+const MAX_VARIABLE_WIDTH = 500;
+const HEADER_SMALL_WIDTH = 170;
+const HEADER_MEDIUM_WIDTH = 220;
+const HEADER_ACTIONS_CONTAINER_NAME = 'header-actions-container';

package/dist/cjs/constants/user-interface-text.js

@@ -32,7 +32,6 @@ const TOOLTIP_TEXT = {
     // Toolbar buttons
     addPanel: 'Add panel',
     addGroup: 'Add panel group',
-    downloadDashboard: 'Download JSON',
     editDatasources: 'Edit datasources',
     editJson: 'Edit JSON',
     editVariables: 'Edit variables',
@@ -44,6 +43,7 @@ const TOOLTIP_TEXT = {
     moveGroupDown: 'Move group down',
     moveGroupUp: 'Move group up',
     // Panel buttons
+    viewPanel: 'Toggle View Mode',
     editPanel: 'Edit',
     duplicatePanel: 'Duplicate',
     deletePanel: 'Delete',
@@ -60,8 +60,10 @@ const ARIA_LABEL_TEXT = {
     moveGroupDown: (groupName)=>`move group ${groupName} down`,
     moveGroupUp: (groupName)=>`move group ${groupName} up`,
     // Panel buttons
+    viewPanel: (panelName)=>`toggle panel ${panelName} view mode`,
     editPanel: (panelName)=>`edit panel ${panelName}`,
     duplicatePanel: (panelName)=>`duplicate panel ${panelName}`,
     deletePanel: (panelName)=>`delete panel ${panelName}`,
+    showPanelActions: (panelName)=>`show panel actions for ${panelName}`,
     movePanel: (panelName)=>`move panel ${panelName}`
 };

package/dist/cjs/context/DashboardProvider/DashboardProvider.js

@@ -33,6 +33,7 @@ _export(exports, {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _zustand = require("zustand");
+const _traditional = require("zustand/traditional");
 const _middleware = require("zustand/middleware");
 const _immer = require("zustand/middleware/immer");
 const _shallow = require("zustand/shallow");
@@ -50,13 +51,14 @@ const _savechangesdialogslice = require("./save-changes-dialog-slice");
 const _duplicatepanelslice = require("./duplicate-panel-slice");
 const _editjsondialogslice = require("./edit-json-dialog-slice");
 const _common = require("./common");
+const _viewpanelslice = require("./view-panel-slice");
 const DashboardContext = /*#__PURE__*/ (0, _react.createContext)(undefined);
 function useDashboardStore(selector) {
     const store = (0, _react.useContext)(DashboardContext);
     if (store === undefined) {
         throw new Error('No DashboardContext found. Did you forget a Provider?');
     }
-    return (0, _zustand.useStore)(store, selector, _shallow.shallow);
+    return (0, _traditional.useStoreWithEqualityFn)(store, selector, _shallow.shallow);
 }
 function DashboardProvider(props) {
     const createDashboardStore = (0, _react.useCallback)(initStore, [
@@ -64,13 +66,12 @@ function DashboardProvider(props) {
     ]);
     // load plugin to retrieve initial spec if default panel kind is defined
     const { defaultPluginKinds } = (0, _pluginsystem.usePluginRegistry)();
-    var _defaultPluginKinds_Panel;
-    const defaultPanelKind = (_defaultPluginKinds_Panel = defaultPluginKinds === null || defaultPluginKinds === void 0 ? void 0 : defaultPluginKinds['Panel']) !== null && _defaultPluginKinds_Panel !== void 0 ? _defaultPluginKinds_Panel : '';
+    const defaultPanelKind = defaultPluginKinds?.['Panel'] ?? '';
     const { data: plugin } = (0, _pluginsystem.usePlugin)('Panel', defaultPanelKind);
     const [store] = (0, _react.useState)(createDashboardStore(props)); // prevent calling createDashboardStore every time it rerenders
     (0, _react.useEffect)(()=>{
         if (plugin === undefined) return;
-        const defaultPanelSpec = plugin.createInitialOptions();
+        const defaultPanelSpec = plugin.createInitialOptions ? plugin.createInitialOptions() : {};
         // set default panel kind, spec, and queries for add panel editor
         store.setState({
             initialValues: {
@@ -88,13 +89,13 @@ function DashboardProvider(props) {
     });
 }
 function initStore(props) {
-    const { initialState: { dashboardResource, isEditMode } } = props;
+    const { initialState: { dashboardResource, isEditMode, viewPanelRef, setViewPanelRef } } = props;
     const { kind, metadata, spec: { display, duration, refreshInterval = _core.DEFAULT_REFRESH_INTERVAL, datasources } } = dashboardResource;
     const ttl = 'ttl' in dashboardResource.spec ? dashboardResource.spec.ttl : undefined;
     let { spec: { layouts, panels } } = dashboardResource;
     // Set fallbacks in case the frontend is used with a non-Perses backend
-    layouts = layouts !== null && layouts !== void 0 ? layouts : [];
-    panels = panels !== null && panels !== void 0 ? panels : {};
+    layouts = layouts ?? [];
+    panels = panels ?? {};
     const store = (0, _zustand.createStore)()((0, _immer.immer)((0, _middleware.devtools)((...args)=>{
         const [set] = args;
         return {
@@ -105,6 +106,7 @@ function initStore(props) {
             ...(0, _paneleditorslice.createPanelEditorSlice)()(...args),
             ...(0, _deletepanelslice.createDeletePanelSlice)()(...args),
             ...(0, _duplicatepanelslice.createDuplicatePanelSlice)()(...args),
+            ...(0, _viewpanelslice.createViewPanelSlice)(viewPanelRef, setViewPanelRef)(...args),
             /* General */ ...(0, _discardchangesdialogslice.createDiscardChangesDialogSlice)(...args),
             ...(0, _editjsondialogslice.createEditJsonDialogSlice)(...args),
             ...(0, _savechangesdialogslice.createSaveChangesDialogSlice)(...args),
@@ -129,7 +131,7 @@ function initStore(props) {
                     state.panelGroups = panelGroups;
                     state.panelGroupOrder = panelGroupOrder;
                     state.duration = duration;
-                    state.refreshInterval = refreshInterval !== null && refreshInterval !== void 0 ? refreshInterval : _core.DEFAULT_REFRESH_INTERVAL;
+                    state.refreshInterval = refreshInterval ?? _core.DEFAULT_REFRESH_INTERVAL;
                     state.datasources = datasources;
                 // TODO: add ttl here to e.g allow edition from JSON view, but probably requires quite some refactoring
                 });