@perses-dev/plugin-system 0.0.0-snapshot-panel-extra-content-2-2767e21 → 0.0.0-snapshot-scatter-chart-embed-8efdfab

package/dist/cjs/components/CalculationSelector/CalculationSelector.js

@@ -16,9 +16,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "CalculationSelector", {
     enumerable: true,
-    get: ()=>CalculationSelector
+    get: function() {
+        return CalculationSelector;
+    }
 });
-const _jsxRuntime = require("react/jsx-runtime");
+const _jsxruntime = require("react/jsx-runtime");
 const _components = require("@perses-dev/components");
 const _core = require("@perses-dev/core");
 const CALC_OPTIONS = Object.entries(_core.CALCULATIONS_CONFIG).map(([id, config])=>{
@@ -32,9 +34,9 @@ function CalculationSelector({ value , onChange  }) {
         onChange(newValue.id);
     };
     const calcConfig = _core.CALCULATIONS_CONFIG[value];
-    return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components.OptionsEditorControl, {
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.OptionsEditorControl, {
         label: "Calculation",
-        control: /*#__PURE__*/ (0, _jsxRuntime.jsx)(_components.SettingsAutocomplete, {
+        control: /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.SettingsAutocomplete, {
             value: {
                 ...calcConfig,
                 id: value

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

@@ -14,15 +14,17 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-_exportStar(require("./CalculationSelector"), exports);
-function _exportStar(from, to) {
+_export_star(require("./CalculationSelector"), exports);
+function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
-        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) Object.defineProperty(to, k, {
-            enumerable: true,
-            get: function() {
-                return from[k];
-            }
-        });
+        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+            Object.defineProperty(to, k, {
+                enumerable: true,
+                get: function() {
+                    return from[k];
+                }
+            });
+        }
     });
     return from;
 }

package/dist/cjs/components/DatasourceEditorForm/DatasourceEditorForm.js

@@ -0,0 +1,350 @@
+// Copyright 2023 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "DatasourceEditorForm", {
+    enumerable: true,
+    get: function() {
+        return DatasourceEditorForm;
+    }
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _useimmer = require("use-immer");
+const _material = require("@mui/material");
+const _react = require("react");
+const _components = require("@perses-dev/components");
+const _reacthookform = require("react-hook-form");
+const _zod = require("@hookform/resolvers/zod");
+const _PluginEditor = require("../PluginEditor");
+const _utils = require("../../utils");
+const _validation = require("../../validation");
+/**
+ * This preprocessing ensures that we always have a defined object for the `display` property
+ * @param datasource
+ */ function getInitialState(name, spec) {
+    var _spec_display, _spec_display1;
+    var _spec_display_name, _spec_display_description;
+    const patchedDisplay = {
+        name: (_spec_display_name = (_spec_display = spec.display) === null || _spec_display === void 0 ? void 0 : _spec_display.name) !== null && _spec_display_name !== void 0 ? _spec_display_name : '',
+        description: (_spec_display_description = (_spec_display1 = spec.display) === null || _spec_display1 === void 0 ? void 0 : _spec_display1.description) !== null && _spec_display_description !== void 0 ? _spec_display_description : ''
+    };
+    return {
+        name: name,
+        spec: {
+            ...spec,
+            display: patchedDisplay
+        }
+    };
+}
+function DatasourceEditorForm(props) {
+    var _state_spec_display, _state_spec_display1;
+    const { initialName , initialSpec , initialAction , isDraft , isReadonly , onSave , onClose , onDelete  } = props;
+    const initialState = getInitialState(initialName, initialSpec);
+    const [state, setState] = (0, _useimmer.useImmer)(initialState);
+    const [isDiscardDialogOpened, setDiscardDialogOpened] = (0, _react.useState)(false);
+    const [action, setAction] = (0, _react.useState)(initialAction);
+    const titleAction = (0, _utils.getTitleAction)(action, isDraft);
+    const submitText = (0, _utils.getSubmitText)(action, isDraft);
+    const form = (0, _reacthookform.useForm)({
+        resolver: (0, _zod.zodResolver)(_validation.datasourceEditValidationSchema),
+        mode: 'onBlur',
+        defaultValues: {
+            name: state.name,
+            title: (_state_spec_display = state.spec.display) === null || _state_spec_display === void 0 ? void 0 : _state_spec_display.name,
+            description: (_state_spec_display1 = state.spec.display) === null || _state_spec_display1 === void 0 ? void 0 : _state_spec_display1.description,
+            default: state.spec.default
+        }
+    });
+    const processForm = ()=>{
+        var _state_spec_display, _state_spec_display1, _state_spec_display2, _state_spec_display3;
+        // reset display attributes to undefined when empty, because we don't want to save empty strings
+        onSave(state.name, {
+            ...state.spec,
+            display: {
+                name: ((_state_spec_display = state.spec.display) === null || _state_spec_display === void 0 ? void 0 : _state_spec_display.name) === '' ? undefined : (_state_spec_display1 = state.spec.display) === null || _state_spec_display1 === void 0 ? void 0 : _state_spec_display1.name,
+                description: ((_state_spec_display2 = state.spec.display) === null || _state_spec_display2 === void 0 ? void 0 : _state_spec_display2.description) === '' ? undefined : (_state_spec_display3 = state.spec.display) === null || _state_spec_display3 === void 0 ? void 0 : _state_spec_display3.description
+            }
+        });
+    };
+    // When user click on cancel, several possibilities:
+    // - create action: ask for discard approval
+    // - update action: ask for discard approval if changed
+    // - read action: don´t ask for discard approval
+    const handleCancel = (0, _react.useCallback)(()=>{
+        if (JSON.stringify(initialState) !== JSON.stringify(state)) {
+            setDiscardDialogOpened(true);
+        } else {
+            onClose();
+        }
+    }, [
+        state,
+        initialState,
+        setDiscardDialogOpened,
+        onClose
+    ]);
+    return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_reacthookform.FormProvider, {
+        ...form,
+        children: [
+            /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Box, {
+                sx: {
+                    display: 'flex',
+                    alignItems: 'center',
+                    padding: (theme)=>theme.spacing(1, 2),
+                    borderBottom: (theme)=>`1px solid ${theme.palette.divider}`
+                },
+                children: [
+                    /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Typography, {
+                        variant: "h2",
+                        children: [
+                            titleAction,
+                            " Datasource"
+                        ]
+                    }),
+                    /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Stack, {
+                        direction: "row",
+                        spacing: 1,
+                        sx: {
+                            marginLeft: 'auto'
+                        },
+                        children: action === 'read' ? /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
+                            children: [
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Button, {
+                                    disabled: isReadonly,
+                                    variant: "contained",
+                                    onClick: ()=>setAction('update'),
+                                    children: "Edit"
+                                }),
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Button, {
+                                    color: "error",
+                                    disabled: isReadonly,
+                                    variant: "outlined",
+                                    onClick: onDelete,
+                                    children: "Delete"
+                                }),
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Divider, {
+                                    orientation: "vertical",
+                                    flexItem: true,
+                                    sx: (theme)=>({
+                                            borderColor: theme.palette.grey['500'],
+                                            '&.MuiDivider-root': {
+                                                marginLeft: 2,
+                                                marginRight: 1
+                                            }
+                                        })
+                                }),
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Button, {
+                                    color: "secondary",
+                                    variant: "outlined",
+                                    onClick: onClose,
+                                    children: "Close"
+                                })
+                            ]
+                        }) : /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
+                            children: [
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Button, {
+                                    variant: "contained",
+                                    disabled: !form.formState.isValid,
+                                    onClick: form.handleSubmit(processForm),
+                                    children: submitText
+                                }),
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Button, {
+                                    color: "secondary",
+                                    variant: "outlined",
+                                    onClick: handleCancel,
+                                    children: "Cancel"
+                                })
+                            ]
+                        })
+                    })
+                ]
+            }),
+            /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Box, {
+                padding: 2,
+                sx: {
+                    overflowY: 'scroll'
+                },
+                children: [
+                    /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Grid, {
+                        container: true,
+                        spacing: 2,
+                        mb: 2,
+                        children: [
+                            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Grid, {
+                                item: true,
+                                xs: 4,
+                                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_reacthookform.Controller, {
+                                    name: "name",
+                                    render: ({ field , fieldState  })=>{
+                                        var _fieldState_error;
+                                        /*#__PURE__*/ return (0, _jsxruntime.jsx)(_material.TextField, {
+                                            ...field,
+                                            required: true,
+                                            fullWidth: true,
+                                            name: "name",
+                                            label: "Name",
+                                            InputLabelProps: {
+                                                shrink: action === 'read' ? true : undefined
+                                            },
+                                            InputProps: {
+                                                disabled: action === 'update' && !isDraft,
+                                                readOnly: action === 'read'
+                                            },
+                                            error: !!fieldState.error,
+                                            helperText: (_fieldState_error = fieldState.error) === null || _fieldState_error === void 0 ? void 0 : _fieldState_error.message,
+                                            onChange: (event)=>{
+                                                field.onChange(event);
+                                                setState((draft)=>{
+                                                    draft.name = event.target.value;
+                                                });
+                                            }
+                                        });
+                                    }
+                                })
+                            }),
+                            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Grid, {
+                                item: true,
+                                xs: 8,
+                                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_reacthookform.Controller, {
+                                    name: "title",
+                                    render: ({ field , fieldState  })=>{
+                                        var _fieldState_error;
+                                        /*#__PURE__*/ return (0, _jsxruntime.jsx)(_material.TextField, {
+                                            ...field,
+                                            fullWidth: true,
+                                            name: "title",
+                                            label: "Display Label",
+                                            InputLabelProps: {
+                                                shrink: action === 'read' ? true : undefined
+                                            },
+                                            InputProps: {
+                                                readOnly: action === 'read'
+                                            },
+                                            error: !!fieldState.error,
+                                            helperText: (_fieldState_error = fieldState.error) === null || _fieldState_error === void 0 ? void 0 : _fieldState_error.message,
+                                            onChange: (event)=>{
+                                                setState((draft)=>{
+                                                    field.onChange(event);
+                                                    if (draft.spec.display) {
+                                                        draft.spec.display.name = event.target.value;
+                                                    }
+                                                });
+                                            }
+                                        });
+                                    }
+                                })
+                            }),
+                            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Grid, {
+                                item: true,
+                                xs: 12,
+                                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_reacthookform.Controller, {
+                                    name: "description",
+                                    render: ({ field , fieldState  })=>{
+                                        var _fieldState_error;
+                                        /*#__PURE__*/ return (0, _jsxruntime.jsx)(_material.TextField, {
+                                            ...field,
+                                            fullWidth: true,
+                                            name: "description",
+                                            label: "Description",
+                                            InputLabelProps: {
+                                                shrink: action === 'read' ? true : undefined
+                                            },
+                                            InputProps: {
+                                                readOnly: action === 'read'
+                                            },
+                                            error: !!fieldState.error,
+                                            helperText: (_fieldState_error = fieldState.error) === null || _fieldState_error === void 0 ? void 0 : _fieldState_error.message,
+                                            onChange: (event)=>{
+                                                field.onChange(event);
+                                                setState((draft)=>{
+                                                    if (draft.spec.display) {
+                                                        draft.spec.display.description = event.target.value;
+                                                    }
+                                                });
+                                            }
+                                        });
+                                    }
+                                })
+                            }),
+                            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Grid, {
+                                item: true,
+                                xs: 6,
+                                sx: {
+                                    paddingTop: '5px !important'
+                                },
+                                children: /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
+                                    children: [
+                                        /*#__PURE__*/ (0, _jsxruntime.jsx)(_reacthookform.Controller, {
+                                            name: "default",
+                                            render: ({ field  })=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_material.FormControlLabel, {
+                                                    ...field,
+                                                    control: /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Switch, {
+                                                        checked: state.spec.default,
+                                                        readOnly: action === 'read',
+                                                        onChange: (event)=>{
+                                                            if (action === 'read') return; // ReadOnly prop is not blocking user interaction...
+                                                            field.onChange(event);
+                                                            setState((draft)=>{
+                                                                draft.spec.default = event.target.checked;
+                                                            });
+                                                        }
+                                                    }),
+                                                    label: "Set as default"
+                                                })
+                                        }),
+                                        /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Typography, {
+                                            variant: "caption",
+                                            children: [
+                                                "Whether this datasource should be the default ",
+                                                state.spec.plugin.kind,
+                                                " to be used"
+                                            ]
+                                        })
+                                    ]
+                                })
+                            })
+                        ]
+                    }),
+                    /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Divider, {}),
+                    /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Typography, {
+                        py: 1,
+                        variant: "h3",
+                        children: "Plugin Options"
+                    }),
+                    /*#__PURE__*/ (0, _jsxruntime.jsx)(_PluginEditor.PluginEditor, {
+                        width: "100%",
+                        pluginType: "Datasource",
+                        pluginKindLabel: "Source",
+                        value: state.spec.plugin,
+                        isReadonly: action === 'read',
+                        onChange: (v)=>{
+                            setState((draft)=>{
+                                draft.spec.plugin = v;
+                            });
+                        }
+                    })
+                ]
+            }),
+            /*#__PURE__*/ (0, _jsxruntime.jsx)(_components.DiscardChangesConfirmationDialog, {
+                description: "Are you sure you want to discard your changes? Changes cannot be recovered.",
+                isOpen: isDiscardDialogOpened,
+                onCancel: ()=>setDiscardDialogOpened(false),
+                onDiscardChanges: ()=>{
+                    setDiscardDialogOpened(false);
+                    onClose();
+                }
+            })
+        ]
+    });
+}

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

