@bygd/nc-report-ui 0.1.17 → 0.1.19

package/dist/default/cjs/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("@material-ui/core/Paper"),a=require("@material-ui/core/styles"),r=require("@material-ui/core/LinearProgress"),n=require("react-google-charts"),l=require("numeral"),o=require("axios"),u=require("@material-ui/core/Typography"),s=require("nunjucks"),i=require("@material-ui/core/FormControl"),c=require("@material-ui/core/Select"),d=require("@material-ui/core/MenuItem"),f=require("react-intersection-observer"),m=require("@mui/material"),p=require("@mui/icons-material/CheckBoxOutlineBlank"),h=require("@mui/icons-material/CheckBox"),y=require("@mui/material/Box"),g=require("@mui/material/InputLabel"),b=require("@mui/material/MenuItem"),E=require("@mui/material/FormControl"),v=require("@mui/material/Select"),w=require("eventemitter3"),x=require("@material-ui/core/Grid"),S=require("@material-ui/core/Box"),C=require("@material-ui/core/Container");function k(e){return e&&e.__esModule?e:{default:e}}function q(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach(function(a){if("default"!==a){var r=Object.getOwnPropertyDescriptor(e,a);Object.defineProperty(t,a,r.get?r:{enumerable:!0,get:function(){return e[a]}})}}),t.default=e,Object.freeze(t)}var M=q(e),R=k(t),I=k(r),T=k(l),A=k(o),O=k(u),_=k(s),F=k(i),z=k(c),Y=k(d),P=k(p),j=k(h),D=k(y),B=k(g),$=k(b),W=k(E),L=k(v),U=k(w),V=k(x),G=k(S),H=k(C);function K(){return K=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var a=arguments[t];for(var r in a)({}).hasOwnProperty.call(a,r)&&(e[r]=a[r])}return e},K.apply(null,arguments)}const N=a.makeStyles(e=>({root:{width:"100%","& > * + *":{marginTop:e.spacing(2)}}}));function J(e){const t=N();return M.default.createElement("div",K({className:t.root},e),M.default.createElement(I.default,null))}function Q(e,t,a="array"){const r=e.columns,n=[...t.doc.metrics,...t.doc.dimensions].reduce((e,t)=>(e[t.name]=t,e),{});return e=>{const t="array"===a?[]:{};return r.reduce((t,r)=>{const l=e[r.name],o=n[r.name];let u=l;return u="timestamp"===o.type?new Date(l):o.format?o.format&&o.prefix?{v:+l,f:o.prefix+" "+T.default(l).format(o.format)}:o.format?{v:+l,f:T.default(l).format(o.format)}:l:l,"array"===a?t.push(u):t[r.name]=u?.f||u,t},t)}}const X="https://report-api.netcapital.pro",Z=A.default.create({baseURL:X,headers:{"Content-Type":"application/json"}}),ee={},te=()=>{const e=Object.keys(ee);return e.length>0?e[0]:null},ae={setBaseUrl(e){Z.defaults.baseURL=e||X},setToken(e){e&&(Z.defaults.headers.common.Authorization=`Bearer ${e}`)},loadDashboardMeta:async({dashboardId:e})=>{const{data:t}=await Z.get(`/dashboard-meta/${e}`);return ee[e]={dashboards:t.dashboards||{},charts:t.charts||{},reports:t.reports||{},reportMetadata:t.reportMetadata||{},dateRanges:t.dateRanges||[]},ee[e]},getDashboard:async({id:e,dashboardId:t})=>{const a=t||te();if(a&&ee[a]?.dashboards?.[e])return ee[a].dashboards[e];const{data:r}=await Z.get(`/entity/dashboards/${e}`);return r},getChart:async({id:e,dashboardId:t})=>{const a=t||te();if(a&&ee[a]?.charts?.[e])return ee[a].charts[e];const{data:r}=await Z.get(`/entity/charts/${e}`);return r},getReport:async({id:e,dashboardId:t})=>{const a=t||te();if(a&&ee[a]?.reports?.[e])return ee[a].reports[e];const{data:r}=await Z.get(`/entity/reports/${e}`);return r},getProviders:async()=>{const{data:e}=await Z.get("/entity/providers");return e},getReportSchema:async({id:e,dashboardId:t,query:a={}})=>{const r=t||te();if(r&&ee[r]?.reportMetadata?.[e])return ee[r].reportMetadata[e];const{data:n}=await Z.post(`/reports/${e}/metadata`,a);return n},runReport:async({id:e,query:t={}})=>{const{data:a}=await Z.post(`/reports/${e}/run`,t);return a},runAdHocReport:async({report:e})=>{const{data:t}=await Z.post("/report-build/run",e);return t},getDateRanges:async({dashboardId:e}={})=>{const t=e||te();if(t&&ee[t]?.dateRanges)return ee[t].dateRanges;const{data:a}=await Z.get("/globals/date-ranges");return a}},re=a.makeStyles(e=>({headerRow:{fontFamily:e.typography.fontFamily,fontSize:e.typography.fontSize},tableRow:{fontFamily:e.typography.fontFamily,fontSize:e.typography.fontSize},oddTableRow:{fontFamily:e.typography.fontFamily,fontSize:e.typography.fontSize},headerCell:{backgroundColor:"white",padding:"4px !important"}})),ne={none:"YYYY-MM-dd",day:"MMM dd",week:"MMM dd",month:"YYYY MMM",year:"YYYY"};const le={GoogleChart:function({chart:t,source:a,view:r,report:l,schema:o,dashboard:u,query:s}){const[i,c]=M.default.useState([]),d=re(),[f,m]=M.default.useState([]);e.useEffect(()=>{(async()=>{const e=await ae.getDateRanges();m(e)})()},[]);const p=e.useMemo(()=>{const e="YYYY-MM-dd",t=s?.date_range?.name,a=f.find(e=>e.name===t);if(!a)return e;return ne[a?.granularity]||e},[f,s]);return M.default.useEffect(()=>{if(!(t&&r&&a&&l&&o))return;let e=[];e.push(function(e,t){const a=[...t.doc.metrics,...t.doc.dimensions];return e.columns.reduce((e,t)=>{const r=a.find(e=>e.name===t.name)||t;return e.push(r.title||r.name),e},[])}(r,o));const n=Q(r,o);a?.forEach(t=>{const a=n(t);e.push(a)}),a?.length?c(e):c()},[t,a,r,l,o]),i?M.default.createElement("div",{style:{}},M.default.createElement(n.Chart,K({width:t?.doc.size?.width||"100%",chartType:t?.doc.chart?.type,data:i,options:(e=>{if("Table"===t?.doc.chart?.type)return{...t?.doc.chart?.options,cssClassNames:d};if("AreaChart"===t?.doc.chart?.type){const a=t?.doc.chart?.options?.hAxis||{},r={...{ticks:e.slice(1).map(e=>e[0]),format:p},...a};return{...t?.doc.chart?.options,hAxis:r,focusTarget:"category"}}return t?.doc.chart?.options})(i)},t?.doc.chart?.props))):M.default.createElement("div",null)},LabelChart:function({chart:e,source:t,view:a,report:r,schema:n}){const[l,o]=M.default.useState([]),[u,s]=M.default.useState(),[i,c]=M.default.useState();return M.default.useEffect(()=>{if(!(e&&a&&t&&r&&n))return;let l=[];const u=Q(a,n);t.forEach(e=>l.push(u(e))),o(l);const i=e?.doc?.chart?.options||{},d=i?.index||0;if(l.length>0&&s(l[0][d]),i.subText?.format){_.default.configure({autoescape:!1});const e=Q(a,n,"object")(t[0]),r=_.default.renderString(i.subText?.format,e);c(r)}},[e,t,a,r,n]),M.default.createElement("div",{style:{display:"flex",justifyContent:"center",alignContent:"center",height:"100%",flexDirection:"column"}},M.default.createElement(O.default,{variant:"h6"},u?.f||u),M.default.createElement(O.default,{variant:"caption"},i))}};function oe(e,t){return void 0!==le[e]?M.default.createElement(le[e],t):M.default.createElement(J,t)}const ue=M.createElement(P.default,{fontSize:"small"}),se=M.createElement(j.default,{fontSize:"small"});function ie({items:t,selectedKeys:a,defaultSelectedKeys:r,onChange:n,inputValue:l,defaultInputValue:o,onInputChange:u,debounceMs:s=300,label:i,placeholder:c,loading:d,disabled:f,size:p="small",error:h,helperText:y,limitTags:g=3,disableClearable:b,id:E,textFieldProps:v}){const w=e.useMemo(()=>Array.isArray(t)?t:[],[t]),x=Array.isArray(a),[S,C]=e.useState(Array.isArray(r)?r:[]),k=x?a:S,q=e.useMemo(()=>{const e=new Map;for(const t of w)e.set(t&&t.key,t);return e},[w]),R=e.useMemo(()=>(Array.isArray(k)?k:[]).map(e=>q.get(e)).filter(Boolean),[k,q]),I="string"==typeof l,[T,A]=e.useState("string"==typeof o?o:""),O=I?l:T,_=function(t,a=300){const r=e.useRef(t),n=e.useRef(null);return r.current=t,e.useEffect(()=>()=>{n.current&&window.clearTimeout(n.current)},[]),M.useCallback((...e)=>{r.current&&(n.current&&window.clearTimeout(n.current),n.current=window.setTimeout(()=>{r.current&&r.current(...e)},a))},[a])}(e=>{u&&u(e)},s),F=R;return M.createElement(m.FormControl,{fullWidth:!0,error:h,disabled:f},M.createElement(m.Autocomplete,{openOnFocus:!0,forcePopupIcon:!0,id:E,multiple:!0,disableCloseOnSelect:!0,options:w,value:F,inputValue:O,getOptionLabel:e=>e&&"object"==typeof e?e.value??"":"",isOptionEqualToValue:(e,t)=>e&&t&&e.key===t.key,loading:d,limitTags:g,disableClearable:b,onChange:(e,t)=>{const a=Array.isArray(t)?t.map(e=>e&&e.key):[];x||C(a),n&&n(a,Array.isArray(t)?t:[])},onInputChange:(e,t,a)=>{I||A(t??""),"input"===a?_(t??""):"clear"===a&&_("")},renderOption:(e,t,{selected:a})=>M.createElement("li",K({},e,{key:t&&t.key||Math.random().toString(36)}),M.createElement(m.Checkbox,{icon:ue,checkedIcon:se,style:{marginRight:8},checked:!!a}),t&&t.value),renderTags:(e,t)=>(Array.isArray(e)?e:[]).map((e,a)=>M.createElement(m.Chip,K({},t({index:a}),{key:e&&e.key||a,label:e&&e.value||""}))),renderInput:e=>M.createElement(m.TextField,K({},e,{label:i,placeholder:c,InputProps:{...e.InputProps,endAdornment:M.createElement(M.Fragment,null,d?M.createElement(m.CircularProgress,{size:18}):null,e.InputProps.endAdornment)},size:p},v))}),y?M.createElement(m.FormHelperText,null,y):null)}const ce=({filter:t,channel:a,query:r})=>{const[n,l]=e.useState([]),[o,u]=e.useState([]),[s,i]=e.useState(!1),[c,d]=e.useState("");return e.useEffect(()=>{u(r?.filter?.[t?.filter]||[])},[r]),e.useEffect(()=>{(async()=>{i(!0);const e=await async function(e,t){return t?.source?(await ae.runReport({id:t.source})).map(e=>({key:e[t.field],value:e[t.field]})):[]}(0,t);l(e),i(!1)})()},[c]),M.default.createElement("div",{style:{display:"flex"}},M.default.createElement("div",{style:{maxWidth:640,minWidth:200}},M.default.createElement(ie,{id:t?.title,label:t?.title,placeholder:"Type to search…",items:n,selectedKeys:o,onChange:(e,r)=>{u(e),a.emit("filterChanged",t,{[t.filter]:e})},onInputChange:e=>{d(e)},loading:s,debounceMs:300,helperText:o.length?`${o.length} selected`:""})))};function de({items:e,value:t,label:a,onChange:r,sx:n={width:"100%"}}){const l=e.some(e=>e.key===t)?t:"";return M.default.createElement(D.default,{sx:n},M.default.createElement(W.default,{fullWidth:!0},M.default.createElement(B.default,{id:"demo-simple-select-label"},a),M.default.createElement(L.default,{labelId:"demo-simple-select-label",id:"demo-simple-select",value:l,label:a,onChange:r,MenuProps:{style:{maxHeight:"300px"}},size:"small"},e.map(e=>{const{key:t,value:a}=e;return M.default.createElement($.default,{key:t,value:t},a)}))))}const fe=({filter:t,channel:a,query:r})=>{const[n,l]=e.useState([]),[o,u]=e.useState("");return e.useEffect(()=>{u(r?.date_range?.name)},[r]),e.useEffect(()=>{(async()=>{const e=(await ae.getDateRanges()).filter(e=>!(t.allowedOptions.length>0)||t.allowedOptions.some(t=>t===e.name)).map(e=>({key:e.name,value:e.title}));l(e)})()},[]),M.default.createElement("div",{style:{minWidth:"200px",maxWidth:"640px"}},M.default.createElement(de,{items:n,value:o,label:t?.title,onChange:(e,r)=>{const n=e.target.value;u(n),a.emit("filterChanged",t,{date_range:{name:n}})}}))},me=({filters:e=[],channel:t,query:a})=>M.default.createElement("div",{style:{display:"flex",flexWrap:"wrap",gap:"8px"}},e.map(e=>"multi-select"===e.type?M.default.createElement(ce,{key:e.title,channel:t,filter:e,query:a}):"date-range"===e.type?M.default.createElement(fe,{key:e.title,channel:t,filter:e,query:a}):null));var pe=e=>M.default.useRef(e||new U.default).current,he=e=>{const t=M.default.useState({}),a=M.default.useCallback((a,r)=>{let n={...t.current,...r};for(var l in t.current=n,n)"date_range"===l||n[l].length||delete n[l];e?.emit("mergedFilterChanged",{value:n})},[e]);M.default.useEffect(()=>(e?.on("filterChanged",a),()=>{e?.off("filterChanged",a)}),[e])},ye=({id:e,cache:t,dashboard:a,channel:r,...n})=>{const[l,o]=M.default.useState(),[u,s]=M.default.useState(),[i,c]=M.default.useState(),[d,m]=M.default.useState(),[p,h]=M.default.useState(oe()),[y,g]=M.default.useState(),[b,E]=M.default.useState(0),[v,w]=M.default.useState(!1),[x,S]=M.default.useState(),[C,k]=M.default.useState(!1),q=M.default.useRef({value:n?.filter}),[I,T]=M.default.useState({}),{ref:A,inView:_,entry:P}=f.useInView({threshold:.1,delay:1e3}),j=pe(r);he(j);const D=M.default.useCallback(e=>{const t=e.target.value;E(t),g(l.doc.view[t])},[l]);M.default.useEffect(()=>{e&&(async()=>{const a=e,r=t?.[a]||await ae.getChart({id:a}),l=r.doc.source?.id,u=l?t?.[l]||await ae.getReport({id:l}):void 0,i=t?.[`schema_${l}`]||n?.schema||await ae.getReportSchema({id:l}),d=r.doc?.view?.[0];E(0),s(u),o(r),g(d),c(i),k(!0)})().catch(e=>{console.error(e.message)})},[e]),M.default.useEffect(()=>{l&&d&&(!l?.doc?.source?.id||u)&&i&&(async()=>{h(oe(l.doc.chart?.component,{view:y,source:d,chart:l,report:u,schema:i,dashboard:a,query:I}))})().catch(e=>{console.error(e.message)})},[l,d,y,u,i]);const B=e=>{const t={...u?.doc.query.filter||{},...n?.filter,...e?.value},a=t.date_range||u?.doc.query.date_range;if(delete t.date_range,k(!1),S(),w(!0),"context"===l?.doc?.source?.type)return m({filter:t}),void w(!1);const r={filter:t,date_range:a,parameters:n?.params};T(r),ae.runReport({id:u.id,query:r}).then(e=>{m(l.doc.source.reverse?e.reverse():e)}).catch(e=>{m([])}).finally(()=>{w(!1)})},$=e=>{q.current=e,_?B(e):(S(e),k(!0))};return M.default.useEffect(()=>(j?.on("mergedFilterChanged",$),()=>{j?.off("mergedFilterChanged",$)}),[j,u,l,_]),M.default.useEffect(()=>{_&&C&&B(x)},[_,C]),M.default.useEffect(()=>{k(!0)},[n.params]),M.default.createElement(R.default,{ref:A,style:{padding:"16px",paddingTop:0,flexGrow:1,borderRadius:12,display:"flex",flexDirection:"column",gap:"16px"},elevation:2},M.default.createElement(J,{style:{visibility:v?"visible":"hidden"}}),M.default.createElement("div",{style:{display:"flex"}},M.default.createElement("div",null,l&&M.default.createElement("div",{style:{display:"flex",alignItems:"center",lineHeight:0}},M.default.createElement(O.default,{noWrap:!0,variant:"caption"},n?.title||l.doc.name," "))),M.default.createElement("div",{style:{flexGrow:1}}),M.default.createElement("div",null,l?.doc?.view?.length>1&&M.default.createElement(F.default,null,M.default.createElement(z.default,{labelId:"date-range-select-label",id:"date-range-select",value:b,onChange:D,style:{fontSize:"12px"},disableUnderline:!0},l.doc.view.map((e,t)=>M.default.createElement(Y.default,{key:t,value:t},e.title)))))),M.default.createElement("div",{style:{position:"relative",flexGrow:a?void 0:1,display:"flex",flexDirection:"column"}},M.default.createElement(me,{filters:l?.doc?.filters,channel:j,query:I}),p))};var ge={Chart:ye,Dashboard:function({id:t="sample_dashboard",api:a,params:r}){const[n,l]=M.default.useState(),[o]=M.default.useState(),[u,s]=M.default.useState([]),i=M.default.useRef({}),c=pe();he(c),e.useEffect(()=>{ae.setBaseUrl(a.base_url),ae.setToken(a.token)},[a]);const d=async e=>{const t=e?.doc?.rows||[],a=[];for(let e=0;e<t.length;e++){const r=t[e];r.columns?.forEach(e=>{if(e.override?.filter?.length){const t={};e.override.filter.forEach(e=>{e.hasOwnProperty("value")&&(t[e.field]=[e.value])}),e.filter=t}}),a.push(r)}s(a)};return M.default.useEffect(()=>{t&&(async()=>{ae.setBaseUrl(a.base_url),ae.setToken(a.token),await ae.loadDashboardMeta({dashboardId:t});const e=await ae.getDashboard({id:t});i.current[e?.id]=e,l(e),await d(e)})().catch(e=>console.error(e.message))},[t]),M.default.createElement(H.default,null,M.default.createElement(V.default,{container:!0,spacing:2},u?.map((e,t)=>M.default.createElement(V.default,{key:t,container:!0,item:!0,alignItems:"stretch",spacing:2},e?.columns?.map((e,t)=>M.default.createElement(V.default,{key:t,item:!0,xs:!0,style:{display:"flex"}},M.default.createElement(G.default,{style:{flex:1,display:"flex",flexDirection:"column"}},M.default.createElement(ye,{api:a,cache:i.current,id:e.id,dashboard:n,schema:o,channel:null,title:e.title,filter:e.filter,params:r}))))))))}};exports.default=ge;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("@material-ui/core/Paper"),a=require("@material-ui/core/styles"),r=require("@material-ui/core"),n=require("react-google-charts"),l=require("numeral"),o=require("axios"),i=require("@material-ui/core/Typography"),s=require("nunjucks"),u=require("@material-ui/core/FormControl"),d=require("@material-ui/core/Select"),c=require("@material-ui/core/MenuItem"),f=require("react-intersection-observer"),m=require("@mui/material"),p=require("@mui/icons-material/CheckBoxOutlineBlank"),h=require("@mui/icons-material/CheckBox"),y=require("@mui/material/Box"),g=require("@mui/material/InputLabel"),b=require("@mui/material/MenuItem"),E=require("@mui/material/FormControl"),v=require("@mui/material/Select"),w=require("eventemitter3"),x=require("@material-ui/core/Grid"),C=require("@material-ui/core/Container");function S(e){return e&&e.__esModule?e:{default:e}}function k(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach(function(a){if("default"!==a){var r=Object.getOwnPropertyDescriptor(e,a);Object.defineProperty(t,a,r.get?r:{enumerable:!0,get:function(){return e[a]}})}}),t.default=e,Object.freeze(t)}var q=k(e),M=S(t),R=S(l),I=S(o),T=S(i),A=S(s),D=S(u),F=S(d),O=S(c),_=S(p),z=S(h),Y=S(y),j=S(g),P=S(b),$=S(E),B=S(v),W=S(w),U=S(x),V=S(C);function G(){return G=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var a=arguments[t];for(var r in a)({}).hasOwnProperty.call(a,r)&&(e[r]=a[r])}return e},G.apply(null,arguments)}const L=a.makeStyles(e=>({root:{width:"100%","& > * + *":{marginTop:e.spacing(2)}}}));function H(e){const t=L();return q.default.createElement("div",G({className:t.root},e),q.default.createElement(r.CircularProgress,{style:{color:"rgb(70, 134, 128)"},size:25}))}function K(e,t,a="array"){const r=e.columns,n=[...t.doc.metrics,...t.doc.dimensions].reduce((e,t)=>(e[t.name]=t,e),{});return e=>{const t="array"===a?[]:{};return r.reduce((t,r)=>{const l=e[r.name],o=n[r.name];let i=l;return i="timestamp"===o.type?new Date(l):o.format?o.format&&o.prefix?{v:+l,f:o.prefix+" "+R.default(l).format(o.format)}:o.format?{v:+l,f:R.default(l).format(o.format)}:l:l,"array"===a?t.push(i):t[r.name]=i?.f||i,t},t)}}const N="https://report-api.netcapital.pro",J=I.default.create({baseURL:N,headers:{"Content-Type":"application/json"}}),Q={},X=()=>{const e=Object.keys(Q);return e.length>0?e[0]:null},Z={setBaseUrl(e){J.defaults.baseURL=e||N},setToken(e){e&&(J.defaults.headers.common.Authorization=`Bearer ${e}`)},loadDashboardMeta:async({dashboardId:e})=>{const{data:t}=await J.get(`/dashboard-meta/${e}`);return Q[e]={dashboards:t.dashboards||{},charts:t.charts||{},reports:t.reports||{},reportMetadata:t.reportMetadata||{},dateRanges:t.dateRanges||[]},Q[e]},getDashboard:async({id:e,dashboardId:t})=>{const a=t||X();if(a&&Q[a]?.dashboards?.[e])return Q[a].dashboards[e];const{data:r}=await J.get(`/entity/dashboards/${e}`);return r},getChart:async({id:e,dashboardId:t})=>{const a=t||X();if(a&&Q[a]?.charts?.[e])return Q[a].charts[e];const{data:r}=await J.get(`/entity/charts/${e}`);return r},getReport:async({id:e,dashboardId:t})=>{const a=t||X();if(a&&Q[a]?.reports?.[e])return Q[a].reports[e];const{data:r}=await J.get(`/entity/reports/${e}`);return r},getProviders:async()=>{const{data:e}=await J.get("/entity/providers");return e},getReportSchema:async({id:e,dashboardId:t,query:a={}})=>{const r=t||X();if(r&&Q[r]?.reportMetadata?.[e])return Q[r].reportMetadata[e];const{data:n}=await J.post(`/reports/${e}/metadata`,a);return n},runReport:async({id:e,query:t={}})=>{const{data:a}=await J.post(`/reports/${e}/run`,t);return a},runAdHocReport:async({report:e})=>{const{data:t}=await J.post("/report-build/run",e);return t},getDateRanges:async({dashboardId:e}={})=>{const t=e||X();if(t&&Q[t]?.dateRanges)return Q[t].dateRanges;const{data:a}=await J.get("/globals/date-ranges");return a},getReportDefinitions:async()=>{const{data:e}=await J.get("/report-definitions");return e},getReportDefinition:async({id:e})=>{const{data:t}=await J.get(`/report-definitions/${e}`);return t},createReportDefinition:async({reportDefinition:e})=>{const{data:t}=await J.post("/report-definitions",e);return t},updateReportDefinition:async({id:e,reportDefinition:t})=>{const{data:a}=await J.put(`/report-definitions/${e}`,t);return a},deleteReportDefinition:async({id:e})=>{const{data:t}=await J.delete(`/report-definitions/${e}`);return t}},ee=a.makeStyles(e=>({headerRow:{fontFamily:e.typography.fontFamily,fontSize:e.typography.fontSize},tableRow:{fontFamily:e.typography.fontFamily,fontSize:e.typography.fontSize},oddTableRow:{fontFamily:e.typography.fontFamily,fontSize:e.typography.fontSize},headerCell:{backgroundColor:"white",padding:"4px !important"}})),te={none:"YYYY-MM-dd",day:"MMM dd",week:"MMM dd",month:"YYYY MMM",year:"YYYY"};const ae={GoogleChart:function({chart:t,source:a,view:r,report:l,schema:o,dashboard:i,query:s}){const[u,d]=q.default.useState([]),c=ee(),[f,m]=q.default.useState([]);e.useEffect(()=>{(async()=>{const e=await Z.getDateRanges();m(e)})()},[]);const p=e.useMemo(()=>{const e="YYYY-MM-dd",t=s?.date_range?.name,a=f.find(e=>e.name===t);if(!a)return e;return te[a?.granularity]||e},[f,s]);return q.default.useEffect(()=>{if(!(t&&r&&a&&l&&o))return;let e=[];e.push(function(e,t){const a=[...t.doc.metrics,...t.doc.dimensions];return e.columns.reduce((e,t)=>{const r=a.find(e=>e.name===t.name)||t;return e.push(r.title||r.name),e},[])}(r,o));const n=K(r,o);a?.forEach(t=>{const a=n(t);e.push(a)}),a?.length?d(e):d()},[t,a,r,l,o]),u?q.default.createElement("div",{style:{}},q.default.createElement(n.Chart,G({width:t?.doc.size?.width||"100%",chartType:t?.doc.chart?.type,data:u,options:(e=>{const a=["#468682","#ff686b","#6c757d","#FFD700","#073b4c"];if("Table"===t?.doc.chart?.type)return{...t?.doc.chart?.options,cssClassNames:c};if("AreaChart"===t?.doc.chart?.type){const r=t?.doc.chart?.options?.hAxis||{},n={...{ticks:e.slice(1).map(e=>e[0]),format:p},...r};return{...t?.doc.chart?.options,hAxis:n,focusTarget:"category",colors:a}}return{...t?.doc.chart?.options,colors:a}})(u)},t?.doc.chart?.props))):q.default.createElement("div",null)},LabelChart:function({chart:e,source:t,view:a,report:r,schema:n}){const[l,o]=q.default.useState([]),[i,s]=q.default.useState(),[u,d]=q.default.useState();return q.default.useEffect(()=>{if(!(e&&a&&t&&r&&n))return;let l=[];const i=K(a,n);t.forEach(e=>l.push(i(e))),o(l);const u=e?.doc?.chart?.options||{},c=u?.index||0;if(l.length>0&&s(l[0][c]),u.subText?.format){A.default.configure({autoescape:!1});const e=K(a,n,"object")(t[0]),r=A.default.renderString(u.subText?.format,e);d(r)}},[e,t,a,r,n]),q.default.createElement("div",{style:{display:"flex",justifyContent:"center",alignContent:"center",height:"100%",flexDirection:"column"}},q.default.createElement(T.default,{variant:"h6"},i?.f||i),q.default.createElement(T.default,{variant:"caption"},u))}};function re(e,t){return void 0!==ae[e]?q.default.createElement(ae[e],t):q.default.createElement(H,t)}const ne=q.createElement(_.default,{fontSize:"small"}),le=q.createElement(z.default,{fontSize:"small"});function oe({items:t,selectedKeys:a,defaultSelectedKeys:r,onChange:n,inputValue:l,defaultInputValue:o,onInputChange:i,debounceMs:s=300,label:u,placeholder:d,loading:c,disabled:f,size:p="small",error:h,helperText:y,limitTags:g=3,disableClearable:b,id:E,textFieldProps:v}){const w=e.useMemo(()=>Array.isArray(t)?t:[],[t]),x=Array.isArray(a),[C,S]=e.useState(Array.isArray(r)?r:[]),k=x?a:C,M=e.useMemo(()=>{const e=new Map;for(const t of w)e.set(t&&t.key,t);return e},[w]),R=e.useMemo(()=>(Array.isArray(k)?k:[]).map(e=>M.get(e)).filter(Boolean),[k,M]),I="string"==typeof l,[T,A]=e.useState("string"==typeof o?o:""),D=I?l:T,F=function(t,a=300){const r=e.useRef(t),n=e.useRef(null);return r.current=t,e.useEffect(()=>()=>{n.current&&window.clearTimeout(n.current)},[]),q.useCallback((...e)=>{r.current&&(n.current&&window.clearTimeout(n.current),n.current=window.setTimeout(()=>{r.current&&r.current(...e)},a))},[a])}(e=>{i&&i(e)},s),O=R;return q.createElement(m.FormControl,{fullWidth:!0,error:h,disabled:f},q.createElement(m.Autocomplete,{openOnFocus:!0,forcePopupIcon:!0,id:E,multiple:!0,disableCloseOnSelect:!0,options:w,value:O,inputValue:D,getOptionLabel:e=>e&&"object"==typeof e?e.value??"":"",isOptionEqualToValue:(e,t)=>e&&t&&e.key===t.key,loading:c,limitTags:g,disableClearable:b,onChange:(e,t)=>{const a=Array.isArray(t)?t.map(e=>e&&e.key):[];x||S(a),n&&n(a,Array.isArray(t)?t:[])},onInputChange:(e,t,a)=>{I||A(t??""),"input"===a?F(t??""):"clear"===a&&F("")},renderOption:(e,t,{selected:a})=>q.createElement("li",G({},e,{key:t&&t.key||Math.random().toString(36)}),q.createElement(m.Checkbox,{icon:ne,checkedIcon:le,style:{marginRight:8},checked:!!a}),t&&t.value),renderTags:(e,t)=>(Array.isArray(e)?e:[]).map((e,a)=>q.createElement(m.Chip,G({},t({index:a}),{key:e&&e.key||a,label:e&&e.value||""}))),renderInput:e=>q.createElement(m.TextField,G({},e,{label:u,placeholder:d,InputProps:{...e.InputProps,endAdornment:q.createElement(q.Fragment,null,c?q.createElement(m.CircularProgress,{size:18}):null,e.InputProps.endAdornment)},size:p},v))}),y?q.createElement(m.FormHelperText,null,y):null)}const ie=({filter:t,channel:a,query:r})=>{const[n,l]=e.useState([]),[o,i]=e.useState([]),[s,u]=e.useState(!1),[d,c]=e.useState("");return e.useEffect(()=>{i(r?.filter?.[t?.filter]||[])},[r]),e.useEffect(()=>{(async()=>{u(!0);const e=await async function(e,t){return t?.source?(await Z.runReport({id:t.source})).map(e=>({key:e[t.field],value:e[t.field]})):[]}(0,t);l(e),u(!1)})()},[d]),q.default.createElement("div",{style:{display:"flex"}},q.default.createElement("div",{style:{maxWidth:640,minWidth:200}},q.default.createElement(oe,{id:t?.title,label:t?.title,placeholder:"Type to search…",items:n,selectedKeys:o,onChange:(e,r)=>{i(e),a.emit("filterChanged",t,{[t.filter]:e})},onInputChange:e=>{c(e)},loading:s,debounceMs:300,helperText:o.length?`${o.length} selected`:""})))};function se({items:e,value:t,label:a,onChange:r,sx:n={width:"100%"}}){const l=e.some(e=>e.key===t)?t:"";return q.default.createElement(Y.default,{sx:n},q.default.createElement($.default,{fullWidth:!0},q.default.createElement(j.default,{id:"demo-simple-select-label"},a),q.default.createElement(B.default,{labelId:"demo-simple-select-label",id:"demo-simple-select",value:l,label:a,onChange:r,MenuProps:{style:{maxHeight:"300px"}},size:"small"},e.map(e=>{const{key:t,value:a,disabled:r}=e;return q.default.createElement(P.default,{key:t,value:t,disabled:r},a)}))))}const ue=({filter:t,channel:a,query:r})=>{const[n,l]=e.useState([]),[o,i]=e.useState("");return e.useEffect(()=>{i(r?.date_range?.name)},[r]),e.useEffect(()=>{(async()=>{const e=(await Z.getDateRanges()).filter(e=>!(t.allowedOptions.length>0)||t.allowedOptions.some(t=>t===e.name)).map(e=>({key:e.name,value:e.title}));l(e)})()},[]),q.default.createElement("div",{style:{minWidth:"200px",maxWidth:"640px"}},q.default.createElement(se,{items:n,value:o,label:t?.title,onChange:(e,r)=>{const n=e.target.value;i(n),a.emit("filterChanged",t,{date_range:{name:n}})}}))},de=({filters:e=[],channel:t,query:a})=>q.default.createElement("div",{style:{display:"flex",flexWrap:"wrap",gap:"8px"}},e.map(e=>"multi-select"===e.type?q.default.createElement(ie,{key:e.title,channel:t,filter:e,query:a}):"date-range"===e.type?q.default.createElement(ue,{key:e.title,channel:t,filter:e,query:a}):null));var ce=e=>q.default.useRef(e||new W.default).current,fe=e=>{const t=q.default.useState({}),a=q.default.useCallback((a,r)=>{let n={...t.current,...r};for(var l in t.current=n,n)"date_range"===l||n[l].length||delete n[l];e?.emit("mergedFilterChanged",{value:n})},[e]);q.default.useEffect(()=>(e?.on("filterChanged",a),()=>{e?.off("filterChanged",a)}),[e])},me=({id:e,cache:t,dashboard:a,channel:r,...n})=>{const[l,o]=q.default.useState(),[i,s]=q.default.useState(),[u,d]=q.default.useState(),[c,m]=q.default.useState(),[p,h]=q.default.useState(re()),[y,g]=q.default.useState(),[b,E]=q.default.useState(0),[v,w]=q.default.useState(!1),[x,C]=q.default.useState(),[S,k]=q.default.useState(!1),R=q.default.useRef({value:n?.filter}),[I,A]=q.default.useState({}),{ref:_,inView:z,entry:Y}=f.useInView({threshold:.1,delay:1e3}),j=ce(r);fe(j);const P=q.default.useCallback(e=>{const t=e.target.value;E(t),g(l.doc.view[t])},[l]);q.default.useEffect(()=>{e&&(async()=>{const a=e,r=t?.[a]||await Z.getChart({id:a}),l=r.doc.source?.id,i=l?t?.[l]||await Z.getReport({id:l}):void 0,u=t?.[`schema_${l}`]||n?.schema||await Z.getReportSchema({id:l}),c=r.doc?.view?.[0];E(0),s(i),o(r),g(c),d(u),k(!0)})().catch(e=>{console.error(e.message)})},[e]),q.default.useEffect(()=>{l&&c&&(!l?.doc?.source?.id||i)&&u&&(async()=>{h(re(l.doc.chart?.component,{view:y,source:c,chart:l,report:i,schema:u,dashboard:a,query:I}))})().catch(e=>{console.error(e.message)})},[l,c,y,i,u]);const $=e=>{const t={...i?.doc.query.filter||{},...n?.filter,...e?.value},a=t.date_range||i?.doc.query.date_range;if(delete t.date_range,k(!1),C(),w(!0),"context"===l?.doc?.source?.type)return m({filter:t}),void w(!1);const r={filter:t,date_range:a,parameters:n?.params};A(r),Z.runReport({id:i.id,query:r}).then(e=>{m(l.doc.source.reverse?e.reverse():e)}).catch(e=>{m([])}).finally(()=>{w(!1)})},B=e=>{R.current=e,z?$(e):(C(e),k(!0))};return q.default.useEffect(()=>(j?.on("mergedFilterChanged",B),()=>{j?.off("mergedFilterChanged",B)}),[j,i,l,z]),q.default.useEffect(()=>{z&&S&&$(x)},[z,S]),q.default.useEffect(()=>{k(!0)},[n.params]),q.default.createElement(M.default,{ref:_,elevation:0,style:{borderRadius:12,padding:20,border:"1px solid #e5e5e5",background:"#fff",display:"flex",flexDirection:"column",gap:"12px",height:"100%"}},l&&q.default.createElement("div",{style:{display:"flex",alignItems:"center",lineHeight:0}},q.default.createElement(T.default,{variant:"subtitle2",style:{fontWeight:600,color:"#252525"}},n?.title||l.doc.name," ")),v?q.default.createElement(H,{style:{display:"flex",justifyContent:"center",alignItems:"center",height:"100%",width:"100%"}}):q.default.createElement(q.default.Fragment,null,q.default.createElement("div",{style:{display:"flex"}},q.default.createElement("div",{style:{flexGrow:1}}),q.default.createElement("div",null,l?.doc?.view?.length>1&&q.default.createElement(D.default,null,q.default.createElement(F.default,{labelId:"date-range-select-label",id:"date-range-select",value:b,onChange:P,style:{fontSize:"12px"},disableUnderline:!0},l.doc.view.map((e,t)=>q.default.createElement(O.default,{key:t,value:t},e.title)))))),q.default.createElement("div",{style:{position:"relative",flexGrow:a?void 0:1,display:"flex",flexDirection:"column"}},q.default.createElement(de,{filters:l?.doc?.filters,channel:j,query:I}),p)))};var pe={Chart:me,Dashboard:function({id:t="sample_dashboard",api:a,params:r}){const[n,l]=q.default.useState(),[o]=q.default.useState(),[i,s]=q.default.useState([]),u=q.default.useRef({}),d=ce();fe(d),console.log({rows:i},{dashboard:n},{schema:o},{params:r}),e.useEffect(()=>{Z.setBaseUrl(a.base_url),Z.setToken(a.token)},[a]);const c=async e=>{const t=e?.doc?.rows||[],a=[];for(let e=0;e<t.length;e++){const r=t[e];r.columns?.forEach(e=>{if(e.override?.filter?.length){const t={};e.override.filter.forEach(e=>{e.hasOwnProperty("value")&&(t[e.field]=[e.value])}),e.filter=t}}),a.push(r)}s(a)};return q.default.useEffect(()=>{t&&(async()=>{Z.setBaseUrl(a.base_url),Z.setToken(a.token),await Z.loadDashboardMeta({dashboardId:t});const e=await Z.getDashboard({id:t});u.current[e?.id]=e,l(e),await c(e)})().catch(e=>console.error(e.message))},[t]),q.default.createElement(V.default,{maxWidth:!1,disableGutters:!0},q.default.createElement(U.default,{container:!0,spacing:3},i?.map((e,t)=>{const l=(e=>0===e?12:12/e)(e.columns.length);return q.default.createElement(q.default.Fragment,{key:t},1===t?q.default.createElement(U.default,{item:!0,xs:12},q.default.createElement(U.default,{container:!0,spacing:3},e.columns.map((e,t)=>q.default.createElement(U.default,{key:t,item:!0,xs:12,md:l},q.default.createElement(me,{api:a,cache:u.current,id:e.id,dashboard:n,schema:o,title:e.title,filter:e.filter,params:r}))))):e.columns.map((e,t)=>q.default.createElement(U.default,{key:t,item:!0,xs:12,md:l},q.default.createElement(me,{api:a,cache:u.current,id:e.id,dashboard:n,schema:o,title:e.title,filter:e.filter,params:r}))))})))}};exports.default=pe;

