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

package/dist/cjs/components/Panel/PanelContent.js

@@ -22,27 +22,73 @@ Object.defineProperty(exports, "PanelContent", {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _pluginsystem = require("@perses-dev/plugin-system");
+const _components = require("@perses-dev/components");
 const _material = require("@mui/material");
+const _PanelPluginLoader = require("./PanelPluginLoader");
 function PanelContent(props) {
-    const { panelPluginKind, contentDimensions, definition, ...others } = props;
-    const { data: plugin, isLoading } = (0, _pluginsystem.usePlugin)('Panel', panelPluginKind, {
-        useErrorBoundary: true
+    const { panelPluginKind, definition, queryResults, spec, contentDimensions } = props;
+    const { data: plugin, isLoading: isPanelLoading } = (0, _pluginsystem.usePlugin)('Panel', panelPluginKind, {
+        throwOnError: true
     });
-    const PanelComponent = plugin === null || plugin === void 0 ? void 0 : plugin.PanelComponent;
-    if (isLoading) {
+    // Show fullsize skeleton if the panel plugin is loading.
+    if (isPanelLoading) {
         return /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Skeleton, {
             variant: "rectangular",
-            width: contentDimensions === null || contentDimensions === void 0 ? void 0 : contentDimensions.width,
-            height: contentDimensions === null || contentDimensions === void 0 ? void 0 : contentDimensions.height,
+            width: contentDimensions?.width,
+            height: contentDimensions?.height,
             "aria-label": "Loading..."
         });
     }
-    if (PanelComponent === undefined) {
-        throw new Error(`Missing PanelComponent from panel plugin for kind '${panelPluginKind}'`);
+    // Render the panel if any query has data, or the panel doesn't have a query attached (for example MarkdownPanel).
+    // Loading indicator or errors of other queries are shown in the panel header.
+    const queryResultsWithData = queryResults.flatMap((q)=>q.data ? [
+            {
+                data: q.data,
+                definition: q.definition
+            }
+        ] : []);
+    if (queryResultsWithData.length > 0 || queryResults.length === 0) {
+        return /*#__PURE__*/ (0, _jsxruntime.jsx)(_PanelPluginLoader.PanelPluginLoader, {
+            kind: panelPluginKind,
+            spec: spec,
+            contentDimensions: contentDimensions,
+            definition: definition,
+            queryResults: queryResultsWithData
+        });
+    }
+    // No query has data, show loading overlay if any query is fetching data.
+    if (queryResults.some((q)=>q.isFetching)) {
+        return /*#__PURE__*/ (0, _jsxruntime.jsx)(PanelLoading, {
+            plugin: plugin,
+            spec: spec,
+            definition: definition,
+            contentDimensions: contentDimensions
+        });
+    }
+    // No query has data or is loading, show the error if any query has an error.
+    // The error will be catched in <ErrorBoundary> of <Panel>.
+    const queryError = queryResults.find((q)=>q.error);
+    if (queryError) {
+        throw queryError.error;
     }
-    return /*#__PURE__*/ (0, _jsxruntime.jsx)(PanelComponent, {
-        ...others,
-        contentDimensions: contentDimensions,
-        definition: definition
+    // At this point, one or more queries are defined, but no query has data, is loading, or has an error.
+    // This can happen if all queries are disabled (e.g. dependent dashboard variables are loading, or they are not in the viewport of the browser).
+    // Most likely, some query will be enabled later. Render the panel loading skeleton.
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(PanelLoading, {
+        plugin: plugin,
+        spec: spec,
+        definition: definition,
+        contentDimensions: contentDimensions
     });
 }
+function PanelLoading({ plugin, spec, definition, contentDimensions }) {
+    if (plugin?.LoadingComponent) {
+        return /*#__PURE__*/ (0, _jsxruntime.jsx)(plugin.LoadingComponent, {
+            spec: spec,
+            contentDimensions: contentDimensions,
+            definition: definition,
+            queryResults: []
+        });
+    }
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.LoadingOverlay, {});
+}

package/dist/cjs/components/Panel/PanelHeader.js

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// Copyright 2025 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
@@ -23,83 +23,14 @@ Object.defineProperty(exports, "PanelHeader", {
 const _jsxruntime = require("react/jsx-runtime");
 const _material = require("@mui/material");
 const _components = require("@perses-dev/components");
-const _InformationOutline = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/InformationOutline"));
-const _PencilOutline = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/PencilOutline"));
-const _DeleteOutline = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/DeleteOutline"));
-const _DragVertical = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/DragVertical"));
-const _ContentCopy = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/ContentCopy"));
 const _pluginsystem = require("@perses-dev/plugin-system");
 const _constants = require("../../constants");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function PanelHeader({ id, title: rawTitle, description: rawDescription, editHandlers, sx, extra, ...rest }) {
+const _PanelActions = require("./PanelActions");
+function PanelHeader({ id, title: rawTitle, description: rawDescription, links, queryResults, readHandlers, editHandlers, sx, extra, ...rest }) {
     const titleElementId = `${id}-title`;
     const descriptionTooltipId = `${id}-description`;
     const title = (0, _pluginsystem.useReplaceVariablesInString)(rawTitle);
     const description = (0, _pluginsystem.useReplaceVariablesInString)(rawDescription);
-    let actions = undefined;
-    if (editHandlers !== undefined) {
-        // If there are edit handlers, always just show the edit buttons
-        actions = /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
-            children: [
-                /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.InfoTooltip, {
-                    description: _constants.TOOLTIP_TEXT.editPanel,
-                    children: /*#__PURE__*/ (0, _jsxruntime.jsx)(HeaderIconButton, {
-                        "aria-label": _constants.ARIA_LABEL_TEXT.editPanel(title),
-                        size: "small",
-                        onClick: editHandlers.onEditPanelClick,
-                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_PencilOutline.default, {
-                            fontSize: "inherit"
-                        })
-                    })
-                }),
-                /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.InfoTooltip, {
-                    description: _constants.TOOLTIP_TEXT.duplicatePanel,
-                    children: /*#__PURE__*/ (0, _jsxruntime.jsx)(HeaderIconButton, {
-                        "aria-label": _constants.ARIA_LABEL_TEXT.duplicatePanel(title),
-                        size: "small",
-                        onClick: editHandlers.onDuplicatePanelClick,
-                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_ContentCopy.default, {
-                            fontSize: "inherit",
-                            sx: {
-                                // Shrink this icon a little bit to look more consistent
-                                // with the other icons in the header.
-                                transform: 'scale(0.925)'
-                            }
-                        })
-                    })
-                }),
-                /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.InfoTooltip, {
-                    description: _constants.TOOLTIP_TEXT.deletePanel,
-                    children: /*#__PURE__*/ (0, _jsxruntime.jsx)(HeaderIconButton, {
-                        "aria-label": _constants.ARIA_LABEL_TEXT.deletePanel(title),
-                        size: "small",
-                        onClick: editHandlers.onDeletePanelClick,
-                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_DeleteOutline.default, {
-                            fontSize: "inherit"
-                        })
-                    })
-                }),
-                /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.InfoTooltip, {
-                    description: _constants.TOOLTIP_TEXT.movePanel,
-                    children: /*#__PURE__*/ (0, _jsxruntime.jsx)(HeaderIconButton, {
-                        "aria-label": _constants.ARIA_LABEL_TEXT.movePanel(title),
-                        size: "small",
-                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_DragVertical.default, {
-                            className: "drag-handle",
-                            sx: {
-                                cursor: 'grab'
-                            },
-                            fontSize: "inherit"
-                        })
-                    })
-                })
-            ]
-        });
-    }
     return /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.CardHeader, {
         id: id,
         component: "header",
@@ -116,68 +47,34 @@ function PanelHeader({ id, title: rawTitle, description: rawDescription, editHan
                         // `minHeight` guarantees that the header has the correct height
                         // when there is no title (i.e. in the preview)
                         lineHeight: '24px',
-                        minHeight: '24px',
+                        minHeight: '26px',
                         whiteSpace: 'nowrap',
                         overflow: 'hidden',
                         textOverflow: 'ellipsis'
                     },
                     children: title
                 }),
