@perses-dev/dashboards 0.9.0 → 0.11.0

package/dist/cjs/components/Dashboard.js

@@ -21,22 +21,17 @@ Object.defineProperty(exports, "Dashboard", {
 const _jsxRuntime = require("react/jsx-runtime");
 const _material = require("@mui/material");
 const _components = require("@perses-dev/components");
+const _context = require("../context");
 const _gridLayout = require("./GridLayout");
 function Dashboard(props) {
-    const { spec , ...others } = props;
+    const panelGroupIds = (0, _context.usePanelGroupIds)();
     return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Box, {
-        ...others,
+        ...props,
         children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components.ErrorBoundary, {
             FallbackComponent: _components.ErrorAlert,
-            children: spec.layouts.map((layout, idx)=>/*#__PURE__*/ (0, _jsxRuntime.jsx)(_gridLayout.GridLayout, {
-                    groupIndex: idx,
-                    definition: layout,
-                    renderGridItemContent: (definition, groupIndex)=>/*#__PURE__*/ (0, _jsxRuntime.jsx)(_gridLayout.GridItemContent, {
-                            content: definition.content,
-                            spec: spec,
-                            groupIndex: groupIndex
-                        })
-                }, `${JSON.stringify(spec.layouts)} ${idx}`))
+            children: panelGroupIds.map((panelGroupId)=>/*#__PURE__*/ (0, _jsxRuntime.jsx)(_gridLayout.GridLayout, {
+                    panelGroupId: panelGroupId
+                }, panelGroupId))
         })
     });
 }

package/dist/cjs/components/DashboardToolbar.js

