@grafana/scenes 0.10.0 → 0.11.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# v0.11.0 (Tue May 23 2023)
+
+#### 🚀 Enhancement
+
+- Macros: Url macro [#199](https://github.com/grafana/scenes/pull/199) ([@torkelo](https://github.com/torkelo) [@dprokop](https://github.com/dprokop))
+- Macros: Add __timezone macro [#200](https://github.com/grafana/scenes/pull/200) ([@dprokop](https://github.com/dprokop))
+
+#### Authors: 2
+
+- Dominik Prokop ([@dprokop](https://github.com/dprokop))
+- Torkel Ödegaard ([@torkelo](https://github.com/torkelo))
+
+---
+
 # v0.10.0 (Tue May 23 2023)
 
 #### 🚀 Enhancement
@@ -73,7 +87,7 @@
 
 You can now use multiple time zones in Scene. `SceneTimeRange` and `SceneTimePicker` respect time zone settings. Additionally, a new object was added, `SceneTimeZoneOverride`. It can be used to override the time zone provided by a time range object higher in the scene hierarchy. Objects within `SceneTimeZoneOverride` scope will use the closest `SceneTimeRange` range, but a locally specified time zone.
 
-Example: 
+Example:
 
 ```ts
 const scene = new EmbeddedScene({
@@ -85,7 +99,7 @@ const scene = new EmbeddedScene({
       ...
     }),
     // Will use global time range and locally specified time zone
-    new VizPanel({ 
+    new VizPanel({
       $timeRange: new SceneTimeZoneOverride({ timeZone: 'America/New_York' }),
       $data: new SceneQueryRunner({ ... }),
       ...

package/dist/esm/variables/macros/index.js

@@ -1,7 +1,8 @@
 import { DataLinkBuiltInVars } from '@grafana/data';
-import { UrlTimeRangeMacro, TimeFromAndToMacro } from './timeMacros.js';
+import { UrlTimeRangeMacro, TimeFromAndToMacro, TimezoneMacro } from './timeMacros.js';
 import { AllVariablesMacro } from './AllVariablesMacro.js';
 import { ValueMacro, DataMacro, SeriesMacro, FieldMacro } from './dataMacros.js';
+import { UrlMacro } from './urlMacros.js';
 
 const macrosIndex = {
   [DataLinkBuiltInVars.includeVars]: AllVariablesMacro,
@@ -10,8 +11,10 @@ const macrosIndex = {
   ["__data"]: DataMacro,
   ["__series"]: SeriesMacro,
   ["__field"]: FieldMacro,
+  ["__url"]: UrlMacro,
   ["__from"]: TimeFromAndToMacro,
-  ["__to"]: TimeFromAndToMacro
+  ["__to"]: TimeFromAndToMacro,
+  ["__timezone"]: TimezoneMacro
 };
 
 export { macrosIndex };

package/dist/esm/variables/macros/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/variables/macros/index.ts"],"sourcesContent":["import { DataLinkBuiltInVars } from '@grafana/data';\nimport { MacroVariableConstructor } from './types';\nimport { TimeFromAndToMacro, UrlTimeRangeMacro } from './timeMacros';\nimport { AllVariablesMacro } from './AllVariablesMacro';\nimport { DataMacro, FieldMacro, SeriesMacro, ValueMacro } from './dataMacros';\n\nexport const macrosIndex: Record<string, MacroVariableConstructor> = {\n  [DataLinkBuiltInVars.includeVars]: AllVariablesMacro,\n  [DataLinkBuiltInVars.keepTime]: UrlTimeRangeMacro,\n  ['__value']: ValueMacro,\n  ['__data']: DataMacro,\n  ['__series']: SeriesMacro,\n  ['__field']: FieldMacro,\n  ['__from']: TimeFromAndToMacro,\n  ['__to']: TimeFromAndToMacro,\n};\n"],"names":[],"mappings":";;;;;AAMO,MAAM,WAAwD,GAAA;AAAA,EACnE,CAAC,oBAAoB,WAAc,GAAA,iBAAA;AAAA,EACnC,CAAC,oBAAoB,QAAW,GAAA,iBAAA;AAAA,EAChC,CAAC,SAAY,GAAA,UAAA;AAAA,EACb,CAAC,QAAW,GAAA,SAAA;AAAA,EACZ,CAAC,UAAa,GAAA,WAAA;AAAA,EACd,CAAC,SAAY,GAAA,UAAA;AAAA,EACb,CAAC,QAAW,GAAA,kBAAA;AAAA,EACZ,CAAC,MAAS,GAAA,kBAAA;AACZ;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../src/variables/macros/index.ts"],"sourcesContent":["import { DataLinkBuiltInVars } from '@grafana/data';\nimport { MacroVariableConstructor } from './types';\nimport { TimeFromAndToMacro, TimezoneMacro, UrlTimeRangeMacro } from './timeMacros';\nimport { AllVariablesMacro } from './AllVariablesMacro';\nimport { DataMacro, FieldMacro, SeriesMacro, ValueMacro } from './dataMacros';\nimport { UrlMacro } from './urlMacros';\n\nexport const macrosIndex: Record<string, MacroVariableConstructor> = {\n  [DataLinkBuiltInVars.includeVars]: AllVariablesMacro,\n  [DataLinkBuiltInVars.keepTime]: UrlTimeRangeMacro,\n  ['__value']: ValueMacro,\n  ['__data']: DataMacro,\n  ['__series']: SeriesMacro,\n  ['__field']: FieldMacro,\n  ['__url']: UrlMacro,\n  ['__from']: TimeFromAndToMacro,\n  ['__to']: TimeFromAndToMacro,\n  ['__timezone']: TimezoneMacro,\n};\n"],"names":[],"mappings":";;;;;;AAOO,MAAM,WAAwD,GAAA;AAAA,EACnE,CAAC,oBAAoB,WAAc,GAAA,iBAAA;AAAA,EACnC,CAAC,oBAAoB,QAAW,GAAA,iBAAA;AAAA,EAChC,CAAC,SAAY,GAAA,UAAA;AAAA,EACb,CAAC,QAAW,GAAA,SAAA;AAAA,EACZ,CAAC,UAAa,GAAA,WAAA;AAAA,EACd,CAAC,SAAY,GAAA,UAAA;AAAA,EACb,CAAC,OAAU,GAAA,QAAA;AAAA,EACX,CAAC,QAAW,GAAA,kBAAA;AAAA,EACZ,CAAC,MAAS,GAAA,kBAAA;AAAA,EACV,CAAC,YAAe,GAAA,aAAA;AAClB;;;;"}

package/dist/esm/variables/macros/timeMacros.js

@@ -4,7 +4,7 @@ import { SkipFormattingValue } from './types.js';
 
 class UrlTimeRangeMacro {
   constructor(name, sceneObject) {
-    this.state = { name, type: "time_macro" };
+    this.state = { name, type: "url_variable" };
     this._sceneObject = sceneObject;
   }
   getValue() {
@@ -39,6 +39,19 @@ class TimeFromAndToMacro {
     }
   }
 }
+class TimezoneMacro {
+  constructor(name, sceneObject) {
+    this.state = { name, type: "time_macro" };
+    this._sceneObject = sceneObject;
+  }
+  getValue() {
+    const timeRange = getTimeRange(this._sceneObject);
+    return timeRange.getTimeZone();
+  }
+  getValueText() {
+    return this.getValue();
+  }
+}
 
-export { TimeFromAndToMacro, UrlTimeRangeMacro };
+export { TimeFromAndToMacro, TimezoneMacro, UrlTimeRangeMacro };
 //# sourceMappingURL=timeMacros.js.map

package/dist/esm/variables/macros/timeMacros.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeMacros.js","sources":["../../../../src/variables/macros/timeMacros.ts"],"sourcesContent":["import { dateTimeFormat, urlUtil } from '@grafana/data';\nimport { getTimeRange } from '../../core/sceneGraph/getTimeRange';\nimport { SceneObject } from '../../core/types';\nimport { FormatVariable } from '../interpolation/formatRegistry';\nimport { SkipFormattingValue } from './types';\n\n/**\n * Handles expressions like $__url_time_range.\n */\nexport class UrlTimeRangeMacro implements FormatVariable {\n  public state: { name: string; type: string };\n  private _sceneObject: SceneObject;\n\n  public constructor(name: string, sceneObject: SceneObject) {\n    this.state = { name: name, type: 'time_macro' };\n    this._sceneObject = sceneObject;\n  }\n\n  public getValue(): SkipFormattingValue {\n    const timeRange = getTimeRange(this._sceneObject);\n    const urlState = timeRange.urlSync?.getUrlState();\n    return new SkipFormattingValue(urlUtil.toUrlParams(urlState));\n  }\n\n  public getValueText?(): string {\n    return '';\n  }\n}\n\n/**\n * Handles expressions like $__from and $__to.\n */\nexport class TimeFromAndToMacro implements FormatVariable {\n  public state: { name: string; type: string };\n  private _sceneObject: SceneObject;\n\n  public constructor(name: string, sceneObject: SceneObject) {\n    this.state = { name: name, type: 'time_macro' };\n    this._sceneObject = sceneObject;\n  }\n\n  public getValue() {\n    const timeRange = getTimeRange(this._sceneObject);\n    if (this.state.name === '__from') {\n      return timeRange.state.value.from.valueOf();\n    } else {\n      return timeRange.state.value.to.valueOf();\n    }\n  }\n\n  public getValueText?(): string {\n    const timeRange = getTimeRange(this._sceneObject);\n    if (this.state.name === '__from') {\n      return dateTimeFormat(timeRange.state.value.from, { timeZone: timeRange.getTimeZone() });\n    } else {\n      return dateTimeFormat(timeRange.state.value.to, { timeZone: timeRange.getTimeZone() });\n    }\n  }\n}\n"],"names":[],"mappings":";;;;AASO,MAAM,iBAA4C,CAAA;AAAA,EAIhD,WAAA,CAAY,MAAc,WAA0B,EAAA;AACzD,IAAA,IAAA,CAAK,KAAQ,GAAA,EAAE,IAAY,EAAA,IAAA,EAAM,YAAa,EAAA,CAAA;AAC9C,IAAA,IAAA,CAAK,YAAe,GAAA,WAAA,CAAA;AAAA,GACtB;AAAA,EAEO,QAAgC,GAAA;AAlBzC,IAAA,IAAA,EAAA,CAAA;AAmBI,IAAM,MAAA,SAAA,GAAY,YAAa,CAAA,IAAA,CAAK,YAAY,CAAA,CAAA;AAChD,IAAM,MAAA,QAAA,GAAA,CAAW,EAAU,GAAA,SAAA,CAAA,OAAA,KAAV,IAAmB,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,WAAA,EAAA,CAAA;AACpC,IAAA,OAAO,IAAI,mBAAA,CAAoB,OAAQ,CAAA,WAAA,CAAY,QAAQ,CAAC,CAAA,CAAA;AAAA,GAC9D;AAAA,EAEO,YAAwB,GAAA;AAC7B,IAAO,OAAA,EAAA,CAAA;AAAA,GACT;AACF,CAAA;AAKO,MAAM,kBAA6C,CAAA;AAAA,EAIjD,WAAA,CAAY,MAAc,WAA0B,EAAA;AACzD,IAAA,IAAA,CAAK,KAAQ,GAAA,EAAE,IAAY,EAAA,IAAA,EAAM,YAAa,EAAA,CAAA;AAC9C,IAAA,IAAA,CAAK,YAAe,GAAA,WAAA,CAAA;AAAA,GACtB;AAAA,EAEO,QAAW,GAAA;AAChB,IAAM,MAAA,SAAA,GAAY,YAAa,CAAA,IAAA,CAAK,YAAY,CAAA,CAAA;AAChD,IAAI,IAAA,IAAA,CAAK,KAAM,CAAA,IAAA,KAAS,QAAU,EAAA;AAChC,MAAA,OAAO,SAAU,CAAA,KAAA,CAAM,KAAM,CAAA,IAAA,CAAK,OAAQ,EAAA,CAAA;AAAA,KACrC,MAAA;AACL,MAAA,OAAO,SAAU,CAAA,KAAA,CAAM,KAAM,CAAA,EAAA,CAAG,OAAQ,EAAA,CAAA;AAAA,KAC1C;AAAA,GACF;AAAA,EAEO,YAAwB,GAAA;AAC7B,IAAM,MAAA,SAAA,GAAY,YAAa,CAAA,IAAA,CAAK,YAAY,CAAA,CAAA;AAChD,IAAI,IAAA,IAAA,CAAK,KAAM,CAAA,IAAA,KAAS,QAAU,EAAA;AAChC,MAAO,OAAA,cAAA,CAAe,SAAU,CAAA,KAAA,CAAM,KAAM,CAAA,IAAA,EAAM,EAAE,QAAU,EAAA,SAAA,CAAU,WAAY,EAAA,EAAG,CAAA,CAAA;AAAA,KAClF,MAAA;AACL,MAAO,OAAA,cAAA,CAAe,SAAU,CAAA,KAAA,CAAM,KAAM,CAAA,EAAA,EAAI,EAAE,QAAU,EAAA,SAAA,CAAU,WAAY,EAAA,EAAG,CAAA,CAAA;AAAA,KACvF;AAAA,GACF;AACF;;;;"}
+{"version":3,"file":"timeMacros.js","sources":["../../../../src/variables/macros/timeMacros.ts"],"sourcesContent":["import { dateTimeFormat, urlUtil } from '@grafana/data';\nimport { getTimeRange } from '../../core/sceneGraph/getTimeRange';\nimport { SceneObject } from '../../core/types';\nimport { FormatVariable } from '../interpolation/formatRegistry';\nimport { SkipFormattingValue } from './types';\n\n/**\n * Handles expressions like $__url_time_range.\n */\nexport class UrlTimeRangeMacro implements FormatVariable {\n  public state: { name: string; type: string };\n  private _sceneObject: SceneObject;\n\n  public constructor(name: string, sceneObject: SceneObject) {\n    this.state = { name: name, type: 'url_variable' };\n    this._sceneObject = sceneObject;\n  }\n\n  public getValue(): SkipFormattingValue {\n    const timeRange = getTimeRange(this._sceneObject);\n    const urlState = timeRange.urlSync?.getUrlState();\n    return new SkipFormattingValue(urlUtil.toUrlParams(urlState));\n  }\n\n  public getValueText?(): string {\n    return '';\n  }\n}\n\n/**\n * Handles expressions like $__from and $__to.\n */\nexport class TimeFromAndToMacro implements FormatVariable {\n  public state: { name: string; type: string };\n  private _sceneObject: SceneObject;\n\n  public constructor(name: string, sceneObject: SceneObject) {\n    this.state = { name: name, type: 'time_macro' };\n    this._sceneObject = sceneObject;\n  }\n\n  public getValue() {\n    const timeRange = getTimeRange(this._sceneObject);\n    if (this.state.name === '__from') {\n      return timeRange.state.value.from.valueOf();\n    } else {\n      return timeRange.state.value.to.valueOf();\n    }\n  }\n\n  public getValueText?(): string {\n    const timeRange = getTimeRange(this._sceneObject);\n    if (this.state.name === '__from') {\n      return dateTimeFormat(timeRange.state.value.from, { timeZone: timeRange.getTimeZone() });\n    } else {\n      return dateTimeFormat(timeRange.state.value.to, { timeZone: timeRange.getTimeZone() });\n    }\n  }\n}\n\n/**\n * Handles $__timezone expression.\n */\nexport class TimezoneMacro implements FormatVariable {\n  public state: { name: string; type: string };\n  private _sceneObject: SceneObject;\n\n  public constructor(name: string, sceneObject: SceneObject) {\n    this.state = { name: name, type: 'time_macro' };\n    this._sceneObject = sceneObject;\n  }\n\n  public getValue() {\n    const timeRange = getTimeRange(this._sceneObject);\n    return timeRange.getTimeZone();\n  }\n\n  public getValueText?(): string {\n    return this.getValue();\n  }\n}\n"],"names":[],"mappings":";;;;AASO,MAAM,iBAA4C,CAAA;AAAA,EAIhD,WAAA,CAAY,MAAc,WAA0B,EAAA;AACzD,IAAA,IAAA,CAAK,KAAQ,GAAA,EAAE,IAAY,EAAA,IAAA,EAAM,cAAe,EAAA,CAAA;AAChD,IAAA,IAAA,CAAK,YAAe,GAAA,WAAA,CAAA;AAAA,GACtB;AAAA,EAEO,QAAgC,GAAA;AAlBzC,IAAA,IAAA,EAAA,CAAA;AAmBI,IAAM,MAAA,SAAA,GAAY,YAAa,CAAA,IAAA,CAAK,YAAY,CAAA,CAAA;AAChD,IAAM,MAAA,QAAA,GAAA,CAAW,EAAU,GAAA,SAAA,CAAA,OAAA,KAAV,IAAmB,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,WAAA,EAAA,CAAA;AACpC,IAAA,OAAO,IAAI,mBAAA,CAAoB,OAAQ,CAAA,WAAA,CAAY,QAAQ,CAAC,CAAA,CAAA;AAAA,GAC9D;AAAA,EAEO,YAAwB,GAAA;AAC7B,IAAO,OAAA,EAAA,CAAA;AAAA,GACT;AACF,CAAA;AAKO,MAAM,kBAA6C,CAAA;AAAA,EAIjD,WAAA,CAAY,MAAc,WAA0B,EAAA;AACzD,IAAA,IAAA,CAAK,KAAQ,GAAA,EAAE,IAAY,EAAA,IAAA,EAAM,YAAa,EAAA,CAAA;AAC9C,IAAA,IAAA,CAAK,YAAe,GAAA,WAAA,CAAA;AAAA,GACtB;AAAA,EAEO,QAAW,GAAA;AAChB,IAAM,MAAA,SAAA,GAAY,YAAa,CAAA,IAAA,CAAK,YAAY,CAAA,CAAA;AAChD,IAAI,IAAA,IAAA,CAAK,KAAM,CAAA,IAAA,KAAS,QAAU,EAAA;AAChC,MAAA,OAAO,SAAU,CAAA,KAAA,CAAM,KAAM,CAAA,IAAA,CAAK,OAAQ,EAAA,CAAA;AAAA,KACrC,MAAA;AACL,MAAA,OAAO,SAAU,CAAA,KAAA,CAAM,KAAM,CAAA,EAAA,CAAG,OAAQ,EAAA,CAAA;AAAA,KAC1C;AAAA,GACF;AAAA,EAEO,YAAwB,GAAA;AAC7B,IAAM,MAAA,SAAA,GAAY,YAAa,CAAA,IAAA,CAAK,YAAY,CAAA,CAAA;AAChD,IAAI,IAAA,IAAA,CAAK,KAAM,CAAA,IAAA,KAAS,QAAU,EAAA;AAChC,MAAO,OAAA,cAAA,CAAe,SAAU,CAAA,KAAA,CAAM,KAAM,CAAA,IAAA,EAAM,EAAE,QAAU,EAAA,SAAA,CAAU,WAAY,EAAA,EAAG,CAAA,CAAA;AAAA,KAClF,MAAA;AACL,MAAO,OAAA,cAAA,CAAe,SAAU,CAAA,KAAA,CAAM,KAAM,CAAA,EAAA,EAAI,EAAE,QAAU,EAAA,SAAA,CAAU,WAAY,EAAA,EAAG,CAAA,CAAA;AAAA,KACvF;AAAA,GACF;AACF,CAAA;AAKO,MAAM,aAAwC,CAAA;AAAA,EAI5C,WAAA,CAAY,MAAc,WAA0B,EAAA;AACzD,IAAA,IAAA,CAAK,KAAQ,GAAA,EAAE,IAAY,EAAA,IAAA,EAAM,YAAa,EAAA,CAAA;AAC9C,IAAA,IAAA,CAAK,YAAe,GAAA,WAAA,CAAA;AAAA,GACtB;AAAA,EAEO,QAAW,GAAA;AAChB,IAAM,MAAA,SAAA,GAAY,YAAa,CAAA,IAAA,CAAK,YAAY,CAAA,CAAA;AAChD,IAAA,OAAO,UAAU,WAAY,EAAA,CAAA;AAAA,GAC/B;AAAA,EAEO,YAAwB,GAAA;AAC7B,IAAA,OAAO,KAAK,QAAS,EAAA,CAAA;AAAA,GACvB;AACF;;;;"}

package/dist/esm/variables/macros/urlMacros.js

@@ -0,0 +1,54 @@
+import { locationService } from '@grafana/runtime';
+
+class UrlMacro {
+  constructor(name, _) {
+    this.state = { name, type: "url_macro" };
+  }
+  getValue(fieldPath) {
+    const location = locationService.getLocation();
+    switch (fieldPath != null ? fieldPath : "") {
+      case "params":
+        return new UrlStateFormatter(location.search);
+      case "path":
+        return location.pathname;
+      case "":
+      default:
+        return location.pathname + location.search;
+    }
+  }
+  getValueText() {
+    return "";
+  }
+}
+class UrlStateFormatter {
+  constructor(_urlQueryParams) {
+    this._urlQueryParams = _urlQueryParams;
+  }
+  formatter(options) {
+    if (!options) {
+      return this._urlQueryParams;
+    }
+    const params = options.split(":");
+    if (params[0] === "exclude" && params.length > 1) {
+      const allParams = new URLSearchParams(this._urlQueryParams);
+      for (const param of params[1].split(",")) {
+        allParams.delete(param);
+      }
+      return `?${allParams}`;
+    }
+    if (params[0] === "include" && params.length > 1) {
+      const allParams = new URLSearchParams(this._urlQueryParams);
+      const includeOnly = params[1].split(",");
+      for (const param of allParams.keys()) {
+        if (!includeOnly.includes(param)) {
+          allParams.delete(param);
+        }
+      }
+      return `?${allParams}`;
+    }
+    return this._urlQueryParams;
+  }
+}
+
+export { UrlMacro };
+//# sourceMappingURL=urlMacros.js.map

package/dist/esm/variables/macros/urlMacros.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"urlMacros.js","sources":["../../../../src/variables/macros/urlMacros.ts"],"sourcesContent":["import { locationService } from '@grafana/runtime';\nimport { SceneObject } from '../../core/types';\nimport { FormatVariable } from '../interpolation/formatRegistry';\nimport { CustomVariableValue } from '../types';\n\nexport class UrlMacro implements FormatVariable {\n  public state: { name: string; type: string };\n\n  public constructor(name: string, _: SceneObject) {\n    this.state = { name: name, type: 'url_macro' };\n  }\n\n  public getValue(fieldPath?: string) {\n    const location = locationService.getLocation();\n\n    switch (fieldPath ?? '') {\n      case 'params':\n        return new UrlStateFormatter(location.search);\n      case 'path':\n        return location.pathname;\n      case '':\n      default:\n        return location.pathname + location.search;\n    }\n  }\n\n  public getValueText?(): string {\n    return '';\n  }\n}\n\nclass UrlStateFormatter implements CustomVariableValue {\n  public constructor(private _urlQueryParams: string) {}\n\n  public formatter(options: string): string {\n    if (!options) {\n      return this._urlQueryParams;\n    }\n\n    const params = options.split(':');\n    if (params[0] === 'exclude' && params.length > 1) {\n      const allParams = new URLSearchParams(this._urlQueryParams);\n      for (const param of params[1].split(',')) {\n        allParams.delete(param);\n      }\n\n      return `?${allParams}`;\n    }\n\n    if (params[0] === 'include' && params.length > 1) {\n      const allParams = new URLSearchParams(this._urlQueryParams);\n      const includeOnly = params[1].split(',');\n\n      for (const param of allParams.keys()) {\n        if (!includeOnly.includes(param)) {\n          allParams.delete(param);\n        }\n      }\n\n      return `?${allParams}`;\n    }\n\n    return this._urlQueryParams;\n  }\n}\n"],"names":[],"mappings":";;AAKO,MAAM,QAAmC,CAAA;AAAA,EAGvC,WAAA,CAAY,MAAc,CAAgB,EAAA;AAC/C,IAAA,IAAA,CAAK,KAAQ,GAAA,EAAE,IAAY,EAAA,IAAA,EAAM,WAAY,EAAA,CAAA;AAAA,GAC/C;AAAA,EAEO,SAAS,SAAoB,EAAA;AAClC,IAAM,MAAA,QAAA,GAAW,gBAAgB,WAAY,EAAA,CAAA;AAE7C,IAAA,QAAQ,SAAa,IAAA,IAAA,GAAA,SAAA,GAAA,EAAA;AAAA,MACd,KAAA,QAAA;AACH,QAAO,OAAA,IAAI,iBAAkB,CAAA,QAAA,CAAS,MAAM,CAAA,CAAA;AAAA,MACzC,KAAA,MAAA;AACH,QAAA,OAAO,QAAS,CAAA,QAAA,CAAA;AAAA,MACb,KAAA,EAAA,CAAA;AAAA,MAAA;AAEH,QAAO,OAAA,QAAA,CAAS,WAAW,QAAS,CAAA,MAAA,CAAA;AAAA,KAAA;AAAA,GAE1C;AAAA,EAEO,YAAwB,GAAA;AAC7B,IAAO,OAAA,EAAA,CAAA;AAAA,GACT;AACF,CAAA;AAEA,MAAM,iBAAiD,CAAA;AAAA,EAC9C,YAAoB,eAAyB,EAAA;AAAzB,IAAA,IAAA,CAAA,eAAA,GAAA,eAAA,CAAA;AAAA,GAA0B;AAAA,EAE9C,UAAU,OAAyB,EAAA;AACxC,IAAA,IAAI,CAAC,OAAS,EAAA;AACZ,MAAA,OAAO,IAAK,CAAA,eAAA,CAAA;AAAA,KACd;AAEA,IAAM,MAAA,MAAA,GAAS,OAAQ,CAAA,KAAA,CAAM,GAAG,CAAA,CAAA;AAChC,IAAA,IAAI,MAAO,CAAA,CAAA,CAAA,KAAO,SAAa,IAAA,MAAA,CAAO,SAAS,CAAG,EAAA;AAChD,MAAA,MAAM,SAAY,GAAA,IAAI,eAAgB,CAAA,IAAA,CAAK,eAAe,CAAA,CAAA;AAC1D,MAAA,KAAA,MAAW,KAAS,IAAA,MAAA,CAAO,CAAG,CAAA,CAAA,KAAA,CAAM,GAAG,CAAG,EAAA;AACxC,QAAA,SAAA,CAAU,OAAO,KAAK,CAAA,CAAA;AAAA,OACxB;AAEA,MAAA,OAAO,CAAI,CAAA,EAAA,SAAA,CAAA,CAAA,CAAA;AAAA,KACb;AAEA,IAAA,IAAI,MAAO,CAAA,CAAA,CAAA,KAAO,SAAa,IAAA,MAAA,CAAO,SAAS,CAAG,EAAA;AAChD,MAAA,MAAM,SAAY,GAAA,IAAI,eAAgB,CAAA,IAAA,CAAK,eAAe,CAAA,CAAA;AAC1D,MAAA,MAAM,WAAc,GAAA,MAAA,CAAO,CAAG,CAAA,CAAA,KAAA,CAAM,GAAG,CAAA,CAAA;AAEvC,MAAW,KAAA,MAAA,KAAA,IAAS,SAAU,CAAA,IAAA,EAAQ,EAAA;AACpC,QAAA,IAAI,CAAC,WAAA,CAAY,QAAS,CAAA,KAAK,CAAG,EAAA;AAChC,UAAA,SAAA,CAAU,OAAO,KAAK,CAAA,CAAA;AAAA,SACxB;AAAA,OACF;AAEA,MAAA,OAAO,CAAI,CAAA,EAAA,SAAA,CAAA,CAAA,CAAA;AAAA,KACb;AAEA,IAAA,OAAO,IAAK,CAAA,eAAA,CAAA;AAAA,GACd;AACF;;;;"}

package/dist/index.js

@@ -977,7 +977,7 @@ class SkipFormattingValue {
 
 class UrlTimeRangeMacro {
   constructor(name, sceneObject) {
-    this.state = { name, type: "time_macro" };
+    this.state = { name, type: "url_variable" };
     this._sceneObject = sceneObject;
   }
   getValue() {
@@ -1012,6 +1012,19 @@ class TimeFromAndToMacro {
     }
   }
 }
+class TimezoneMacro {
+  constructor(name, sceneObject) {
+    this.state = { name, type: "time_macro" };
+    this._sceneObject = sceneObject;
+  }
+  getValue() {
+    const timeRange = getTimeRange(this._sceneObject);
+    return timeRange.getTimeZone();
+  }
+  getValueText() {
+    return this.getValue();
+  }
+}
 
 class AllVariablesMacro {
   constructor(name, sceneObject) {
@@ -1232,6 +1245,56 @@ class FieldMacro {
   }
 }
 
+class UrlMacro {
+  constructor(name, _) {
+    this.state = { name, type: "url_macro" };
+  }
+  getValue(fieldPath) {
+    const location = runtime.locationService.getLocation();
+    switch (fieldPath != null ? fieldPath : "") {
+      case "params":
+        return new UrlStateFormatter(location.search);
+      case "path":
+        return location.pathname;
+      case "":
+      default:
+        return location.pathname + location.search;
+    }
+  }
+  getValueText() {
+    return "";
+  }
+}
+class UrlStateFormatter {
+  constructor(_urlQueryParams) {
+    this._urlQueryParams = _urlQueryParams;
+  }
+  formatter(options) {
+    if (!options) {
+      return this._urlQueryParams;
+    }
+    const params = options.split(":");
+    if (params[0] === "exclude" && params.length > 1) {
+      const allParams = new URLSearchParams(this._urlQueryParams);
+      for (const param of params[1].split(",")) {
+        allParams.delete(param);
+      }
+      return `?${allParams}`;
+    }
+    if (params[0] === "include" && params.length > 1) {
+      const allParams = new URLSearchParams(this._urlQueryParams);
+      const includeOnly = params[1].split(",");
+      for (const param of allParams.keys()) {
+        if (!includeOnly.includes(param)) {
+          allParams.delete(param);
+        }
+      }
+      return `?${allParams}`;
+    }
+    return this._urlQueryParams;
+  }
+}
+
 const macrosIndex = {
   [data.DataLinkBuiltInVars.includeVars]: AllVariablesMacro,
   [data.DataLinkBuiltInVars.keepTime]: UrlTimeRangeMacro,
@@ -1239,8 +1302,10 @@ const macrosIndex = {
   ["__data"]: DataMacro,
   ["__series"]: SeriesMacro,
   ["__field"]: FieldMacro,
+  ["__url"]: UrlMacro,
   ["__from"]: TimeFromAndToMacro,
-  ["__to"]: TimeFromAndToMacro
+  ["__to"]: TimeFromAndToMacro,
+  ["__timezone"]: TimezoneMacro
 };
 
 function sceneInterpolator(sceneObject, target, scopedVars, format) {