@devtable/dashboard 1.28.0 → 1.29.0

package/dist/api-caller/index.d.ts

@@ -8,5 +8,5 @@ interface IQueryBySQL {
 }
 export declare const queryBySQL: ({ context, definitions, title, query }: IQueryBySQL) => () => Promise<any>;
 export declare type TQuerySources = Record<string, string[]>;
-export declare function getQuerySources(): Promise<TQuerySources>;
+export declare function listDataSources(): Promise<TQuerySources>;
 export {};

package/dist/dashboard.es.js

@@ -146,16 +146,16 @@ const queryBySQL = ({ context, definitions, title, query }) => async () => {
       console.log(formattedSQL);
       console.groupEnd();
     }
-    const res = await APIClient.getRequest("POST")("/query", { type, key, sql: formattedSQL });
+    const res = await APIClient.getRequest("POST")("/query", { type, key, query: formattedSQL });
     return res;
   } catch (error) {
     console.error(error);
     return [];
   }
 };
-async function getQuerySources() {
+async function listDataSources() {
   try {
-    const res = await APIClient.getRequest("GET")("/query/sources", {});
+    const res = await APIClient.getRequest("GET")("/datasource/list", {});
     return res;
   } catch (error) {
     console.error(error);
@@ -6433,7 +6433,7 @@ function QueryForm({
   const {
     data: querySources = {},
     loading
-  } = useRequest(getQuerySources, {
+  } = useRequest(listDataSources, {
     refreshDeps: []
   }, []);
   const querySourceTypeOptions = React.useMemo(() => {

package/dist/dashboard.umd.js

@@ -1,4 +1,4 @@
-(function(z,U){typeof exports=="object"&&typeof module!="undefined"?U(exports,require("react"),require("lodash"),require("react-grid-layout"),require("@mantine/core"),require("ahooks"),require("axios"),require("tabler-icons-react"),require("@mantine/rte"),require("@mantine/hooks"),require("echarts-for-react/lib/core"),require("echarts/core"),require("echarts/charts"),require("echarts/renderers"),require("echarts/components"),require("numbro"),require("echarts-gl"),require("react-hook-form"),require("@mantine/form"),require("@mantine/prism")):typeof define=="function"&&define.amd?define(["exports","react","lodash","react-grid-layout","@mantine/core","ahooks","axios","tabler-icons-react","@mantine/rte","@mantine/hooks","echarts-for-react/lib/core","echarts/core","echarts/charts","echarts/renderers","echarts/components","numbro","echarts-gl","react-hook-form","@mantine/form","@mantine/prism"],U):(z=typeof globalThis!="undefined"?globalThis:z||self,U(z.dashboard={},z.React,z._,z["react-grid-layout"],z["@mantine/core"],z.ahooks,z.axios,z["tabler-icons-react"],z["@mantine/rte"],z["@mantine/hooks"],z["echarts-for-react/lib/core"],z["echarts/core"],z["echarts/charts"],z["echarts/renderers"],z["echarts/components"],z.numbro,z["echarts-gl"],z["react-hook-form"],z["@mantine/form"],z["@mantine/prism"]))})(this,function(z,U,X,te,a,Ue,vn,_,xt,H,bn,yn,Ee,Ge,ye,Cn,ho,F,de,oe){"use strict";var fo=Object.defineProperty,po=Object.defineProperties;var mo=Object.getOwnPropertyDescriptors;var We=Object.getOwnPropertySymbols;var hn=Object.prototype.hasOwnProperty,gn=Object.prototype.propertyIsEnumerable;var gt=(z,U,X)=>U in z?fo(z,U,{enumerable:!0,configurable:!0,writable:!0,value:X}):z[U]=X,C=(z,U)=>{for(var X in U||(U={}))hn.call(U,X)&&gt(z,X,U[X]);if(We)for(var X of We(U))gn.call(U,X)&&gt(z,X,U[X]);return z},k=(z,U)=>po(z,mo(U));var Z=(z,U)=>{var X={};for(var te in z)hn.call(z,te)&&U.indexOf(te)<0&&(X[te]=z[te]);if(z!=null&&We)for(var te of We(z))U.indexOf(te)<0&&gn.call(z,te)&&(X[te]=z[te]);return X};var xn=(z,U,X)=>(gt(z,typeof U!="symbol"?U+"":U,X),X);function Ce(e){return e&&typeof e=="object"&&"default"in e?e:{default:e}}function Sn(e){if(e&&e.__esModule)return e;var r=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});return e&&Object.keys(e).forEach(function(n){if(n!=="default"){var o=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(r,n,o.get?o:{enumerable:!0,get:function(){return e[n]}})}}),r.default=e,Object.freeze(r)}var x=Ce(U),W=Ce(X),vt=Ce(te),wn=Ce(vn),Qe=Ce(xt),ze=Ce(bn),ce=Sn(yn),Me=Ce(Cn),ae=(e=>(e.Use="use",e.Layout="layout",e.Edit="edit",e))(ae||{});const Dn={layoutFrozen:!1,freezeLayout:()=>{},mode:ae.Edit,inEditMode:!1,inLayoutMode:!1,inUseMode:!0},fe=x.default.createContext(Dn);function Tn(e,r){const n=Object.keys(r),o=Object.values(r);try{return new Function(...n,`return \`${e}\`;`)(...o)}catch(i){return console.error(i),i.message}}function ke(e,r){const n=Object.keys(r),o=Object.values(r);try{return new Function(...n,`return \`${e}\`;`)(...o)}catch(i){throw n.length===0&&e.includes("$")?new Error("[formatSQL] insufficient params"):i}}function bt(e,r){const n=r.sqlSnippets.reduce((o,i)=>(o[i.key]=ke(i.value,e),o),{});return W.default.merge({},n,e)}function En(e,r,n){try{const o=bt(r,n);return ke(e,o)}catch(o){return console.error(o),o.message}}const De={baseURL:"http://localhost:31200",getRequest(e){return(r,n,o={})=>{const i=C({"X-Requested-With":"XMLHttpRequest","Content-Type":o.string?"application/x-www-form-urlencoded":"application/json"},o.headers),l={baseURL:this.baseURL,method:e,url:r,params:e==="GET"?n:o.params,headers:i};return e==="POST"&&(l.data=o.string?JSON.stringify(n):n),wn.default(l).then(u=>u.data).catch(u=>Promise.reject(u))}}},yt=({context:e,definitions:r,title:n,query:o})=>async()=>{if(!o||!o.sql)return[];const{type:i,key:l,sql:u}=o,s=u.includes("$");try{const d=bt(e,r),p=ke(u,d);return s&&(console.groupCollapsed(`Final SQL for: ${n}`),console.log(p),console.groupEnd()),await De.getRequest("POST")("/query",{type:i,key:l,sql:p})}catch(d){return console.error(d),[]}};async function Mn(){try{return await De.getRequest("GET")("/query/sources",{})}catch(e){return console.error(e),{}}}const Ct={},Pn=Ct,pe=x.default.createContext(Ct),An={id:"",data:[],loading:!1,title:"",setTitle:()=>{},description:"",setDescription:()=>{},queryID:"",setQueryID:()=>{},viz:{type:"",conf:{}},setViz:()=>{},refreshData:()=>{}},le=x.default.createContext(An),je=U.createContext(null);je.displayName="@mantine/modals/ModalsContext";function St(){const e=U.useContext(je);if(!e)throw new Error("[@mantine/modals] useModals hook was called outside of context, wrap your app with ModalsProvider component");return e}var In=Object.defineProperty,Gn=Object.defineProperties,zn=Object.getOwnPropertyDescriptors,wt=Object.getOwnPropertySymbols,Ln=Object.prototype.hasOwnProperty,On=Object.prototype.propertyIsEnumerable,Dt=(e,r,n)=>r in e?In(e,r,{enumerable:!0,configurable:!0,writable:!0,value:n}):e[r]=n,Ke=(e,r)=>{for(var n in r||(r={}))Ln.call(r,n)&&Dt(e,n,r[n]);if(wt)for(var n of wt(r))On.call(r,n)&&Dt(e,n,r[n]);return e},Tt=(e,r)=>Gn(e,zn(r));function Nn({id:e,cancelProps:r,confirmProps:n,labels:o={cancel:"",confirm:""},closeOnConfirm:i=!0,closeOnCancel:l=!0,groupProps:u,onCancel:s,onConfirm:d,children:p}){const{cancel:c,confirm:f}=o,g=St(),m=h=>{typeof(r==null?void 0:r.onClick)=="function"&&(r==null||r.onClick(h)),typeof s=="function"&&s(),l&&g.closeModal(e)},w=h=>{typeof(n==null?void 0:n.onClick)=="function"&&(n==null||n.onClick(h)),typeof d=="function"&&d(),i&&g.closeModal(e)};return x.default.createElement(x.default.Fragment,null,p&&x.default.createElement(a.Box,{mb:"md"},p),x.default.createElement(a.Group,Ke({position:"right"},u),x.default.createElement(a.Button,Tt(Ke({variant:"default"},r),{onClick:m}),(r==null?void 0:r.children)||c),x.default.createElement(a.Button,Tt(Ke({},n),{onClick:w}),(n==null?void 0:n.children)||f)))}function _n(e,r){switch(r.type){case"OPEN":return{current:r.payload,modals:[...e.modals,r.payload]};case"CLOSE":return{current:e.modals[e.modals.length-2]||null,modals:e.modals.filter(n=>n.id!==r.payload)};case"CLOSE_ALL":return{current:e.current,modals:[]};default:return e}}var Fn=typeof globalThis!="undefined"?globalThis:typeof window!="undefined"?window:typeof global!="undefined"?global:typeof self!="undefined"?self:{},Le={exports:{}},Oe={};/**
+(function(z,U){typeof exports=="object"&&typeof module!="undefined"?U(exports,require("react"),require("lodash"),require("react-grid-layout"),require("@mantine/core"),require("ahooks"),require("axios"),require("tabler-icons-react"),require("@mantine/rte"),require("@mantine/hooks"),require("echarts-for-react/lib/core"),require("echarts/core"),require("echarts/charts"),require("echarts/renderers"),require("echarts/components"),require("numbro"),require("echarts-gl"),require("react-hook-form"),require("@mantine/form"),require("@mantine/prism")):typeof define=="function"&&define.amd?define(["exports","react","lodash","react-grid-layout","@mantine/core","ahooks","axios","tabler-icons-react","@mantine/rte","@mantine/hooks","echarts-for-react/lib/core","echarts/core","echarts/charts","echarts/renderers","echarts/components","numbro","echarts-gl","react-hook-form","@mantine/form","@mantine/prism"],U):(z=typeof globalThis!="undefined"?globalThis:z||self,U(z.dashboard={},z.React,z._,z["react-grid-layout"],z["@mantine/core"],z.ahooks,z.axios,z["tabler-icons-react"],z["@mantine/rte"],z["@mantine/hooks"],z["echarts-for-react/lib/core"],z["echarts/core"],z["echarts/charts"],z["echarts/renderers"],z["echarts/components"],z.numbro,z["echarts-gl"],z["react-hook-form"],z["@mantine/form"],z["@mantine/prism"]))})(this,function(z,U,X,te,a,Ue,vn,_,xt,H,bn,yn,Ee,Ge,ye,Cn,ho,F,de,oe){"use strict";var fo=Object.defineProperty,po=Object.defineProperties;var mo=Object.getOwnPropertyDescriptors;var We=Object.getOwnPropertySymbols;var hn=Object.prototype.hasOwnProperty,gn=Object.prototype.propertyIsEnumerable;var gt=(z,U,X)=>U in z?fo(z,U,{enumerable:!0,configurable:!0,writable:!0,value:X}):z[U]=X,C=(z,U)=>{for(var X in U||(U={}))hn.call(U,X)&&gt(z,X,U[X]);if(We)for(var X of We(U))gn.call(U,X)&&gt(z,X,U[X]);return z},k=(z,U)=>po(z,mo(U));var Z=(z,U)=>{var X={};for(var te in z)hn.call(z,te)&&U.indexOf(te)<0&&(X[te]=z[te]);if(z!=null&&We)for(var te of We(z))U.indexOf(te)<0&&gn.call(z,te)&&(X[te]=z[te]);return X};var xn=(z,U,X)=>(gt(z,typeof U!="symbol"?U+"":U,X),X);function Ce(e){return e&&typeof e=="object"&&"default"in e?e:{default:e}}function Sn(e){if(e&&e.__esModule)return e;var r=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});return e&&Object.keys(e).forEach(function(n){if(n!=="default"){var o=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(r,n,o.get?o:{enumerable:!0,get:function(){return e[n]}})}}),r.default=e,Object.freeze(r)}var x=Ce(U),W=Ce(X),vt=Ce(te),wn=Ce(vn),Qe=Ce(xt),ze=Ce(bn),ce=Sn(yn),Me=Ce(Cn),ae=(e=>(e.Use="use",e.Layout="layout",e.Edit="edit",e))(ae||{});const Dn={layoutFrozen:!1,freezeLayout:()=>{},mode:ae.Edit,inEditMode:!1,inLayoutMode:!1,inUseMode:!0},fe=x.default.createContext(Dn);function Tn(e,r){const n=Object.keys(r),o=Object.values(r);try{return new Function(...n,`return \`${e}\`;`)(...o)}catch(i){return console.error(i),i.message}}function ke(e,r){const n=Object.keys(r),o=Object.values(r);try{return new Function(...n,`return \`${e}\`;`)(...o)}catch(i){throw n.length===0&&e.includes("$")?new Error("[formatSQL] insufficient params"):i}}function bt(e,r){const n=r.sqlSnippets.reduce((o,i)=>(o[i.key]=ke(i.value,e),o),{});return W.default.merge({},n,e)}function En(e,r,n){try{const o=bt(r,n);return ke(e,o)}catch(o){return console.error(o),o.message}}const De={baseURL:"http://localhost:31200",getRequest(e){return(r,n,o={})=>{const i=C({"X-Requested-With":"XMLHttpRequest","Content-Type":o.string?"application/x-www-form-urlencoded":"application/json"},o.headers),l={baseURL:this.baseURL,method:e,url:r,params:e==="GET"?n:o.params,headers:i};return e==="POST"&&(l.data=o.string?JSON.stringify(n):n),wn.default(l).then(u=>u.data).catch(u=>Promise.reject(u))}}},yt=({context:e,definitions:r,title:n,query:o})=>async()=>{if(!o||!o.sql)return[];const{type:i,key:l,sql:u}=o,s=u.includes("$");try{const d=bt(e,r),p=ke(u,d);return s&&(console.groupCollapsed(`Final SQL for: ${n}`),console.log(p),console.groupEnd()),await De.getRequest("POST")("/query",{type:i,key:l,query:p})}catch(d){return console.error(d),[]}};async function Mn(){try{return await De.getRequest("GET")("/datasource/list",{})}catch(e){return console.error(e),{}}}const Ct={},Pn=Ct,pe=x.default.createContext(Ct),An={id:"",data:[],loading:!1,title:"",setTitle:()=>{},description:"",setDescription:()=>{},queryID:"",setQueryID:()=>{},viz:{type:"",conf:{}},setViz:()=>{},refreshData:()=>{}},le=x.default.createContext(An),je=U.createContext(null);je.displayName="@mantine/modals/ModalsContext";function St(){const e=U.useContext(je);if(!e)throw new Error("[@mantine/modals] useModals hook was called outside of context, wrap your app with ModalsProvider component");return e}var In=Object.defineProperty,Gn=Object.defineProperties,zn=Object.getOwnPropertyDescriptors,wt=Object.getOwnPropertySymbols,Ln=Object.prototype.hasOwnProperty,On=Object.prototype.propertyIsEnumerable,Dt=(e,r,n)=>r in e?In(e,r,{enumerable:!0,configurable:!0,writable:!0,value:n}):e[r]=n,Ke=(e,r)=>{for(var n in r||(r={}))Ln.call(r,n)&&Dt(e,n,r[n]);if(wt)for(var n of wt(r))On.call(r,n)&&Dt(e,n,r[n]);return e},Tt=(e,r)=>Gn(e,zn(r));function Nn({id:e,cancelProps:r,confirmProps:n,labels:o={cancel:"",confirm:""},closeOnConfirm:i=!0,closeOnCancel:l=!0,groupProps:u,onCancel:s,onConfirm:d,children:p}){const{cancel:c,confirm:f}=o,g=St(),m=h=>{typeof(r==null?void 0:r.onClick)=="function"&&(r==null||r.onClick(h)),typeof s=="function"&&s(),l&&g.closeModal(e)},w=h=>{typeof(n==null?void 0:n.onClick)=="function"&&(n==null||n.onClick(h)),typeof d=="function"&&d(),i&&g.closeModal(e)};return x.default.createElement(x.default.Fragment,null,p&&x.default.createElement(a.Box,{mb:"md"},p),x.default.createElement(a.Group,Ke({position:"right"},u),x.default.createElement(a.Button,Tt(Ke({variant:"default"},r),{onClick:m}),(r==null?void 0:r.children)||c),x.default.createElement(a.Button,Tt(Ke({},n),{onClick:w}),(n==null?void 0:n.children)||f)))}function _n(e,r){switch(r.type){case"OPEN":return{current:r.payload,modals:[...e.modals,r.payload]};case"CLOSE":return{current:e.modals[e.modals.length-2]||null,modals:e.modals.filter(n=>n.id!==r.payload)};case"CLOSE_ALL":return{current:e.current,modals:[]};default:return e}}var Fn=typeof globalThis!="undefined"?globalThis:typeof window!="undefined"?window:typeof global!="undefined"?global:typeof self!="undefined"?self:{},Le={exports:{}},Oe={};/**
  * @license React
  * react-jsx-runtime.production.min.js
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"