@@ -34,11 +34,17 @@ function _interopRequireDefault(obj) {
 const DashboardToolbar = (props)=>{
     const { dashboardName  } = props;
     const { isEditMode , setEditMode  } = (0, _context.useEditMode)();
-    const { openPanelDrawer , openPanelGroupDialog  } = (0, _context.useDashboardApp)();
+    const { openAddPanelGroup , openAddPanel , reset , save  } = (0, _context.useDashboardActions)();
+    const isLaptopSize = (0, _material.useMediaQuery)((0, _material.useTheme)().breakpoints.up('sm'));
     const onEditButtonClick = ()=>{
         setEditMode(true);
     };
     const onCancelButtonClick = ()=>{
+        reset();
+        setEditMode(false);
+    };
+    const onSave = ()=>{
+        save();
         setEditMode(false);
     };
     return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
@@ -69,6 +75,7 @@ const DashboardToolbar = (props)=>{
                                 children: [
                                     /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Button, {
                                         variant: "contained",
+                                        onClick: onSave,
                                         children: "Save"
                                     }),
                                     /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Button, {
@@ -85,6 +92,7 @@ const DashboardToolbar = (props)=>{
                     sx: {
                         display: 'flex',
                         width: '100%',
+                        alignItems: 'flex-start',
                         padding: (theme)=>theme.spacing(2)
                     },
                     children: [
@@ -101,14 +109,12 @@ const DashboardToolbar = (props)=>{
                             children: [
                                 /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Button, {
                                     startIcon: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_plusBoxOutline.default, {}),
-                                    onClick: ()=>openPanelGroupDialog(),
+                                    onClick: openAddPanelGroup,
                                     children: "Add Panel Group"
                                 }),
                                 /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Button, {
                                     startIcon: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_chartBoxPlusOutline.default, {}),
-                                    onClick: ()=>openPanelDrawer({
-                                            groupIndex: 0
-                                        }),
+                                    onClick: openAddPanel,
                                     children: "Add Panel"
                                 }),
                                 /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components1.TimeRangeControls, {})
@@ -139,7 +145,7 @@ const DashboardToolbar = (props)=>{
                             },
                             children: [
                                 /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components1.TimeRangeControls, {}),
-                                /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Button, {
+                                isLaptopSize && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Button, {
                                     variant: "outlined",
                                     startIcon: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_pencilOutline.default, {}),
                                     onClick: onEditButtonClick,

package/dist/cjs/components/GridLayout/GridItemContent.js

@@ -19,21 +19,13 @@ Object.defineProperty(exports, "GridItemContent", {
     get: ()=>GridItemContent
 });
 const _jsxRuntime = require("react/jsx-runtime");
-const _components = require("@perses-dev/components");
-const _core = require("@perses-dev/core");
+const _context = require("../../context");
 const _panel = require("../Panel/Panel");
 function GridItemContent(props) {
-    const { content , spec , groupIndex  } = props;
-    try {
-        const { panelDefinition , panelsKey  } = (0, _core.resolvePanelRef)(spec, content);
-        return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_panel.Panel, {
-            definition: panelDefinition,
-            groupIndex: groupIndex,
-            panelKey: panelsKey
-        });
-    } catch (err) {
-        return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components.ErrorAlert, {
-            error: err
-        });
-    }
+    const { panelGroupItemId  } = props;
+    const panelDefinition = (0, _context.usePanel)(panelGroupItemId);
+    return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_panel.Panel, {
+        definition: panelDefinition,
+        panelGroupItemId: panelGroupItemId
+    });
 }

package/dist/cjs/components/GridLayout/GridLayout.js

@@ -22,29 +22,18 @@ const _jsxRuntime = require("react/jsx-runtime");
 const _react = require("react");
 const _reactGridLayout = require("react-grid-layout");
 const _material = require("@mui/material");
+const _components = require("@perses-dev/components");
 const _styles = require("../../css/styles");
 const _context = require("../../context");
 const _gridTitle = require("./GridTitle");
+const _gridItemContent = require("./GridItemContent");
 const ResponsiveGridLayout = (0, _reactGridLayout.WidthProvider)(_reactGridLayout.Responsive);
 function GridLayout(props) {
-    var ref, ref1;
-    const { groupIndex , definition: { spec  } , renderGridItemContent , ...others } = props;
-    var ref2;
-    const [isOpen, setIsOpen] = (0, _react.useState)((ref2 = (ref = spec.display) === null || ref === void 0 ? void 0 : (ref1 = ref.collapse) === null || ref1 === void 0 ? void 0 : ref1.open) !== null && ref2 !== void 0 ? ref2 : true);
+    const { panelGroupId , ...others } = props;
+    const groupDefinition = (0, _context.usePanelGroup)(panelGroupId);
+    var ref;
+    const [isOpen, setIsOpen] = (0, _react.useState)((ref = !groupDefinition.isCollapsed) !== null && ref !== void 0 ? ref : true);
     const { isEditMode  } = (0, _context.useEditMode)();
-    const gridItems = [];
-    spec.items.forEach((item, idx)=>{
-        const { x , y , width: w , height: h  } = item;
-        gridItems.push(/*#__PURE__*/ (0, _jsxRuntime.jsx)("div", {
-            "data-grid": {
-                x,
-                y,
-                w,
-                h
-            },
-            children: renderGridItemContent(item, groupIndex)
-        }, idx));
-    });
     return /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [
             /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.GlobalStyles, {
@@ -59,10 +48,10 @@ function GridLayout(props) {
                     }
                 },
                 children: [
-                    spec.display !== undefined && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_gridTitle.GridTitle, {
-                        groupIndex: groupIndex,
-                        title: spec.display.title,
-                        collapse: spec.display.collapse === undefined ? undefined : {
+                    groupDefinition.title !== undefined && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_gridTitle.GridTitle, {
+                        panelGroupId: panelGroupId,
+                        title: groupDefinition.title,
+                        collapse: groupDefinition.isCollapsed === undefined ? undefined : {
                             isOpen,
                             onToggleOpen: ()=>setIsOpen((current)=>!current)
                         }
@@ -93,7 +82,23 @@ function GridLayout(props) {
                             ],
                             isDraggable: isEditMode,
                             isResizable: isEditMode,
-                            children: gridItems
+                            children: groupDefinition.items.map(({ x , y , width , height  }, itemIndex)=>/*#__PURE__*/ (0, _jsxRuntime.jsx)("div", {
+                                    "data-grid": {
+                                        x,
+                                        y,
+                                        w: width,
+                                        h: height
+                                    },
+                                    children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components.ErrorBoundary, {
+                                        FallbackComponent: _components.ErrorAlert,
+                                        children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_gridItemContent.GridItemContent, {
+                                            panelGroupItemId: {
+                                                panelGroupId,
+                                                itemIndex
+                                            }
+                                        })
+                                    })
+                                }, itemIndex))
                         })
                     })
                 ]