-                description !== undefined && description.trim().length > 0 && /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.InfoTooltip, {
-                    id: descriptionTooltipId,
+                /*#__PURE__*/ (0, _jsxruntime.jsx)(_PanelActions.PanelActions, {
+                    title: title,
                     description: description,
-                    enterDelay: 100,
-                    children: /*#__PURE__*/ (0, _jsxruntime.jsx)(HeaderIconButton, {
-                        "aria-label": "panel description",
-                        size: "small",
-                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_InformationOutline.default, {
-                            "aria-describedby": "info-tooltip",
-                            "aria-hidden": false,
-                            fontSize: "inherit",
-                            sx: {
-                                color: (theme)=>theme.palette.text.secondary
-                            }
-                        })
-                    })
+                    descriptionTooltipId: descriptionTooltipId,
+                    links: links,
+                    queryResults: queryResults,
+                    readHandlers: readHandlers,
+                    editHandlers: editHandlers,
+                    extra: extra
                 })
             ]
         }),
-        action: /*#__PURE__*/ (0, _jsxruntime.jsxs)(HeaderActionWrapper, {
-            direction: "row",
-            spacing: 0.25,
-            alignItems: "center",
-            children: [
-                editHandlers === undefined && extra,
-                " ",
-                actions
-            ]
-        }),
         sx: (0, _components.combineSx)((theme)=>({
+                containerType: 'inline-size',
+                containerName: _constants.HEADER_ACTIONS_CONTAINER_NAME,
                 padding: theme.spacing(1),
                 borderBottom: `solid 1px ${theme.palette.divider}`,
                 '.MuiCardHeader-content': {
                     overflow: 'hidden'
-                },
-                '.MuiCardHeader-action': {
-                    // Overriding the negative margins from MUI's defaults, so we
-                    // can vertically center the icons. Moving these values to a wrapper
-                    // inside the action in `HeaderActionWrapper` below.
-                    // https://github.com/mui/material-ui/blob/master/packages/mui-material/src/CardHeader/CardHeader.js#L56-L58
-                    margin: 'auto'
                 }
             }), sx),
         ...rest
     });
 }