@@ -0,0 +1,30 @@
+// Copyright 2023 The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+_export_star(require("./DatasourceEditorForm"), exports);
+function _export_star(from, to) {
+    Object.keys(from).forEach(function(k) {
+        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+            Object.defineProperty(to, k, {
+                enumerable: true,
+                get: function() {
+                    return from[k];
+                }
+            });
+        }
+    });
+    return from;
+}

package/dist/cjs/components/DatasourceSelect.js

@@ -14,58 +14,168 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "DatasourceSelect", {
-    enumerable: true,
-    get: ()=>DatasourceSelect
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    DatasourceSelect: function() {
+        return DatasourceSelect;
+    },
+    DatasourceName: function() {
+        return DatasourceName;
+    }
 });
-const _jsxRuntime = require("react/jsx-runtime");
+const _jsxruntime = require("react/jsx-runtime");
+const _OpenInNew = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/OpenInNew"));
 const _material = require("@mui/material");
 const _react = require("react");
 const _runtime = require("../runtime");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function DatasourceSelect(props) {
-    const { datasourcePluginKind , value , onChange , ...others } = props;
-    const { data , isLoading  } = (0, _runtime.useListDatasources)(datasourcePluginKind);
-    // Convert the datasource list into menu items with name/value strings that the Select input can work with
+    const { datasourcePluginKind , value , project , onChange , ...others } = props;
+    const { data , isLoading  } = (0, _runtime.useListDatasourceSelectItems)(datasourcePluginKind, project);
+    // Rebuild the group of the value if not provided
+    const defaultValue = (0, _react.useMemo)(()=>{
+        var _flatMap_find;
+        const group = (_flatMap_find = (data !== null && data !== void 0 ? data : []).flatMap((itemGroup)=>itemGroup.items).find((item)=>{
+            return value.kind === item.selector.kind && value.name === item.selector.name && !item.overridden;
+        })) === null || _flatMap_find === void 0 ? void 0 : _flatMap_find.selector.group;
+        return {
+            ...value,
+            group
+        };
+    }, [
+        value,
+        data
+    ]);
+    // Convert the datasource list into menu items with name/group?/value strings that the Select input can work with
     const menuItems = (0, _react.useMemo)(()=>{
-        if (data === undefined) return [];
-        return data.map((ds)=>({
-                name: ds.name,
-                value: selectorToOptionValue(ds.selector)
+        var _item_saved;
+        return (data !== null && data !== void 0 ? data : []).map((itemGroup)=>({
+                group: itemGroup.group,
+                editLink: itemGroup.editLink,
+                items: itemGroup.items.map((item)=>({
+                        name: item.name,
+                        overriding: item.overriding,
+                        overridden: item.overridden,
+                        saved: (_item_saved = item.saved) !== null && _item_saved !== void 0 ? _item_saved : true,
+                        group: item.selector.group,
+                        value: selectorToOptionValue(item.selector)
+                    }))
             }));
     }, [
         data
     ]);
     // While loading available values, just use an empty string so MUI select doesn't warn about values out of range
-    const optionValue = isLoading ? '' : selectorToOptionValue(value);
+    const optionValue = isLoading ? '' : selectorToOptionValue(defaultValue);
     // When the user makes a selection, convert the string option value back to a DatasourceSelector
     const handleChange = (e)=>{
         const next = optionValueToSelector(e.target.value);
         onChange(next);
     };
-    // TODO: Does this need a loading indicator of some kind?
-    return /*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.Select, {
+    // We use a fake action event when we click on the action of the chip (hijack the "delete" feature).
+    // This is because the href link action is on the `deleteIcon` property already, but the `onDelete` property
+    // controls its visibility.
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    const fakeActionEvent = ()=>{};
+    // TODO:
+    //  - Does this need a loading indicator of some kind?
+    //  - The group's edit link is not clickable once selected.
+    //  - The group's edit link is disabled if datasource is overridden.
+    //    Ref: https://github.com/mui/material-ui/issues/36572
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Select, {
         ...others,
         value: optionValue,
         onChange: handleChange,
-        children: menuItems.map((menuItem)=>/*#__PURE__*/ (0, _jsxRuntime.jsx)(_material.MenuItem, {
-                value: menuItem.value,
-                children: menuItem.name
-            }, menuItem.value))
+        children: menuItems.map((menuItemGroup)=>[
+                /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Divider, {}, `${menuItemGroup.group}-divider`),
+                ...menuItemGroup.items.map((menuItem)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_material.MenuItem, {
+                        value: menuItem.value,
+                        disabled: menuItem.overridden || !menuItem.saved,
+                        children: /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
+                            direction: "row",
+                            alignItems: "center",
+                            justifyContent: "space-between",
+                            width: "100%",
+                            children: [
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.ListItemText, {
+                                    children: /*#__PURE__*/ (0, _jsxruntime.jsx)(DatasourceName, {
+                                        name: menuItem.name,
+                                        overridden: menuItem.overridden,
+                                        overriding: menuItem.overriding
+                                    })
+                                }),
+                                !menuItem.saved && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.ListItemText, {
+                                    children: "Save the dashboard to enable this datasource"
+                                }),
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.ListItemText, {
+                                    style: {
+                                        textAlign: 'right'
+                                    },
+                                    children: menuItemGroup.group && menuItemGroup.group.length > 0 && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Chip, {
+                                        disabled: false,
+                                        label: menuItemGroup.group,
+                                        size: "small",
+                                        onDelete: menuItemGroup.editLink ? fakeActionEvent : undefined,
+                                        deleteIcon: menuItemGroup.editLink ? /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                                            href: menuItemGroup.editLink,
+                                            target: "_blank",
+                                            children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_OpenInNew.default, {
+                                                fontSize: "small"
+                                            })
+                                        }) : undefined
+                                    })
+                                })
+                            ]
+                        })
+                    }, menuItem.value))
+            ])
+    });
+}
+function DatasourceName(props) {
+    const { name , overridden , overriding  } = props;
+    return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
+        children: [
+            `${name} `,
+            !overridden && overriding && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Box, {
+                display: "inline",
+                fontWeight: "normal",
+                color: (theme)=>theme.palette.primary.main,
+                children: "(overriding)"
+            }),
+            overridden && '(overridden)'
+        ]
     });
 }
 // Delimiter used to stringify/parse option values
 const OPTION_VALUE_DELIMITER = '_____';