package/dist/cjs/components/GridLayout/GridTitle.js

@@ -19,12 +19,15 @@ Object.defineProperty(exports, "GridTitle", {
     get: ()=>GridTitle
 });
 const _jsxRuntime = require("react/jsx-runtime");
+const _react = require("react");
 const _material = require("@mui/material");
 const _chevronUp = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/ChevronUp"));
 const _chevronDown = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/ChevronDown"));
 const _plus = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/Plus"));
 const _pencilOutline = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/PencilOutline"));
-const _react = require("react");
+const _arrowUp = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/ArrowUp"));
+const _arrowDown = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/ArrowDown"));
+const _deleteOutline = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/DeleteOutline"));
 const _context = require("../../context");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
@@ -32,9 +35,9 @@ function _interopRequireDefault(obj) {
     };
 }
 function GridTitle(props) {
-    const { groupIndex , title , collapse  } = props;
+    const { panelGroupId , title , collapse  } = props;
     const [isHovered, setIsHovered] = (0, _react.useState)(false);
-    const { openPanelDrawer , openPanelGroupDialog  } = (0, _context.useDashboardApp)();
+    const { openAddPanel , openEditPanelGroup , deletePanelGroup , moveUp , moveDown  } = (0, _context.usePanelGroupActions)(panelGroupId);
     const { isEditMode  } = (0, _context.useEditMode)();
     const text = /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Typography, {
         variant: "h2",
@@ -67,14 +70,31 @@ function GridTitle(props) {
                     },
                     children: [
                         /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.IconButton, {
-                            onClick: ()=>openPanelDrawer({
-                                    groupIndex
-                                }),
+                            "aria-label": "add panel to group",
+                            onClick: openAddPanel,
                             children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_plus.default, {})
                         }),
                         /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.IconButton, {
-                            onClick: ()=>openPanelGroupDialog(groupIndex),
+                            "aria-label": "edit group",
+                            onClick: openEditPanelGroup,
                             children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_pencilOutline.default, {})
+                        }),
+                        /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.IconButton, {
+                            "aria-label": "delete group",
+                            onClick: deletePanelGroup,
+                            children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_deleteOutline.default, {})
+                        }),
+                        /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.IconButton, {
+                            "aria-label": "move group down",
+                            disabled: moveDown === undefined,
+                            onClick: moveDown,
+                            children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_arrowDown.default, {})
+                        }),
+                        /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.IconButton, {
+                            "aria-label": "move group up",
+                            disabled: moveUp === undefined,
+                            onClick: moveUp,
+                            children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_arrowUp.default, {})
                         })
                     ]
                 })

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

@@ -0,0 +1,95 @@
+// Copyright 2022 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, "default", {
+    enumerable: true,
+    get: ()=>_default
+});
+const _jsxRuntime = require("react/jsx-runtime");
+const _material = require("@mui/material");
+const _close = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/Close"));
+const _context = require("../../context");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const DeletePanelDialog = ()=>{
+    const { deletePanelDialog , closeDeletePanelDialog  } = (0, _context.useDeletePanelDialog)();
+    return /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.Dialog, {
+        open: deletePanelDialog !== undefined,
+        children: [
+            /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.DialogTitle, {
+                children: "Delete Panel"
+            }),
+            /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.IconButton, {
+                "aria-label": "Close",
+                onClick: ()=>closeDeletePanelDialog(),
+                sx: (theme)=>({
+                        position: 'absolute',
+                        top: theme.spacing(0.5),
+                        right: theme.spacing(0.5)
+                    }),
+                children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_close.default, {})
+            }),
+            deletePanelDialog && /*#__PURE__*/ (0, _jsxRuntime.jsx)(DeletePanelForm, {
+                deletePanelDialog: deletePanelDialog
+            })
+        ]
+    });
+};
+const DeletePanelForm = ({ deletePanelDialog  })=>{
+    const { deletePanels , closeDeletePanelDialog  } = (0, _context.useDeletePanelDialog)();
+    const handleDelete = (e)=>{
+        e.preventDefault();
+        const { panelGroupItemId  } = deletePanelDialog;
+        deletePanels([
+            panelGroupItemId
+        ]);
+        closeDeletePanelDialog();
+    };
+    return /*#__PURE__*/ (0, _jsxRuntime.jsxs)("form", {
+        onSubmit: handleDelete,
+        children: [
+            /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.DialogContent, {
+                sx: {
+                    width: '500px'
+                },
+                children: [
+                    "Are you sure you want to delete ",
+                    deletePanelDialog.panelName,
+                    " from ",
+                    deletePanelDialog.panelGroupName,
+                    "? This action cannot be undone."
+                ]
+            }),
+            /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.DialogActions, {
+                children: [
+                    /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Button, {
+                        variant: "contained",
+                        type: "submit",
+                        children: "Delete"
+                    }),
+                    /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Button, {
+                        onClick: ()=>closeDeletePanelDialog(),
+                        children: "Cancel"
+                    })
+                ]
+            })
+        ]
+    });
+};
+const _default = DeletePanelDialog;

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

