@perses-dev/static-list-variable-plugin 0.6.0 → 0.7.1

package/lib/cjs/StaticListVariable.js

@@ -1,4 +1,4 @@
-"use strict";
+/* eslint-disable jsx-a11y/no-autofocus */ "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
@@ -10,47 +10,231 @@ Object.defineProperty(exports, "StaticListVariable", {
 });
 const _jsxruntime = require("react/jsx-runtime");
 const _material = require("@mui/material");
+const _react = require("react");
+const _PlusCircle = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/PlusCircle"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function StaticListVariableOptionEditor(props) {
-    const value = (props.value.values || []).map((v)=>{
-        if (typeof v === 'string') {
-            return v;
-        } else {
-            return v.value;
+    const { value: { values: variables = [] }, onChange } = props;
+    const [editModeOption, setEditModeOption] = (0, _react.useState)('');
+    const onChangeHandler = (0, _react.useCallback)((_, value)=>{
+        const newVariable = value.pop();
+        const valueExists = variables.map((v)=>{
+            return typeof v === 'string' ? v : v?.value || '';
+        }).some((v)=>v === newVariable);
+        if (valueExists) return;
+        onChange({
+            values: [
+                ...variables,
+                {
+                    value: String(newVariable),
+                    label: String(newVariable)
+                }
+            ]
+        });
+    }, [
+        onChange,
+        variables
+    ]);
+    const onPasteHandler = (0, _react.useCallback)((e)=>{
+        const v = e.clipboardData.getData('text/plain');
+        if (v) {
+            const items = v.split(',').filter((i)=>{
+                const exists = variables.map((v)=>{
+                    return v?.value || String(v);
+                }).some((v)=>v === i);
+                return !exists;
+            }).map((item)=>({
+                    value: item.trim(),
+                    label: ''
+                }));
+            onChange({
+                values: [
+                    ...variables,
+                    ...items
+                ]
+            });
+            e.preventDefault();
         }
-    });
-    const onChange = (__, value)=>{
-        props.onChange({
-            values: value.map((v)=>{
-                return {
-                    value: v,
-                    label: v
+    }, [
+        onChange,
+        variables
+    ]);
+    const tagDeleteHandler = (0, _react.useCallback)((option)=>{
+        const filteredVariables = variables.filter((v)=>!(v === option || v?.value === option));
+        onChange({
+            values: [
+                ...filteredVariables
+            ]
+        });
+        setEditModeOption('');
+    }, [
+        variables,
+        onChange
+    ]);
+    const renderTagsHandler = (0, _react.useCallback)((tagValue)=>{
+        const updateVariableWithLabel = (optionKey, label)=>{
+            if (!optionKey || !label) return variables;
+            /* Prevent duplicate label */ const labelAlreadyExists = variables.filter((v)=>typeof v !== 'string').some((v)=>v?.label === label);
+            if (labelAlreadyExists) return variables;
+            return variables.map((v)=>{
+                if (typeof v === 'string') return v;
+                const variableOption = v;
+                if (variableOption.value !== optionKey) return variableOption;
+                const updatedVariableOption = {
+                    label,
+                    value: variableOption.value
                 };
-            })
+                return updatedVariableOption;
+            });
+        };
+        return tagValue.map((_, index)=>{
+            const foundVariable = variables[index];
+            if (!foundVariable) return null;
+            const labelObject = {
+                value: '',
+                label: ''
+            };
+            if (typeof foundVariable === 'string') {
+                /* value and label are identical */ labelObject.value = foundVariable;
+                labelObject.label = foundVariable;
+            } else {
+                labelObject.value = foundVariable.value;
+                labelObject.label = foundVariable.label || foundVariable.value;
+            }
+            /* The value and key are the same thing, they can be used interchangeably  */ const optionKey = foundVariable?.value || foundVariable;
+            return /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Chip, {
+                sx: {
+                    margin: '4px'
+                },
+                label: editModeOption !== optionKey ? /*#__PURE__*/ (0, _jsxruntime.jsxs)("div", {
+                    style: {
+                        display: 'flex',
+                        alignItems: 'center',
+                        gap: '8px'
+                    },
+                    children: [
+                        /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Typography, {
+                            variant: "body2",
+                            children: labelObject.value
+                        }),
+                        labelObject?.value !== labelObject?.label && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Typography, {
+                            variant: "body2",
+                            sx: {
+                                backgroundColor: (theme)=>theme.palette.grey[200],
+                                color: (theme)=>theme.palette.text.primary,
+                                padding: '4px 8px',
+                                borderRadius: '4px',
+                                fontWeight: 500
+                            },
+                            children: labelObject.label
+                        }),
+                        typeof foundVariable !== 'string' && labelObject.value === labelObject.label && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
+                            size: "small",
+                            onClick: (e)=>{
+                                e.stopPropagation();
+                                setEditModeOption(optionKey);
+                            },
+                            sx: {
+                                color: (theme)=>theme.palette.action.disabled
+                            },
+                            children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_PlusCircle.default, {
+                                fontSize: "small"
+                            })
+                        })
+                    ]
+                }) : /*#__PURE__*/ (0, _jsxruntime.jsxs)("div", {
+                    style: {
+                        display: 'flex',
+                        alignItems: 'center',
+                        gap: '8px'
+                    },
+                    children: [
+                        /*#__PURE__*/ (0, _jsxruntime.jsx)("span", {
+                            children: optionKey
+                        }),
+                        /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.TextField, {
+                            defaultValue: labelObject.label,
+                            onBlur: (e)=>{
+                                const { target: { value: input } } = e;
+                                if (input) {
+                                    const updatedVariables = updateVariableWithLabel(optionKey, input);
+                                    onChange({
+                                        values: updatedVariables
+                                    });
+                                }
+                                setEditModeOption('');
+                            },
+                            onKeyDown: (e)=>{
+                                if (e.key === 'Enter') {
+                                    const { value: input } = e.target;
+                                    const updatedVariables = updateVariableWithLabel(optionKey, input);
+                                    onChange({
+                                        values: updatedVariables
+                                    });
+                                    setEditModeOption('');
+                                } else if (e.key === 'Escape') {
+                                    setEditModeOption('');
+                                }
+                            },
+                            size: "small",
+                            autoFocus: true,
+                            sx: {
+                                width: '100%',
+                                padding: 0,
+                                margin: 0,
+                                backgroundColor: (theme)=>theme.palette.background.default,
+                                '& .MuiInputBase-root': {
+                                    fontSize: '0.875rem',
+                                    padding: 0
+                                },
+                                '& .MuiOutlinedInput-notchedOutline': {
+                                    border: 'none'
+                                }
+                            },
+                            inputProps: {
+                                style: {
+                                    padding: 0
+                                }
+                            }
+                        })
+                    ]
+                }),
+                onDelete: ()=>{
+                    tagDeleteHandler(optionKey);
+                }
+            }, optionKey);
         });