package/dist/default/esm/index.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import React__default, { useEffect, useMemo, useState, useRef } from 'react';
 import Paper from '@material-ui/core/Paper';
 import { makeStyles } from '@material-ui/core/styles';
-import LinearProgress from '@material-ui/core/LinearProgress';
+import { CircularProgress } from '@material-ui/core';
 import { Chart as Chart$1 } from 'react-google-charts';
 import numeral from 'numeral';
 import axios from 'axios';
@@ -12,7 +12,7 @@ import FormControl$2 from '@material-ui/core/FormControl';
 import Select$1 from '@material-ui/core/Select';
 import MenuItem$1 from '@material-ui/core/MenuItem';
 import { useInView } from 'react-intersection-observer';
-import { FormControl, Autocomplete, TextField, CircularProgress, Chip, Checkbox, FormHelperText } from '@mui/material';
+import { FormControl, Autocomplete, TextField, CircularProgress as CircularProgress$1, Chip, Checkbox, FormHelperText } from '@mui/material';
 import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank';
 import CheckBoxIcon from '@mui/icons-material/CheckBox';
 import Box from '@mui/material/Box';
@@ -22,7 +22,6 @@ import FormControl$1 from '@mui/material/FormControl';
 import Select from '@mui/material/Select';
 import EventEmitter from 'eventemitter3';
 import Grid from '@material-ui/core/Grid';
