@sisense/sdk-ui 2.6.0 → 2.7.0

package/dist/{widget-composer-I9gUFBZt.js → widget-composer-B4eAv2pf.js}

@@ -1,20 +1,29 @@
-var tt = Object.defineProperty, et = Object.defineProperties;
-var rt = Object.getOwnPropertyDescriptors;
-var $ = Object.getOwnPropertySymbols;
-var it = Object.prototype.hasOwnProperty, at = Object.prototype.propertyIsEnumerable;
-var j = (t, e, r) => e in t ? tt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, o = (t, e) => {
+var at = Object.defineProperty, st = Object.defineProperties;
+var nt = Object.getOwnPropertyDescriptors;
+var E = Object.getOwnPropertySymbols;
+var P = Object.prototype.hasOwnProperty, L = Object.prototype.propertyIsEnumerable;
+var $ = (t, e, r) => e in t ? at(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, o = (t, e) => {
   for (var r in e || (e = {}))
-    it.call(e, r) && j(t, r, e[r]);
-  if ($)
-    for (var r of $(e))
-      at.call(e, r) && j(t, r, e[r]);
+    P.call(e, r) && $(t, r, e[r]);
+  if (E)
+    for (var r of E(e))
+      L.call(e, r) && $(t, r, e[r]);
   return t;
-}, u = (t, e) => et(t, rt(e));
-import { eb as st, au as nt, ec as ot, ed as lt, e5 as _, w as dt, m as C, T as S, ee as ct, aU as N, dM as ut, ef as O, e7 as z, aD as pt, b5 as mt, b4 as gt, aL as I, at as yt, n as M, eg as ft, a8 as ht, bN as L, eh as St } from "./derive-chart-family-BPYK8evJ.js";
-class J extends _ {
+}, c = (t, e) => st(t, nt(e));
+var A = (t, e) => {
+  var r = {};
+  for (var i in t)
+    P.call(t, i) && e.indexOf(i) < 0 && (r[i] = t[i]);
+  if (t != null && E)
+    for (var i of E(t))
+      e.indexOf(i) < 0 && L.call(t, i) && (r[i] = t[i]);
+  return r;
+};
+import { eb as ot, ec as lt, ed as dt, ee as ct, e5 as J, w as ut, m as q, T as S, ef as pt, aU as K, dM as mt, eg as O, e7 as U, aD as gt, b5 as yt, b4 as ft, aL as I, at as ht, n as M, eh as St, a8 as Ot, bN as Q, ei as Tt } from "./derive-chart-family-DvYmrG1k.js";
+class Y extends J {
   constructor(e, r) {
     var i;
-    super((i = e.jaql.title) !== null && i !== void 0 ? i : "", r), this.__serializable = "JaqlElement", this.expression = e.jaql.dim || e.jaql.formula, this.metadataItem = e, e.jaql.agg ? this.aggregation = e.jaql.agg : delete this.aggregation, e.jaql.formula ? this.formula = e.jaql.formula : delete this.formula, e.jaql.sort ? this.sortType = dt(e.jaql.sort) : delete this.sortType, this.skipValidation = !0;
+    super((i = e.jaql.title) !== null && i !== void 0 ? i : "", r), this.__serializable = "JaqlElement", this.expression = e.jaql.dim || e.jaql.formula, this.metadataItem = e, e.jaql.agg ? this.aggregation = e.jaql.agg : delete this.aggregation, e.jaql.formula ? this.formula = e.jaql.formula : delete this.formula, e.jaql.sort ? this.sortType = ut(e.jaql.sort) : delete this.sortType, this.skipValidation = !0;
   }
   get id() {
     return this.expression;
@@ -30,21 +39,21 @@ class J extends _ {
     return e.metadataItem = this.metadataItem, e.type = this.type, e;
   }
 }
-const Ot = {
-  text: C.TextAttribute,
-  numeric: C.NumericAttribute,
-  datetime: C.DateLevel
-}, ae = (t) => t && t.__serializable === "JaqlElement";
-function Tt(t) {
+const bt = {
+  text: q.TextAttribute,
+  numeric: q.NumericAttribute,
+  datetime: q.DateLevel
+}, le = (t) => t && t.__serializable === "JaqlElement";
+function vt(t) {
   var e;
-  return new J(t, (e = Ot[t.jaql.datatype]) !== null && e !== void 0 ? e : "numeric");
+  return new Y(t, (e = bt[t.jaql.datatype]) !== null && e !== void 0 ? e : "numeric");
 }
-function K(t) {
+function V(t) {
   const { jaql: e } = t;
   if (e.formula)
-    return st(e);
-  const r = nt.translateJaqlToGranularity(e);
-  return "agg" in e && e.dim && e.datatype ? ot({
+    return ot(e);
+  const r = lt(e);
+  return "agg" in e && e.dim && e.datatype ? dt({
     expression: e.dim,
     dataType: e.datatype,
     agg: e.agg || "",
@@ -53,7 +62,7 @@ function K(t) {
     sort: e.sort,
     title: e.title,
     dataSource: e.datasource
-  }) : e.dim && e.datatype ? lt({
+  }) : e.dim && e.datatype ? ct({
     expression: e.dim,
     dataType: e.datatype,
     granularity: r,
@@ -61,9 +70,9 @@ function K(t) {
     title: e.title,
     panel: t.panel,
     dataSource: e.datasource
-  }) : Tt(t);
+  }) : vt(t);
 }
-const se = {
+const de = {
   jaql: {
     datasource: {
       title: "",
@@ -73,23 +82,23 @@ const se = {
   },
   queryTitle: "",
   chartRecommendations: {}
-}, ne = {
+}, ce = {
   model: "",
   metadata: [],
   chart: {},
   queryTitle: ""
-}, oe = (t) => "widgetProps" in t, bt = (t) => "dashboardOid" in t && "widgetOid" in t, le = (t) => "dashboardProps" in t, de = (t) => "dashboardOid" in t;
-function vt(t) {
+}, ue = (t) => "widgetProps" in t, xt = (t) => "dashboardOid" in t && "widgetOid" in t, pe = (t) => "dashboardProps" in t, me = (t) => "dashboardOid" in t;
+function Et(t) {
   return t.replace(/\s+/g, "-").replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
 }
-function ce(t) {
+function ge(t) {
   return t.charAt(0).toUpperCase() + t.slice(1);
 }
-function ue(t) {
+function ye(t) {
   const e = /\[(.+?)\s\(Calendar\)\]/;
   return t.replace(e, "[$1]").trim();
 }
-function pe(t) {
+function fe(t) {
   if (t)
     if (t.metadata) {
       if (!t.model)
@@ -100,12 +109,12 @@ function pe(t) {
     throw new S("errors.emptyModel");
   return t;
 }
-function xt(t) {
+function Dt(t) {
   return !t || !t.jaql.datasource.title || !t.jaql.metadata.length;
 }
-function U(t) {
+function H(t) {
   if (![
-    ...ct,
+    ...pt,
     "pivot",
     "pivot2"
   ].includes(t))
@@ -113,21 +122,21 @@ function U(t) {
       chartType: t
     });
 }
-function Et(t) {
+function wt(t) {
   return "widgetType" in t && t.widgetType === "pivot";
 }
 function h(t) {
   var e;
   return "column" in t && ((e = t.column) == null ? void 0 : e.expression) && /\(.*\)/.test(t.column.expression);
 }
-function A(t) {
-  const e = "measures" in t && c(t.measures) || "values" in t && c(t.values);
-  return Et(t) ? "values" in t.dataOptions && c(t.dataOptions.values) : "chartType" in t ? t.chartType === "indicator" ? "value" in t.dataOptions && c(t.dataOptions.value) || "secondary" in t.dataOptions && c(t.dataOptions.secondary) : t.chartType === "table" ? !("columns" in t.dataOptions) || !c(t.dataOptions.columns) ? !1 : t.dataOptions.columns.some((i) => h(i)) : t.chartType === "boxplot" ? !1 : t.chartType === "scatter" ? "x" in t.dataOptions && t.dataOptions.x !== void 0 && h(t.dataOptions.x) || "y" in t.dataOptions && t.dataOptions.y !== void 0 && h(t.dataOptions.y) || "size" in t.dataOptions && t.dataOptions.size !== void 0 : t.chartType === "scattermap" ? "colorBy" in t.dataOptions && t.dataOptions.colorBy !== void 0 && h(t.dataOptions.colorBy) || "details" in t.dataOptions && t.dataOptions.details !== void 0 && h(t.dataOptions.details) || "size" in t.dataOptions && t.dataOptions.size !== void 0 && h(t.dataOptions.size) : t.chartType === "areamap" ? "geo" in t.dataOptions && c(t.dataOptions.geo) && "color" in t.dataOptions && c(t.dataOptions.color) : "value" in t.dataOptions && c(t.dataOptions.value) : e;
+function k(t) {
+  const e = "measures" in t && p(t.measures) || "values" in t && p(t.values);
+  return wt(t) ? "values" in t.dataOptions && p(t.dataOptions.values) : "chartType" in t ? t.chartType === "indicator" ? "value" in t.dataOptions && p(t.dataOptions.value) || "secondary" in t.dataOptions && p(t.dataOptions.secondary) : t.chartType === "table" ? !("columns" in t.dataOptions) || !p(t.dataOptions.columns) ? !1 : t.dataOptions.columns.some((i) => h(i)) : t.chartType === "boxplot" ? !1 : t.chartType === "scatter" ? "x" in t.dataOptions && t.dataOptions.x !== void 0 && h(t.dataOptions.x) || "y" in t.dataOptions && t.dataOptions.y !== void 0 && h(t.dataOptions.y) || "size" in t.dataOptions && t.dataOptions.size !== void 0 : t.chartType === "scattermap" ? "colorBy" in t.dataOptions && t.dataOptions.colorBy !== void 0 && h(t.dataOptions.colorBy) || "details" in t.dataOptions && t.dataOptions.details !== void 0 && h(t.dataOptions.details) || "size" in t.dataOptions && t.dataOptions.size !== void 0 && h(t.dataOptions.size) : t.chartType === "areamap" ? "geo" in t.dataOptions && p(t.dataOptions.geo) && "color" in t.dataOptions && p(t.dataOptions.color) : "value" in t.dataOptions && p(t.dataOptions.value) : e;
 }
-function c(t) {
+function p(t) {
   return Array.isArray(t) && t.length > 0;
 }
-function Dt(t) {
+function Ct(t) {
   const e = t.split(`
 `);
   for (let r = 0; r < e.length - 1; r++)
@@ -141,7 +150,7 @@ function Dt(t) {
   return e.join(`
 `);
 }
-function wt(t) {
+function qt(t) {
   const e = (i) => /^[$A-Z_][0-9A-Z_$]*$/i.test(i);
   if ("composeCode" in t)
     return t;
@@ -152,7 +161,7 @@ function wt(t) {
   }
   return r;
 }
-const Ct = {
+const Mt = {
   react: {
     baseChartTmpl: `import { {{componentString}} } from '@sisense/sdk-ui';
 {{extraImportsString}}
@@ -611,10 +620,10 @@ import { DashboardById } from '@sisense/sdk-ui-vue';
 </template>`,
     dashboardTmpl: "/** COMING SOON */"
   }
-}, Y = (t, e) => Ct[e][t].replace(/{{(.*?)Tmpl}}/g, (i, a) => Y(`${a}Tmpl`, e)), Mt = (t, e) => t.replace(/{{(.*?)}}/g, (r, i) => i in e ? e[i] : (console.warn(`Placeholder ${i} not found in data`), r)), q = (t, e, r = "react") => {
-  const i = Y(t, r);
-  return Dt(Mt(i, e));
-}, It = () => Object.values(ut).map((e) => N.aggregationToJAQL(e)).join("|"), V = (t) => {
+}, G = (t, e) => Mt[e][t].replace(/{{(.*?)Tmpl}}/g, (i, a) => G(`${a}Tmpl`, e)), It = (t, e) => t.replace(/{{(.*?)}}/g, (r, i) => i in e ? e[i] : (console.warn(`Placeholder ${i} not found in data`), r)), j = (t, e, r = "react") => {
+  const i = G(t, r);
+  return Ct(It(i, e));
+}, jt = () => Object.values(mt).map((e) => K.aggregationToJAQL(e)).join("|"), Z = (t) => {
   const { formula: e, context: r, filter: i } = t;
   if (!r || !e)
     return t;
@@ -624,9 +633,9 @@ import { DashboardById } from '@sisense/sdk-ui-vue';
   const s = a[0];
   if (typeof s != "string")
     return t;
-  const n = r[`${s}`], m = It(), l = new RegExp(`^\\s*(${m})\\(\\[\\w+\\]\\)$`), y = e.match(l);
-  if (y && e.includes(s)) {
-    const d = y[1];
+  const n = r[`${s}`], u = jt(), l = new RegExp(`^\\s*(${u})\\(\\[\\w+\\]\\)$`), g = e.match(l);
+  if (g && e.includes(s)) {
+    const d = g[1];
     return o({
       dim: n.dim,
       table: n.table,
@@ -639,162 +648,162 @@ import { DashboardById } from '@sisense/sdk-ui-vue';
     } : {});
   }
   return t;
-}, D = (t) => {
+}, w = (t) => {
   let e = t;
-  if ("formula" in t && (e = V(t)), "context" in e) {
+  if ("formula" in t && (e = Z(t)), "context" in e) {
     const r = o({}, e.context);
     Object.keys(r).forEach((i) => {
-      r[`${i}`] = D(r[`${i}`]);
+      r[`${i}`] = w(r[`${i}`]);
     }), e.context = r;
   }
   return e;
-}, qt = (t) => {
+}, Wt = (t) => {
   var i;
   const e = t;
   if (e.panel !== "scope")
     return e;
   const { jaql: r } = e;
-  return (i = r.filter) != null && i.by && (r.filter.by = V(r.filter.by)), u(o({}, e), {
+  return (i = r.filter) != null && i.by && (r.filter.by = Z(r.filter.by)), c(o({}, e), {
     jaql: r
   });
-}, Wt = (t) => {
+}, $t = (t) => {
   let e = t;
-  e = qt(e);
+  e = Wt(e);
   const { jaql: r, measure: i, by: a } = e;
-  return o(o(u(o({}, e), {
-    jaql: D(r)
+  return o(o(c(o({}, e), {
+    jaql: w(r)
   }), a ? {
-    by: D(a)
+    by: w(a)
   } : {}), i ? {
-    measure: D(i)
+    measure: w(i)
   } : {});
-}, w = 6, E = `
-`, W = "UNKNOWN", $t = (t, e) => {
+}, C = 6, D = `
+`, W = "UNKNOWN", Pt = (t, e) => {
   let r = "";
   return r += `measureFactory.customFormula(
 `, r += " ".repeat(e), r += `  '${O(t.title)}',
 `, r += " ".repeat(e), r += `  '${t.formula}',
 `, r += " ".repeat(e), r += `  {
 `, Object.entries(t.context).forEach(([i, a]) => {
-    const s = z(a.table || W, a.column || W, void 0, "DM");
+    const s = U(a.table || W, a.column || W, void 0, "DM");
     r += " ".repeat(e), r += `    '${i.slice(1, -1)}': ${s},
 `;
   }), r += " ".repeat(e), r += `  }
 `, r += " ".repeat(e), r += ")", r;
-}, jt = (t) => {
+}, Lt = (t) => {
   const { level: e, table: r, column: i, agg: a, title: s } = t;
   let n;
-  return r && i && (n = z(r, i, e, "DM")), a && r && i && s && (n = `measureFactory.${N.aggregationFromJAQL(a)}(${n}, '${O(s)}')`), n || W;
-}, Lt = (t, e) => {
+  return r && i && (n = U(r, i, e, "DM")), a && r && i && s && (n = `measureFactory.${K.aggregationFromJAQL(a)}(${n}, '${O(s)}')`), n || W;
+}, At = (t, e) => {
   const r = t.jaql(!1).jaql;
-  return "formula" in r ? $t(r, e) : jt(r);
-}, p = (t, e = 0, r = !1) => {
+  return "formula" in r ? Pt(r, e) : Lt(r);
+}, m = (t, e = 0, r = !1) => {
   if (!t)
     return "";
   if (typeof t == "string")
     return `'${O(t)}'`;
+  if (t instanceof Y)
+    return At(t, e);
   if (t instanceof J)
-    return Lt(t, e);
-  if (t instanceof _)
     return t.composeCode || "";
   let i = "";
-  return Array.isArray(t) ? i += `[${t.map((a) => p(a, e + 2))}${t.length ? E + " ".repeat(e + 2) : ""}]` : (i += `{${E}`, Object.entries(t).forEach(([a, s]) => {
+  return Array.isArray(t) ? i += `[${t.map((a) => m(a, e + 2))}${t.length ? D + " ".repeat(e + 2) : ""}]` : (i += `{${D}`, Object.entries(t).forEach(([a, s]) => {
     if (r && typeof a == "string" && (a = `'${O(a)}'`), i += " ".repeat(e + 2), Array.isArray(s))
-      i += `${a}: [${s.map((n) => p(n, e + 4, r))}${s.length ? E + " ".repeat(e + 2) : ""}]`;
+      i += `${a}: [${s.map((n) => m(n, e + 4, r))}${s.length ? D + " ".repeat(e + 2) : ""}]`;
     else if (typeof s == "object" && s !== null) {
-      const n = Array.isArray(s) ? s : wt(s);
-      i += `${a}: ${p(n, e + 2, r)}`;
+      const n = Array.isArray(s) ? s : qt(s);
+      i += `${a}: ${m(n, e + 2, r)}`;
     } else
       [
         "number",
         "boolean",
         "undefined"
       ].includes(typeof s) || s === null ? i += `${a}: ${s}` : typeof s == "string" ? i += `${a}: '${O(s)}'` : i += `${a}: ${s}`;
-    i += `,${E}`;
+    i += `,${D}`;
   }), i += " ".repeat(e), i += "}"), i;
 };
-function At(t) {
-  return p(t, w);
+function Qt(t) {
+  return m(t, C);
 }
-function P(t, e = "data-source-placeholder") {
+function B(t, e = "data-source-placeholder") {
   if (!t)
     return e;
   const r = typeof t == "object" && "title" in t ? t.title : t;
-  return vt(r);
+  return Et(r);
 }
-function Q(t, e = !0) {
+function F(t, e = !0) {
   const r = [];
-  return e && r.push("measureFactory"), c(t) && r.push("filterFactory"), r.length > 0 ? `import { ${r.join(", ")} } from '@sisense/sdk-data';` : "";
+  return e && r.push("measureFactory"), p(t) && r.push("filterFactory"), r.length > 0 ? `import { ${r.join(", ")} } from '@sisense/sdk-data';` : "";
 }
-const k = `
-`, Pt = (t, e) => {
+const R = `
+`, kt = (t, e) => {
   if (t.composeCode)
-    return `${k}${" ".repeat(e)}${t.composeCode}`;
+    return `${R}${" ".repeat(e)}${t.composeCode}`;
   const r = t.jaql().jaql;
-  return `${k}${" ".repeat(e)}filterFactory.customFilter(${p(r, e, !0)})`;
-}, Qt = (t, e = 0) => {
+  return `${R}${" ".repeat(e)}filterFactory.customFilter(${m(r, e, !0)})`;
+}, Bt = (t, e = 0) => {
   if (!t)
     return "";
   let r = "";
-  return r += `[${t.map((i) => Pt(i, e + 2))}${t.length ? `
+  return r += `[${t.map((i) => kt(i, e + 2))}${t.length ? `
 ` + " ".repeat(e + 2) : ""}]`, r;
-}, B = (t) => t ? Array.isArray(t) ? Qt(t, 6) : "/** Filter relations not supported yet */" : "[]", kt = [
+}, _ = (t) => t ? Array.isArray(t) ? Bt(t, 6) : "/** Filter relations not supported yet */" : "[]", Ft = [
   "executeQueryByWidgetIdTmpl",
   "widgetByIdTmpl"
-], Bt = "chartWidgetTmpl", Rt = "pivotTableWidgetTmpl", Ft = (t) => t, _t = ({ dashboardOid: t, widgetOid: e, uiFramework: r = "react", chartType: i = "table", includeChart: a = !0 }) => {
-  U(i);
+], Rt = "chartWidgetTmpl", _t = "pivotTableWidgetTmpl", Nt = (t) => t, zt = ({ dashboardOid: t, widgetOid: e, uiFramework: r = "react", chartType: i = "table", includeChart: a = !0 }) => {
+  H(i);
   const s = {
     dashboardOid: t,
     widgetOid: e
-  }, n = kt[Number(a)];
-  return q(n, s, r);
-}, Nt = (t, e, r) => {
-  if (pt(t)) {
-    U(t.chartType);
-    const i = A(t), a = {
+  }, n = Ft[Number(a)];
+  return j(n, s, r);
+}, Jt = (t, e, r) => {
+  if (gt(t)) {
+    H(t.chartType);
+    const i = k(t), a = {
       idString: t.id,
       widgetTypeString: "chart",
       titleString: t.title,
-      dataSourceString: P(t.dataSource),
-      chartTypeString: Ft(t.chartType),
-      dataOptionsString: At(t.dataOptions),
-      filtersString: B(t.filters),
+      dataSourceString: B(t.dataSource),
+      chartTypeString: Nt(t.chartType),
+      dataOptionsString: Qt(t.dataOptions),
+      filtersString: _(t.filters),
       componentString: "ChartWidget",
-      extraImportsString: Q(t.filters || [], i),
-      styleOptionsString: p(t.styleOptions || {}, w),
-      drilldownOptionsString: p(t.drilldownOptions || {}, w)
+      extraImportsString: F(t.filters || [], i),
+      styleOptionsString: m(t.styleOptions || {}, C),
+      drilldownOptionsString: m(t.drilldownOptions || {}, C)
     };
-    return q(r.chart, a, e);
+    return j(r.chart, a, e);
   }
-  if (mt(t)) {
-    const i = A(t), a = {
+  if (yt(t)) {
+    const i = k(t), a = {
       idString: t.id,
       widgetTypeString: "pivot",
       titleString: t.title,
-      dataSourceString: P(t.dataSource),
-      dataOptionsString: p(t.dataOptions),
-      filtersString: B(t.filters),
+      dataSourceString: B(t.dataSource),
+      dataOptionsString: m(t.dataOptions),
+      filtersString: _(t.filters),
       componentString: "PivotTableWidget",
-      extraImportsString: Q(t.filters || [], i),
-      styleOptionsString: p(t.styleOptions || {}, w)
+      extraImportsString: F(t.filters || [], i),
+      styleOptionsString: m(t.styleOptions || {}, C)
     };
-    return q(r.pivot, a, e);
+    return j(r.pivot, a, e);
   }
-  if (gt(t))
+  if (ft(t))
     return "/** Custom widget code not supported yet */";
   throw new S("errors.otherWidgetTypesNotSupported");
-}, zt = ({ widgetProps: t, uiFramework: e = "react" }) => Nt(t, e, {
-  chart: Bt,
-  pivot: Rt
-}), me = (t) => "chartType" in t.chartRecommendations ? t.chartRecommendations : {
+}, Kt = ({ widgetProps: t, uiFramework: e = "react" }) => Jt(t, e, {
+  chart: Rt,
+  pivot: _t
+}), he = (t) => "chartType" in t.chartRecommendations ? t.chartRecommendations : {
   chartType: "table",
   chartFamily: "table",
   axesMapping: {}
-}, Jt = (t) => ({
+}, Ut = (t) => ({
   dataOptions: {
-    columns: t.map(K)
+    columns: t.map(V)
   }
-}), Kt = Object.freeze({
+}), Yt = Object.freeze({
   convolution: {
     enabled: !0,
     selectedConvolutionType: "bySlicesCount",
@@ -815,40 +824,40 @@ const k = `
   xAxis: {
     gridLines: !1
   }
-}), R = Object.freeze({
+}), N = Object.freeze({
   line: "line/spline",
   pie: "pie/donut",
   bar: "bar/stacked",
   column: "column/stackedcolumn"
-}), Ut = (t, e, r) => {
+}), Vt = (t, e, r) => {
   const i = t.reduce((s, n) => (s[n.jaql.title] = n, s), {}), a = Object.entries(r).reduce((s, n) => {
-    const [m, l] = n;
-    return s[`${m}`] = Array.isArray(l) ? l.map((y) => {
+    const [u, l] = n;
+    return s[`${u}`] = Array.isArray(l) ? l.map((g) => {
       var T, b;
-      const d = I(y);
+      const d = I(g);
       delete d.enabled;
-      const g = i[d.column.name];
-      if (!g)
+      const y = i[d.column.name];
+      if (!y)
         return {
           column: {
             type: "",
             name: d.column.name
           }
         };
-      const f = K(g);
-      if (g.panel === "measures")
-        return u(o({}, d), {
+      const f = V(y);
+      if (y.panel === "measures")
+        return c(o({}, d), {
           column: f
         });
-      if (yt(f.type)) {
-        const v = (b = (T = g.format) == null ? void 0 : T.mask) == null ? void 0 : b[g.jaql.level];
+      if (ht(f.type)) {
+        const v = (b = (T = y.format) == null ? void 0 : T.mask) == null ? void 0 : b[y.jaql.level];
         if (v)
-          return u(o({}, d), {
+          return c(o({}, d), {
             column: f,
             dateFormat: v
           });
       }
-      return u(o({}, d), {
+      return c(o({}, d), {
         column: f
       });
     }) : l, s;
@@ -874,20 +883,20 @@ const k = `
         s !== "geo" && (a[`${s}`] = a[`${s}`][0]);
       }), a;
     case "table":
-      return Object.keys(a).length === 0 ? Jt(t).dataOptions : a;
+      return Object.keys(a).length === 0 ? Ut(t).dataOptions : a;
     case "boxplot":
     case "areamap":
     case "indicator":
     default:
       return a;
   }
-}, F = (t, e) => {
+}, z = (t, e) => {
   var r, i, a, s;
   return e === "x" ? (i = (r = t.category) != null ? r : t.x) == null ? void 0 : i.map((n) => I(n).column.name).join(", ") : (s = (a = t.value) != null ? a : t.y) == null ? void 0 : s.map((n) => I(n).column.name).join(", ");
-}, Yt = (t, e, r, i) => {
+}, Ht = (t, e, r, i) => {
   let a;
-  return i && t in R ? a = M(M(Kt, {
-    subtype: R[`${t}`]
+  return i && t in N ? a = M(M(Yt, {
+    subtype: N[`${t}`]
   }), {
     legend: {
       enabled: !0,
@@ -896,96 +905,125 @@ const k = `
     yAxis: {
       title: {
         enabled: !0,
-        text: F(e, "y")
+        text: z(e, "y")
       }
     },
     xAxis: {
       title: {
         enabled: !0,
-        text: F(e, "x")
+        text: z(e, "x")
       }
     }
-  }, r) : a = M(ft(), r), a;
-}, Vt = (t, e, r = !0) => {
-  const { chartFamily: i, chartType: a, axesMapping: s = {}, styleOptions: n = {} } = e, m = Ut(t, i, s), l = Yt(a, s, n, r);
+  }, r) : a = M(St(), r), a;
+}, Gt = (t, e, r = !0) => {
+  const { chartFamily: i, chartType: a, axesMapping: s = {}, styleOptions: n = {} } = e, u = Vt(t, i, s), l = Ht(a, s, n, r);
   return {
-    dataOptions: m,
+    dataOptions: u,
     chartStyleOptions: l
   };
-}, Ht = (t) => "chartType" in t ? t : {
+};
+function Zt(t) {
+  return !!(t && (t.top !== void 0 || t.bottom !== void 0));
+}
+const Xt = (t) => {
+  const e = t.find((r) => r.panel === "rows");
+  return e ? t.map((r) => {
+    const i = r.jaql.filter;
+    if (!(r.panel === "scope" && Zt(i) && i.by === void 0))
+      return r;
+    const d = r.jaql, { type: s, context: n, formula: u, filter: l } = d, g = A(d, ["type", "context", "formula", "filter"]);
+    return c(o({}, r), {
+      jaql: o({
+        // Copy dimension properties from rows dimension
+        dim: e.jaql.dim,
+        table: e.jaql.table,
+        column: e.jaql.column,
+        datatype: e.jaql.datatype,
+        // Keep the filter but add the by clause
+        filter: c(o({}, l), {
+          by: {
+            type: s,
+            context: n,
+            formula: u
+          }
+        })
+      }, g)
+    });
+  }) : t;
+}, te = (t) => "chartType" in t ? t : {
   chartType: "table",
   chartFamily: "table",
   axesMapping: {}
-}, Gt = (t) => t.map((e) => ht(e.jaql)), Zt = (t) => t.reduce((e, r) => {
-  if ((r.panel === "scope" || r.jaql.filter) && e.metadataFilters.push(L(r)), r.panel !== "scope") {
-    const i = L(r);
+}, ee = (t) => t.map((e) => Ot(e.jaql)), re = (t) => t.reduce((e, r) => {
+  if ((r.panel === "scope" || r.jaql.filter) && e.metadataFilters.push(Q(r)), r.panel !== "scope") {
+    const i = Q(r);
     delete i.jaql.filter, e.metadataColumns.push(i);
   }
   return e;
 }, {
   metadataColumns: [],
   metadataFilters: []
-}), Xt = (t, e) => {
-  if (!xt(t))
+}), ie = (t, e) => {
+  if (!Dt(t))
     try {
-      const { useCustomizedStyleOptions: r = !1 } = e || {}, { jaql: i, chartRecommendations: a, queryTitle: s } = t, { metadata: n, datasource: m } = i, l = u(o({}, m), {
-        type: m.type || "elasticube"
-      }), y = St(l), d = n.map((x) => Wt(x)).map((x) => u(o({}, x), {
-        jaql: u(o({}, x.jaql), {
-          datasource: y
+      const { useCustomizedStyleOptions: r = !1 } = e || {}, { jaql: i, chartRecommendations: a, queryTitle: s } = t, { metadata: n, datasource: u } = i, l = c(o({}, u), {
+        type: u.type || "elasticube"
+      }), g = Tt(l), y = Xt(n).map((x) => $t(x)).map((x) => c(o({}, x), {
+        jaql: c(o({}, x.jaql), {
+          datasource: g
         })
-      })), g = Ht(a), f = g.chartType.toLowerCase(), T = {
+      })), f = te(a), T = f.chartType.toLowerCase(), b = {
         cornerRadius: "Small",
         header: {
           // remove info button and render empty toolbar instead
           renderToolbar: () => null
         }
-      }, { metadataColumns: b, metadataFilters: v } = Zt(d), H = Gt(v), { dataOptions: G, chartStyleOptions: Z } = Vt(b, g, r), X = o(o({}, Z), T);
+      }, { metadataColumns: v, metadataFilters: X } = re(y), tt = ee(X), { dataOptions: et, chartStyleOptions: rt } = Gt(v, f, r), it = o(o({}, rt), b);
       return {
         widgetType: "chart",
         id: s,
         title: s,
-        chartType: f,
+        chartType: T,
         dataSource: l,
-        dataOptions: G,
-        filters: H,
-        styleOptions: X
+        dataOptions: et,
+        filters: tt,
+        styleOptions: it
       };
     } catch (r) {
       console.error(r);
       return;
     }
-}, te = (t, e) => Xt(t, e), ee = (t) => bt(t) ? _t(t) : zt(t), ge = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, ae = (t, e) => ie(t, e), se = (t) => xt(t) ? zt(t) : Kt(t), Se = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  toWidgetCode: ee,
-  toWidgetProps: te
+  toWidgetCode: se,
+  toWidgetProps: ae
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  w as C,
-  ne as E,
-  J,
-  q as a,
-  A as b,
-  ce as c,
-  P as d,
-  B as e,
-  Q as f,
-  Nt as g,
-  p as h,
-  de as i,
-  ae as j,
-  se as k,
-  oe as l,
-  bt as m,
-  le as n,
-  Wt as o,
-  Mt as p,
-  me as q,
-  Ut as r,
-  ue as s,
-  te as t,
-  Yt as u,
-  pe as v,
-  ge as w,
-  Vt as x
+  C,
+  ce as E,
+  Y as J,
+  j as a,
+  k as b,
+  ge as c,
+  B as d,
+  _ as e,
+  F as f,
+  Jt as g,
+  m as h,
+  me as i,
+  le as j,
+  de as k,
+  ue as l,
+  xt as m,
+  pe as n,
+  $t as o,
+  It as p,
+  he as q,
+  Vt as r,
+  ye as s,
+  ae as t,
+  Ht as u,
+  fe as v,
+  Se as w,
+  Gt as x
 };