-    };
+    }, [
+        variables,
+        tagDeleteHandler,
+        editModeOption,
+        onChange
+    ]);
     return /*#__PURE__*/ (0, _jsxruntime.jsx)("div", {
         children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Autocomplete, {
-            onPaste: (e)=>{
-                // Append new values on paste
-                const v = e.clipboardData.getData('text/plain');
-                if (v) {
-                    const values = v.split(',');
-                    onChange(null, value.concat(values));
-                    e.preventDefault();
-                }
-            },
+            onPaste: onPasteHandler,
             multiple: true,
-            value: value,
-            onChange: onChange,
+            value: variables.map((vr)=>typeof vr === 'string' ? vr : vr.label || vr.value),
+            onChange: onChangeHandler,
             options: [],
             freeSolo: true,
             clearOnBlur: true,
             readOnly: props.isReadonly,
+            renderTags: renderTagsHandler,
             renderInput: (params)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_material.TextField, {
                     ...params,
                     label: "Values",
                     placeholder: "Values",
-                    helperText: 'Type new value then press "Enter" to add.'
+                    helperText: 'Type new value then press "Enter" to add. Optionally define a label by clicking on the "+" button.',
+                    onKeyDown: (e)=>{
+                        if (e.key === 'Backspace' && !params.inputProps.value) {
+                            e.stopPropagation();
+                        }
+                    }
                 })
         })
     });

package/lib/cjs/index-federation.js

@@ -1,15 +1,3 @@
-// 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";
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
@@ -52,4 +40,16 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
+// 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.
 Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("./bootstrap")));

package/mf-manifest.json

@@ -5,11 +5,11 @@
     "name": "StaticListVariable",
     "type": "app",
     "buildInfo": {
-      "buildVersion": "0.6.0",
+      "buildVersion": "0.7.1",
       "buildName": "@perses-dev/static-list-variable-plugin"
     },
     "remoteEntry": {
-      "name": "__mf/js/StaticListVariable.97d532c4.js",
+      "name": "__mf/js/StaticListVariable.0c581d02.js",
       "path": "",
       "type": "global"
     },
@@ -20,7 +20,7 @@
       "api": ""
     },
     "globalName": "StaticListVariable",
-    "pluginVersion": "0.19.1",
+    "pluginVersion": "0.21.6",
     "prefetchInterface": false,
     "getPublicPath": "function() { const prefix = window.PERSES_PLUGIN_ASSETS_PATH || window.PERSES_APP_CONFIG?.api_prefix || \"\"; return prefix + \"/plugins/StaticListVariable/\"; }"
   },
