@sisense/sdk-ui 2.4.1 → 2.6.0

package/dist/{widget-composer-DheWJukc.cjs → widget-composer-B2r2a9Oh.cjs}

@@ -1,6 +1,6 @@
-"use strict";var tt=Object.defineProperty,et=Object.defineProperties;var rt=Object.getOwnPropertyDescriptors;var j=Object.getOwnPropertySymbols;var it=Object.prototype.hasOwnProperty,at=Object.prototype.propertyIsEnumerable;var $=(t,e,r)=>e in t?tt(t,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[e]=r,l=(t,e)=>{for(var r in e||(e={}))it.call(e,r)&&$(t,r,e[r]);if(j)for(var r of j(e))at.call(e,r)&&$(t,r,e[r]);return t},m=(t,e)=>et(t,rt(e));const n=require("./derive-chart-family-Cqw-HJq1.cjs");class P extends n.DimensionalElement{constructor(e,r){var i;super((i=e.jaql.title)!==null&&i!==void 0?i:"",r),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=n.getSortType(e.jaql.sort):delete this.sortType,this.skipValidation=!0}get id(){return this.expression}jaql(e){return e===!0?this.metadataItem.jaql:this.metadataItem}serialize(){const e=super.serialize();return e.__serializable="JaqlElement",e.metadataItem=this.metadataItem,e.type=this.type,e}}const st={text:n.MetadataTypes.TextAttribute,numeric:n.MetadataTypes.NumericAttribute,datetime:n.MetadataTypes.DateLevel};function nt(t){var e;return new P(t,(e=st[t.jaql.datatype])!==null&&e!==void 0?e:"numeric")}function B(t){const{jaql:e}=t;if(e.formula)return n.createCalculatedMeasureHelper(e);const r=n.DimensionalLevelAttribute.translateJaqlToGranularity(e);return"agg"in e&&e.dim&&e.datatype?n.createMeasureHelper({expression:e.dim,dataType:e.datatype,agg:e.agg||"",granularity:r,format:void 0,sort:e.sort,title:e.title,dataSource:e.datasource}):e.dim&&e.datatype?n.createAttributeHelper({expression:e.dim,dataType:e.datatype,granularity:r,sort:e.sort,title:e.title,panel:t.panel,dataSource:e.datasource}):nt(t)}const ot={jaql:{datasource:{title:"",type:"elasticube"},metadata:[]},queryTitle:"",chartRecommendations:{}},lt={model:"",metadata:[],chart:{},queryTitle:""},dt=t=>"widgetProps"in t,R=t=>"dashboardOid"in t&&"widgetOid"in t,ct=t=>"dashboardProps"in t,ut=t=>"dashboardOid"in t;function pt(t){return t.replace(/\s+/g,"-").replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase()}function mt(t){return t.charAt(0).toUpperCase()+t.slice(1)}function gt(t){const e=/\[(.+?)\s\(Calendar\)\]/;return t.replace(e,"[$1]").trim()}function yt(t){if(t)if(t.metadata){if(!t.model)throw new n.TranslatableError("errors.missingModelTitle")}else throw new n.TranslatableError("errors.missingMetadata");else throw new n.TranslatableError("errors.emptyModel");return t}function ft(t){return!t||!t.jaql.datasource.title||!t.jaql.metadata.length}function k(t){if(![...n.ALL_CHART_TYPES,"pivot","pivot2"].includes(t))throw new n.TranslatableError("errors.chartTypeNotSupported",{chartType:t})}function ht(t){return"widgetType"in t&&t.widgetType==="pivot"}function S(t){var e;return"column"in t&&((e=t.column)==null?void 0:e.expression)&&/\(.*\)/.test(t.column.expression)}function w(t){const e="measures"in t&&u(t.measures)||"values"in t&&u(t.values);return ht(t)?"values"in t.dataOptions&&u(t.dataOptions.values):"chartType"in t?t.chartType==="indicator"?"value"in t.dataOptions&&u(t.dataOptions.value)||"secondary"in t.dataOptions&&u(t.dataOptions.secondary):t.chartType==="table"?!("columns"in t.dataOptions)||!u(t.dataOptions.columns)?!1:t.dataOptions.columns.some(i=>S(i)):t.chartType==="boxplot"?!1:t.chartType==="scatter"?"x"in t.dataOptions&&t.dataOptions.x!==void 0&&S(t.dataOptions.x)||"y"in t.dataOptions&&t.dataOptions.y!==void 0&&S(t.dataOptions.y)||"size"in t.dataOptions&&t.dataOptions.size!==void 0:t.chartType==="scattermap"?"colorBy"in t.dataOptions&&t.dataOptions.colorBy!==void 0&&S(t.dataOptions.colorBy)||"details"in t.dataOptions&&t.dataOptions.details!==void 0&&S(t.dataOptions.details)||"size"in t.dataOptions&&t.dataOptions.size!==void 0&&S(t.dataOptions.size):t.chartType==="areamap"?"geo"in t.dataOptions&&u(t.dataOptions.geo)&&"color"in t.dataOptions&&u(t.dataOptions.color):"value"in t.dataOptions&&u(t.dataOptions.value):e}function u(t){return Array.isArray(t)&&t.length>0}function St(t){const e=t.split(`
+"use strict";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,l=(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]);return t},m=(t,e)=>et(t,rt(e));const n=require("./derive-chart-family-yUBZXP4x.cjs");class P extends n.DimensionalElement{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=n.getSortType(e.jaql.sort):delete this.sortType,this.skipValidation=!0}get id(){return this.expression}jaql(e){return e===!0?this.metadataItem.jaql:this.metadataItem}serialize(){const e=super.serialize();return e.metadataItem=this.metadataItem,e.type=this.type,e}}const st={text:n.MetadataTypes.TextAttribute,numeric:n.MetadataTypes.NumericAttribute,datetime:n.MetadataTypes.DateLevel},nt=t=>t&&t.__serializable==="JaqlElement";function ot(t){var e;return new P(t,(e=st[t.jaql.datatype])!==null&&e!==void 0?e:"numeric")}function _(t){const{jaql:e}=t;if(e.formula)return n.createCalculatedMeasureHelper(e);const r=n.DimensionalLevelAttribute.translateJaqlToGranularity(e);return"agg"in e&&e.dim&&e.datatype?n.createMeasureHelper({expression:e.dim,dataType:e.datatype,agg:e.agg||"",granularity:r,format:void 0,sort:e.sort,title:e.title,dataSource:e.datasource}):e.dim&&e.datatype?n.createAttributeHelper({expression:e.dim,dataType:e.datatype,granularity:r,sort:e.sort,title:e.title,panel:t.panel,dataSource:e.datasource}):ot(t)}const lt={jaql:{datasource:{title:"",type:"elasticube"},metadata:[]},queryTitle:"",chartRecommendations:{}},dt={model:"",metadata:[],chart:{},queryTitle:""},ct=t=>"widgetProps"in t,B=t=>"dashboardOid"in t&&"widgetOid"in t,ut=t=>"dashboardProps"in t,pt=t=>"dashboardOid"in t;function mt(t){return t.replace(/\s+/g,"-").replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase()}function gt(t){return t.charAt(0).toUpperCase()+t.slice(1)}function yt(t){const e=/\[(.+?)\s\(Calendar\)\]/;return t.replace(e,"[$1]").trim()}function ft(t){if(t)if(t.metadata){if(!t.model)throw new n.TranslatableError("errors.missingModelTitle")}else throw new n.TranslatableError("errors.missingMetadata");else throw new n.TranslatableError("errors.emptyModel");return t}function ht(t){return!t||!t.jaql.datasource.title||!t.jaql.metadata.length}function R(t){if(![...n.ALL_CHART_TYPES,"pivot","pivot2"].includes(t))throw new n.TranslatableError("errors.chartTypeNotSupported",{chartType:t})}function St(t){return"widgetType"in t&&t.widgetType==="pivot"}function S(t){var e;return"column"in t&&((e=t.column)==null?void 0:e.expression)&&/\(.*\)/.test(t.column.expression)}function w(t){const e="measures"in t&&u(t.measures)||"values"in t&&u(t.values);return St(t)?"values"in t.dataOptions&&u(t.dataOptions.values):"chartType"in t?t.chartType==="indicator"?"value"in t.dataOptions&&u(t.dataOptions.value)||"secondary"in t.dataOptions&&u(t.dataOptions.secondary):t.chartType==="table"?!("columns"in t.dataOptions)||!u(t.dataOptions.columns)?!1:t.dataOptions.columns.some(i=>S(i)):t.chartType==="boxplot"?!1:t.chartType==="scatter"?"x"in t.dataOptions&&t.dataOptions.x!==void 0&&S(t.dataOptions.x)||"y"in t.dataOptions&&t.dataOptions.y!==void 0&&S(t.dataOptions.y)||"size"in t.dataOptions&&t.dataOptions.size!==void 0:t.chartType==="scattermap"?"colorBy"in t.dataOptions&&t.dataOptions.colorBy!==void 0&&S(t.dataOptions.colorBy)||"details"in t.dataOptions&&t.dataOptions.details!==void 0&&S(t.dataOptions.details)||"size"in t.dataOptions&&t.dataOptions.size!==void 0&&S(t.dataOptions.size):t.chartType==="areamap"?"geo"in t.dataOptions&&u(t.dataOptions.geo)&&"color"in t.dataOptions&&u(t.dataOptions.color):"value"in t.dataOptions&&u(t.dataOptions.value):e}function u(t){return Array.isArray(t)&&t.length>0}function Ot(t){const e=t.split(`
 `);for(let r=0;r<e.length-1;r++)if(e[r].trim()===""){const i=e[r+1].trim();if(i.startsWith("import *")||i.startsWith("import {")){e.splice(r,1);break}}return e.join(`
-`)}const Ot={react:{baseChartTmpl:`import { {{componentString}} } from '@sisense/sdk-ui';
+`)}function Tt(t){const e=i=>/^[$A-Z_][0-9A-Z_$]*$/i.test(i);if("composeCode"in t)return t;const r={};for(const[i,a]of Object.entries(t)){const s=e(i)?i:`"${i}"`;r[s]=a}return r}const bt={react:{baseChartTmpl:`import { {{componentString}} } from '@sisense/sdk-ui';
 {{extraImportsString}}
 import * as DM from './{{dataSourceString}}'; // generated with @sisense/sdk-cli
 
@@ -416,13 +416,13 @@ import { DashboardById } from '@sisense/sdk-ui-vue';
 <\/script>
 <template>
   <DashboardById :dashboardOid="'{{dashboardOid}}'" />
-</template>`,dashboardTmpl:"/** COMING SOON */"}},F=(t,e)=>Ot[e][t].replace(/{{(.*?)Tmpl}}/g,(i,a)=>F(`${a}Tmpl`,e)),_=(t,e)=>t.replace(/{{(.*?)}}/g,(r,i)=>i in e?e[i]:(console.warn(`Placeholder ${i} not found in data`),r)),C=(t,e,r="react")=>{const i=F(t,r);return St(_(i,e))},Tt=()=>Object.values(n.AggregationTypes).map(e=>n.DimensionalBaseMeasure.aggregationToJAQL(e)).join("|"),N=t=>{const{formula:e,context:r,filter:i}=t;if(!r||!e)return t;const a=Object.keys(r);if(a.length!==1)return t;const s=a[0];if(typeof s!="string")return t;const o=r[`${s}`],g=Tt(),d=new RegExp(`^\\s*(${g})\\(\\[\\w+\\]\\)$`),f=e.match(d);if(f&&e.includes(s)){const c=f[1];return l({dim:o.dim,table:o.table,column:o.column,datatype:o.datatype,agg:c,title:t.title},i?{filter:l({},i)}:{})}return t},D=t=>{let e=t;if("formula"in t&&(e=N(t)),"context"in e){const r=l({},e.context);Object.keys(r).forEach(i=>{r[`${i}`]=D(r[`${i}`])}),e.context=r}return e},bt=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=N(r.filter.by)),m(l({},e),{jaql:r})},z=t=>{let e=t;e=bt(e);const{jaql:r,measure:i,by:a}=e;return l(l(m(l({},e),{jaql:D(r)}),a?{by:D(a)}:{}),i?{measure:D(i)}:{})},O=6,x=`
-`,M="UNKNOWN",vt=(t,e)=>{let r="";return r+=`measureFactory.customFormula(
+</template>`,dashboardTmpl:"/** COMING SOON */"}},k=(t,e)=>bt[e][t].replace(/{{(.*?)Tmpl}}/g,(i,a)=>k(`${a}Tmpl`,e)),F=(t,e)=>t.replace(/{{(.*?)}}/g,(r,i)=>i in e?e[i]:(console.warn(`Placeholder ${i} not found in data`),r)),C=(t,e,r="react")=>{const i=k(t,r);return Ot(F(i,e))},vt=()=>Object.values(n.AggregationTypes).map(e=>n.DimensionalBaseMeasure.aggregationToJAQL(e)).join("|"),N=t=>{const{formula:e,context:r,filter:i}=t;if(!r||!e)return t;const a=Object.keys(r);if(a.length!==1)return t;const s=a[0];if(typeof s!="string")return t;const o=r[`${s}`],g=vt(),d=new RegExp(`^\\s*(${g})\\(\\[\\w+\\]\\)$`),f=e.match(d);if(f&&e.includes(s)){const c=f[1];return l({dim:o.dim,table:o.table,column:o.column,datatype:o.datatype,agg:c,title:t.title},i?{filter:l({},i)}:{})}return t},D=t=>{let e=t;if("formula"in t&&(e=N(t)),"context"in e){const r=l({},e.context);Object.keys(r).forEach(i=>{r[`${i}`]=D(r[`${i}`])}),e.context=r}return e},Et=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=N(r.filter.by)),m(l({},e),{jaql:r})},z=t=>{let e=t;e=Et(e);const{jaql:r,measure:i,by:a}=e;return l(l(m(l({},e),{jaql:D(r)}),a?{by:D(a)}:{}),i?{measure:D(i)}:{})},O=6,x=`
+`,M="UNKNOWN",xt=(t,e)=>{let r="";return r+=`measureFactory.customFormula(
 `,r+=" ".repeat(e),r+=`  '${n.escapeSingleQuotes(t.title)}',
 `,r+=" ".repeat(e),r+=`  '${t.formula}',
 `,r+=" ".repeat(e),r+=`  {
 `,Object.entries(t.context).forEach(([i,a])=>{const s=n.normalizeAttributeName(a.table||M,a.column||M,void 0,"DM");r+=" ".repeat(e),r+=`    '${i.slice(1,-1)}': ${s},
 `}),r+=" ".repeat(e),r+=`  }
-`,r+=" ".repeat(e),r+=")",r},Et=t=>{const{level:e,table:r,column:i,agg:a,title:s}=t;let o;return r&&i&&(o=n.normalizeAttributeName(r,i,e,"DM")),a&&r&&i&&s&&(o=`measureFactory.${n.DimensionalBaseMeasure.aggregationFromJAQL(a)}(${o}, '${n.escapeSingleQuotes(s)}')`),o||M},xt=(t,e)=>{const r=t.jaql(!1).jaql;return"formula"in r?vt(r,e):Et(r)},p=(t,e=0,r=!1)=>{if(!t)return"";if(typeof t=="string")return`'${n.escapeSingleQuotes(t)}'`;if(t instanceof P)return xt(t,e);if(t instanceof n.DimensionalElement)return t.composeCode||"";let i="";return Array.isArray(t)?i+=`[${t.map(a=>p(a,e+2))}${t.length?x+" ".repeat(e+2):""}]`:(i+=`{${x}`,Object.entries(t).forEach(([a,s])=>{r&&typeof a=="string"&&(a=`'${n.escapeSingleQuotes(a)}'`),i+=" ".repeat(e+2),Array.isArray(s)?i+=`${a}: [${s.map(o=>p(o,e+4,r))}${s.length?x+" ".repeat(e+2):""}]`:typeof s=="object"&&s!==null?i+=`${a}: ${p(s,e+2,r)}`:["number","boolean","undefined"].includes(typeof s)||s===null?i+=`${a}: ${s}`:typeof s=="string"?i+=`${a}: '${n.escapeSingleQuotes(s)}'`:i+=`${a}: ${s}`,i+=`,${x}`}),i+=" ".repeat(e),i+="}"),i};function Dt(t){return p(t,O)}function I(t,e="data-source-placeholder"){if(!t)return e;const r=typeof t=="object"&&"title"in t?t.title:t;return pt(r)}function W(t,e=!0){const r=[];return e&&r.push("measureFactory"),u(t)&&r.push("filterFactory"),r.length>0?`import { ${r.join(", ")} } from '@sisense/sdk-data';`:""}const L=`
-`,Ct=(t,e)=>{if(t.composeCode)return`${L}${" ".repeat(e)}${t.composeCode}`;const r=t.jaql().jaql;return`${L}${" ".repeat(e)}filterFactory.customFilter(${p(r,e,!0)})`},wt=(t,e=0)=>{if(!t)return"";let r="";return r+=`[${t.map(i=>Ct(i,e+2))}${t.length?`
-`+" ".repeat(e+2):""}]`,r},q=t=>t?Array.isArray(t)?wt(t,6):"/** Filter relations not supported yet */":"[]",Mt=["executeQueryByWidgetIdTmpl","widgetByIdTmpl"],It="chartWidgetTmpl",Wt="pivotTableWidgetTmpl",qt=t=>t,Pt=({dashboardOid:t,widgetOid:e,uiFramework:r="react",chartType:i="table",includeChart:a=!0})=>{k(i);const s={dashboardOid:t,widgetOid:e},o=Mt[Number(a)];return C(o,s,r)},Y=(t,e,r)=>{if(n.isChartWidgetProps(t)){k(t.chartType);const i=w(t),a={idString:t.id,widgetTypeString:"chart",titleString:t.title,dataSourceString:I(t.dataSource),chartTypeString:qt(t.chartType),dataOptionsString:Dt(t.dataOptions),filtersString:q(t.filters),componentString:"ChartWidget",extraImportsString:W(t.filters||[],i),styleOptionsString:p(t.styleOptions||{},O),drilldownOptionsString:p(t.drilldownOptions||{},O)};return C(r.chart,a,e)}if(n.isPivotTableWidgetProps(t)){const i=w(t),a={idString:t.id,widgetTypeString:"pivot",titleString:t.title,dataSourceString:I(t.dataSource),dataOptionsString:p(t.dataOptions),filtersString:q(t.filters),componentString:"PivotTableWidget",extraImportsString:W(t.filters||[],i),styleOptionsString:p(t.styleOptions||{},O)};return C(r.pivot,a,e)}if(n.isCustomWidgetProps(t))return"/** Custom widget code not supported yet */";throw new n.TranslatableError("errors.otherWidgetTypesNotSupported")},jt=({widgetProps:t,uiFramework:e="react"})=>Y(t,e,{chart:It,pivot:Wt}),$t=t=>"chartType"in t.chartRecommendations?t.chartRecommendations:{chartType:"table",chartFamily:"table",axesMapping:{}},Lt=t=>({dataOptions:{columns:t.map(B)}}),Qt=Object.freeze({convolution:{enabled:!0,selectedConvolutionType:"bySlicesCount",independentSlicesCount:7},lineWidth:{width:"bold"},markers:{enabled:!1},legend:{enabled:!1},yAxis:{gridLines:!1},xAxis:{gridLines:!1}}),Q=Object.freeze({line:"line/spline",pie:"pie/donut",bar:"bar/stacked",column:"column/stackedcolumn"}),J=(t,e,r)=>{const i=t.reduce((s,o)=>(s[o.jaql.title]=o,s),{}),a=Object.entries(r).reduce((s,o)=>{const[g,d]=o;return s[`${g}`]=Array.isArray(d)?d.map(f=>{var T,b;const c=n.normalizeAnyColumn(f);delete c.enabled;const y=i[c.column.name];if(!y)return{column:{type:"",name:c.column.name}};const h=B(y);if(y.panel==="measures")return m(l({},c),{column:h});if(n.isDatetime(h.type)){const v=(b=(T=y.format)==null?void 0:T.mask)==null?void 0:b[y.jaql.level];if(v)return m(l({},c),{column:h,dateFormat:v})}return m(l({},c),{column:h})}):d,s},{});switch(e){case"cartesian":return l({category:[],value:[],breakBy:[]},a);case"categorical":return l({category:[],value:[]},a);case"scatter":return Object.keys(a).forEach(s=>{a[`${s}`]=a[`${s}`][0]}),a;case"scattermap":return Object.keys(a).forEach(s=>{s!=="geo"&&(a[`${s}`]=a[`${s}`][0])}),a;case"table":return Object.keys(a).length===0?Lt(t).dataOptions:a;case"boxplot":case"areamap":case"indicator":default:return a}},A=(t,e)=>{var r,i,a,s;return e==="x"?(i=(r=t.category)!=null?r:t.x)==null?void 0:i.map(o=>n.normalizeAnyColumn(o).column.name).join(", "):(s=(a=t.value)!=null?a:t.y)==null?void 0:s.map(o=>n.normalizeAnyColumn(o).column.name).join(", ")},U=(t,e,r,i)=>{let a;return i&&t in Q?a=n.merge(n.merge(Qt,{subtype:Q[`${t}`]}),{legend:{enabled:!0,position:"right"},yAxis:{title:{enabled:!0,text:A(e,"y")}},xAxis:{title:{enabled:!0,text:A(e,"x")}}},r):a=n.merge(n.getDefaultStyleOptions(),r),a},K=(t,e,r=!0)=>{const{chartFamily:i,chartType:a,axesMapping:s={},styleOptions:o={}}=e,g=J(t,i,s),d=U(a,s,o,r);return{dataOptions:g,chartStyleOptions:d}},At=t=>"chartType"in t?t:{chartType:"table",chartFamily:"table",axesMapping:{}},Bt=t=>t.map(e=>n.createFilterFromJaql(e.jaql)),Rt=t=>t.reduce((e,r)=>{if((r.panel==="scope"||r.jaql.filter)&&e.metadataFilters.push(n.cloneDeep(r)),r.panel!=="scope"){const i=n.cloneDeep(r);delete i.jaql.filter,e.metadataColumns.push(i)}return e},{metadataColumns:[],metadataFilters:[]}),kt=(t,e)=>{if(!ft(t))try{const{useCustomizedStyleOptions:r=!1}=e||{},{jaql:i,chartRecommendations:a,queryTitle:s}=t,{metadata:o,datasource:g}=i,d=m(l({},g),{type:g.type||"elasticube"}),f=n.convertJaqlDataSourceForDto(d),c=o.map(E=>z(E)).map(E=>m(l({},E),{jaql:m(l({},E.jaql),{datasource:f})})),y=At(a),h=y.chartType.toLowerCase(),T={cornerRadius:"Small",header:{renderToolbar:()=>null}},{metadataColumns:b,metadataFilters:v}=Rt(c),H=Bt(v),{dataOptions:G,chartStyleOptions:X}=K(b,y,r),Z=l(l({},X),T);return{widgetType:"chart",id:s,title:s,chartType:h,dataSource:d,dataOptions:G,filters:H,styleOptions:Z}}catch(r){console.error(r);return}},V=(t,e)=>kt(t,e),Ft=t=>R(t)?Pt(t):jt(t),_t=Object.freeze(Object.defineProperty({__proto__:null,toWidgetCode:Ft,toWidgetProps:V},Symbol.toStringTag,{value:"Module"}));exports.CODE_TEMPLATES_INDENT=O;exports.EMPTY_EXPANDED_QUERY_MODEL=ot;exports.EMPTY_SIMPLE_QUERY_MODEL=lt;exports.JaqlElement=P;exports.capitalizeFirstLetter=mt;exports.checkIfMeasuresExist=w;exports.generateCode=C;exports.getChartDataOptions=J;exports.getChartOptions=K;exports.getChartRecommendationsOrDefault=$t;exports.getChartStyleOptions=U;exports.getWidgetCode=Y;exports.isByIdDashboardCodeParams=ut;exports.isByIdWidgetCodeParams=R;exports.isClientSideDashboardCodeParams=ct;exports.isClientSideWidgetCodeParams=dt;exports.populatePlaceholders=_;exports.sanitizeDimensionId=gt;exports.simplifyMetadataItem=z;exports.stringifyDataSource=I;exports.stringifyExtraImports=W;exports.stringifyFilters=q;exports.stringifyProps=p;exports.toWidgetProps=V;exports.validateQueryModel=yt;exports.widgetComposer=_t;
+`,r+=" ".repeat(e),r+=")",r},Dt=t=>{const{level:e,table:r,column:i,agg:a,title:s}=t;let o;return r&&i&&(o=n.normalizeAttributeName(r,i,e,"DM")),a&&r&&i&&s&&(o=`measureFactory.${n.DimensionalBaseMeasure.aggregationFromJAQL(a)}(${o}, '${n.escapeSingleQuotes(s)}')`),o||M},Ct=(t,e)=>{const r=t.jaql(!1).jaql;return"formula"in r?xt(r,e):Dt(r)},p=(t,e=0,r=!1)=>{if(!t)return"";if(typeof t=="string")return`'${n.escapeSingleQuotes(t)}'`;if(t instanceof P)return Ct(t,e);if(t instanceof n.DimensionalElement)return t.composeCode||"";let i="";return Array.isArray(t)?i+=`[${t.map(a=>p(a,e+2))}${t.length?x+" ".repeat(e+2):""}]`:(i+=`{${x}`,Object.entries(t).forEach(([a,s])=>{if(r&&typeof a=="string"&&(a=`'${n.escapeSingleQuotes(a)}'`),i+=" ".repeat(e+2),Array.isArray(s))i+=`${a}: [${s.map(o=>p(o,e+4,r))}${s.length?x+" ".repeat(e+2):""}]`;else if(typeof s=="object"&&s!==null){const o=Array.isArray(s)?s:Tt(s);i+=`${a}: ${p(o,e+2,r)}`}else["number","boolean","undefined"].includes(typeof s)||s===null?i+=`${a}: ${s}`:typeof s=="string"?i+=`${a}: '${n.escapeSingleQuotes(s)}'`:i+=`${a}: ${s}`;i+=`,${x}`}),i+=" ".repeat(e),i+="}"),i};function wt(t){return p(t,O)}function I(t,e="data-source-placeholder"){if(!t)return e;const r=typeof t=="object"&&"title"in t?t.title:t;return mt(r)}function q(t,e=!0){const r=[];return e&&r.push("measureFactory"),u(t)&&r.push("filterFactory"),r.length>0?`import { ${r.join(", ")} } from '@sisense/sdk-data';`:""}const L=`
+`,Mt=(t,e)=>{if(t.composeCode)return`${L}${" ".repeat(e)}${t.composeCode}`;const r=t.jaql().jaql;return`${L}${" ".repeat(e)}filterFactory.customFilter(${p(r,e,!0)})`},It=(t,e=0)=>{if(!t)return"";let r="";return r+=`[${t.map(i=>Mt(i,e+2))}${t.length?`
+`+" ".repeat(e+2):""}]`,r},W=t=>t?Array.isArray(t)?It(t,6):"/** Filter relations not supported yet */":"[]",qt=["executeQueryByWidgetIdTmpl","widgetByIdTmpl"],Wt="chartWidgetTmpl",Pt="pivotTableWidgetTmpl",$t=t=>t,jt=({dashboardOid:t,widgetOid:e,uiFramework:r="react",chartType:i="table",includeChart:a=!0})=>{R(i);const s={dashboardOid:t,widgetOid:e},o=qt[Number(a)];return C(o,s,r)},J=(t,e,r)=>{if(n.isChartWidgetProps(t)){R(t.chartType);const i=w(t),a={idString:t.id,widgetTypeString:"chart",titleString:t.title,dataSourceString:I(t.dataSource),chartTypeString:$t(t.chartType),dataOptionsString:wt(t.dataOptions),filtersString:W(t.filters),componentString:"ChartWidget",extraImportsString:q(t.filters||[],i),styleOptionsString:p(t.styleOptions||{},O),drilldownOptionsString:p(t.drilldownOptions||{},O)};return C(r.chart,a,e)}if(n.isPivotTableWidgetProps(t)){const i=w(t),a={idString:t.id,widgetTypeString:"pivot",titleString:t.title,dataSourceString:I(t.dataSource),dataOptionsString:p(t.dataOptions),filtersString:W(t.filters),componentString:"PivotTableWidget",extraImportsString:q(t.filters||[],i),styleOptionsString:p(t.styleOptions||{},O)};return C(r.pivot,a,e)}if(n.isCustomWidgetProps(t))return"/** Custom widget code not supported yet */";throw new n.TranslatableError("errors.otherWidgetTypesNotSupported")},Lt=({widgetProps:t,uiFramework:e="react"})=>J(t,e,{chart:Wt,pivot:Pt}),Qt=t=>"chartType"in t.chartRecommendations?t.chartRecommendations:{chartType:"table",chartFamily:"table",axesMapping:{}},At=t=>({dataOptions:{columns:t.map(_)}}),_t=Object.freeze({convolution:{enabled:!0,selectedConvolutionType:"bySlicesCount",independentSlicesCount:7},lineWidth:{width:"bold"},markers:{enabled:!1},legend:{enabled:!1},yAxis:{gridLines:!1},xAxis:{gridLines:!1}}),Q=Object.freeze({line:"line/spline",pie:"pie/donut",bar:"bar/stacked",column:"column/stackedcolumn"}),Y=(t,e,r)=>{const i=t.reduce((s,o)=>(s[o.jaql.title]=o,s),{}),a=Object.entries(r).reduce((s,o)=>{const[g,d]=o;return s[`${g}`]=Array.isArray(d)?d.map(f=>{var T,b;const c=n.normalizeAnyColumn(f);delete c.enabled;const y=i[c.column.name];if(!y)return{column:{type:"",name:c.column.name}};const h=_(y);if(y.panel==="measures")return m(l({},c),{column:h});if(n.isDatetime(h.type)){const v=(b=(T=y.format)==null?void 0:T.mask)==null?void 0:b[y.jaql.level];if(v)return m(l({},c),{column:h,dateFormat:v})}return m(l({},c),{column:h})}):d,s},{});switch(e){case"cartesian":return l({category:[],value:[],breakBy:[]},a);case"categorical":return l({category:[],value:[]},a);case"scatter":return Object.keys(a).forEach(s=>{a[`${s}`]=a[`${s}`][0]}),a;case"scattermap":return Object.keys(a).forEach(s=>{s!=="geo"&&(a[`${s}`]=a[`${s}`][0])}),a;case"table":return Object.keys(a).length===0?At(t).dataOptions:a;case"boxplot":case"areamap":case"indicator":default:return a}},A=(t,e)=>{var r,i,a,s;return e==="x"?(i=(r=t.category)!=null?r:t.x)==null?void 0:i.map(o=>n.normalizeAnyColumn(o).column.name).join(", "):(s=(a=t.value)!=null?a:t.y)==null?void 0:s.map(o=>n.normalizeAnyColumn(o).column.name).join(", ")},U=(t,e,r,i)=>{let a;return i&&t in Q?a=n.merge(n.merge(_t,{subtype:Q[`${t}`]}),{legend:{enabled:!0,position:"right"},yAxis:{title:{enabled:!0,text:A(e,"y")}},xAxis:{title:{enabled:!0,text:A(e,"x")}}},r):a=n.merge(n.getDefaultStyleOptions(),r),a},K=(t,e,r=!0)=>{const{chartFamily:i,chartType:a,axesMapping:s={},styleOptions:o={}}=e,g=Y(t,i,s),d=U(a,s,o,r);return{dataOptions:g,chartStyleOptions:d}},Bt=t=>"chartType"in t?t:{chartType:"table",chartFamily:"table",axesMapping:{}},Rt=t=>t.map(e=>n.createFilterFromJaql(e.jaql)),kt=t=>t.reduce((e,r)=>{if((r.panel==="scope"||r.jaql.filter)&&e.metadataFilters.push(n.cloneDeep(r)),r.panel!=="scope"){const i=n.cloneDeep(r);delete i.jaql.filter,e.metadataColumns.push(i)}return e},{metadataColumns:[],metadataFilters:[]}),Ft=(t,e)=>{if(!ht(t))try{const{useCustomizedStyleOptions:r=!1}=e||{},{jaql:i,chartRecommendations:a,queryTitle:s}=t,{metadata:o,datasource:g}=i,d=m(l({},g),{type:g.type||"elasticube"}),f=n.convertJaqlDataSourceForDto(d),c=o.map(E=>z(E)).map(E=>m(l({},E),{jaql:m(l({},E.jaql),{datasource:f})})),y=Bt(a),h=y.chartType.toLowerCase(),T={cornerRadius:"Small",header:{renderToolbar:()=>null}},{metadataColumns:b,metadataFilters:v}=kt(c),H=Rt(v),{dataOptions:G,chartStyleOptions:Z}=K(b,y,r),X=l(l({},Z),T);return{widgetType:"chart",id:s,title:s,chartType:h,dataSource:d,dataOptions:G,filters:H,styleOptions:X}}catch(r){console.error(r);return}},V=(t,e)=>Ft(t,e),Nt=t=>B(t)?jt(t):Lt(t),zt=Object.freeze(Object.defineProperty({__proto__:null,toWidgetCode:Nt,toWidgetProps:V},Symbol.toStringTag,{value:"Module"}));exports.CODE_TEMPLATES_INDENT=O;exports.EMPTY_EXPANDED_QUERY_MODEL=lt;exports.EMPTY_SIMPLE_QUERY_MODEL=dt;exports.JaqlElement=P;exports.capitalizeFirstLetter=gt;exports.checkIfMeasuresExist=w;exports.generateCode=C;exports.getChartDataOptions=Y;exports.getChartOptions=K;exports.getChartRecommendationsOrDefault=Qt;exports.getChartStyleOptions=U;exports.getWidgetCode=J;exports.isByIdDashboardCodeParams=pt;exports.isByIdWidgetCodeParams=B;exports.isClientSideDashboardCodeParams=ut;exports.isClientSideWidgetCodeParams=ct;exports.isJaqlElement=nt;exports.populatePlaceholders=F;exports.sanitizeDimensionId=yt;exports.simplifyMetadataItem=z;exports.stringifyDataSource=I;exports.stringifyExtraImports=q;exports.stringifyFilters=W;exports.stringifyProps=p;exports.toWidgetProps=V;exports.validateQueryModel=ft;exports.widgetComposer=zt;

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

@@ -1,20 +1,20 @@
 var tt = Object.defineProperty, et = Object.defineProperties;
 var rt = Object.getOwnPropertyDescriptors;
-var j = Object.getOwnPropertySymbols;
+var $ = Object.getOwnPropertySymbols;
 var it = Object.prototype.hasOwnProperty, at = Object.prototype.propertyIsEnumerable;
-var $ = (t, e, r) => e in t ? tt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, o = (t, e) => {
+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) => {
   for (var r in e || (e = {}))
-    it.call(e, r) && $(t, r, e[r]);
-  if (j)
-    for (var r of j(e))
-      at.call(e, r) && $(t, r, e[r]);
+    it.call(e, r) && j(t, r, e[r]);
+  if ($)
+    for (var r of $(e))
+      at.call(e, r) && j(t, r, e[r]);
   return t;
 }, u = (t, e) => et(t, rt(e));
-import { dW as N, w as st, e0 as nt, ap as ot, e1 as lt, e2 as dt, m as C, T as S, e3 as ct, aP as _, dI as ut, e4 as O, dY as z, ay as pt, b0 as mt, a$ as gt, aG as M, ao as yt, n as I, e5 as ft, a8 as ht, bI as L, e6 as St } from "./derive-chart-family-woVAnbRi.js";
-class J extends N {
+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 _ {
   constructor(e, r) {
     var i;
-    super((i = e.jaql.title) !== null && i !== void 0 ? i : "", r), 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 = st(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 = dt(e.jaql.sort) : delete this.sortType, this.skipValidation = !0;
   }
   get id() {
     return this.expression;
@@ -27,24 +27,24 @@ class J extends N {
    */
   serialize() {
     const e = super.serialize();
-    return e.__serializable = "JaqlElement", e.metadataItem = this.metadataItem, e.type = this.type, e;
+    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) {
   var e;
   return new J(t, (e = Ot[t.jaql.datatype]) !== null && e !== void 0 ? e : "numeric");
 }
-function Y(t) {
+function K(t) {
   const { jaql: e } = t;
   if (e.formula)
-    return nt(e);
-  const r = ot.translateJaqlToGranularity(e);
-  return "agg" in e && e.dim && e.datatype ? lt({
+    return st(e);
+  const r = nt.translateJaqlToGranularity(e);
+  return "agg" in e && e.dim && e.datatype ? ot({
     expression: e.dim,
     dataType: e.datatype,
     agg: e.agg || "",
@@ -53,7 +53,7 @@ function Y(t) {
     sort: e.sort,
     title: e.title,
     dataSource: e.datasource
-  }) : e.dim && e.datatype ? dt({
+  }) : e.dim && e.datatype ? lt({
     expression: e.dim,
     dataType: e.datatype,
     granularity: r,
@@ -63,7 +63,7 @@ function Y(t) {
     dataSource: e.datasource
   }) : Tt(t);
 }
-const ie = {
+const se = {
   jaql: {
     datasource: {
       title: "",
@@ -73,23 +73,23 @@ const ie = {
   },
   queryTitle: "",
   chartRecommendations: {}
-}, ae = {
+}, ne = {
   model: "",
   metadata: [],
   chart: {},
   queryTitle: ""
-}, se = (t) => "widgetProps" in t, bt = (t) => "dashboardOid" in t && "widgetOid" in t, ne = (t) => "dashboardProps" in t, oe = (t) => "dashboardOid" in t;
+}, 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) {
   return t.replace(/\s+/g, "-").replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
 }
-function le(t) {
+function ce(t) {
   return t.charAt(0).toUpperCase() + t.slice(1);
 }
-function de(t) {
+function ue(t) {
   const e = /\[(.+?)\s\(Calendar\)\]/;
   return t.replace(e, "[$1]").trim();
 }
-function ce(t) {
+function pe(t) {
   if (t)
     if (t.metadata) {
       if (!t.model)
@@ -120,7 +120,7 @@ function h(t) {
   var e;
   return "column" in t && ((e = t.column) == null ? void 0 : e.expression) && /\(.*\)/.test(t.column.expression);
 }
-function P(t) {
+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;
 }
@@ -141,7 +141,18 @@ function Dt(t) {
   return e.join(`
 `);
 }
-const wt = {
+function wt(t) {
+  const e = (i) => /^[$A-Z_][0-9A-Z_$]*$/i.test(i);
+  if ("composeCode" in t)
+    return t;
+  const r = {};
+  for (const [i, a] of Object.entries(t)) {
+    const s = e(i) ? i : `"${i}"`;
+    r[s] = a;
+  }
+  return r;
+}
+const Ct = {
   react: {
     baseChartTmpl: `import { {{componentString}} } from '@sisense/sdk-ui';
 {{extraImportsString}}
@@ -600,10 +611,10 @@ import { DashboardById } from '@sisense/sdk-ui-vue';
 </template>`,
     dashboardTmpl: "/** COMING SOON */"
   }
-}, K = (t, e) => wt[e][t].replace(/{{(.*?)Tmpl}}/g, (i, a) => K(`${a}Tmpl`, e)), Ct = (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 = K(t, r);
-  return Dt(Ct(i, e));
-}, It = () => Object.values(ut).map((e) => _.aggregationToJAQL(e)).join("|"), V = (t) => {
+}, 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) => {
   const { formula: e, context: r, filter: i } = t;
   if (!r || !e)
     return t;
@@ -637,7 +648,7 @@ import { DashboardById } from '@sisense/sdk-ui-vue';
     }), e.context = r;
   }
   return e;
-}, Mt = (t) => {
+}, qt = (t) => {
   var i;
   const e = t;
   if (e.panel !== "scope")
@@ -646,9 +657,9 @@ import { DashboardById } from '@sisense/sdk-ui-vue';
   return (i = r.filter) != null && i.by && (r.filter.by = V(r.filter.by)), u(o({}, e), {
     jaql: r
   });
-}, qt = (t) => {
+}, Wt = (t) => {
   let e = t;
-  e = Mt(e);
+  e = qt(e);
   const { jaql: r, measure: i, by: a } = e;
   return o(o(u(o({}, e), {
     jaql: D(r)
@@ -658,7 +669,7 @@ import { DashboardById } from '@sisense/sdk-ui-vue';
     measure: D(i)
   } : {});
 }, w = 6, E = `
-`, W = "UNKNOWN", Wt = (t, e) => {
+`, W = "UNKNOWN", $t = (t, e) => {
   let r = "";
   return r += `measureFactory.customFormula(
 `, r += " ".repeat(e), r += `  '${O(t.title)}',
@@ -673,38 +684,45 @@ import { DashboardById } from '@sisense/sdk-ui-vue';
 }, jt = (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.${_.aggregationFromJAQL(a)}(${n}, '${O(s)}')`), n || W;
-}, $t = (t, e) => {
+  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) => {
   const r = t.jaql(!1).jaql;
-  return "formula" in r ? Wt(r, e) : jt(r);
+  return "formula" in r ? $t(r, e) : jt(r);
 }, p = (t, e = 0, r = !1) => {
   if (!t)
     return "";
   if (typeof t == "string")
     return `'${O(t)}'`;
   if (t instanceof J)
-    return $t(t, e);
-  if (t instanceof N)
+    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]) => {
-    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) : ""}]` : typeof s == "object" && s !== null ? i += `${a}: ${p(s, e + 2, r)}` : [
-      "number",
-      "boolean",
-      "undefined"
-    ].includes(typeof s) || s === null ? i += `${a}: ${s}` : typeof s == "string" ? i += `${a}: '${O(s)}'` : i += `${a}: ${s}`, i += `,${E}`;
+    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) : ""}]`;
+    else if (typeof s == "object" && s !== null) {
+      const n = Array.isArray(s) ? s : wt(s);
+      i += `${a}: ${p(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 += " ".repeat(e), i += "}"), i;
 };
-function Lt(t) {
+function At(t) {
   return p(t, w);
 }
-function Q(t, e = "data-source-placeholder") {
+function P(t, e = "data-source-placeholder") {
   if (!t)
     return e;
   const r = typeof t == "object" && "title" in t ? t.title : t;
   return vt(r);
 }
-function A(t, e = !0) {
+function Q(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';` : "";
 }
@@ -720,44 +738,44 @@ const k = `
   let r = "";
   return r += `[${t.map((i) => Pt(i, e + 2))}${t.length ? `
 ` + " ".repeat(e + 2) : ""}]`, r;
-}, B = (t) => t ? Array.isArray(t) ? Qt(t, 6) : "/** Filter relations not supported yet */" : "[]", At = [
+}, B = (t) => t ? Array.isArray(t) ? Qt(t, 6) : "/** Filter relations not supported yet */" : "[]", kt = [
   "executeQueryByWidgetIdTmpl",
   "widgetByIdTmpl"
-], kt = "chartWidgetTmpl", Bt = "pivotTableWidgetTmpl", Rt = (t) => t, Ft = ({ dashboardOid: t, widgetOid: e, uiFramework: r = "react", chartType: i = "table", includeChart: a = !0 }) => {
+], Bt = "chartWidgetTmpl", Rt = "pivotTableWidgetTmpl", Ft = (t) => t, _t = ({ dashboardOid: t, widgetOid: e, uiFramework: r = "react", chartType: i = "table", includeChart: a = !0 }) => {
   U(i);
   const s = {
     dashboardOid: t,
     widgetOid: e
-  }, n = At[Number(a)];
+  }, n = kt[Number(a)];
   return q(n, s, r);
 }, Nt = (t, e, r) => {
   if (pt(t)) {
     U(t.chartType);
-    const i = P(t), a = {
+    const i = A(t), a = {
       idString: t.id,
       widgetTypeString: "chart",
       titleString: t.title,
-      dataSourceString: Q(t.dataSource),
-      chartTypeString: Rt(t.chartType),
-      dataOptionsString: Lt(t.dataOptions),
+      dataSourceString: P(t.dataSource),
+      chartTypeString: Ft(t.chartType),
+      dataOptionsString: At(t.dataOptions),
       filtersString: B(t.filters),
       componentString: "ChartWidget",
-      extraImportsString: A(t.filters || [], i),
+      extraImportsString: Q(t.filters || [], i),
       styleOptionsString: p(t.styleOptions || {}, w),
       drilldownOptionsString: p(t.drilldownOptions || {}, w)
     };
     return q(r.chart, a, e);
   }
   if (mt(t)) {
-    const i = P(t), a = {
+    const i = A(t), a = {
       idString: t.id,
       widgetTypeString: "pivot",
       titleString: t.title,
-      dataSourceString: Q(t.dataSource),
+      dataSourceString: P(t.dataSource),
       dataOptionsString: p(t.dataOptions),
       filtersString: B(t.filters),
       componentString: "PivotTableWidget",
-      extraImportsString: A(t.filters || [], i),
+      extraImportsString: Q(t.filters || [], i),
       styleOptionsString: p(t.styleOptions || {}, w)
     };
     return q(r.pivot, a, e);
@@ -765,18 +783,18 @@ const k = `
   if (gt(t))
     return "/** Custom widget code not supported yet */";
   throw new S("errors.otherWidgetTypesNotSupported");
-}, _t = ({ widgetProps: t, uiFramework: e = "react" }) => Nt(t, e, {
-  chart: kt,
-  pivot: Bt
-}), ue = (t) => "chartType" in t.chartRecommendations ? t.chartRecommendations : {
+}, zt = ({ widgetProps: t, uiFramework: e = "react" }) => Nt(t, e, {
+  chart: Bt,
+  pivot: Rt
+}), me = (t) => "chartType" in t.chartRecommendations ? t.chartRecommendations : {
   chartType: "table",
   chartFamily: "table",
   axesMapping: {}
-}, zt = (t) => ({
+}, Jt = (t) => ({
   dataOptions: {
-    columns: t.map(Y)
+    columns: t.map(K)
   }
-}), Jt = Object.freeze({
+}), Kt = Object.freeze({
   convolution: {
     enabled: !0,
     selectedConvolutionType: "bySlicesCount",
@@ -802,12 +820,12 @@ const k = `
   pie: "pie/donut",
   bar: "bar/stacked",
   column: "column/stackedcolumn"
-}), Yt = (t, e, r) => {
+}), Ut = (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) => {
       var T, b;
-      const d = M(y);
+      const d = I(y);
       delete d.enabled;
       const g = i[d.column.name];
       if (!g)
@@ -817,7 +835,7 @@ const k = `
             name: d.column.name
           }
         };
-      const f = Y(g);
+      const f = K(g);
       if (g.panel === "measures")
         return u(o({}, d), {
           column: f
@@ -856,7 +874,7 @@ const k = `
         s !== "geo" && (a[`${s}`] = a[`${s}`][0]);
       }), a;
     case "table":
-      return Object.keys(a).length === 0 ? zt(t).dataOptions : a;
+      return Object.keys(a).length === 0 ? Jt(t).dataOptions : a;
     case "boxplot":
     case "areamap":
     case "indicator":
@@ -865,10 +883,10 @@ const k = `
   }
 }, F = (t, e) => {
   var r, i, a, s;
-  return e === "x" ? (i = (r = t.category) != null ? r : t.x) == null ? void 0 : i.map((n) => M(n).column.name).join(", ") : (s = (a = t.value) != null ? a : t.y) == null ? void 0 : s.map((n) => M(n).column.name).join(", ");
-}, Ut = (t, e, r, i) => {
+  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) => {
   let a;
-  return i && t in R ? a = I(I(Jt, {
+  return i && t in R ? a = M(M(Kt, {
     subtype: R[`${t}`]
   }), {
     legend: {
@@ -887,18 +905,18 @@ const k = `
         text: F(e, "x")
       }
     }
-  }, r) : a = I(ft(), r), a;
-}, Kt = (t, e, r = !0) => {
-  const { chartFamily: i, chartType: a, axesMapping: s = {}, styleOptions: n = {} } = e, m = Yt(t, i, s), l = Ut(a, s, n, r);
+  }, 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);
   return {
     dataOptions: m,
     chartStyleOptions: l
   };
-}, Vt = (t) => "chartType" in t ? t : {
+}, Ht = (t) => "chartType" in t ? t : {
   chartType: "table",
   chartFamily: "table",
   axesMapping: {}
-}, Gt = (t) => t.map((e) => ht(e.jaql)), Ht = (t) => t.reduce((e, r) => {
+}, 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);
     delete i.jaql.filter, e.metadataColumns.push(i);
@@ -912,61 +930,62 @@ const k = `
     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) => qt(x)).map((x) => u(o({}, x), {
+      }), y = St(l), d = n.map((x) => Wt(x)).map((x) => u(o({}, x), {
         jaql: u(o({}, x.jaql), {
           datasource: y
         })
-      })), g = Vt(a), f = g.chartType.toLowerCase(), T = {
+      })), g = Ht(a), f = g.chartType.toLowerCase(), T = {
         cornerRadius: "Small",
         header: {
           // remove info button and render empty toolbar instead
           renderToolbar: () => null
         }
-      }, { metadataColumns: b, metadataFilters: v } = Ht(d), G = Gt(v), { dataOptions: H, chartStyleOptions: X } = Kt(b, g, r), Z = o(o({}, X), T);
+      }, { metadataColumns: b, metadataFilters: v } = Zt(d), H = Gt(v), { dataOptions: G, chartStyleOptions: Z } = Vt(b, g, r), X = o(o({}, Z), T);
       return {
         widgetType: "chart",
         id: s,
         title: s,
         chartType: f,
         dataSource: l,
-        dataOptions: H,
-        filters: G,
-        styleOptions: Z
+        dataOptions: G,
+        filters: H,
+        styleOptions: X
       };
     } catch (r) {
       console.error(r);
       return;
     }
-}, Zt = (t, e) => Xt(t, e), te = (t) => bt(t) ? Ft(t) : _t(t), pe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, te = (t, e) => Xt(t, e), ee = (t) => bt(t) ? _t(t) : zt(t), ge = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  toWidgetCode: te,
-  toWidgetProps: Zt
+  toWidgetCode: ee,
+  toWidgetProps: te
 }, Symbol.toStringTag, { value: "Module" }));
 export {
   w as C,
-  ae as E,
+  ne as E,
   J,
   q as a,
-  P as b,
-  le as c,
-  Q as d,
+  A as b,
+  ce as c,
+  P as d,
   B as e,
-  A as f,
+  Q as f,
   Nt as g,
   p as h,
-  oe as i,
-  ie as j,
+  de as i,
+  ae as j,
   se as k,
-  bt as l,
-  ne as m,
-  qt as n,
-  ue as o,
-  Ct as p,
-  Yt as q,
+  oe as l,
+  bt as m,
+  le as n,
+  Wt as o,
+  Mt as p,
+  me as q,
   Ut as r,
-  de as s,
-  Zt as t,
-  Kt as u,
-  ce as v,
-  pe as w
+  ue as s,
+  te as t,
+  Yt as u,
+  pe as v,
+  ge as w,
+  Vt as x
 };

package/package.json

@@ -11,7 +11,7 @@
     "Sisense",
     "Compose SDK"
   ],
-  "version": "2.4.1",
+  "version": "2.6.0",
   "type": "module",
   "exports": {
     ".": {
@@ -57,12 +57,12 @@
     "@emotion/styled": "^11.14.0",
     "@mui/material": "^6.4.11",
     "@mui/system": "^6.4.11",
-    "@sisense/sdk-common": "2.4.1",
-    "@sisense/sdk-data": "2.4.1",
-    "@sisense/sdk-pivot-client": "2.4.1",
-    "@sisense/sdk-query-client": "2.4.1",
-    "@sisense/sdk-rest-client": "2.4.1",
-    "@sisense/sdk-tracking": "2.4.1",
+    "@sisense/sdk-common": "2.6.0",
+    "@sisense/sdk-data": "2.6.0",
+    "@sisense/sdk-pivot-client": "2.6.0",
+    "@sisense/sdk-query-client": "2.6.0",
+    "@sisense/sdk-rest-client": "2.6.0",
+    "@sisense/sdk-tracking": "2.6.0",
     "@sisense/sisense-charts": "5.1.1",
     "@tanstack/react-query": "4.36.1",
     "classnames": "^2.3.2",