-const HeaderIconButton = (0, _material.styled)(_material.IconButton)(({ theme })=>({
-        borderRadius: theme.shape.borderRadius,
-        padding: '4px'
-    }));
-const HeaderActionWrapper = (0, _material.styled)(_material.Stack)(()=>({
-        // Adding back the negative margins from MUI's defaults for actions, so we
-        // avoid increasing the header size when actions are present while also being
-        // able to vertically center the actions.
-        // https://github.com/mui/material-ui/blob/master/packages/mui-material/src/CardHeader/CardHeader.js#L56-L58
-        marginTop: -4,
-        marginBottom: -4
-    }));

package/dist/cjs/components/Panel/PanelLinks.js

@@ -0,0 +1,136 @@
+// 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
+//
+// 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, "PanelLinks", {
+    enumerable: true,
+    get: function() {
+        return PanelLinks;
+    }
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _material = require("@mui/material");
+const _Launch = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Launch"));
+const _react = require("react");
+const _components = require("@perses-dev/components");
+const _pluginsystem = require("@perses-dev/plugin-system");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function PanelLinks({ links }) {
+    const [anchorEl, setAnchorEl] = (0, _react.useState)(null);
+    const isMenuOpened = Boolean(anchorEl);
+    const handleOpenMenu = (event)=>{
+        setAnchorEl(event.currentTarget);
+    };
+    const handleClose = ()=>{
+        setAnchorEl(null);
+    };
+    // If there is only one link, show it directly
+    if (links.length === 1 && links[0]) {
+        const link = links[0];
+        return /*#__PURE__*/ (0, _jsxruntime.jsx)(LinkButton, {
+            link: link
+        });
+    }
+    // Else we show a menu with a list of all links
+    return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
+        children: [
+            /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.InfoTooltip, {
+                description: `${links.length} links`,
+                enterDelay: 100,
+                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                    "aria-label": "Panel links",
+                    size: "small",
+                    onClick: handleOpenMenu,
+                    sx: (theme)=>({
+                            borderRadius: theme.shape.borderRadius,
+                            padding: '4px'
+                        }),
+                    children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Launch.default, {
+                        "aria-describedby": "links-icon",
+                        fontSize: "inherit",
+                        sx: {
+                            color: (theme)=>theme.palette.text.secondary
+                        }
+                    })
+                })
+            }),
+            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Menu, {
+                anchorEl: anchorEl,
+                open: isMenuOpened,
+                onClose: handleClose,
+                MenuListProps: {
+                    'aria-labelledby': 'panel-links'
+                },
+                children: links.map((link)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(LinkMenuItem, {
+                        link: link
+                    }, link.url))
+            })
+        ]
+    });
+}
+function LinkButton({ link }) {
+    const { url, name, tooltip, targetBlank } = useLink(link);
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.InfoTooltip, {
+        description: tooltip ?? url,
+        enterDelay: 100,
+        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+            "aria-label": name ?? url,
+            size: "small",
+            href: url,
+            target: targetBlank ? '_blank' : '_self',
+            sx: (theme)=>({
+                    borderRadius: theme.shape.borderRadius,
+                    padding: '4px'
+                }),
+            children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Launch.default, {
+                fontSize: "inherit",
+                sx: {
+                    color: (theme)=>theme.palette.text.secondary
+                }
+            })
+        })
+    });
+}
+function LinkMenuItem({ link }) {
+    const { url, name, tooltip, targetBlank } = useLink(link);
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.InfoTooltip, {
+        description: tooltip ?? url,
+        enterDelay: 100,
+        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.MenuItem, {
+            component: _material.Link,
+            href: url,
+            target: targetBlank ? '_blank' : '_self',
+            children: name ?? url
+        })
+    });
+}
+function useLink(link) {
+    const url = (0, _pluginsystem.useReplaceVariablesInString)(link.url) ?? link.url;
+    const name = (0, _pluginsystem.useReplaceVariablesInString)(link.name);
+    const tooltip = (0, _pluginsystem.useReplaceVariablesInString)(link.tooltip);
+    if (link.renderVariables === false) {
+        return link;
+    }
+    return {
+        ...link,
+        url,
+        name,
+        tooltip
+    };
+}