@@ -35,7 +35,7 @@
         "js": {
           "async": [],
           "sync": [
-            "__mf/js/async/960.bbf8418e.js"
+            "__mf/js/async/274.45a05c55.js"
           ]
         },
         "css": {
@@ -54,8 +54,8 @@
         "js": {
           "async": [],
           "sync": [
-            "__mf/js/async/694.28c130cc.js",
-            "__mf/js/async/770.c6728f86.js"
+            "__mf/js/async/235.dc9459f4.js",
+            "__mf/js/async/616.6892b34f.js"
           ]
         },
         "css": {
@@ -74,7 +74,7 @@
         "js": {
           "async": [],
           "sync": [
-            "__mf/js/async/173.4391bb15.js"
+            "__mf/js/async/470.d2f8305b.js"
           ]
         },
         "css": {
@@ -93,7 +93,7 @@
         "js": {
           "async": [],
           "sync": [
-            "__mf/js/async/964.29df3fc1.js"
+            "__mf/js/async/121.4ebe7f6a.js"
           ]
         },
         "css": {
@@ -111,8 +111,8 @@
       "assets": {
         "js": {
           "sync": [
-            "__mf/js/async/526.cb9b2a3c.js",
-            "__mf/js/async/__federation_expose_StaticListVariable.3195ca52.js"
+            "__mf/js/async/797.94e2c0d6.js",
+            "__mf/js/async/__federation_expose_StaticListVariable.e1dcc909.js"
           ],
           "async": []
         },

package/mf-stats.json

@@ -5,11 +5,11 @@
     "name": "StaticListVariable",
     "type": "app",
     "buildInfo": {
-      "buildVersion": "0.6.0",
+      "buildVersion": "0.7.1",
       "buildName": "@perses-dev/static-list-variable-plugin"
     },
     "remoteEntry": {
-      "name": "__mf/js/StaticListVariable.97d532c4.js",
+      "name": "__mf/js/StaticListVariable.0c581d02.js",
       "path": "",
       "type": "global"
     },
@@ -20,7 +20,7 @@
       "api": ""
     },
     "globalName": "StaticListVariable",
-    "pluginVersion": "0.19.1",
+    "pluginVersion": "0.21.6",
     "prefetchInterface": false,
     "getPublicPath": "function() { const prefix = window.PERSES_PLUGIN_ASSETS_PATH || window.PERSES_APP_CONFIG?.api_prefix || \"\"; return prefix + \"/plugins/StaticListVariable/\"; }"
   },
@@ -37,7 +37,7 @@
         "js": {
           "async": [],
           "sync": [
-            "__mf/js/async/960.bbf8418e.js"
+            "__mf/js/async/274.45a05c55.js"
           ]
         },
         "css": {
@@ -59,8 +59,8 @@
         "js": {
           "async": [],
           "sync": [
-            "__mf/js/async/694.28c130cc.js",
-            "__mf/js/async/770.c6728f86.js"
+            "__mf/js/async/235.dc9459f4.js",
+            "__mf/js/async/616.6892b34f.js"
           ]
         },
         "css": {
@@ -82,7 +82,7 @@
         "js": {
           "async": [],
           "sync": [
-            "__mf/js/async/173.4391bb15.js"
+            "__mf/js/async/470.d2f8305b.js"
           ]
         },
         "css": {
@@ -104,7 +104,7 @@
         "js": {
           "async": [],
           "sync": [
-            "__mf/js/async/964.29df3fc1.js"
+            "__mf/js/async/121.4ebe7f6a.js"
           ]
         },
         "css": {
@@ -112,7 +112,9 @@
           "sync": []
         }
       },
-      "usedIn": []
+      "usedIn": [
+        "./StaticListVariable"
+      ]
     }
   ],
   "remotes": [],
@@ -121,13 +123,15 @@
       "path": "./StaticListVariable",
       "id": "StaticListVariable:StaticListVariable",
       "name": "StaticListVariable",
-      "requires": [],
+      "requires": [
+        "react"
+      ],
       "file": "src/StaticListVariable.tsx",
       "assets": {
         "js": {
           "sync": [
-            "__mf/js/async/526.cb9b2a3c.js",
-            "__mf/js/async/__federation_expose_StaticListVariable.3195ca52.js"
+            "__mf/js/async/797.94e2c0d6.js",
+            "__mf/js/async/__federation_expose_StaticListVariable.e1dcc909.js"
           ],
           "async": []
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perses-dev/static-list-variable-plugin",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "homepage": "https://github.com/perses/plugins/blob/main/README.md",
   "repository": {
     "type": "git",
@@ -30,9 +30,9 @@
     "@emotion/react": "^11.7.1",
     "@emotion/styled": "^11.6.0",
     "@hookform/resolvers": "^3.2.0",
-    "@perses-dev/components": "^0.52.0",
-    "@perses-dev/core": "^0.52.0",
-    "@perses-dev/plugin-system": "^0.52.0",
+    "@perses-dev/components": "^0.53.0-beta.2",
+    "@perses-dev/core": "^0.53.0-beta.2",
+    "@perses-dev/plugin-system": "^0.53.0-beta.2",
     "date-fns": "^4.1.0",
     "date-fns-tz": "^3.2.0",
     "echarts": "5.5.0",