@sisense/sdk-ui 2.26.0 → 2.28.0

package/dist/{widget-composer-BAJFWk3t.js → widget-composer-Bv_OVu1o.js}

@@ -1,68 +1,68 @@
 var le = Object.defineProperty, de = Object.defineProperties;
 var ce = Object.getOwnPropertyDescriptors;
-var D = Object.getOwnPropertySymbols;
-var $ = Object.prototype.hasOwnProperty, k = Object.prototype.propertyIsEnumerable;
-var N = (e, t, r) => t in e ? le(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, o = (e, t) => {
+var A = Object.getOwnPropertySymbols;
+var j = Object.prototype.hasOwnProperty, Q = Object.prototype.propertyIsEnumerable;
+var R = (e, t, r) => t in e ? le(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, o = (e, t) => {
   for (var r in t || (t = {}))
-    $.call(t, r) && N(e, r, t[r]);
-  if (D)
-    for (var r of D(t))
-      k.call(t, r) && N(e, r, t[r]);
+    j.call(t, r) && R(e, r, t[r]);
+  if (A)
+    for (var r of A(t))
+      Q.call(t, r) && R(e, r, t[r]);
   return e;
 }, p = (e, t) => de(e, ce(t));
-var q = (e, t) => {
+var U = (e, t) => {
   var r = {};
   for (var i in e)
-    $.call(e, i) && t.indexOf(i) < 0 && (r[i] = e[i]);
-  if (e != null && D)
-    for (var i of D(e))
-      t.indexOf(i) < 0 && k.call(e, i) && (r[i] = e[i]);
+    j.call(e, i) && t.indexOf(i) < 0 && (r[i] = e[i]);
+  if (e != null && A)
+    for (var i of A(e))
+      t.indexOf(i) < 0 && Q.call(e, i) && (r[i] = e[i]);
   return r;
 };
-import { J as ue, c as Z, i as pe } from "./types-D6jCGncV.js";
-import { C as me, i as ge, a as fe, b as ye, n as _, m as w, g as B } from "./utils-BQtueE3Z.js";
-import { T as b, A as Se, n as he, k as G, l as Oe, m as l, o as be, q as T, D as Te, r as W, s as X, t as ve, u as Ee, v as xe } from "./apply-styled-options-to-query-Bzt2GrgO.js";
-function Ce(e) {
+import { J as ue, c as X, i as pe } from "./types-D3fPN43o.js";
+import { C as me, i as ge, a as fe, b as ye, n as W, m as I, g as z } from "./utils-CsV-iYtb.js";
+import { T, A as Se, n as Oe, k as ee, l as he, m as l, o as be, q as v, D as Te, r as q, s as te, t as ve, u as xe, v as Ee, x as Ce } from "./apply-styled-options-to-query-BagjzMqm.js";
+function De(e) {
   return e.replace(/\s+/g, "-").replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
 }
 function Mt(e) {
   return e.charAt(0).toUpperCase() + e.slice(1);
 }
-function Pt(e) {
+function Wt(e) {
   const t = /\[(.+?)\s\(Calendar\)\]/;
   return e.replace(t, "[$1]").trim();
 }
-function Wt(e) {
+function Ft(e) {
   if (e)
     if (e.metadata) {
       if (!e.model)
-        throw new b("errors.missingModelTitle");
-    } else throw new b("errors.missingMetadata");
-  else throw new b("errors.emptyModel");
+        throw new T("errors.missingModelTitle");
+    } else throw new T("errors.missingMetadata");
+  else throw new T("errors.emptyModel");
   return e;
 }
-function De(e) {
+function we(e) {
   return !e || !e.jaql.datasource.title || !e.jaql.metadata.length;
 }
-function ee(e) {
+function re(e) {
   if (![...Se, "pivot", "pivot2"].includes(e))
-    throw new b("errors.chartTypeNotSupported", { chartType: e });
+    throw new T("errors.chartTypeNotSupported", { chartType: e });
 }
-function we(e) {
+function Le(e) {
   return "widgetType" in e && e.widgetType === "pivot";
 }
-function h(e) {
+function O(e) {
   var t;
   return "column" in e && ((t = e.column) == null ? void 0 : t.expression) && /\(.*\)/.test(e.column.expression);
 }
-function R(e) {
+function Y(e) {
   const t = "measures" in e && m(e.measures) || "values" in e && m(e.values);
-  return we(e) ? "values" in e.dataOptions && m(e.dataOptions.values) : "chartType" in e ? e.chartType === "indicator" ? "value" in e.dataOptions && m(e.dataOptions.value) || "secondary" in e.dataOptions && m(e.dataOptions.secondary) : e.chartType === "table" ? !("columns" in e.dataOptions) || !m(e.dataOptions.columns) ? !1 : e.dataOptions.columns.some((i) => h(i)) : e.chartType === "boxplot" ? !1 : e.chartType === "scatter" ? "x" in e.dataOptions && e.dataOptions.x !== void 0 && h(e.dataOptions.x) || "y" in e.dataOptions && e.dataOptions.y !== void 0 && h(e.dataOptions.y) || "size" in e.dataOptions && e.dataOptions.size !== void 0 : e.chartType === "scattermap" ? "colorBy" in e.dataOptions && e.dataOptions.colorBy !== void 0 && h(e.dataOptions.colorBy) || "details" in e.dataOptions && e.dataOptions.details !== void 0 && h(e.dataOptions.details) || "size" in e.dataOptions && e.dataOptions.size !== void 0 && h(e.dataOptions.size) : e.chartType === "areamap" ? "geo" in e.dataOptions && m(e.dataOptions.geo) && "color" in e.dataOptions && m(e.dataOptions.color) : "value" in e.dataOptions && m(e.dataOptions.value) : t;
+  return Le(e) ? "values" in e.dataOptions && m(e.dataOptions.values) : "chartType" in e ? e.chartType === "indicator" ? "value" in e.dataOptions && m(e.dataOptions.value) || "secondary" in e.dataOptions && m(e.dataOptions.secondary) : e.chartType === "table" ? !("columns" in e.dataOptions) || !m(e.dataOptions.columns) ? !1 : e.dataOptions.columns.some((i) => O(i)) : e.chartType === "boxplot" ? !1 : e.chartType === "scatter" ? "x" in e.dataOptions && e.dataOptions.x !== void 0 && O(e.dataOptions.x) || "y" in e.dataOptions && e.dataOptions.y !== void 0 && O(e.dataOptions.y) || "size" in e.dataOptions && e.dataOptions.size !== void 0 : e.chartType === "scattermap" ? "colorBy" in e.dataOptions && e.dataOptions.colorBy !== void 0 && O(e.dataOptions.colorBy) || "details" in e.dataOptions && e.dataOptions.details !== void 0 && O(e.dataOptions.details) || "size" in e.dataOptions && e.dataOptions.size !== void 0 && O(e.dataOptions.size) : e.chartType === "areamap" ? "geo" in e.dataOptions && m(e.dataOptions.geo) && "color" in e.dataOptions && m(e.dataOptions.color) : "value" in e.dataOptions && m(e.dataOptions.value) : t;
 }
 function m(e) {
   return Array.isArray(e) && e.length > 0;
 }
-function Le(e) {
+function Ae(e) {
   const t = e.split(`
 `);
   for (let r = 0; r < t.length - 1; r++)
@@ -76,7 +76,7 @@ function Le(e) {
   return t.join(`
 `);
 }
-function Ae(e) {
+function Ie(e) {
   const t = (i) => /^[$A-Z_][0-9A-Z_$]*$/i.test(i);
   if ("composeCode" in e)
     return e;
@@ -87,7 +87,7 @@ function Ae(e) {
   }
   return r;
 }
-const Ie = {
+const _e = {
   react: {
     baseChartTmpl: `import { {{componentString}} } from '@sisense/sdk-ui';
 {{extraImportsString}}
@@ -550,16 +550,16 @@ const config = {{configString}};
     dashboardTmpl: "/** COMING SOON */"
   }
 };
-function _e(e) {
-  return e.replace(/\[\[([^\]]+)\]\]/g, (t, r) => he(r));
+function Pe(e) {
+  return e.replace(/\[\[([^\]]+)\]\]/g, (t, r) => Oe(r));
 }
-const te = (e, t) => Ie[t][e].replace(
+const ie = (e, t) => _e[t][e].replace(
   /{{(.*?)Tmpl}}/g,
-  (i, a) => te(`${a}Tmpl`, t)
-), Me = (e, t) => e.replace(/{{(.*?)}}/g, (r, i) => i in t ? t[i] : (console.warn(`Placeholder ${i} not found in data`), r)), M = (e, t, r = "react") => {
-  const i = te(e, r), a = Me(i, t);
-  return Le(_e(a));
-}, Pe = () => Object.values(Oe).map((t) => G.aggregationToJAQL(t)).join("|"), re = (e) => {
+  (i, a) => ie(`${a}Tmpl`, t)
+), Me = (e, t) => e.replace(/{{(.*?)}}/g, (r, i) => i in t ? t[i] : (console.warn(`Placeholder ${i} not found in data`), r)), N = (e, t, r = "react") => {
+  const i = ie(e, r), a = Me(i, t);
+  return Ae(Pe(a));
+}, We = () => Object.values(he).map((t) => ee.aggregationToJAQL(t)).join("|"), ae = (e) => {
   const { formula: t, context: r, filter: i } = e;
   if (!r || !t)
     return e;
@@ -569,7 +569,7 @@ const te = (e, t) => Ie[t][e].replace(
   const n = a[0];
   if (typeof n != "string")
     return e;
-  const s = r[`${n}`], u = Pe(), d = new RegExp(`^\\s*(${u})\\(\\[\\w+\\]\\)$`), f = t.match(d);
+  const s = r[`${n}`], u = We(), d = new RegExp(`^\\s*(${u})\\(\\[\\w+\\]\\)$`), f = t.match(d);
   if (f && t.includes(n)) {
     const c = f[1];
     return o({
@@ -582,29 +582,29 @@ const te = (e, t) => Ie[t][e].replace(
     }, i ? { filter: o({}, i) } : {});
   }
   return e;
-}, A = (e) => {
+}, P = (e) => {
   let t = e;
-  if ("formula" in e && (t = re(e)), "context" in t) {
+  if ("formula" in e && (t = ae(e)), "context" in t) {
     const r = o({}, t.context);
     Object.keys(r).forEach((i) => {
-      r[`${i}`] = A(r[`${i}`]);
+      r[`${i}`] = P(r[`${i}`]);
     }), t.context = r;
   }
   return t;
-}, We = (e) => {
+}, Fe = (e) => {
   var i;
   const t = e;
   if (t.panel !== "scope") return t;
   const { jaql: r } = t;
-  return (i = r.filter) != null && i.by && (r.filter.by = re(r.filter.by)), p(o({}, t), { jaql: r });
-}, Fe = (e) => {
+  return (i = r.filter) != null && i.by && (r.filter.by = ae(r.filter.by)), p(o({}, t), { jaql: r });
+}, $e = (e) => {
   let t = e;
-  t = We(t);
+  t = Fe(t);
   const { jaql: r, measure: i, by: a } = t;
   return o(o(p(o({}, t), {
-    jaql: A(r)
-  }), a ? { by: A(a) } : {}), i ? { measure: A(i) } : {});
-}, I = 6;
+    jaql: P(r)
+  }), a ? { by: P(a) } : {}), i ? { measure: P(i) } : {});
+}, M = 6;
 function Ne(e) {
   switch (e) {
     case "line":
@@ -640,7 +640,7 @@ function Ne(e) {
       return {};
   }
 }
-const $e = {
+const ke = {
   subtype: "indicator/numeric",
   numericSubtype: "numericSimple",
   skin: "vertical",
@@ -659,7 +659,7 @@ const $e = {
       shouldBeShown: !1
     }
   }
-}, ke = {
+}, qe = {
   legend: {
     enabled: !0,
     position: "bottom"
@@ -725,7 +725,7 @@ const $e = {
   navigator: {
     enabled: !0
   }
-}, qe = {
+}, Be = {
   subtype: "line/basic",
   lineWidth: {
     width: "bold"
@@ -735,7 +735,7 @@ const $e = {
     size: "small",
     fill: "filled"
   }
-}, Be = {
+}, Re = {
   subtype: "area/basic",
   lineWidth: {
     width: "bold"
@@ -745,11 +745,11 @@ const $e = {
     size: "small",
     fill: "filled"
   }
-}, Re = {
-  subtype: "bar/classic"
 }, je = {
-  subtype: "column/classic"
+  subtype: "bar/classic"
 }, Qe = {
+  subtype: "column/classic"
+}, Ue = {
   subtype: "polar/column",
   yAxis: {
     enabled: !0,
@@ -771,10 +771,10 @@ const $e = {
     categoriesCapacity: 200
   }
 };
-function O(e) {
-  return be({}, ke, e);
+function b(e) {
+  return be({}, qe, e);
 }
-const Ue = {
+const ze = {
   subtype: "pie/classic",
   legend: {
     enabled: !1,
@@ -797,7 +797,7 @@ const Ue = {
     minimalIndependentSlicePercentage: 3,
     selectedConvolutionType: "byPercentage"
   }
-}, ze = {
+}, Ye = {
   legend: {
     enabled: !1,
     position: "left"
@@ -812,7 +812,7 @@ const Ue = {
   funnelSize: "regular",
   funnelType: "regular",
   funnelDirection: "regular"
-}, Ye = {
+}, Je = {
   rowsPerPage: 25,
   isAutoHeight: !0,
   rowHeight: null,
@@ -821,7 +821,7 @@ const Ue = {
   headersColor: !1,
   membersColor: !1,
   totalsColor: !1
-}, Je = {
+}, Ke = {
   labels: {
     category: [
       {
@@ -838,7 +838,7 @@ const Ue = {
   tooltip: {
     mode: "value"
   }
-}, Ke = {
+}, Ve = {
   subtype: me.SUBTYPE,
   viewType: "month",
   startOfWeek: "sunday",
@@ -856,7 +856,7 @@ const Ue = {
     cellColor: "#e6e6e6",
     hideValues: !0
   }
-}, Ve = {
+}, He = {
   legend: {
     enabled: !0,
     position: "bottom"
@@ -864,7 +864,7 @@ const Ue = {
   tooltip: {
     mode: "value"
   }
-}, He = {
+}, Ze = {
   legend: {
     enabled: !0,
     position: "bottom"
@@ -916,7 +916,7 @@ const Ue = {
     scatterBubbleMinSize: 10,
     scatterBubbleMaxSize: 10
   }
-}, Ze = {
+}, Ge = {
   header: {
     color: {
       enabled: !1
@@ -932,7 +932,7 @@ const Ue = {
       enabled: !1
     }
   }
-}, Ge = {
+}, Xe = {
   subtype: "scattermap",
   markers: {
     fill: "filled",
@@ -942,9 +942,9 @@ const Ue = {
       maxSize: 24
     }
   }
-}, Xe = {
-  mapType: "world"
 }, et = {
+  mapType: "world"
+}, tt = {
   subtype: "boxplot/full",
   legend: {
     enabled: !0,
@@ -996,42 +996,42 @@ const Ue = {
     enabled: !0
   }
 };
-function tt(e) {
+function rt(e) {
   switch (e) {
     case "indicator":
-      return l($e);
+      return l(ke);
     case "line":
-      return O(qe);
+      return b(Be);
     case "area":
-      return O(Be);
+      return b(Re);
     case "bar":
-      return O(Re);
+      return b(je);
     case "column":
-      return O(je);
+      return b(Qe);
     case "polar":
-      return O(Qe);
+      return b(Ue);
     case "pie":
-      return l(Ue);
-    case "funnel":
       return l(ze);
+    case "funnel":
+      return l(Ye);
     case "treemap":
-      return l(Je);
-    case "calendar-heatmap":
       return l(Ke);
-    case "sunburst":
+    case "calendar-heatmap":
       return l(Ve);
-    case "scatter":
+    case "sunburst":
       return l(He);
+    case "scatter":
+      return l(Ze);
     case "scattermap":
-      return l(Ge);
-    case "areamap":
       return l(Xe);
-    case "boxplot":
+    case "areamap":
       return l(et);
+    case "boxplot":
+      return l(tt);
     case "table":
-      return l(Ze);
+      return l(Ge);
     case "pivot":
-      return l(Ye);
+      return l(Je);
     case "pivot2":
       return {};
     case "image":
@@ -1040,17 +1040,17 @@ function tt(e) {
       return {};
   }
 }
-const L = `
-`, P = "UNKNOWN", rt = (e, t) => {
+const _ = `
+`, k = "UNKNOWN", it = (e, t) => {
   let r = "";
   return r += `measureFactory.customFormula(
-`, r += " ".repeat(t), r += `  '${T(e.title)}',
+`, r += " ".repeat(t), r += `  '${v(e.title)}',
 `, r += " ".repeat(t), r += `  '${e.formula}',
 `, r += " ".repeat(t), r += `  {
 `, Object.entries(e.context).forEach(([i, a]) => {
-    const n = X(
-      a.table || P,
-      a.column || P,
+    const n = te(
+      a.table || k,
+      a.column || k,
       void 0,
       "DM"
     );
@@ -1058,43 +1058,43 @@ const L = `
 `;
   }), r += " ".repeat(t), r += `  }
 `, r += " ".repeat(t), r += ")", r;
-}, it = (e) => {
+}, at = (e) => {
   const { level: t, table: r, column: i, agg: a, title: n } = e;
   let s;
-  return r && i && (s = X(r, i, t, "DM")), a && r && i && n && (s = `measureFactory.${G.aggregationFromJAQL(
+  return r && i && (s = te(r, i, t, "DM")), a && r && i && n && (s = `measureFactory.${ee.aggregationFromJAQL(
     a
-  )}(${s}, '${T(n)}')`), s || P;
-}, at = (e, t) => {
+  )}(${s}, '${v(n)}')`), s || k;
+}, nt = (e, t) => {
   const r = e.jaql(!1).jaql;
-  return "formula" in r ? rt(r, t) : it(r);
+  return "formula" in r ? it(r, t) : at(r);
 }, g = (e, t = 0, r = !1) => {
   if (!e)
     return "";
   if (typeof e == "string")
-    return `'${T(e)}'`;
+    return `'${v(e)}'`;
   if (e instanceof ue)
-    return at(e, t);
+    return nt(e, t);
   if (e instanceof Te)
     return e.composeCode || "";
   let i = "";
-  return Array.isArray(e) ? i += `[${e.map((a) => g(a, t + 2))}${e.length ? L + " ".repeat(t + 2) : ""}]` : (i += `{${L}`, Object.entries(e).forEach(([a, n]) => {
-    if (r && typeof a == "string" && (a = `'${T(a)}'`), i += " ".repeat(t + 2), Array.isArray(n))
-      i += `${a}: [${n.map((s) => g(s, t + 4, r))}${n.length ? L + " ".repeat(t + 2) : ""}]`;
+  return Array.isArray(e) ? i += `[${e.map((a) => g(a, t + 2))}${e.length ? _ + " ".repeat(t + 2) : ""}]` : (i += `{${_}`, Object.entries(e).forEach(([a, n]) => {
+    if (r && typeof a == "string" && (a = `'${v(a)}'`), i += " ".repeat(t + 2), Array.isArray(n))
+      i += `${a}: [${n.map((s) => g(s, t + 4, r))}${n.length ? _ + " ".repeat(t + 2) : ""}]`;
     else if (typeof n == "object" && n !== null) {
-      const s = Array.isArray(n) ? n : Ae(n);
+      const s = Array.isArray(n) ? n : Ie(n);
       i += `${a}: ${g(s, t + 2, r)}`;
-    } else ["number", "boolean", "undefined"].includes(typeof n) || n === null ? i += `${a}: ${n}` : typeof n == "string" ? i += `${a}: '${T(n)}'` : i += `${a}: ${n}`;
-    i += `,${L}`;
+    } else ["number", "boolean", "undefined"].includes(typeof n) || n === null ? i += `${a}: ${n}` : typeof n == "string" ? i += `${a}: '${v(n)}'` : i += `${a}: ${n}`;
+    i += `,${_}`;
   }), i += " ".repeat(t), i += "}"), i;
 };
-function F(e, t) {
+function B(e, t) {
   if (t === void 0 || t && typeof t == "object" && !Array.isArray(t) && Object.keys(t).length === 0)
     return e;
-  if (!W(e, t)) {
+  if (!q(e, t)) {
     if (e && typeof e == "object" && !Array.isArray(e)) {
       const r = {};
       for (const i of Object.keys(e)) {
-        const a = F(e[i], t == null ? void 0 : t[i]), n = t && Object.prototype.hasOwnProperty.call(t, i), s = n ? t[i] : void 0;
+        const a = B(e[i], t == null ? void 0 : t[i]), n = t && Object.prototype.hasOwnProperty.call(t, i), s = n ? t[i] : void 0;
         (a !== void 0 || !n || e[i] === void 0 && s !== void 0) && (r[i] = a);
       }
       return Object.keys(r).length ? r : void 0;
@@ -1102,127 +1102,127 @@ function F(e, t) {
     return e;
   }
 }
-function j(e, t) {
+function J(e, t) {
   if (!e || Object.keys(e).length === 0)
     return {};
-  const r = tt(t);
-  if (W(e, r))
+  const r = rt(t);
+  if (q(e, r))
     return {};
-  const i = F(e, r);
+  const i = B(e, r);
   return i != null ? i : {};
 }
-function Q(e, t) {
+function K(e, t) {
   const r = Ne(t);
-  if (W(e, r))
+  if (q(e, r))
     return e;
-  const i = F(e, r);
+  const i = B(e, r);
   return i != null ? i : {};
 }
-function nt(e) {
-  return g(e, I);
+function st(e) {
+  return g(e, M);
 }
-function U(e, t = "data-source-placeholder") {
+function V(e, t = "data-source-placeholder") {
   if (!e)
     return t;
   const r = typeof e == "object" && "title" in e ? e.title : e;
-  return Ce(r);
+  return De(r);
 }
-function z(e, t = !0) {
+function H(e, t = !0) {
   const r = [];
   return t && r.push("measureFactory"), m(e) && r.push("filterFactory"), r.length > 0 ? `import { ${r.join(", ")} } from '@sisense/sdk-data';` : "";
 }
-const Y = `
-`, st = (e, t) => {
+const Z = `
+`, ot = (e, t) => {
   if (e.composeCode)
-    return `${Y}${" ".repeat(t)}${e.composeCode}`;
+    return `${Z}${" ".repeat(t)}${e.composeCode}`;
   const r = e.jaql().jaql;
-  return `${Y}${" ".repeat(t)}filterFactory.customFilter(${g(
+  return `${Z}${" ".repeat(t)}filterFactory.customFilter(${g(
     r,
     t,
     !0
   )})`;
-}, ot = (e, t = 0) => {
+}, lt = (e, t = 0) => {
   if (!e)
     return "";
   let r = "";
-  return r += `[${e.map((i) => st(i, t + 2))}${e.length ? `
+  return r += `[${e.map((i) => ot(i, t + 2))}${e.length ? `
 ` + " ".repeat(t + 2) : ""}]`, r;
-}, J = (e) => e ? Array.isArray(e) ? ot(e, 6) : "/** Filter relations not supported yet */" : "[]", lt = ["executeQueryByWidgetIdTmpl", "widgetByIdTmpl"], dt = "chartWidgetTmpl", ct = "pivotTableWidgetTmpl", ut = (e) => e, pt = ({
+}, G = (e) => e ? Array.isArray(e) ? lt(e, 6) : "/** Filter relations not supported yet */" : "[]", dt = ["executeQueryByWidgetIdTmpl", "widgetByIdTmpl"], ct = "chartWidgetTmpl", ut = "pivotTableWidgetTmpl", pt = (e) => e, mt = ({
   dashboardOid: e,
   widgetOid: t,
   uiFramework: r = "react",
   chartType: i = "table",
   includeChart: a = !0
 }) => {
-  ee(i);
-  const n = { dashboardOid: e, widgetOid: t }, s = lt[Number(a)];
-  return M(s, n, r);
-}, mt = (e, t, r, i) => {
+  re(i);
+  const n = { dashboardOid: e, widgetOid: t }, s = dt[Number(a)];
+  return N(s, n, r);
+}, gt = (e, t, r, i) => {
   if (ge(e)) {
-    ee(e.chartType);
-    const a = R(e), n = {
+    re(e.chartType);
+    const a = Y(e), n = {
       idString: e.id,
       widgetTypeString: "chart",
       titleString: e.title,
-      dataSourceString: U(e.dataSource),
-      chartTypeString: ut(e.chartType),
-      dataOptionsString: nt(
-        i ? Q(e.dataOptions, e.chartType) : e.dataOptions
+      dataSourceString: V(e.dataSource),
+      chartTypeString: pt(e.chartType),
+      dataOptionsString: st(
+        i ? K(e.dataOptions, e.chartType) : e.dataOptions
       ),
-      filtersString: J(e.filters),
+      filtersString: G(e.filters),
       componentString: "ChartWidget",
-      extraImportsString: z(e.filters || [], a),
+      extraImportsString: H(e.filters || [], a),
       styleOptionsString: g(
-        i ? j(e.styleOptions || {}, e.chartType) : e.styleOptions || {},
-        I
+        i ? J(e.styleOptions || {}, e.chartType) : e.styleOptions || {},
+        M
       ),
       drilldownOptionsString: g(
         e.drilldownOptions || {},
-        I
+        M
       )
     };
-    return M(r.chart, n, t);
+    return N(r.chart, n, t);
   }
   if (fe(e)) {
-    const a = R(e), n = {
+    const a = Y(e), n = {
       idString: e.id,
       widgetTypeString: "pivot",
       titleString: e.title,
-      dataSourceString: U(e.dataSource),
+      dataSourceString: V(e.dataSource),
       dataOptionsString: g(
-        i ? Q(e.dataOptions, e.widgetType) : e.dataOptions
+        i ? K(e.dataOptions, e.widgetType) : e.dataOptions
       ),
-      filtersString: J(e.filters),
+      filtersString: G(e.filters),
       componentString: "PivotTableWidget",
-      extraImportsString: z(e.filters || [], a),
+      extraImportsString: H(e.filters || [], a),
       styleOptionsString: g(
-        i ? j(e.styleOptions || {}, e.widgetType) : e.styleOptions || {},
-        I
+        i ? J(e.styleOptions || {}, e.widgetType) : e.styleOptions || {},
+        M
       )
     };
-    return M(r.pivot, n, t);
+    return N(r.pivot, n, t);
   }
   if (ye(e))
     return "/** Custom widget code not supported yet */";
-  throw new b("errors.otherWidgetTypesNotSupported");
-}, gt = ({
+  throw new T("errors.otherWidgetTypesNotSupported");
+}, ft = ({
   widgetProps: e,
   uiFramework: t = "react",
   removeDefaultProps: r = !1
-}) => mt(e, t, {
-  chart: dt,
-  pivot: ct
+}) => gt(e, t, {
+  chart: ct,
+  pivot: ut
 }, r);
-function ft(e) {
+function yt(e) {
   return !!(e && (e.top !== void 0 || e.bottom !== void 0));
 }
-const yt = (e) => {
+const St = (e) => {
   const t = e.find((r) => r.panel === "rows");
   return t ? e.map((r) => {
     const i = r.jaql.filter;
-    if (!(r.panel === "scope" && ft(i) && i.by === void 0))
+    if (!(r.panel === "scope" && yt(i) && i.by === void 0))
       return r;
-    const c = r.jaql, { type: n, context: s, formula: u, filter: d } = c, f = q(c, ["type", "context", "formula", "filter"]);
+    const c = r.jaql, { type: n, context: s, formula: u, filter: d } = c, f = U(c, ["type", "context", "formula", "filter"]);
     return p(o({}, r), {
       jaql: o({
         // Copy dimension properties from rows dimension
@@ -1241,12 +1241,12 @@ const yt = (e) => {
       }, f)
     });
   }) : e;
-}, Ft = (e) => "chartType" in e.chartRecommendations ? e.chartRecommendations : {
+}, $t = (e) => "chartType" in e.chartRecommendations ? e.chartRecommendations : {
   chartType: "table",
   chartFamily: "table",
   axesMapping: {}
-}, St = (e) => ({
-  dataOptions: { columns: e.map(Z) }
+}, Ot = (e) => ({
+  dataOptions: { columns: e.map(X) }
 }), ht = Object.freeze({
   convolution: {
     enabled: !0,
@@ -1266,31 +1266,35 @@ const yt = (e) => {
   xAxis: {
     gridLines: !1
   }
-}), K = Object.freeze({
+}), F = Object.freeze({
+  area: "area/stacked",
+  arearange: "arearange/spline",
+  bar: "bar/stacked",
+  boxplot: "boxplot/full",
+  column: "column/stackedcolumn",
   line: "line/spline",
   pie: "pie/donut",
-  bar: "bar/stacked",
-  column: "column/stackedcolumn"
-}), Ot = (e, t, r) => {
+  polar: "polar/column"
+}), bt = (e, t, r) => {
   const i = e.reduce((n, s) => (n[s.jaql.title] = s, n), {}), a = Object.entries(r).reduce((n, s) => {
     const [u, d] = s;
     return n[`${u}`] = Array.isArray(d) ? d.map((f) => {
-      var v, E;
-      const c = _(f);
+      var x, E;
+      const c = W(f);
       delete c.enabled;
       const y = i[c.column.name];
       if (!y) return { column: { type: "", name: c.column.name } };
-      const S = Z(y);
+      const S = X(y);
       if (y.panel === "measures")
         return p(o({}, c), {
           column: S
         });
       if (ve(S.type)) {
-        const x = (E = (v = y.format) == null ? void 0 : v.mask) == null ? void 0 : E[y.jaql.level];
-        if (x)
+        const C = y.jaql, D = C.dateTimeLevel || C.level, w = D ? (E = (x = y.format) == null ? void 0 : x.mask) == null ? void 0 : E[D] : void 0;
+        if (w)
           return p(o({}, c), {
             column: S,
-            dateFormat: x
+            dateFormat: w
           });
       }
       return p(o({}, c), { column: S });
@@ -1317,25 +1321,72 @@ const yt = (e) => {
         n !== "geo" && (a[`${n}`] = a[`${n}`][0]);
       }), a;
     case "table":
-      return Object.keys(a).length === 0 ? St(e).dataOptions : a;
+      return Object.keys(a).length === 0 ? Ot(e).dataOptions : a;
     case "boxplot":
     case "areamap":
     case "indicator":
     default:
       return a;
   }
-}, V = (e, t) => {
+}, h = (e, t) => {
   var r, i, a, n;
-  return t === "x" ? (i = (r = e.category) != null ? r : e.x) == null ? void 0 : i.map((s) => _(s).column.name).join(", ") : (n = (a = e.value) != null ? a : e.y) == null ? void 0 : n.map((s) => _(s).column.name).join(", ");
-}, H = (e, t) => {
+  return t === "x" ? (i = (r = e.category) != null ? r : e.x) == null ? void 0 : i.map((s) => W(s).column.name).join(", ") : (n = (a = e.value) != null ? a : e.y) == null ? void 0 : n.map((s) => W(s).column.name).join(", ");
+}, $ = (e, t) => {
+  var r;
+  return (r = e[t]) == null ? void 0 : r.map((i) => W(i).column.name).join(", ");
+}, Nt = (e, t) => {
   var r;
-  return (r = e[t]) == null ? void 0 : r.map((i) => _(i).column.name).join(", ");
-}, bt = (e, t, r, i) => {
+  if (e in F) {
+    const i = F[`${e}`];
+    return xe(e) ? {
+      subtype: i,
+      yAxis: {
+        title: {
+          enabled: !0,
+          text: h(t, "y")
+        }
+      },
+      xAxis: {
+        title: {
+          enabled: !0,
+          text: h(t, "x")
+        }
+      }
+    } : { subtype: i };
+  }
+  if (e === "scatter")
+    return {
+      xAxis: {
+        title: {
+          enabled: !0,
+          text: h(t, "x")
+        }
+      },
+      yAxis: {
+        title: {
+          enabled: !0,
+          text: h(t, "y")
+        }
+      }
+    };
+  if (e === "indicator") {
+    const i = {
+      title: {
+        shouldBeShown: !0,
+        text: (r = $(t, "value")) != null ? r : ""
+      }
+    }, a = $(t, "secondary");
+    return a && (i.secondaryTitle = {
+      text: a
+    }), { indicatorComponents: i };
+  }
+  return {};
+}, Tt = (e, t, r, i) => {
   let a;
-  if (i && e in K)
-    a = w(
-      w(ht, {
-        subtype: K[`${e}`]
+  if (i && e in F)
+    a = I(
+      I(ht, {
+        subtype: F[`${e}`]
       }),
       {
         legend: {
@@ -1345,13 +1396,13 @@ const yt = (e) => {
         yAxis: {
           title: {
             enabled: !0,
-            text: V(t, "y")
+            text: h(t, "y")
           }
         },
         xAxis: {
           title: {
             enabled: !0,
-            text: V(t, "x")
+            text: h(t, "x")
           }
         }
       },
@@ -1362,27 +1413,27 @@ const yt = (e) => {
       indicatorComponents: {
         title: {
           shouldBeShown: !0,
-          text: H(t, "value")
+          text: $(t, "value")
         }
       }
-    }, s = H(t, "secondary");
+    }, s = $(t, "secondary");
     s && (n != null && n.indicatorComponents) && (n.indicatorComponents.secondaryTitle = {
       text: s
-    }), a = w(
-      B(),
+    }), a = I(
+      z(),
       n,
       r
     );
   } else
-    a = w(B(), r);
+    a = I(z(), r);
   return a;
-}, Tt = (e, t, r = !0) => {
+}, vt = (e, t, r = !0) => {
   const {
     chartFamily: i,
     chartType: a,
     axesMapping: n = {},
     styleOptions: s = {}
-  } = t, u = Ot(e, i, n), d = bt(
+  } = t, u = bt(e, i, n), d = Tt(
     a,
     n,
     s,
@@ -1392,11 +1443,11 @@ const yt = (e) => {
     dataOptions: u,
     chartStyleOptions: d
   };
-}, vt = (e) => "chartType" in e ? e : {
+}, xt = (e) => "chartType" in e ? e : {
   chartType: "table",
   chartFamily: "table",
   axesMapping: {}
-}, Et = (e) => e.map((t) => Ee(t.jaql)), xt = (e) => e.reduce(
+}, Et = (e) => e.map((t) => Ee(t.jaql)), Ct = (e) => e.reduce(
   (t, r) => {
     if ((r.panel === "scope" || r.jaql.filter) && t.metadataFilters.push(l(r)), r.panel !== "scope") {
       const i = l(r);
@@ -1405,21 +1456,21 @@ const yt = (e) => {
     return t;
   },
   { metadataColumns: [], metadataFilters: [] }
-), Ct = (e, t) => {
-  if (!De(e))
+), Dt = (e, t) => {
+  if (!we(e))
     try {
-      const { useCustomizedStyleOptions: r = !1 } = t || {}, { jaql: i, chartRecommendations: a, queryTitle: n } = e, { metadata: s, datasource: u } = i, d = p(o({}, u), { type: u.type || "elasticube" }), f = xe(d), y = yt(s).map((C) => Fe(C)).map((C) => p(o({}, C), {
-        jaql: p(o({}, C.jaql), {
+      const { useCustomizedStyleOptions: r = !1 } = t || {}, { jaql: i, chartRecommendations: a, queryTitle: n } = e, { metadata: s, datasource: u } = i, d = p(o({}, u), { type: u.type || "elasticube" }), f = Ce(d), y = St(s).map((L) => $e(L)).map((L) => p(o({}, L), {
+        jaql: p(o({}, L.jaql), {
           datasource: f
         })
-      })), S = vt(a), v = S.chartType.toLowerCase(), E = {
+      })), S = xt(a), x = S.chartType.toLowerCase(), E = {
         cornerRadius: "Small",
         header: {
           // remove info button and render empty toolbar instead
           renderToolbar: () => null
         }
-      }, { metadataColumns: x, metadataFilters: ie } = xt(y), ae = Et(ie), { dataOptions: ne, chartStyleOptions: se } = Tt(
-        x,
+      }, { metadataColumns: C, metadataFilters: D } = Ct(y), w = Et(D), { dataOptions: ne, chartStyleOptions: se } = vt(
+        C,
         S,
         r
       ), oe = o(o({}, se), E);
@@ -1427,39 +1478,40 @@ const yt = (e) => {
         widgetType: "chart",
         id: n,
         title: n,
-        chartType: v,
+        chartType: x,
         dataSource: d,
         dataOptions: ne,
-        filters: ae,
+        filters: w,
         styleOptions: oe
       };
     } catch (r) {
       console.error(r);
       return;
     }
-}, Dt = (e, t) => Ct(e, t), wt = (e) => pe(e) ? pt(e) : gt(e), Nt = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, wt = (e, t) => Dt(e, t), Lt = (e) => pe(e) ? mt(e) : ft(e), kt = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  toWidgetCode: wt,
-  toWidgetProps: Dt
+  toWidgetCode: Lt,
+  toWidgetProps: wt
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  I as C,
+  M as C,
   g as a,
-  M as b,
+  N as b,
   Mt as c,
-  R as d,
-  U as e,
-  J as f,
-  mt as g,
-  z as h,
-  Fe as i,
-  Ft as j,
-  Ot as k,
-  bt as l,
+  Y as d,
+  V as e,
+  G as f,
+  gt as g,
+  H as h,
+  $e as i,
+  $t as j,
+  bt as k,
+  Nt as l,
   Tt as m,
+  vt as n,
   Me as p,
-  Pt as s,
-  Dt as t,
-  Wt as v,
-  Nt as w
+  Wt as s,
+  wt as t,
+  Ft as v,
+  kt as w
 };