package/dist/cjs/components/Panel/PanelPluginLoader.js

@@ -0,0 +1,56 @@
+// Copyright 2025 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, "PanelPluginLoader", {
+    enumerable: true,
+    get: function() {
+        return PanelPluginLoader;
+    }
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _pluginsystem = require("@perses-dev/plugin-system");
+const _material = require("@mui/material");
+function PanelPluginLoader(props) {
+    const { kind, spec, contentDimensions, definition, queryResults } = props;
+    const { data: plugin, isLoading: isPanelLoading } = (0, _pluginsystem.usePlugin)('Panel', kind, {
+        throwOnError: true
+    });
+    const PanelComponent = plugin?.PanelComponent;
+    const supportedQueryTypes = plugin?.supportedQueryTypes || [];
+    // Show fullsize skeleton if the panel plugin is loading.
+    if (isPanelLoading) {
+        return /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Skeleton, {
+            variant: "rectangular",
+            width: contentDimensions?.width,
+            height: contentDimensions?.height,
+            "aria-label": "Loading..."
+        });
+    }
+    if (PanelComponent === undefined) {
+        throw new Error(`Missing PanelComponent from panel plugin for kind '${kind}'`);
+    }
+    for (const queryResult of queryResults){
+        if (!supportedQueryTypes.includes(queryResult.definition.kind)) {
+            throw new Error(`This panel does not support queries of type '${queryResult.definition.kind}'. Supported query types: ${supportedQueryTypes.join(', ')}.`);
+        }
+    }
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(PanelComponent, {
+        spec: spec,
+        contentDimensions: contentDimensions,
+        definition: definition,
+        queryResults: queryResults
+    });
+}

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

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 _export_star(require("./Panel"), exports);
+_export_star(require("./PanelPluginLoader"), 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/PanelDrawer/PanelDrawer.js

@@ -44,7 +44,7 @@ const PanelDrawer = ()=>{
     };
     // Don't call closeDrawer on the store until the Drawer has completely transitioned out and reset close state
     const handleExited = ()=>{
-        panelEditor === null || panelEditor === void 0 ? void 0 : panelEditor.close();
+        panelEditor?.close();
         setIsClosing(false);
     };
     // Disables closing on click out. This is a quick-win solution to avoid losing draft changes.
@@ -58,11 +58,14 @@ const PanelDrawer = ()=>{
             onExited: handleExited
         },
         "data-testid": "panel-editor",
-        children: panelEditor && /*#__PURE__*/ (0, _jsxruntime.jsx)(_PanelEditorForm.PanelEditorForm, {
-            initialAction: panelEditor.mode,
-            initialValues: panelEditor.initialValues,
-            onSave: handleSave,
-            onClose: handleClose
+        children: panelEditor && /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.ErrorBoundary, {
+            FallbackComponent: _components.ErrorAlert,
+            children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_PanelEditorForm.PanelEditorForm, {
+                initialAction: panelEditor.mode,
+                initialValues: panelEditor.initialValues,
+                onSave: handleSave,
+                onClose: handleClose
+            })
         })
     });
 };