@@ -26,6 +26,7 @@ const _components = require("@perses-dev/components");
 const _material = require("@mui/material");
 const _informationOutline = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/InformationOutline"));
 const _pencil = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/Pencil"));
+const _deleteOutline = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/DeleteOutline"));
 const _dragVertical = /*#__PURE__*/ _interopRequireDefault(require("mdi-material-ui/DragVertical"));
 const _context = require("../../context");
 const _panelContent = require("./PanelContent");
@@ -35,7 +36,7 @@ function _interopRequireDefault(obj) {
     };
 }
 function Panel(props) {
-    const { definition , groupIndex , panelKey , ...others } = props;
+    const { definition , panelGroupItemId , ...others } = props;
     const [contentElement, setContentElement] = (0, _react.useState)(null);
     const [isHovered, setIsHovered] = (0, _react.useState)(false);
     const { width , height  } = (0, _useResizeObserver.default)({
@@ -59,13 +60,7 @@ function Panel(props) {
     // TODO: adjust padding for small panels, consistent way to determine isLargePanel here and in StatChart
     const panelPadding = 1.5;
     const { isEditMode  } = (0, _context.useEditMode)();
-    const { openPanelDrawer  } = (0, _context.useDashboardApp)();
-    const handleEditButtonClick = ()=>{
-        openPanelDrawer({
-            groupIndex,
-            panelKey
-        });
-    };
+    const { openEditPanel , openDeletePanelDialog  } = (0, _context.usePanelActions)(panelGroupItemId);
     return /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.Card, {
         ref: ref,
         sx: {
@@ -125,9 +120,15 @@ function Panel(props) {
                                         /*#__PURE__*/ (0, _jsxRuntime.jsx)(IconButton, {
                                             "aria-label": "edit panel",
                                             size: "small",
-                                            onClick: handleEditButtonClick,
+                                            onClick: openEditPanel,
                                             children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_pencil.default, {})
                                         }),
+                                        /*#__PURE__*/ (0, _jsxRuntime.jsx)(IconButton, {
+                                            "aria-label": "delete panel",
+                                            size: "small",
+                                            onClick: openDeletePanelDialog,
+                                            children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_deleteOutline.default, {})
+                                        }),
                                         /*#__PURE__*/ (0, _jsxRuntime.jsx)(IconButton, {
                                             "aria-label": "drag handle",
                                             size: "small",
@@ -165,7 +166,8 @@ function Panel(props) {
                 children: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components.ErrorBoundary, {
                     FallbackComponent: _components.ErrorAlert,
                     children: inView === true && /*#__PURE__*/ (0, _jsxRuntime.jsx)(_panelContent.PanelContent, {
-                        definition: definition,
+                        panelPluginKind: definition.spec.plugin.kind,
+                        spec: definition.spec.plugin.spec,
                         contentDimensions: contentDimensions
                     })
                 })

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

@@ -16,11 +16,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 const _jsxRuntime = require("react/jsx-runtime");
 const _pluginSystem = require("@perses-dev/plugin-system");
-require("intersection-observer");
 const _react = require("@testing-library/react");
+const _userEvent = /*#__PURE__*/ _interopRequireDefault(require("@testing-library/user-event"));
 const _test = require("../../test");
 const _context = require("../../context");
 const _panel = require("./Panel");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 describe('Panel', ()=>{
     // Helper to create panel props for rendering tests
     const createPanelProps = ()=>{
@@ -38,8 +43,10 @@ describe('Panel', ()=>{
                     }
                 }
             },
-            groupIndex: 0,
-            panelKey: 'panelRef'
+            panelGroupItemId: {
+                panelGroupId: 0,
+                itemIndex: 0
+            }
         };
     };
     // Helper to render the panel with some context set
@@ -66,8 +73,10 @@ describe('Panel', ()=>{
     });
     it('should render edit icons when in edit mode', ()=>{
         renderPanel(true);
-        _react.screen.queryByLabelText('drag handle');
-        _react.screen.queryByLabelText('edit panel');
-        _react.screen.queryByLabelText('more');
+        const panelTitle = _react.screen.getByText('Fake Panel');
+        _userEvent.default.hover(panelTitle);
+        _react.screen.getByLabelText('drag handle');
+        _react.screen.getByLabelText('edit panel');
+        _react.screen.getByLabelText('delete panel');
     });
 });

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

@@ -22,7 +22,7 @@ const _jsxRuntime = require("react/jsx-runtime");
 const _pluginSystem = require("@perses-dev/plugin-system");
 const _material = require("@mui/material");
 function PanelContent(props) {
-    const { definition: { spec: { plugin: { kind: panelPluginKind  } ,  } ,  } , contentDimensions ,  } = props;
+    const { panelPluginKind , contentDimensions , ...others } = props;
     const { data: plugin , isLoading  } = (0, _pluginSystem.usePlugin)('Panel', panelPluginKind, {
         useErrorBoundary: true
     });
@@ -38,6 +38,7 @@ function PanelContent(props) {
         throw new Error(`Missing PanelComponent from panel plugin for kind '${panelPluginKind}'`);
     }
     return /*#__PURE__*/ (0, _jsxRuntime.jsx)(PanelComponent, {
-        ...props
+        ...others,
+        contentDimensions: contentDimensions
     });
 }

package/dist/cjs/components/PanelDrawer/PanelDrawer.js

@@ -23,27 +23,25 @@ const _react = require("react");
 const _material = require("@mui/material");
 const _components = require("@perses-dev/components");
 const _context = require("../../context");
-const _panelEditorModel = require("./panel-editor-model");
 const _panelEditorForm = require("./PanelEditorForm");
 const PanelDrawer = ()=>{
-    const { closePanelDrawer  } = (0, _context.useDashboardApp)();
-    const model = (0, _panelEditorModel.usePanelDrawerModel)();
+    const panelEditor = (0, _context.usePanelEditor)();
     // When the user clicks close, start closing but don't call the store yet to keep values stable during animtation
     const [isClosing, setIsClosing] = (0, _react.useState)(false);
     const handleClose = ()=>setIsClosing(true);
     // Don't call closeDrawer on the store until the Drawer has completely transitioned out
     const handleExited = ()=>{
-        closePanelDrawer();
+        panelEditor === null || panelEditor === void 0 ? void 0 : panelEditor.close();
         setIsClosing(false);
     };
     // Drawer is open if we have a model and we're not transitioning out
-    const isOpen = model !== undefined && isClosing === false;
+    const isOpen = panelEditor !== undefined && isClosing === false;
     const handleSubmit = (values)=>{
         // This shouldn't happen since we don't render the submit button until we have a model, but check to make TS happy
-        if (model === undefined) {
+        if (panelEditor === undefined) {
             throw new Error('Cannot apply changes');
         }
-        model.applyChanges(values);
+        panelEditor.applyChanges(values);
         handleClose();
     };
     return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components.Drawer, {
@@ -52,7 +50,7 @@ const PanelDrawer = ()=>{
         SlideProps: {
             onExited: handleExited
         },
-        children: model !== undefined && /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: panelEditor !== undefined && /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
             children: [
                 /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.Box, {
                     sx: {
@@ -63,9 +61,12 @@ const PanelDrawer = ()=>{
                         borderBottom: (theme)=>`1px solid ${theme.palette.grey[100]}`
                     },
                     children: [
-                        /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Typography, {
+                        /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.Typography, {
                             variant: "h2",
-                            children: model.drawerTitle
+                            children: [
+                                panelEditor.mode,
+                                " Panel"
+                            ]
                         }),
                         /*#__PURE__*/ (0, _jsxRuntime.jsxs)(_material.Stack, {
                             direction: "row",
@@ -78,7 +79,7 @@ const PanelDrawer = ()=>{
                                     type: "submit",
                                     variant: "contained",
                                     form: _panelEditorForm.panelEditorFormId,
-                                    children: model.submitButtonText
+                                    children: panelEditor.mode === 'Add' ? 'Add' : 'Apply'
                                 }),
                                 /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Button, {
                                     variant: "outlined",
@@ -91,7 +92,7 @@ const PanelDrawer = ()=>{
                 }),
                 /*#__PURE__*/ (0, _jsxRuntime.jsx)(_panelEditorForm.PanelEditorForm, {
                     onSubmit: handleSubmit,
-                    initialValues: model.initialValues
+                    initialValues: panelEditor.initialValues
                 })
             ]
         })

package/dist/cjs/components/PanelDrawer/PanelDrawer.test.js

@@ -30,7 +30,7 @@ function _interopRequireDefault(obj) {
 describe('Panel Drawer', ()=>{
     const renderPanelDrawer = ()=>{
         const { addMockPlugin , pluginRegistryProps  } = (0, _test.mockPluginRegistryProps)();
-        addMockPlugin('Panel', 'LineChart', _test.FAKE_PANEL_PLUGIN);
+        addMockPlugin('Panel', 'TimeSeriesChart', _test.FAKE_PANEL_PLUGIN);
         const { store , DashboardProviderSpy  } = (0, _test.createDashboardProviderSpy)();
         (0, _test.renderWithContext)(/*#__PURE__*/ (0, _jsxRuntime.jsx)(_pluginSystem.PluginRegistry, {
             ...pluginRegistryProps,
@@ -54,10 +54,8 @@ describe('Panel Drawer', ()=>{
     it('should add new panel', async ()=>{
         const storeApi = renderPanelDrawer();
         // Open the drawer for a new panel (i.e. no panel key)
-        (0, _testUtils.act)(()=>storeApi.getState().openPanelDrawer({
-                groupIndex: 0
-            }));
-        const nameInput = await _react.screen.findByLabelText(/Panel Name/);
+        (0, _testUtils.act)(()=>storeApi.getState().openAddPanel(0));
+        const nameInput = await _react.screen.findByLabelText(/Name/);
         _userEvent.default.type(nameInput, 'New Panel');
         _userEvent.default.click(_react.screen.getByText('Add'));
         // TODO: Assert drawer is closed?
@@ -68,8 +66,7 @@ describe('Panel Drawer', ()=>{
                 kind: 'Panel',
                 spec: {
                     display: {
-                        name: 'New Panel',
-                        description: ''
+                        name: 'New Panel'
                     },
                     plugin: {
                         kind: '',
@@ -82,11 +79,11 @@ describe('Panel Drawer', ()=>{
     it('should edit an existing panel', async ()=>{
         const storeApi = renderPanelDrawer();
         // Open the drawer for an existing panel
-        (0, _testUtils.act)(()=>storeApi.getState().openPanelDrawer({
-                groupIndex: 0,
-                panelKey: 'cpu'
+        (0, _testUtils.act)(()=>storeApi.getState().openEditPanel({
+                panelGroupId: 0,
+                itemIndex: 0
             }));
-        const nameInput = await _react.screen.findByLabelText(/Panel Name/);
+        const nameInput = await _react.screen.findByLabelText(/Name/);
         _userEvent.default.clear(nameInput);
         _userEvent.default.type(nameInput, 'cpu usage');
         _userEvent.default.click(_react.screen.getByText('Apply'));
@@ -96,8 +93,7 @@ describe('Panel Drawer', ()=>{
                 kind: 'Panel',
                 spec: {
                     display: {
-                        name: 'cpu usage',
-                        description: ''
+                        name: 'cpu usage'
                     },
                     plugin: {
                         kind: 'TimeSeriesChart',