-// Given a DatasourceSelector, returns a string value like `{kind}_____{name}` that can be used as a Select input value
-function selectorToOptionValue(selector) {
-    var _name;
+/**
+ * Given a DatasourceSelectItemSelector,
+ * returns a string value like `{kind}_____{group}_____{name}` that can be used as a Select input value.
+ * @param selector
+ */ function selectorToOptionValue(selector) {
+    var _selector_group, _selector_name;
     return [
         selector.kind,
-        (_name = selector.name) !== null && _name !== void 0 ? _name : ''
+        (_selector_group = selector.group) !== null && _selector_group !== void 0 ? _selector_group : '',
+        (_selector_name = selector.name) !== null && _selector_name !== void 0 ? _selector_name : ''
     ].join(OPTION_VALUE_DELIMITER);
 }
-// Given an option value name like `{kind}_____{name}`, returns a DatasourceSelector
-function optionValueToSelector(optionValue) {
-    const [kind, name] = optionValue.split(OPTION_VALUE_DELIMITER);
+/**
+ * Given an option value name like `{kind}_____{group}_____{name}`,
+ * returns a DatasourceSelector to be used by the query data model.
+ * @param optionValue
+ */ function optionValueToSelector(optionValue) {
+    const words = optionValue.split(OPTION_VALUE_DELIMITER);
+    const kind = words[0];
+    const name = words[2];
     if (kind === undefined || name === undefined) {
         throw new Error('Invalid optionValue string');
     }