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

package/dist/components/Variables/{TemplateVariable.js → Variable.js}

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// Copyright 2024 The Perses Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -15,8 +15,8 @@ import { useEffect, useMemo, useState } from 'react';
 import { LinearProgress, TextField, Autocomplete, Popper } from '@mui/material';
 import { DEFAULT_ALL_VALUE } from '@perses-dev/core';
 import { useListVariablePluginValues } from '@perses-dev/plugin-system';
-import { useTemplateVariable, useTemplateVariableActions } from '../../context';
-import { MAX_TEMPLATE_VARIABLE_WIDTH, MIN_TEMPLATE_VARIABLE_WIDTH } from '../../constants';
+import { useVariableDefinitionAndState, useVariableDefinitionActions } from '../../context';
+import { MAX_VARIABLE_WIDTH, MIN_VARIABLE_WIDTH } from '../../constants';
 function variableOptionToVariableValue(options) {
     if (options === null) {
         return null;
@@ -28,10 +28,9 @@ function variableOptionToVariableValue(options) {
     }
     return options.value;
 }
-export function TemplateVariable({ name, source }) {
-    var _ctx_definition;
-    const ctx = useTemplateVariable(name, source);
-    const kind = (_ctx_definition = ctx.definition) === null || _ctx_definition === void 0 ? void 0 : _ctx_definition.kind;
+export function Variable({ name, source }) {
+    const ctx = useVariableDefinitionAndState(name, source);
+    const kind = ctx.definition?.kind;
     switch(kind){
         case 'TextVariable':
             return /*#__PURE__*/ _jsx(TextVariable, {
@@ -52,22 +51,16 @@ export function TemplateVariable({ name, source }) {
     });
 }
 export function useListVariableState(spec, state, variablesOptionsQuery) {
-    const allowMultiple = (spec === null || spec === void 0 ? void 0 : spec.allowMultiple) === true;
-    const allowAllValue = (spec === null || spec === void 0 ? void 0 : spec.allowAllValue) === true;
-    const sort = spec === null || spec === void 0 ? void 0 : spec.sort;
-    const loading = useMemo(()=>{
-        var _variablesOptionsQuery_isFetching;
-        return (_variablesOptionsQuery_isFetching = variablesOptionsQuery.isFetching) !== null && _variablesOptionsQuery_isFetching !== void 0 ? _variablesOptionsQuery_isFetching : false;
-    }, [
+    const allowMultiple = spec?.allowMultiple === true;
+    const allowAllValue = spec?.allowAllValue === true;
+    const sort = spec?.sort;
+    const loading = useMemo(()=>variablesOptionsQuery.isFetching ?? false, [
         variablesOptionsQuery.isFetching
     ]);
-    const options = useMemo(()=>{
-        var _variablesOptionsQuery_data;
-        return (_variablesOptionsQuery_data = variablesOptionsQuery.data) !== null && _variablesOptionsQuery_data !== void 0 ? _variablesOptionsQuery_data : [];
-    }, [
+    const options = useMemo(()=>variablesOptionsQuery.data ?? [], [
         variablesOptionsQuery.data
     ]);
-    let value = state === null || state === void 0 ? void 0 : state.value;
+    let value = state?.value;
     // Make sure value is an array if allowMultiple is true
     if (allowMultiple && !Array.isArray(value)) {
         value = typeof value === 'string' ? [
@@ -128,8 +121,7 @@ export function useListVariableState(spec, state, variablesOptionsQuery) {
         allowMultiple
     ]);
     value = useMemo(()=>{
-        var _viewOptions_;
-        const firstOptionValue = viewOptions === null || viewOptions === void 0 ? void 0 : (_viewOptions_ = viewOptions[allowAllValue ? 1 : 0]) === null || _viewOptions_ === void 0 ? void 0 : _viewOptions_.value;
+        const firstOptionValue = viewOptions?.[allowAllValue ? 1 : 0]?.value;
         // If there is no value but there are options, or the value is not in options, we set the value to the first option.
         if (firstOptionValue) {
             if (!valueIsInOptions || !value || value.length === 0) {
@@ -151,13 +143,12 @@ export function useListVariableState(spec, state, variablesOptionsQuery) {
         // an array, hence this conditional
         if (Array.isArray(value)) {
             return viewOptions.filter((o)=>{
-                return value === null || value === void 0 ? void 0 : value.includes(o.value);
+                return value?.includes(o.value);
             });
         } else {
-            var _viewOptions_find;
-            return (_viewOptions_find = viewOptions.find((o)=>{
+            return viewOptions.find((o)=>{
                 return value === o.value;
-            })) !== null && _viewOptions_find !== void 0 ? _viewOptions_find : {
+            }) ?? {
                 value: '',
                 label: ''
             };
@@ -175,7 +166,6 @@ export function useListVariableState(spec, state, variablesOptionsQuery) {
     };
 }
 const StyledPopper = (props)=>/*#__PURE__*/ _jsx(Popper, {
-        placeholder: undefined,
         ...props,
         sx: {
             minWidth: 'fit-content'
@@ -185,28 +175,27 @@ const StyledPopper = (props)=>/*#__PURE__*/ _jsx(Popper, {
 const LETTER_HSIZE = 8; // approximation
 const ARROW_OFFSET = 40; // right offset for list variables (= take into account the dropdown toggle size)
 const getWidthPx = (inputValue, kind)=>{
-    const width = (inputValue.length + 1) * LETTER_HSIZE + (kind == 'list' ? ARROW_OFFSET : 0);
-    if (width < MIN_TEMPLATE_VARIABLE_WIDTH) {
-        return MIN_TEMPLATE_VARIABLE_WIDTH;
-    } else if (width > MAX_TEMPLATE_VARIABLE_WIDTH) {
-        return MAX_TEMPLATE_VARIABLE_WIDTH;
+    const width = (inputValue.length + 1) * LETTER_HSIZE + (kind === 'list' ? ARROW_OFFSET : 0);
+    if (width < MIN_VARIABLE_WIDTH) {
+        return MIN_VARIABLE_WIDTH;
+    } else if (width > MAX_VARIABLE_WIDTH) {
+        return MAX_VARIABLE_WIDTH;
     } else {
         return width;
     }
 };
 function ListVariable({ name, source }) {
-    var _definition_spec_display;
-    const ctx = useTemplateVariable(name, source);
+    const ctx = useVariableDefinitionAndState(name, source);
     const definition = ctx.definition;
     const variablesOptionsQuery = useListVariablePluginValues(definition);
-    const { setVariableValue, setVariableLoading, setVariableOptions } = useTemplateVariableActions();
-    const { selectedOptions, value, loading, options, viewOptions } = useListVariableState(definition === null || definition === void 0 ? void 0 : definition.spec, ctx.state, variablesOptionsQuery);
+    const { setVariableValue, setVariableLoading, setVariableOptions } = useVariableDefinitionActions();
+    const { selectedOptions, value, loading, options, viewOptions } = useListVariableState(definition?.spec, ctx.state, variablesOptionsQuery);
+    const [inputWidth, setInputWidth] = useState(MIN_VARIABLE_WIDTH);
+    // Used for multiple value variables, it will not clear variable input when selecting an option
     const [inputValue, setInputValue] = useState('');
-    const [inputWidth, setInputWidth] = useState(MIN_TEMPLATE_VARIABLE_WIDTH);
-    var _definition_spec_display_name;
-    const title = (_definition_spec_display_name = definition === null || definition === void 0 ? void 0 : (_definition_spec_display = definition.spec.display) === null || _definition_spec_display === void 0 ? void 0 : _definition_spec_display.name) !== null && _definition_spec_display_name !== void 0 ? _definition_spec_display_name : name;
-    const allowMultiple = (definition === null || definition === void 0 ? void 0 : definition.spec.allowMultiple) === true;
-    const allowAllValue = (definition === null || definition === void 0 ? void 0 : definition.spec.allowAllValue) === true;
+    const title = definition?.spec.display?.name ?? name;
+    const allowMultiple = definition?.spec.allowMultiple === true;
+    const allowAllValue = definition?.spec.allowAllValue === true;
     // Update value when changed
     useEffect(()=>{
         if (value) {
@@ -248,11 +237,14 @@ function ListVariable({ name, source }) {
                 limitTags: 3,
                 size: "small",
                 disableClearable: true,
-                PopperComponent: StyledPopper,
+                slots: {
+                    popper: StyledPopper
+                },
                 renderInput: (params)=>{
                     return allowMultiple ? /*#__PURE__*/ _jsx(TextField, {
                         ...params,
-                        label: title
+                        label: title,
+                        onChange: (e)=>setInputValue(e.target.value)
                     }) : /*#__PURE__*/ _jsx(TextField, {
                         ...params,
                         label: title,
@@ -265,9 +257,8 @@ function ListVariable({ name, source }) {
                     '& .MuiInputBase-root': {
                         minHeight: '38px'
                     },
-                    '& .MuiInputBase-root.MuiOutlinedInput-root.MuiInputBase-sizeSmall': {
-                        paddingY: '5px',
-                        paddingLeft: '5px'
+                    '& .MuiAutocomplete-tag': {
+                        margin: '1px 2px'
                     }
                 },
                 value: selectedOptions,
@@ -278,13 +269,17 @@ function ListVariable({ name, source }) {
                         setVariableValue(name, variableOptionToVariableValue(value), source);
                     }
                 },
-                inputValue: inputValue,
+                inputValue: allowMultiple ? inputValue : undefined,
                 onInputChange: (_, newInputValue)=>{
-                    setInputValue(newInputValue);
                     if (!allowMultiple) {
                         setInputWidth(getWidthPx(newInputValue, 'list'));
                     }
                 },
+                onBlur: ()=>{
+                    if (allowMultiple) {
+                        setInputValue('');
+                    }
+                },
                 options: viewOptions
             }),
             loading && /*#__PURE__*/ _jsx(LinearProgress, {})
@@ -292,34 +287,31 @@ function ListVariable({ name, source }) {
     });
 }
 function TextVariable({ name, source }) {
-    var _definition_spec_display;
-    const ctx = useTemplateVariable(name, source);
+    const ctx = useVariableDefinitionAndState(name, source);
     const state = ctx.state;
     const definition = ctx.definition;
-    var _state_value;
-    const [tempValue, setTempValue] = useState((_state_value = state === null || state === void 0 ? void 0 : state.value) !== null && _state_value !== void 0 ? _state_value : '');
+    const [tempValue, setTempValue] = useState(state?.value ?? '');
     const [inputWidth, setInputWidth] = useState(getWidthPx(tempValue, 'text'));
-    const { setVariableValue } = useTemplateVariableActions();
+    const { setVariableValue } = useVariableDefinitionActions();
     useEffect(()=>{
-        var _state_value;
-        setTempValue((_state_value = state === null || state === void 0 ? void 0 : state.value) !== null && _state_value !== void 0 ? _state_value : '');
+        setTempValue(state?.value ?? '');
     }, [
-        state === null || state === void 0 ? void 0 : state.value
+        state?.value
     ]);
-    var _definition_spec_display_name, _definition_spec_constant;
     return /*#__PURE__*/ _jsx(TextField, {
         title: tempValue,
         value: tempValue,
-        //onChange={(e) => setTempValue(e.target.value)}
         onChange: (e)=>{
             setTempValue(e.target.value);
             setInputWidth(getWidthPx(e.target.value, 'text'));
         },
         onBlur: ()=>setVariableValue(name, tempValue, source),
         placeholder: name,
-        label: (_definition_spec_display_name = definition === null || definition === void 0 ? void 0 : (_definition_spec_display = definition.spec.display) === null || _definition_spec_display === void 0 ? void 0 : _definition_spec_display.name) !== null && _definition_spec_display_name !== void 0 ? _definition_spec_display_name : name,
-        InputProps: {
-            readOnly: (_definition_spec_constant = definition === null || definition === void 0 ? void 0 : definition.spec.constant) !== null && _definition_spec_constant !== void 0 ? _definition_spec_constant : false
+        label: definition?.spec.display?.name ?? name,
+        slotProps: {
+            input: {
+                readOnly: definition?.spec.constant ?? false
+            }
         },
         sx: {
             width: `${inputWidth}px`,
@@ -333,4 +325,4 @@ function TextVariable({ name, source }) {
     });
 }
 
-//# sourceMappingURL=TemplateVariable.js.map
+//# sourceMappingURL=Variable.js.map

package/dist/components/Variables/Variable.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/components/Variables/Variable.tsx"],"sourcesContent":["// Copyright 2024 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { ReactElement, useEffect, useMemo, useState } from 'react';\nimport { LinearProgress, TextField, Autocomplete, Popper, PopperProps } from '@mui/material';\nimport {\n  DEFAULT_ALL_VALUE,\n  ListVariableDefinition,\n  ListVariableSpec,\n  TextVariableDefinition,\n  VariableName,\n  VariableValue,\n} from '@perses-dev/core';\nimport { useListVariablePluginValues, VariableOption, VariableState } from '@perses-dev/plugin-system';\nimport { UseQueryResult } from '@tanstack/react-query';\nimport { useVariableDefinitionAndState, useVariableDefinitionActions } from '../../context';\nimport { MAX_VARIABLE_WIDTH, MIN_VARIABLE_WIDTH } from '../../constants';\n\ntype VariableProps = {\n  name: VariableName;\n  source?: string;\n};\n\nfunction variableOptionToVariableValue(options: VariableOption | VariableOption[] | null): VariableValue {\n  if (options === null) {\n    return null;\n  }\n  if (Array.isArray(options)) {\n    return options.map((v) => {\n      return v.value;\n    });\n  }\n  return options.value;\n}\n\nexport function Variable({ name, source }: VariableProps): ReactElement {\n  const ctx = useVariableDefinitionAndState(name, source);\n  const kind = ctx.definition?.kind;\n  switch (kind) {\n    case 'TextVariable':\n      return <TextVariable name={name} source={source} />;\n    case 'ListVariable':\n      return <ListVariable name={name} source={source} />;\n  }\n\n  return <div>Unsupported Variable Kind: ${kind}</div>;\n}\n\nexport function useListVariableState(\n  spec: ListVariableSpec | undefined,\n  state: VariableState | undefined,\n  variablesOptionsQuery: Partial<UseQueryResult<VariableOption[]>>\n): {\n  // Value, Loading, Options are modified only when we want to save the changes made\n  value: VariableValue | undefined;\n  loading: boolean;\n  options: VariableOption[] | undefined;\n  // selectedOptions is/are the option(s) selected in the view\n  selectedOptions: VariableOption | VariableOption[];\n  // viewOptions are the options used in the view only (= options + All if allowed)\n  viewOptions: VariableOption[];\n} {\n  const allowMultiple = spec?.allowMultiple === true;\n  const allowAllValue = spec?.allowAllValue === true;\n  const sort = spec?.sort;\n  const loading = useMemo(() => variablesOptionsQuery.isFetching ?? false, [variablesOptionsQuery.isFetching]);\n  const options = useMemo(() => variablesOptionsQuery.data ?? [], [variablesOptionsQuery.data]);\n\n  let value = state?.value;\n\n  // Make sure value is an array if allowMultiple is true\n  if (allowMultiple && !Array.isArray(value)) {\n    value = typeof value === 'string' ? [value] : [];\n  }\n\n  // Sort the provided list of options according to the method defined\n  const sortedOptions = useMemo((): VariableOption[] => {\n    const opts = options ? [...options] : [];\n\n    if (!sort || sort === 'none') return opts;\n\n    switch (sort) {\n      case 'alphabetical-asc':\n        return opts.sort((a, b) => (a.label > b.label ? 1 : -1));\n      case 'alphabetical-desc':\n        return opts.sort((a, b) => (a.label > b.label ? -1 : 1));\n      case 'numerical-asc':\n        return opts.sort((a, b) => (parseInt(a.label) > parseInt(b.label) ? 1 : -1));\n      case 'numerical-desc':\n        return opts.sort((a, b) => (parseInt(a.label) < parseInt(b.label) ? 1 : -1));\n      case 'alphabetical-ci-asc':\n        return opts.sort((a, b) => (a.label.toLowerCase() > b.label.toLowerCase() ? 1 : -1));\n      case 'alphabetical-ci-desc':\n        return opts.sort((a, b) => (a.label.toLowerCase() > b.label.toLowerCase() ? -1 : 1));\n      default:\n        return opts;\n    }\n  }, [options, sort]);\n\n  const viewOptions = useMemo(() => {\n    let computedOptions = sortedOptions;\n\n    // Add the all value if it's allowed\n    if (allowAllValue) {\n      computedOptions = [{ value: DEFAULT_ALL_VALUE, label: 'All' }, ...computedOptions];\n    }\n    return computedOptions;\n  }, [allowAllValue, sortedOptions]);\n\n  const valueIsInOptions = useMemo(\n    () =>\n      Boolean(\n        viewOptions.find((v) => {\n          if (allowMultiple) {\n            return (value as string[]).includes(v.value);\n          }\n          return value === v.value;\n        })\n      ),\n    [viewOptions, value, allowMultiple]\n  );\n\n  value = useMemo(() => {\n    const firstOptionValue = viewOptions?.[allowAllValue ? 1 : 0]?.value;\n\n    // If there is no value but there are options, or the value is not in options, we set the value to the first option.\n    if (firstOptionValue) {\n      if (!valueIsInOptions || !value || value.length === 0) {\n        return allowMultiple ? [firstOptionValue] : firstOptionValue;\n      }\n    }\n\n    return value;\n  }, [viewOptions, value, valueIsInOptions, allowMultiple, allowAllValue]);\n\n  const selectedOptions = useMemo(() => {\n    // In the case Autocomplete.multiple equals false, Autocomplete.value expects a single object, not\n    // an array, hence this conditional\n    if (Array.isArray(value)) {\n      return viewOptions.filter((o) => {\n        return value?.includes(o.value);\n      });\n    } else {\n      return (\n        viewOptions.find((o) => {\n          return value === o.value;\n        }) ?? { value: '', label: '' }\n      );\n    }\n  }, [value, viewOptions]);\n\n  return { value, loading, options, selectedOptions, viewOptions };\n}\n\nconst StyledPopper = (props: PopperProps): ReactElement => (\n  <Popper {...props} sx={{ minWidth: 'fit-content' }} placement=\"bottom-start\" />\n);\n\nconst LETTER_HSIZE = 8; // approximation\nconst ARROW_OFFSET = 40; // right offset for list variables (= take into account the dropdown toggle size)\nconst getWidthPx = (inputValue: string, kind: 'list' | 'text'): number => {\n  const width = (inputValue.length + 1) * LETTER_HSIZE + (kind === 'list' ? ARROW_OFFSET : 0);\n  if (width < MIN_VARIABLE_WIDTH) {\n    return MIN_VARIABLE_WIDTH;\n  } else if (width > MAX_VARIABLE_WIDTH) {\n    return MAX_VARIABLE_WIDTH;\n  } else {\n    return width;\n  }\n};\n\nfunction ListVariable({ name, source }: VariableProps): ReactElement {\n  const ctx = useVariableDefinitionAndState(name, source);\n  const definition = ctx.definition as ListVariableDefinition;\n  const variablesOptionsQuery = useListVariablePluginValues(definition);\n  const { setVariableValue, setVariableLoading, setVariableOptions } = useVariableDefinitionActions();\n  const { selectedOptions, value, loading, options, viewOptions } = useListVariableState(\n    definition?.spec,\n    ctx.state,\n    variablesOptionsQuery\n  );\n  const [inputWidth, setInputWidth] = useState(MIN_VARIABLE_WIDTH);\n  // Used for multiple value variables, it will not clear variable input when selecting an option\n  const [inputValue, setInputValue] = useState('');\n\n  const title = definition?.spec.display?.name ?? name;\n  const allowMultiple = definition?.spec.allowMultiple === true;\n  const allowAllValue = definition?.spec.allowAllValue === true;\n\n  // Update value when changed\n  useEffect(() => {\n    if (value) {\n      setVariableValue(name, value, source);\n    }\n  }, [setVariableValue, name, value, source]);\n\n  // Update loading when changed\n  useEffect(() => {\n    setVariableLoading(name, loading, source);\n  }, [setVariableLoading, name, loading, source]);\n\n  // Update options when changed\n  useEffect(() => {\n    if (options) {\n      setVariableOptions(name, options, source);\n    }\n  }, [setVariableOptions, name, options, source]);\n\n  return (\n    <>\n      <Autocomplete\n        disablePortal\n        disableCloseOnSelect={allowMultiple}\n        multiple={allowMultiple}\n        fullWidth\n        limitTags={3}\n        size=\"small\"\n        disableClearable\n        slots={{ popper: StyledPopper }}\n        renderInput={(params) => {\n          return allowMultiple ? (\n            <TextField {...params} label={title} onChange={(e) => setInputValue(e.target.value)} />\n          ) : (\n            <TextField {...params} label={title} style={{ width: `${inputWidth}px` }} />\n          );\n        }}\n        sx={{\n          '& .MuiInputBase-root': {\n            minHeight: '38px',\n          },\n          '& .MuiAutocomplete-tag': {\n            margin: '1px 2px', // Default margin of 2px (Y axis) make min height of the autocomplete 40px\n          },\n        }}\n        value={selectedOptions}\n        onChange={(_, value) => {\n          if ((value === null || (Array.isArray(value) && value.length === 0)) && allowAllValue) {\n            setVariableValue(name, DEFAULT_ALL_VALUE, source);\n          } else {\n            setVariableValue(name, variableOptionToVariableValue(value), source);\n          }\n        }}\n        inputValue={allowMultiple ? inputValue : undefined}\n        onInputChange={(_, newInputValue) => {\n          if (!allowMultiple) {\n            setInputWidth(getWidthPx(newInputValue, 'list'));\n          }\n        }}\n        onBlur={() => {\n          if (allowMultiple) {\n            setInputValue('');\n          }\n        }}\n        options={viewOptions}\n      />\n      {loading && <LinearProgress />}\n    </>\n  );\n}\n\nfunction TextVariable({ name, source }: VariableProps): ReactElement {\n  const ctx = useVariableDefinitionAndState(name, source);\n  const state = ctx.state;\n  const definition = ctx.definition as TextVariableDefinition;\n  const [tempValue, setTempValue] = useState(state?.value ?? '');\n  const [inputWidth, setInputWidth] = useState(getWidthPx(tempValue as string, 'text'));\n  const { setVariableValue } = useVariableDefinitionActions();\n\n  useEffect(() => {\n    setTempValue(state?.value ?? '');\n  }, [state?.value]);\n\n  return (\n    <TextField\n      title={tempValue as string}\n      value={tempValue}\n      onChange={(e) => {\n        setTempValue(e.target.value);\n        setInputWidth(getWidthPx(e.target.value, 'text'));\n      }}\n      onBlur={() => setVariableValue(name, tempValue, source)}\n      placeholder={name}\n      label={definition?.spec.display?.name ?? name}\n      slotProps={{\n        input: {\n          readOnly: definition?.spec.constant ?? false,\n        },\n      }}\n      sx={{\n        width: `${inputWidth}px`,\n        '& .MuiInputBase-root': {\n          minHeight: '38px',\n        },\n        '& .MuiInputBase-input': {\n          textOverflow: 'ellipsis',\n        },\n      }}\n    />\n  );\n}\n"],"names":["useEffect","useMemo","useState","LinearProgress","TextField","Autocomplete","Popper","DEFAULT_ALL_VALUE","useListVariablePluginValues","useVariableDefinitionAndState","useVariableDefinitionActions","MAX_VARIABLE_WIDTH","MIN_VARIABLE_WIDTH","variableOptionToVariableValue","options","Array","isArray","map","v","value","Variable","name","source","ctx","kind","definition","TextVariable","ListVariable","div","useListVariableState","spec","state","variablesOptionsQuery","allowMultiple","allowAllValue","sort","loading","isFetching","data","sortedOptions","opts","a","b","label","parseInt","toLowerCase","viewOptions","computedOptions","valueIsInOptions","Boolean","find","includes","firstOptionValue","length","selectedOptions","filter","o","StyledPopper","props","sx","minWidth","placement","LETTER_HSIZE","ARROW_OFFSET","getWidthPx","inputValue","width","setVariableValue","setVariableLoading","setVariableOptions","inputWidth","setInputWidth","setInputValue","title","display","disablePortal","disableCloseOnSelect","multiple","fullWidth","limitTags","size","disableClearable","slots","popper","renderInput","params","onChange","e","target","style","minHeight","margin","_","undefined","onInputChange","newInputValue","onBlur","tempValue","setTempValue","placeholder","slotProps","input","readOnly","constant","textOverflow"],"mappings":"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"}

package/dist/components/Variables/VariableEditor.d.ts

@@ -1,3 +1,4 @@
+import { ReactElement } from 'react';
 import { BuiltinVariableDefinition, VariableDefinition } from '@perses-dev/core';
 import { VariableState } from '@perses-dev/plugin-system';
 import { ExternalVariableDefinition } from '../../context';
@@ -7,9 +8,9 @@ export declare function VariableEditor(props: {
     builtinVariableDefinitions: BuiltinVariableDefinition[];
     onChange: (variableDefinitions: VariableDefinition[]) => void;
     onCancel: () => void;
-}): import("react/jsx-runtime").JSX.Element;
+}): ReactElement;
 export declare function VariableName(props: {
     name: string;
     state: VariableState | undefined;
-}): import("react/jsx-runtime").JSX.Element;
+}): ReactElement;
 //# sourceMappingURL=VariableEditor.d.ts.map

package/dist/components/Variables/VariableEditor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VariableEditor.d.ts","sourceRoot":"","sources":["../../../src/components/Variables/VariableEditor.tsx"],"names":[],"mappings":"AAoCA,OAAO,EAAU,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAUzF,OAAO,EAAsB,aAAa,EAAkB,MAAM,2BAA2B,CAAC;AAE9F,OAAO,EAAE,0BAA0B,EAAuC,MAAM,eAAe,CAAC;AAuBhG,wBAAgB,cAAc,CAAC,KAAK,EAAE;IACpC,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IAC1C,2BAA2B,EAAE,0BAA0B,EAAE,CAAC;IAC1D,0BAA0B,EAAE,yBAAyB,EAAE,CAAC;IACxD,QAAQ,EAAE,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,KAAK,IAAI,CAAC;IAC9D,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB,2CAmUA;AAMD,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,aAAa,GAAG,SAAS,CAAA;CAAE,2CAoBrF"}
+{"version":3,"file":"VariableEditor.d.ts","sourceRoot":"","sources":["../../../src/components/Variables/VariableEditor.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAqB,YAAY,EAAE,MAAM,OAAO,CAAC;AAuBxD,OAAO,EAAU,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAUzF,OAAO,EAA0C,aAAa,EAAkB,MAAM,2BAA2B,CAAC;AAElH,OAAO,EAAE,0BAA0B,EAAuC,MAAM,eAAe,CAAC;AAuBhG,wBAAgB,cAAc,CAAC,KAAK,EAAE;IACpC,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IAC1C,2BAA2B,EAAE,0BAA0B,EAAE,CAAC;IAC1D,0BAA0B,EAAE,yBAAyB,EAAE,CAAC;IACxD,QAAQ,EAAE,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,KAAK,IAAI,CAAC;IAC9D,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB,GAAG,YAAY,CAsUf;AAMD,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,aAAa,GAAG,SAAS,CAAA;CAAE,GAAG,YAAY,CAoBpG"}

package/dist/components/Variables/VariableEditor.js

@@ -1,4 +1,4 @@
-// Copyright 2023 The Perses Authors
+// Copyright 2024 The Perses Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -22,14 +22,13 @@ import ArrowDown from 'mdi-material-ui/ArrowDown';
 import ContentDuplicate from 'mdi-material-ui/ContentDuplicate';
 import OpenInNewIcon from 'mdi-material-ui/OpenInNew';
 import ExpandMoreIcon from 'mdi-material-ui/ChevronUp';
-import { VariableEditorForm, VARIABLE_TYPES } from '@perses-dev/plugin-system';
+import { ValidationProvider, VariableEditorForm, VARIABLE_TYPES } from '@perses-dev/plugin-system';
 import { InfoTooltip } from '@perses-dev/components';
 import { useDiscardChangesConfirmationDialog } from '../../context';
-import { hydrateTemplateVariableStates } from '../../context/TemplateVariableProvider/hydrationUtils';
+import { hydrateVariableDefinitionStates } from '../../context/VariableProvider/hydrationUtils';
 import { BuiltinVariableAccordions } from './BuiltinVariableAccordions';
 function getVariableLabelByKind(kind) {
-    var _VARIABLE_TYPES_find;
-    return (_VARIABLE_TYPES_find = VARIABLE_TYPES.find((variableType)=>variableType.kind === kind)) === null || _VARIABLE_TYPES_find === void 0 ? void 0 : _VARIABLE_TYPES_find.label;
+    return VARIABLE_TYPES.find((variableType)=>variableType.kind === kind)?.label;
 }
 function getValidation(variableDefinitions) {
     const errors = [];
@@ -54,7 +53,7 @@ export function VariableEditor(props) {
     ]);
     const [variableState] = useMemo(()=>{
         return [
-            hydrateTemplateVariableStates(variableDefinitions, {}, externalVariableDefinitions)
+            hydrateVariableDefinitionStates(variableDefinitions, {}, externalVariableDefinitions)
         ];
     }, [
         externalVariableDefinitions,
@@ -143,22 +142,25 @@ export function VariableEditor(props) {
     };
     return /*#__PURE__*/ _jsxs(_Fragment, {
         children: [
-            currentEditingVariableDefinition && /*#__PURE__*/ _jsx(VariableEditorForm, {
-                initialVariableDefinition: currentEditingVariableDefinition,
-                initialAction: variableFormAction,
-                isDraft: true,
-                onSave: (definition)=>{
-                    setVariableDefinitions((draft)=>{
-                        draft[variableEditIdx] = definition;
+            currentEditingVariableDefinition && /*#__PURE__*/ _jsx(ValidationProvider, {
+                children: /*#__PURE__*/ _jsx(VariableEditorForm, {
+                    initialVariableDefinition: currentEditingVariableDefinition,
+                    action: variableFormAction,
+                    isDraft: true,
+                    onActionChange: setVariableFormAction,
+                    onSave: (definition)=>{
+                        setVariableDefinitions((draft)=>{
+                            draft[variableEditIdx] = definition;
+                            setVariableEditIdx(null);
+                        });
+                    },
+                    onClose: ()=>{
+                        if (variableFormAction === 'create') {
+                            removeVariable(variableEditIdx);
+                        }
                         setVariableEditIdx(null);
-                    });
-                },
-                onClose: ()=>{
-                    if (variableFormAction === 'create') {
-                        removeVariable(variableEditIdx);
                     }
-                    setVariableEditIdx(null);
-                }
+                })
             }),
             !currentEditingVariableDefinition && /*#__PURE__*/ _jsxs(_Fragment, {
                 children: [
@@ -242,16 +244,13 @@ export function VariableEditor(props) {
                                                         })
                                                     }),
                                                     /*#__PURE__*/ _jsx(TableBody, {
-                                                        children: variableDefinitions.map((v, idx)=>/*#__PURE__*/ {
-                                                            var _v_spec_display, _v_spec_display1;
-                                                            var _getVariableLabelByKind, _v_spec_display_description;
-                                                            return _jsxs(TableRow, {
+                                                        children: variableDefinitions.map((v, idx)=>/*#__PURE__*/ _jsxs(TableRow, {
                                                                 children: [
                                                                     /*#__PURE__*/ _jsx(TableCell, {
                                                                         component: "th",
                                                                         scope: "row",
                                                                         children: /*#__PURE__*/ _jsx(Switch, {
-                                                                            checked: ((_v_spec_display = v.spec.display) === null || _v_spec_display === void 0 ? void 0 : _v_spec_display.hidden) !== true,
+                                                                            checked: v.spec.display?.hidden !== true,
                                                                             onChange: (e)=>{
                                                                                 toggleVariableVisibility(idx, e.target.checked);
                                                                             }
@@ -271,10 +270,10 @@ export function VariableEditor(props) {
                                                                         })
                                                                     }),
                                                                     /*#__PURE__*/ _jsx(TableCell, {
-                                                                        children: (_getVariableLabelByKind = getVariableLabelByKind(v.kind)) !== null && _getVariableLabelByKind !== void 0 ? _getVariableLabelByKind : v.kind
+                                                                        children: getVariableLabelByKind(v.kind) ?? v.kind
                                                                     }),
                                                                     /*#__PURE__*/ _jsx(TableCell, {
-                                                                        children: (_v_spec_display_description = (_v_spec_display1 = v.spec.display) === null || _v_spec_display1 === void 0 ? void 0 : _v_spec_display1.description) !== null && _v_spec_display_description !== void 0 ? _v_spec_display_description : ''
+                                                                        children: v.spec.display?.description ?? ''
                                                                     }),
                                                                     /*#__PURE__*/ _jsxs(TableCell, {
                                                                         align: "right",
@@ -303,8 +302,7 @@ export function VariableEditor(props) {
                                                                         ]
                                                                     })
                                                                 ]
-                                                            }, v.spec.name);
-                                                        })
+                                                            }, v.spec.name))
                                                     })
                                                 ]
                                             })
@@ -404,16 +402,13 @@ export function VariableEditor(props) {
                                                                 })
                                                             }),
                                                             /*#__PURE__*/ _jsx(TableBody, {
-                                                                children: extVar.definitions.map((v)=>/*#__PURE__*/ {
-                                                                    var _v_spec_display, _v_spec_display1;
-                                                                    var _getVariableLabelByKind, _v_spec_display_description;
-                                                                    return _jsxs(TableRow, {
+                                                                children: extVar.definitions.map((v)=>/*#__PURE__*/ _jsxs(TableRow, {
                                                                         children: [
                                                                             /*#__PURE__*/ _jsx(TableCell, {
                                                                                 component: "th",
                                                                                 scope: "row",
                                                                                 children: /*#__PURE__*/ _jsx(Switch, {
-                                                                                    checked: ((_v_spec_display = v.spec.display) === null || _v_spec_display === void 0 ? void 0 : _v_spec_display.hidden) !== true,
+                                                                                    checked: v.spec.display?.hidden !== true,
                                                                                     disabled: true
                                                                                 })
                                                                             }),
@@ -432,10 +427,10 @@ export function VariableEditor(props) {
                                                                                 })
                                                                             }),
                                                                             /*#__PURE__*/ _jsx(TableCell, {
-                                                                                children: (_getVariableLabelByKind = getVariableLabelByKind(v.kind)) !== null && _getVariableLabelByKind !== void 0 ? _getVariableLabelByKind : v.kind
+                                                                                children: getVariableLabelByKind(v.kind) ?? v.kind
                                                                             }),
                                                                             /*#__PURE__*/ _jsx(TableCell, {
-                                                                                children: (_v_spec_display_description = (_v_spec_display1 = v.spec.display) === null || _v_spec_display1 === void 0 ? void 0 : _v_spec_display1.description) !== null && _v_spec_display_description !== void 0 ? _v_spec_display_description : ''
+                                                                                children: v.spec.display?.description ?? ''
                                                                             }),
                                                                             /*#__PURE__*/ _jsxs(TableCell, {
                                                                                 align: "right",
@@ -469,8 +464,7 @@ export function VariableEditor(props) {
                                                                                 ]
                                                                             })
                                                                         ]
-                                                                    }, v.spec.name);
-                                                                })
+                                                                    }, v.spec.name))
                                                             })
                                                         ]
                                                     })
@@ -496,13 +490,13 @@ export function VariableName(props) {
     const { name, state } = props;
     return /*#__PURE__*/ _jsxs(_Fragment, {
         children: [
-            !(state === null || state === void 0 ? void 0 : state.overridden) && `${name} `,
-            !(state === null || state === void 0 ? void 0 : state.overridden) && (state === null || state === void 0 ? void 0 : state.overriding) && /*#__PURE__*/ _jsx(Box, {
+            !state?.overridden && `${name} `,
+            !state?.overridden && state?.overriding && /*#__PURE__*/ _jsx(Box, {
                 fontWeight: "normal",
                 color: (theme)=>theme.palette.primary.main,
                 children: "(overriding)"
             }),
-            (state === null || state === void 0 ? void 0 : state.overridden) && /*#__PURE__*/ _jsxs(_Fragment, {
+            state?.overridden && /*#__PURE__*/ _jsxs(_Fragment, {
                 children: [
                     /*#__PURE__*/ _jsx(Box, {
                         color: (theme)=>theme.palette.grey[500],