@grafana/scenes 6.52.1--canary.1323.20597071326.0 → 6.52.1--canary.1325.20726992281.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/packages/scenes/src/components/VizPanel/VizPanel.js +2 -2
- package/dist/esm/packages/scenes/src/components/VizPanel/VizPanel.js.map +1 -1
- package/dist/esm/packages/scenes/src/variables/interpolation/formatRegistry.js +2 -2
- package/dist/esm/packages/scenes/src/variables/interpolation/formatRegistry.js.map +1 -1
- package/dist/esm/packages/scenes/src/variables/variants/LocalValueVariable.js +1 -7
- package/dist/esm/packages/scenes/src/variables/variants/LocalValueVariable.js.map +1 -1
- package/dist/esm/packages/scenes/src/variables/variants/MultiValueVariable.js +24 -30
- package/dist/esm/packages/scenes/src/variables/variants/MultiValueVariable.js.map +1 -1
- package/dist/esm/packages/scenes/src/variables/variants/SwitchVariable.js +1 -1
- package/dist/esm/packages/scenes/src/variables/variants/SwitchVariable.js.map +1 -1
- package/dist/index.d.ts +2 -3
- package/dist/index.js +30 -42
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -83,7 +83,7 @@ function SwitchVariableRenderer({ model }) {
|
|
|
83
83
|
return /* @__PURE__ */ React.createElement("div", { className: styles.container }, /* @__PURE__ */ React.createElement(
|
|
84
84
|
Switch,
|
|
85
85
|
{
|
|
86
|
-
id: `var-${state.key}`,
|
|
86
|
+
id: `var-switch-${state.key}`,
|
|
87
87
|
value: state.value === state.enabledValue,
|
|
88
88
|
onChange: (event) => {
|
|
89
89
|
model.setValue(event.currentTarget.checked ? state.enabledValue : state.disabledValue);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SwitchVariable.js","sources":["../../../../../../../src/variables/variants/SwitchVariable.tsx"],"sourcesContent":["import React from 'react';\nimport { Observable, of } from 'rxjs';\nimport { Switch, useStyles2 } from '@grafana/ui';\nimport { GrafanaTheme2 } from '@grafana/data';\nimport { css } from '@emotion/css';\nimport { SceneObjectBase } from '../../core/SceneObjectBase';\nimport { SceneComponentProps, SceneObjectUrlValues } from '../../core/types';\nimport { SceneObjectUrlSyncConfig } from '../../services/SceneObjectUrlSyncConfig';\nimport {\n SceneVariable,\n SceneVariableState,\n SceneVariableValueChangedEvent,\n ValidateAndUpdateResult,\n VariableValue,\n} from '../types';\n\nexport interface SwitchVariableState extends SceneVariableState {\n value: string;\n enabledValue: string;\n disabledValue: string;\n}\n\nexport class SwitchVariable extends SceneObjectBase<SwitchVariableState> implements SceneVariable<SwitchVariableState> {\n public static Component = SwitchVariableRenderer;\n private _prevValue: VariableValue = '';\n\n public constructor(initialState: Partial<SwitchVariableState>) {\n super({\n // TODO: remove this once switch is in the schema @leventebalogh\n // @ts-expect-error - switch is a valid variable type, but not in the schema yet\n type: 'switch',\n value: 'false',\n enabledValue: 'true',\n disabledValue: 'false',\n name: '',\n ...initialState,\n });\n\n this._urlSync = new SceneObjectUrlSyncConfig(this, { keys: () => this.getKeys() });\n }\n\n /**\n * This function is called on when SceneVariableSet is activated or when a dependency changes.\n */\n public validateAndUpdate(): Observable<ValidateAndUpdateResult> {\n const newValue = this.getValue();\n\n if (this._prevValue !== newValue) {\n this._prevValue = newValue;\n this.publishEvent(new SceneVariableValueChangedEvent(this), true);\n }\n\n return of({});\n }\n\n public setValue(newValue: string): void {\n // Ignore if there's no change\n if (this.getValue() === newValue) {\n return;\n }\n\n if ([this.state.enabledValue, this.state.disabledValue].includes(newValue)) {\n this.setState({ value: newValue });\n this.publishEvent(new SceneVariableValueChangedEvent(this), true);\n } else {\n console.error(\n `Invalid value for switch variable: \"${newValue}\". Valid values are: \"${this.state.enabledValue}\" and \"${this.state.disabledValue}\".`\n );\n }\n }\n\n public getValue(): VariableValue {\n return this.state.value;\n }\n\n public isEnabled(): boolean {\n return this.state.value === this.state.enabledValue;\n }\n\n public isDisabled(): boolean {\n return this.state.value === this.state.disabledValue;\n }\n\n private getKey(): string {\n return `var-${this.state.name}`;\n }\n\n public getKeys(): string[] {\n if (this.state.skipUrlSync) {\n return [];\n }\n\n return [this.getKey()];\n }\n\n public getUrlState(): SceneObjectUrlValues {\n if (this.state.skipUrlSync) {\n return {};\n }\n\n return { [this.getKey()]: this.state.value };\n }\n\n public updateFromUrl(values: SceneObjectUrlValues): void {\n const val = values[this.getKey()];\n\n if (typeof val === 'string') {\n this.setValue(val);\n }\n }\n}\n\nfunction SwitchVariableRenderer({ model }: SceneComponentProps<SwitchVariable>) {\n const state = model.useState();\n const styles = useStyles2(getStyles);\n\n return (\n <div className={styles.container}>\n <Switch\n id={`var-${state.key}`}\n value={state.value === state.enabledValue}\n onChange={(event) => {\n model.setValue(event!.currentTarget.checked ? state.enabledValue : state.disabledValue);\n }}\n />\n </div>\n );\n}\n\nfunction getStyles(theme: GrafanaTheme2) {\n return {\n container: css({\n display: 'flex',\n alignItems: 'center',\n padding: theme.spacing(0, 1),\n height: theme.spacing(theme.components.height.md),\n borderRadius: theme.shape.radius.default,\n border: `1px solid ${theme.components.input.borderColor}`,\n background: theme.colors.background.primary,\n }),\n };\n}\n"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SwitchVariable.js","sources":["../../../../../../../src/variables/variants/SwitchVariable.tsx"],"sourcesContent":["import React from 'react';\nimport { Observable, of } from 'rxjs';\nimport { Switch, useStyles2 } from '@grafana/ui';\nimport { GrafanaTheme2 } from '@grafana/data';\nimport { css } from '@emotion/css';\nimport { SceneObjectBase } from '../../core/SceneObjectBase';\nimport { SceneComponentProps, SceneObjectUrlValues } from '../../core/types';\nimport { SceneObjectUrlSyncConfig } from '../../services/SceneObjectUrlSyncConfig';\nimport {\n SceneVariable,\n SceneVariableState,\n SceneVariableValueChangedEvent,\n ValidateAndUpdateResult,\n VariableValue,\n} from '../types';\n\nexport interface SwitchVariableState extends SceneVariableState {\n value: string;\n enabledValue: string;\n disabledValue: string;\n}\n\nexport class SwitchVariable extends SceneObjectBase<SwitchVariableState> implements SceneVariable<SwitchVariableState> {\n public static Component = SwitchVariableRenderer;\n private _prevValue: VariableValue = '';\n\n public constructor(initialState: Partial<SwitchVariableState>) {\n super({\n // TODO: remove this once switch is in the schema @leventebalogh\n // @ts-expect-error - switch is a valid variable type, but not in the schema yet\n type: 'switch',\n value: 'false',\n enabledValue: 'true',\n disabledValue: 'false',\n name: '',\n ...initialState,\n });\n\n this._urlSync = new SceneObjectUrlSyncConfig(this, { keys: () => this.getKeys() });\n }\n\n /**\n * This function is called on when SceneVariableSet is activated or when a dependency changes.\n */\n public validateAndUpdate(): Observable<ValidateAndUpdateResult> {\n const newValue = this.getValue();\n\n if (this._prevValue !== newValue) {\n this._prevValue = newValue;\n this.publishEvent(new SceneVariableValueChangedEvent(this), true);\n }\n\n return of({});\n }\n\n public setValue(newValue: string): void {\n // Ignore if there's no change\n if (this.getValue() === newValue) {\n return;\n }\n\n if ([this.state.enabledValue, this.state.disabledValue].includes(newValue)) {\n this.setState({ value: newValue });\n this.publishEvent(new SceneVariableValueChangedEvent(this), true);\n } else {\n console.error(\n `Invalid value for switch variable: \"${newValue}\". Valid values are: \"${this.state.enabledValue}\" and \"${this.state.disabledValue}\".`\n );\n }\n }\n\n public getValue(): VariableValue {\n return this.state.value;\n }\n\n public isEnabled(): boolean {\n return this.state.value === this.state.enabledValue;\n }\n\n public isDisabled(): boolean {\n return this.state.value === this.state.disabledValue;\n }\n\n private getKey(): string {\n return `var-${this.state.name}`;\n }\n\n public getKeys(): string[] {\n if (this.state.skipUrlSync) {\n return [];\n }\n\n return [this.getKey()];\n }\n\n public getUrlState(): SceneObjectUrlValues {\n if (this.state.skipUrlSync) {\n return {};\n }\n\n return { [this.getKey()]: this.state.value };\n }\n\n public updateFromUrl(values: SceneObjectUrlValues): void {\n const val = values[this.getKey()];\n\n if (typeof val === 'string') {\n this.setValue(val);\n }\n }\n}\n\nfunction SwitchVariableRenderer({ model }: SceneComponentProps<SwitchVariable>) {\n const state = model.useState();\n const styles = useStyles2(getStyles);\n\n return (\n <div className={styles.container}>\n <Switch\n id={`var-switch-${state.key}`}\n value={state.value === state.enabledValue}\n onChange={(event) => {\n model.setValue(event!.currentTarget.checked ? state.enabledValue : state.disabledValue);\n }}\n />\n </div>\n );\n}\n\nfunction getStyles(theme: GrafanaTheme2) {\n return {\n container: css({\n display: 'flex',\n alignItems: 'center',\n padding: theme.spacing(0, 1),\n height: theme.spacing(theme.components.height.md),\n borderRadius: theme.shape.radius.default,\n border: `1px solid ${theme.components.input.borderColor}`,\n background: theme.colors.background.primary,\n }),\n };\n}\n"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1273,9 +1273,8 @@ declare abstract class MultiValueVariable<TState extends MultiValueVariableState
|
|
|
1273
1273
|
*/
|
|
1274
1274
|
protected interceptStateUpdateAfterValidation(stateUpdate: Partial<MultiValueVariableState>): void;
|
|
1275
1275
|
getValue(fieldPath?: string): VariableValue;
|
|
1276
|
-
getValueText(fieldPath?: string): string;
|
|
1277
|
-
private getFieldAtPath;
|
|
1278
1276
|
private getFieldAccessor;
|
|
1277
|
+
getValueText(): string;
|
|
1279
1278
|
hasAllValue(): boolean;
|
|
1280
1279
|
getDefaultMultiState(options: VariableValueOption[]): {
|
|
1281
1280
|
value: string[];
|
|
@@ -2552,7 +2551,7 @@ declare class LocalValueVariable extends SceneObjectBase<LocalValueVariableState
|
|
|
2552
2551
|
constructor(initialState: Partial<LocalValueVariableState>);
|
|
2553
2552
|
getValue(fieldPath?: string): VariableValue;
|
|
2554
2553
|
private getFieldAccessor;
|
|
2555
|
-
getValueText(
|
|
2554
|
+
getValueText(): string;
|
|
2556
2555
|
/**
|
|
2557
2556
|
* Checks the ancestor of our parent SceneVariableSet for loading state of a variable with the same name
|
|
2558
2557
|
* This function is unit tested from SceneVariableSet tests.
|
package/dist/index.js
CHANGED
|
@@ -1581,9 +1581,9 @@ const formatRegistry = new data.Registry(() => {
|
|
|
1581
1581
|
id: schema.VariableFormatID.Text,
|
|
1582
1582
|
name: "Text",
|
|
1583
1583
|
description: "Format variables in their text representation. Example in multi-variable scenario A + B + C.",
|
|
1584
|
-
formatter: (value, _args, variable
|
|
1584
|
+
formatter: (value, _args, variable) => {
|
|
1585
1585
|
if (variable.getValueText) {
|
|
1586
|
-
return variable.getValueText(
|
|
1586
|
+
return variable.getValueText();
|
|
1587
1587
|
}
|
|
1588
1588
|
return String(value);
|
|
1589
1589
|
}
|
|
@@ -1892,39 +1892,24 @@ const _MultiValueVariable = class _MultiValueVariable extends SceneObjectBase {
|
|
|
1892
1892
|
value = this.state.options.map((o) => o.value);
|
|
1893
1893
|
}
|
|
1894
1894
|
if (fieldPath != null) {
|
|
1895
|
-
|
|
1896
|
-
|
|
1897
|
-
|
|
1898
|
-
|
|
1899
|
-
getValueText(fieldPath) {
|
|
1900
|
-
if (this.hasAllValue()) {
|
|
1901
|
-
return ALL_VARIABLE_TEXT;
|
|
1902
|
-
}
|
|
1903
|
-
const text = fieldPath != null ? this.getFieldAtPath(this.state.value, fieldPath, true) : this.state.text;
|
|
1904
|
-
return Array.isArray(text) ? text.join(" + ") : String(text);
|
|
1905
|
-
}
|
|
1906
|
-
getFieldAtPath(value, fieldPath, returnText = false) {
|
|
1907
|
-
const accesor = this.getFieldAccessor(fieldPath);
|
|
1908
|
-
if (Array.isArray(value)) {
|
|
1909
|
-
const index = parseInt(fieldPath, 10);
|
|
1910
|
-
if (!isNaN(index) && index >= 0 && index < value.length) {
|
|
1911
|
-
const v = value[index];
|
|
1912
|
-
if (!returnText) {
|
|
1913
|
-
return v;
|
|
1895
|
+
if (Array.isArray(value)) {
|
|
1896
|
+
const index = parseInt(fieldPath, 10);
|
|
1897
|
+
if (!isNaN(index) && index >= 0 && index < value.length) {
|
|
1898
|
+
return value[index];
|
|
1914
1899
|
}
|
|
1915
|
-
const
|
|
1916
|
-
return
|
|
1900
|
+
const accesor2 = this.getFieldAccessor(fieldPath);
|
|
1901
|
+
return value.map((v) => {
|
|
1902
|
+
const o2 = this.state.options.find((o3) => o3.value === v);
|
|
1903
|
+
return o2 ? accesor2(o2.properties) : v;
|
|
1904
|
+
});
|
|
1905
|
+
}
|
|
1906
|
+
const accesor = this.getFieldAccessor(fieldPath);
|
|
1907
|
+
const o = this.state.options.find((o2) => o2.value === value);
|
|
1908
|
+
if (o) {
|
|
1909
|
+
return accesor(o.properties);
|
|
1917
1910
|
}
|
|
1918
|
-
return value.map((v) => {
|
|
1919
|
-
const o2 = this.state.options.find((o3) => o3.value === v);
|
|
1920
|
-
return o2 ? accesor(o2.properties) : v;
|
|
1921
|
-
});
|
|
1922
|
-
}
|
|
1923
|
-
const o = this.state.options.find((o2) => o2.value === value);
|
|
1924
|
-
if (o) {
|
|
1925
|
-
return accesor(o.properties);
|
|
1926
1911
|
}
|
|
1927
|
-
return
|
|
1912
|
+
return value;
|
|
1928
1913
|
}
|
|
1929
1914
|
getFieldAccessor(fieldPath) {
|
|
1930
1915
|
const accessor = _MultiValueVariable.fieldAccessorCache[fieldPath];
|
|
@@ -1933,6 +1918,15 @@ const _MultiValueVariable = class _MultiValueVariable extends SceneObjectBase {
|
|
|
1933
1918
|
}
|
|
1934
1919
|
return _MultiValueVariable.fieldAccessorCache[fieldPath] = lodash.property(fieldPath);
|
|
1935
1920
|
}
|
|
1921
|
+
getValueText() {
|
|
1922
|
+
if (this.hasAllValue()) {
|
|
1923
|
+
return ALL_VARIABLE_TEXT;
|
|
1924
|
+
}
|
|
1925
|
+
if (Array.isArray(this.state.text)) {
|
|
1926
|
+
return this.state.text.join(" + ");
|
|
1927
|
+
}
|
|
1928
|
+
return String(this.state.text);
|
|
1929
|
+
}
|
|
1936
1930
|
hasAllValue() {
|
|
1937
1931
|
const value = this.state.value;
|
|
1938
1932
|
return value === ALL_VARIABLE_VALUE || Array.isArray(value) && value[0] === ALL_VARIABLE_VALUE;
|
|
@@ -8836,8 +8830,8 @@ class VizPanel extends SceneObjectBase {
|
|
|
8836
8830
|
const sceneTimeRange = sceneGraph.getTimeRange(this);
|
|
8837
8831
|
if (liveNowTimer instanceof LiveNowTimer && liveNowTimer.isEnabled) {
|
|
8838
8832
|
return evaluateTimeRange(
|
|
8839
|
-
sceneTimeRange.state.from,
|
|
8840
|
-
sceneTimeRange.state.to,
|
|
8833
|
+
sceneTimeRange.state.value.from,
|
|
8834
|
+
sceneTimeRange.state.value.to,
|
|
8841
8835
|
sceneTimeRange.getTimeZone(),
|
|
8842
8836
|
sceneTimeRange.state.fiscalYearStartMonth,
|
|
8843
8837
|
sceneTimeRange.state.UNSAFE_nowDelay,
|
|
@@ -10828,13 +10822,7 @@ const _LocalValueVariable = class _LocalValueVariable extends SceneObjectBase {
|
|
|
10828
10822
|
}
|
|
10829
10823
|
return _LocalValueVariable.fieldAccessorCache[fieldPath] = lodash.property(fieldPath);
|
|
10830
10824
|
}
|
|
10831
|
-
getValueText(
|
|
10832
|
-
if (fieldPath && this.state.properties) {
|
|
10833
|
-
const value = this.getFieldAccessor(fieldPath)(this.state.properties);
|
|
10834
|
-
if (value != null) {
|
|
10835
|
-
return String(value);
|
|
10836
|
-
}
|
|
10837
|
-
}
|
|
10825
|
+
getValueText() {
|
|
10838
10826
|
return this.state.text.toString();
|
|
10839
10827
|
}
|
|
10840
10828
|
/**
|
|
@@ -12790,7 +12778,7 @@ function SwitchVariableRenderer({ model }) {
|
|
|
12790
12778
|
return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.container }, /* @__PURE__ */ React__default.default.createElement(
|
|
12791
12779
|
ui.Switch,
|
|
12792
12780
|
{
|
|
12793
|
-
id: `var-${state.key}`,
|
|
12781
|
+
id: `var-switch-${state.key}`,
|
|
12794
12782
|
value: state.value === state.enabledValue,
|
|
12795
12783
|
onChange: (event) => {
|
|
12796
12784
|
model.setValue(event.currentTarget.checked ? state.enabledValue : state.disabledValue);
|