-import Box$1 from '@material-ui/core/Box';
 import Container from '@material-ui/core/Container';
 
 function _extends() {
@@ -37,8 +36,8 @@ function _extends() {
 
 const useStyles$1 = makeStyles(theme => ({
   root: {
-    width: '100%',
-    '& > * + *': {
+    width: "100%",
+    "& > * + *": {
       marginTop: theme.spacing(2)
     }
   }
@@ -47,7 +46,13 @@ function LinearIndeterminate(props) {
   const classes = useStyles$1();
   return /*#__PURE__*/React__default.createElement("div", _extends({
     className: classes.root
-  }, props), /*#__PURE__*/React__default.createElement(LinearProgress, null));
+  }, props), /*#__PURE__*/React__default.createElement(CircularProgress, {
+    style: {
+      color: "rgb(70, 134, 128)"
+    } // custom color
+    ,
+    size: 25
+  }));
 }
 
 function ValuePicker(view, schema, outputFormat = 'array') {
@@ -291,6 +296,74 @@ const Api = {
       data
     } = await apiClient.get(`/globals/date-ranges`);
     return data;
+  },
+  /**
+   * Get all report definitions
+   * @returns {Promise} Axios response promise with array of report definitions
+   */
+  getReportDefinitions: async () => {
+    const {
+      data
+    } = await apiClient.get(`/report-definitions`);
+    return data;
+  },
+  /**
+   * Get report definition by ID
+   * @param {Object} params - Parameters object
+   * @param {string} params.id - Report definition ID
+   * @returns {Promise} Axios response promise with report definition
+   */
+  getReportDefinition: async ({
+    id
+  }) => {
+    const {
+      data
+    } = await apiClient.get(`/report-definitions/${id}`);
+    return data;
+  },
+  /**
+   * Create a new report definition
+   * @param {Object} params - Parameters object
+   * @param {Object} params.reportDefinition - Report definition object to create
+   * @returns {Promise} Axios response promise with created report definition
+   */
+  createReportDefinition: async ({
+    reportDefinition
+  }) => {
+    const {
+      data
+    } = await apiClient.post(`/report-definitions`, reportDefinition);
+    return data;
+  },
+  /**
+   * Update an existing report definition
+   * @param {Object} params - Parameters object
+   * @param {string} params.id - Report definition ID
+   * @param {Object} params.reportDefinition - Updated report definition object
+   * @returns {Promise} Axios response promise with updated report definition
+   */
+  updateReportDefinition: async ({
+    id,
+    reportDefinition
+  }) => {
+    const {
+      data
+    } = await apiClient.put(`/report-definitions/${id}`, reportDefinition);
+    return data;
+  },
+  /**
+   * Delete a report definition
+   * @param {Object} params - Parameters object
+   * @param {string} params.id - Report definition ID
+   * @returns {Promise} Axios response promise
+   */
+  deleteReportDefinition: async ({
+    id
+  }) => {
+    const {
+      data
+    } = await apiClient.delete(`/report-definitions/${id}`);
+    return data;
   }
 };
 
@@ -316,11 +389,11 @@ const useStyles = makeStyles(theme => ({
   // },
 }));
 const dateRangeFormats = {
-  "none": "YYYY-MM-dd",
-  "day": "MMM dd",
-  "week": "MMM dd",
-  "month": "YYYY MMM",
-  "year": "YYYY"
+  none: "YYYY-MM-dd",
+  day: "MMM dd",
+  week: "MMM dd",
+  month: "YYYY MMM",
+  year: "YYYY"
 };
 function GoogleChart({
   chart,
@@ -341,7 +414,7 @@ function GoogleChart({
     })();
   }, []);
   const dateRangeFormat = useMemo(() => {
-    const defaultFormat = 'YYYY-MM-dd';
+    const defaultFormat = "YYYY-MM-dd";
     const name = query?.date_range?.name;
     const dateRange = dateRanges.find(f => f.name === name);
     if (!dateRange) return defaultFormat;
@@ -349,12 +422,14 @@ function GoogleChart({
     return format;
   }, [dateRanges, query]);
   const getOptions = data => {
-    if (chart?.doc.chart?.type === 'Table') {
+    const customColors = ["#468682", "#ff686b", "#6c757d", "#FFD700", "#073b4c"]; // your custom colors
+
+    if (chart?.doc.chart?.type === "Table") {
       return {
         ...chart?.doc.chart?.options,
         cssClassNames: classes
       };
-    } else if (chart?.doc.chart?.type === 'AreaChart') {
+    } else if (chart?.doc.chart?.type === "AreaChart") {
       const hAxisFromChart = chart?.doc.chart?.options?.hAxis || {};
       const hAxisDefaults = {
         ticks: data.slice(1).map(row => row[0]),
@@ -364,17 +439,18 @@ function GoogleChart({
         ...hAxisDefaults,
         ...hAxisFromChart
       };
-
-      // console.log({GoogleChart:{chart,source,view,report,schema,query,dateRanges,dateRangeFormat,ticks:hAxis.ticks}})
-
       return {
         ...chart?.doc.chart?.options,
-        ...{
-          hAxis,
-          focusTarget: 'category'
-        }
+        hAxis,
+        focusTarget: "category",
+        colors: customColors // <-- add this line
+      };
+    } else {
+      return {
+        ...chart?.doc.chart?.options,
+        colors: customColors // add for other chart types too
       };
-    } else return chart?.doc.chart?.options;
+    }
   };
   React__default.useEffect(() => {
     if (!chart || !view || !source || !report || !schema) return;
@@ -390,7 +466,7 @@ function GoogleChart({
   return data ? /*#__PURE__*/React__default.createElement("div", {
     style: {}
   }, /*#__PURE__*/React__default.createElement(Chart$1, _extends({
-    width: chart?.doc.size?.width || '100%'
+    width: chart?.doc.size?.width || "100%"
     //height={dashboard ? (chart?.doc.size?.height || '300px') : '100%'}
     ,
     chartType: chart?.doc.chart?.type,
@@ -592,7 +668,7 @@ function CheckboxMultiAutocomplete({
       placeholder: placeholder,
       InputProps: {
         ...params.InputProps,
-        endAdornment: /*#__PURE__*/React.createElement(React.Fragment, null, loading ? /*#__PURE__*/React.createElement(CircularProgress, {
+        endAdornment: /*#__PURE__*/React.createElement(React.Fragment, null, loading ? /*#__PURE__*/React.createElement(CircularProgress$1, {
           size: 18
         }) : null, params.InputProps.endAdornment)
       },
@@ -698,11 +774,13 @@ function SingleSelect({
   }, items.map(itm => {
     const {
       key,
-      value
+      value,
+      disabled
     } = itm;
     return /*#__PURE__*/React__default.createElement(MenuItem, {
       key: key,
-      value: key
+      value: key,
+      disabled: disabled
     }, value);
   }))));
 }
@@ -839,7 +917,7 @@ var Chart = ({
     entry
   } = useInView({
     /* Optional options */
-    threshold: 0.10,
+    threshold: 0.1,
     delay: 1000
   });
   const channelUsed = useChannel(channel);
@@ -932,7 +1010,7 @@ var Chart = ({
     setDirty(false);
     setFilter();
     setLoading(true);
-    if (chart?.doc?.source?.type === 'context') {
+    if (chart?.doc?.source?.type === "context") {
       setSource({
         filter: finalFilter
       });
@@ -968,9 +1046,9 @@ var Chart = ({
     }
   };
   React__default.useEffect(() => {
-    channelUsed?.on('mergedFilterChanged', onMergedFilterChanged);
+    channelUsed?.on("mergedFilterChanged", onMergedFilterChanged);
     return () => {
-      channelUsed?.off('mergedFilterChanged', onMergedFilterChanged);
+      channelUsed?.off("mergedFilterChanged", onMergedFilterChanged);
     };
   }, [channelUsed, report, chart, inView]);
   React__default.useEffect(() => {
@@ -982,37 +1060,42 @@ var Chart = ({
   }, [props.params]);
   return /*#__PURE__*/React__default.createElement(Paper, {
     ref: ref,
+    elevation: 0,
     style: {
-      //margin: "4px", 
-      padding: "16px",
-      paddingTop: 0,
-      //flexGrow: dashboard ? undefined : 1, display: "flex", flexDirection: "column",
-      flexGrow: 1,
-      // gap:'16px',
       borderRadius: 12,
-      display: 'flex',
-      flexDirection: 'column',
-      gap: '16px'
-    },
-    elevation: 2
-  }, /*#__PURE__*/React__default.createElement(LinearIndeterminate, {
+      padding: 20,
+      border: "1px solid #e5e5e5",
+      background: "#fff",
+      display: "flex",
+      flexDirection: "column",
+      gap: "12px",
+      height: "100%"
+    }
+  }, chart && /*#__PURE__*/React__default.createElement("div", {
     style: {
-      visibility: loading ? 'visible' : 'hidden'
+      display: "flex",
+      alignItems: "center",
+      lineHeight: 0
     }
-  }), /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement(Typography, {
+    variant: "subtitle2",
     style: {
-      display: "flex"
+      fontWeight: 600,
+      color: "#252525"
     }
-  }, /*#__PURE__*/React__default.createElement("div", null, chart && /*#__PURE__*/React__default.createElement("div", {
+  }, props?.title || chart.doc.name, " ")), loading ? /*#__PURE__*/React__default.createElement(LinearIndeterminate, {
     style: {
       display: "flex",
+      justifyContent: "center",
       alignItems: "center",
-      lineHeight: 0
+      height: "100%",
+      width: "100%"
     }
-  }, /*#__PURE__*/React__default.createElement(Typography, {
-    noWrap: true,
-    variant: "caption"
-  }, props?.title || chart.doc.name, " "))), /*#__PURE__*/React__default.createElement("div", {
+  }) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: "flex"
+    }
+  }, /*#__PURE__*/React__default.createElement("div", {
     style: {
       flexGrow: 1
     }
@@ -1035,15 +1118,15 @@ var Chart = ({
       // paddingTop: chart?.doc?.size?.vpad,
       // paddingBottom: chart?.doc?.size?.vpad,
       flexGrow: dashboard ? undefined : 1,
-      display: 'flex',
-      flexDirection: 'column'
+      display: "flex",
+      flexDirection: "column"
       // gap:'16px'
     }
   }, /*#__PURE__*/React__default.createElement(ChartFilters, {
     filters: chart?.doc?.filters,
     channel: channelUsed,
     query: currentQuery
-  }), chartType));
+  }), chartType)));
 };
 
 function Dashboard({
@@ -1058,6 +1141,15 @@ function Dashboard({
   const cache = React__default.useRef({});
   const channel = useChannel();
   useFilterManager(channel);
+  console.log({
+    rows
+  }, {
+    dashboard
+  }, {
+    schema
+  }, {
+    params
+  });
   useEffect(() => {
     // console.log('token changed',api);
 
@@ -1091,7 +1183,7 @@ function Dashboard({
         if (column.override?.filter?.length) {
           const filter = {};
           column.override.filter.forEach(item => {
-            if (item.hasOwnProperty('value')) filter[item.field] = [item.value];
+            if (item.hasOwnProperty("value")) filter[item.field] = [item.value];
             // else filter[item.field] = [sourceDataRow[item.field]];
           });
           column.filter = filter;
@@ -1105,6 +1197,10 @@ function Dashboard({
     if (!id) return;
     init().catch(error => console.error(error.message));
   }, [id]);
+  const getMd = count => {
+    if (count === 0) return 12;
+    return 12 / count;
+  };
   return (
     /*#__PURE__*/
     // <Container>
@@ -1131,41 +1227,63 @@ function Dashboard({
     //         )}
     //     </Grid>
     // </Container>
-    React__default.createElement(Container, null, /*#__PURE__*/React__default.createElement(Grid, {
+    React__default.createElement(Container, {
+      maxWidth: false,
+      disableGutters: true
+      //   style={{
+      //     padding: "24px",
+      //     background: "#f7f8fa",
+      //     borderRadius: "10px",
+      //   }}
+    }, /*#__PURE__*/React__default.createElement(Grid, {
       container: true,
-      spacing: 2
-    }, rows?.map((row, rowIndex) => /*#__PURE__*/React__default.createElement(Grid, {
-      key: rowIndex,
-      container: true,
-      item: true
-      // important: make items in this row stretch to same height
-      ,
-      alignItems: "stretch",
-      spacing: 2
-    }, row?.columns?.map((column, colIndex) => /*#__PURE__*/React__default.createElement(Grid, {
-      key: colIndex,
-      item: true,
-      xs: true,
-      style: {
-        display: 'flex'
-      }
-    }, /*#__PURE__*/React__default.createElement(Box$1, {
-      style: {
-        flex: 1,
-        display: 'flex',
-        flexDirection: 'column'
-      }
-    }, /*#__PURE__*/React__default.createElement(Chart, {
-      api: api,
-      cache: cache.current,
-      id: column.id,
-      dashboard: dashboard,
-      schema: schema,
-      channel: null,
-      title: column.title,
-      filter: column.filter,
-      params: params
-    }))))))))
+      spacing: 3
+    }, rows?.map((row, rowIndex) => {
+      const count = row.columns.length;
+      const md = getMd(count);
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
+        key: rowIndex
+      }, rowIndex === 1 ?
+      /*#__PURE__*/
+      // Row 2 is special: nested grid inside a full-width container
+      React__default.createElement(Grid, {
+        item: true,
+        xs: 12
+      }, /*#__PURE__*/React__default.createElement(Grid, {
+        container: true,
+        spacing: 3
+      }, row.columns.map((column, i) => /*#__PURE__*/React__default.createElement(Grid, {
+        key: i,
+        item: true,
+        xs: 12,
+        md: md
+      }, /*#__PURE__*/React__default.createElement(Chart, {
+        api: api,
+        cache: cache.current,
+        id: column.id,
+        dashboard: dashboard,
+        schema: schema,
+        title: column.title,
+        filter: column.filter,
+        params: params
+      }))))) :
+      // All other rows behave normally
+      row.columns.map((column, i) => /*#__PURE__*/React__default.createElement(Grid, {
+        key: i,
+        item: true,
+        xs: 12,
+        md: md
+      }, /*#__PURE__*/React__default.createElement(Chart, {
+        api: api,
+        cache: cache.current,
+        id: column.id,
+        dashboard: dashboard,
+        schema: schema,
+        title: column.title,
+        filter: column.filter,
+        params: params
+      }))));
+    })))
   );
 }