sea-chart 0.0.1-beta → 0.0.2

package/dist/api/index.js

@@ -0,0 +1,101 @@
+import axios from 'axios';
+class SeaChartAPI {
+  constructor(config) {
+    var _this = this;
+    this.getDTableAccessToken = () => {
+      // dtable-web
+      const {
+        server,
+        APIToken
+      } = this.config;
+      const url = server + '/api/v2.1/dtable/app-access-token/';
+      const headers = {
+        'Authorization': 'Token ' + APIToken
+      };
+      return axios.get(url, {
+        headers
+      });
+    };
+    this.getBaseData = () => {
+      const {
+        dtableServer,
+        dtableUuid,
+        accessToken
+      } = this;
+      const url = dtableServer + 'dtables/' + dtableUuid;
+      const headers = {
+        'Authorization': 'Token ' + accessToken
+      };
+      return axios.get(url, {
+        headers
+      });
+    };
+    this.getBaseMetaData = () => {
+      const {
+        dtableServer,
+        dtableUuid,
+        accessToken
+      } = this;
+      const url = dtableServer + 'api/v1/dtables/' + dtableUuid + '/metadata';
+      const headers = {
+        'Authorization': 'Token ' + accessToken
+      };
+      return axios.get(url, {
+        headers
+      });
+    };
+    this.sqlQuery = function (sql, parameters) {
+      let convert_keys = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      // dtable-db
+      const {
+        dtableDB,
+        dtableUuid,
+        accessToken
+      } = _this;
+      const url = dtableDB + 'api/v1/query/' + dtableUuid;
+      const data = {
+        sql,
+        convert_keys,
+        ...(parameters && {
+          parameters: parameters
+        })
+      };
+      const headers = {
+        'Authorization': 'Token ' + accessToken
+      };
+      return axios.post(url, data, {
+        headers
+      });
+    };
+    this.config = config;
+    this.instance = null;
+    this.appName = '';
+    this.accessToken = '';
+    this.dtableUuid = '';
+    this.dtableServer = '';
+    this.dtableSocket = '';
+  }
+  static getInstance(config) {
+    if (this.instance) return this.instance;
+    this.instance = new SeaChartAPI(config);
+    return this.instance;
+  }
+  async init() {
+    const accessTokenRes = await this.getDTableAccessToken();
+    const {
+      app_name,
+      access_token,
+      dtable_uuid,
+      dtable_server,
+      dtable_socket,
+      dtable_db
+    } = accessTokenRes.data;
+    this.appName = app_name;
+    this.accessToken = access_token;
+    this.dtableUuid = dtable_uuid;
+    this.dtableServer = dtable_server.replace(/\/+$/, '') + '/';
+    this.dtableSocket = dtable_socket.replace(/\/+$/, '') + '/';
+    this.dtableDB = dtable_db.replace(/\/+$/, '') + '/';
+  }
+}
+export default SeaChartAPI;

package/dist/components/types-dialog/index.js

@@ -3,6 +3,7 @@ import { Modal, ModalHeader, ModalBody, ModalFooter, UncontrolledTooltip, Button
 import classnames from 'classnames';
 import { CHART_TYPES, CHART_TYPE_SHOW, ZH_CN_SUPPORT_CHARTS, CHART_TYPE_IMAGE } from '../../constants';
 import { eventStopPropagation } from '../../utils';
+import context from '../../context';
 import intl from '../../intl';
 import Icon from '../icon';
 import './index.css';
@@ -15,7 +16,7 @@ const TypesDialog = _ref => {
   const [currentCatIndex, setCurrentCatIndex] = useState(0);
   const [selectedType, setType] = useState(type);
   const notSupportStatisticTypes = useMemo(() => {
-    const lang = window.seaChart.context.getSetting('lang');
+    const lang = context.getSetting('lang');
     return lang !== 'zh-cn' ? ZH_CN_SUPPORT_CHARTS : [];
   }, []);
   const seaChartTypeContainerRef = useRef(null);

package/dist/context.js

@@ -1,23 +1,63 @@
-import { User } from './model';
+import { getTableById } from 'dtable-utils';
+import CollaboratorManager from './utils/collaborator-manager';
+import { ChartDataSQL } from './utils';
 class Context {
-  constructor(eventBus, config) {
-    this.settings = config || {};
-    this.collaboratorsCache = {};
-    this.eventBus = eventBus || {};
-  }
-  getCollaboratorFromCache(email) {
-    return this.collaboratorsCache[email];
+  constructor() {
+    this.queryResultFromDB = _ref => {
+      let {
+        chart,
+        tables,
+        onSuccess,
+        onFail
+      } = _ref;
+      const table = getTableById(tables, chart.config.table_id);
+      const chartDataSQL = new ChartDataSQL({
+        table,
+        chart
+      });
+      const {
+        sql,
+        error
+      } = chartDataSQL.to_sql();
+      if (error) return;
+      return this.api.sqlQuery(sql).then(res => {
+        onSuccess && onSuccess(res);
+      }).catch(error => {
+        onFail && onFail(error);
+      });
+    };
+    this.queryUser = (emails, callback) => {
+      this.userApi.queryUsers(emails, callback);
+    };
+    this.api = null;
+    this.settings = {};
+    this.hasInit = false;
+    this.collaborators = [];
+    this.collaboratorManager = null;
   }
-  getCollaboratorsFromCache() {
-    const collaboratorsCache = this.collaboratorsCache;
-    return Object.values(collaboratorsCache).filter(item => item.email !== 'anonymous');
-  }
-  onlyUpdateCollaboratorsCache(email, collaborator) {
-    this.collaboratorsCache[email] = collaborator instanceof User ? collaborator : new User(collaborator);
-  }
-  updateCollaboratorsCache(email, collaborator) {
-    this.collaboratorsCache[email] = collaborator instanceof User ? collaborator : new User(collaborator);
-    this.eventBus.dispatch && this.eventBus.dispatch('query-collaborator', email);
+  init(props) {
+    const {
+      config,
+      api,
+      usersAPI,
+      collaborators,
+      collaboratorManager
+    } = props;
+    if (this.hasInit) return;
+    if (!config) {
+      throw new Error('Props config is required');
+    }
+    if (!api) {
+      throw new Error('Props api is required');
+    }
+    if (!usersAPI) {
+      throw new Error('Props usersAPI is required');
+    }
+    this.api = api;
+    this.settings = config || {};
+    this.hasInit = true;
+    this.collaborators = collaborators || [];
+    this.collaboratorManager = collaboratorManager ? collaboratorManager : new CollaboratorManager(collaborators);
   }
   setSettings() {
     let settings = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -29,5 +69,15 @@ class Context {
   getSetting(key) {
     return this.settings[key] || this.settings[key] === false ? this.settings[key] : '';
   }
+  getCollaboratorFromCache(email) {
+    return this.collaboratorManager.getCollaboratorFromCache(email);
+  }
+  getCollaboratorsFromCache() {
+    return this.collaboratorManager.getCollaboratorsFromCache();
+  }
+  updateCollaboratorsCache(email, collaborator) {
+    this.collaboratorManager.updateCollaboratorsCache(email, collaborator);
+  }
 }
-export default Context;
+const context = new Context();
+export default context;

package/dist/editor/index.js

@@ -1,10 +1,15 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import classnames from 'classnames';
+import context from '../context';
 import View from '../view';
 import Settings from '../settings';
 import './index.css';
 class Editor extends React.PureComponent {
+  constructor(props) {
+    super(props);
+    context.init(props);
+  }
   render() {
     const {
       settingsTarget

package/dist/index.js

@@ -1,6 +1,9 @@
+import SeaChartAPI from './api';
+import { CHART_TYPES } from './constants/type';
 import View from './view';
 import Editor from './editor';
 import Settings, { StyleSettings } from './settings';
 import { ChartDataSQL } from './utils';
+import Context from './context';
 export default View;
-export { View, Editor, Settings, StyleSettings, ChartDataSQL };
+export { SeaChartAPI, CHART_TYPES, View, Editor, Settings, StyleSettings, Context, ChartDataSQL };

package/dist/settings/widgets/data-filter/index.js

@@ -4,6 +4,7 @@ import { getTableById } from 'dtable-utils';
 import DTableFiltersPopover from "dtable-ui-component/lib/DTableFiltersPopover";
 import { eventStopPropagation, generatorKey } from '../../../utils';
 import intl from '../../../intl';
+import context from '../../../context';
 import './index.css';
 const DataFilter = _ref => {
   let {
@@ -55,7 +56,7 @@ const DataFilter = _ref => {
     } = config;
     return filter_conjunction || 'And';
   }, [chart]);
-  const collaborators = window.seaChart.context.getCollaboratorsFromCache();
+  const collaborators = context.getCollaboratorsFromCache();
   const {
     config
   } = chart;

package/dist/settings/widgets/time-picker.js

@@ -6,6 +6,7 @@ import 'dayjs/locale/zh-cn';
 import 'dayjs/locale/en-gb';
 import { translateCalendar } from '../../utils';
 import intl from '../../intl';
+import context from '../../context';
 import '@seafile/seafile-calendar/assets/index.css';
 let now = dayjs();
 const DATE_FORMAT = 'YYYY-MM-DD';
@@ -80,7 +81,7 @@ class TimePicker extends Component {
     const {
       value
     } = this.props;
-    const iszhcn = window.seaChart.context.getSetting('lang') === 'zh-cn';
+    const iszhcn = context.getSetting('lang') === 'zh-cn';
     if (iszhcn) {
       now = now.locale('zh-cn');
     } else {

package/dist/utils/chart-data-sql.js

@@ -16,7 +16,7 @@ class ChartDataSQL {
     this._update_filter_sql = (includeEmpty, column) => {
       const columnName = (column === null || column === void 0 ? void 0 : column.name) || '';
       if (!includeEmpty) {
-        const notIncludeEmptySQL = "`".concat(columnName, "` IS NOT NULL");
+        const notIncludeEmptySQL = "".concat(columnName, " is not null");
         if (this.filter_sql) {
           this.filter_sql = "WHERE ".concat(notIncludeEmptySQL, " AND ").concat(this.filter_sql);
         } else {

package/dist/utils/chart-utils.js

@@ -9,6 +9,7 @@ import { getKnownCollaboratorByEmail, generateDefaultUser } from './collaborator
 import { getDateColumnFormat, getColumnByKey } from './column-utils';
 import ObjectUtils from './object-utils';
 import intl from '../intl';
+import context from '../context';
 class ChartUtils {
   static formatGroupsLabel(results, chart, tables) {
     if (!results) return;
@@ -71,15 +72,15 @@ class ChartUtils {
           email: name,
           name: name
         };
-        window.seaChart.context.updateCollaboratorsCache(name, collaboratorTemplate);
+        context.updateCollaboratorsCache(name, collaboratorTemplate);
         if (!collaborator) {
-          window.seaChart.queryUsers([name], emailUserMap => {
+          context.queryUsers([name], emailUserMap => {
             const collaborator = emailUserMap && emailUserMap[name] || generateDefaultUser(name);
             const loadedCollaborator = {
               ...collaborator,
               loaded: true
             };
-            window.seaChart.context.updateCollaboratorsCache(name, loadedCollaborator);
+            context.updateCollaboratorsCache(name, loadedCollaborator);
             result[nameKey] = name;
           });
         } else {
@@ -378,7 +379,7 @@ ChartUtils.isValidCombinationChart = (config, table) => {
   return true;
 };
 ChartUtils.getGroupLabelFromDB = (cellValue, column, tables) => {
-  const collaborators = window.seaChart.context.getCollaboratorsFromCache();
+  const collaborators = context.getCollaboratorsFromCache();
   const {
     type,
     data
@@ -1099,15 +1100,15 @@ ChartUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, color
         email: name,
         name: name
       };
-      window.seaChart.context.updateCollaboratorsCache(name, collaboratorTemplate);
+      context.updateCollaboratorsCache(name, collaboratorTemplate);
       if (!collaborator) {
-        window.seaChart.queryUsers([name], emailUserMap => {
+        context.queryUsers([name], emailUserMap => {
           const collaborator = emailUserMap && emailUserMap[name] || generateDefaultUser(name);
           const loadedCollaborator = {
             ...collaborator,
             loaded: true
           };
-          window.seaChart.context.updateCollaboratorsCache(name, loadedCollaborator);
+          context.updateCollaboratorsCache(name, loadedCollaborator);
           result[nameKey] = name;
         });
       } else {
@@ -1375,7 +1376,7 @@ ChartUtils.convertConfig = config => {
 ChartUtils.imEmptyChartResult = chartResult => {
   return !chartResult || !chartResult.result && chartResult.result !== 0 || Array.isArray(chartResult.result) && chartResult.result.length === 0;
 };
-ChartUtils.calculateChart = (chart, dataAPI, tables, callback, isChartData) => {
+ChartUtils.calculateChart = (chart, tables, callback, isChartData) => {
   if (!_class.isValidExistChart(tables, chart)) {
     const tip_message = 'Please_complete_the_chart_configuration_first';
     return callback && callback('', tip_message, null);
@@ -1411,7 +1412,9 @@ ChartUtils.calculateChart = (chart, dataAPI, tables, callback, isChartData) => {
     const error_message = 'There_are_some_problems_with_the_filters';
     return callback && callback(error_message, '', null);
   }
-  dataAPI({
+  context.queryResultFromDB({
+    chart,
+    tables,
     onSuccess: res => {
       const {
         success,

package/dist/utils/collaborator-manager.js

@@ -0,0 +1,24 @@
+import { User } from '../model';
+class CollaboratorManager {
+  constructor(collaborators) {
+    this.collaborators = collaborators || [];
+    this.collaboratorsCache = {};
+    if (collaborators && Array.isArray(collaborators)) {
+      this.collaboratorsCache = collaborators.reduce((cache, item) => {
+        cache[item.email] = item;
+        return cache;
+      }, {});
+    }
+  }
+  getCollaboratorFromCache(email) {
+    return this.collaboratorsCache[email];
+  }
+  getCollaboratorsFromCache() {
+    const collaboratorsCache = this.collaboratorsCache;
+    return Object.values(collaboratorsCache).filter(item => item.email !== 'anonymous');
+  }
+  updateCollaboratorsCache(email, collaborator) {
+    this.collaboratorsCache[email] = collaborator instanceof User ? collaborator : new User(collaborator);
+  }
+}
+export default CollaboratorManager;

package/dist/utils/collaborator-utils.js

@@ -1,5 +1,6 @@
 import { isValidEmail } from 'dtable-utils';
 import { User } from '../model';
+import context from '../context';
 export const getKnownCollaboratorByEmail = email => {
   const defaultUser = generateDefaultUser(email);
   if (email === 'anonymous' || email === 'Automation Rule') {
@@ -7,20 +8,20 @@ export const getKnownCollaboratorByEmail = email => {
       ...defaultUser,
       loaded: true
     });
-    window.seaChart.context.updateCollaboratorsCache(email, anonymous);
+    context.updateCollaboratorsCache(email, anonymous);
     return anonymous;
   }
-  let creator = window.seaChart.context.getCollaboratorFromCache(email);
+  let creator = context.getCollaboratorFromCache(email);
   if (creator) return creator;
   if (!isValidEmail(email)) {
     creator = new User({
       ...defaultUser,
       loaded: true
     });
-    window.seaChart.context.updateCollaboratorsCache(email, creator);
+    context.updateCollaboratorsCache(email, creator);
     return creator;
   }
-  creator = window.seaChart.context.getCollaboratorFromCache(email);
+  creator = context.getCollaboratorFromCache(email);
   if (creator) return creator;
   return null;
 };
@@ -29,7 +30,7 @@ export const getKnownCollaboratorsByEmails = emails => {
   return emails.map(email => getKnownCollaboratorByEmail(email));
 };
 export const generateDefaultUser = name => {
-  const mediaUrl = window.seaChart.context.getSetting('mediaUrl');
+  const mediaUrl = context.getSetting('mediaUrl');
   const defaultAvatarUrl = "".concat(mediaUrl, "avatars/default.png");
   return {
     name,

package/dist/view/index.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import classnames from 'classnames';
 import shallowEqual from 'shallowequal';
+import context from '../context';
 import intl from '../intl';
 import { Loading } from '../components';
 import { ChartUtils } from '../utils';
-import Context from '../context';
 import Title from './title';
 import Wrapper from './wrapper';
 import './index.css';
@@ -53,7 +53,6 @@ class View extends React.PureComponent {
       const {
         tables,
         chart,
-        dataAPI,
         isStatisticalData
       } = _this.props;
       const {
@@ -63,7 +62,7 @@ class View extends React.PureComponent {
         ChartUtils.calculateStaticChart(tables, chart, data, _this.callback);
         return;
       }
-      ChartUtils.calculateChart(chart, dataAPI, tables, _this.callback, isStatisticalData);
+      ChartUtils.calculateChart(chart, tables, _this.callback, isStatisticalData);
     };
     this.state = {
       isCalculated: false,
@@ -71,31 +70,12 @@ class View extends React.PureComponent {
       errorMessage: '',
       tipMessage: ''
     };
+    console.log(props);
+    context.init(props);
   }
   componentDidMount() {
-    var _window$seaChart, _window$seaChart2;
-    const {
-      usersAPI,
-      context,
-      config,
-      eventBus,
-      collaborators
-    } = this.props;
-    if (!window.seaChart) {
-      window.seaChart = {};
-    }
-    if (!((_window$seaChart = window.seaChart) === null || _window$seaChart === void 0 ? void 0 : _window$seaChart.queryUsers)) {
-      window.seaChart.queryUsers = usersAPI;
-    }
-    if (!((_window$seaChart2 = window.seaChart) === null || _window$seaChart2 === void 0 ? void 0 : _window$seaChart2.context)) {
-      const validContext = context || new Context(eventBus, config);
-      Array.isArray(collaborators) && collaborators.forEach(collaborator => {
-        validContext.onlyUpdateCollaboratorsCache && validContext.onlyUpdateCollaboratorsCache(collaborator.email, collaborator);
-      });
-      window.seaChart.context = validContext;
-      const lang = validContext.getSetting('lang') || 'zh-cn';
-      intl.setLang(lang);
-    }
+    const lang = context.getSetting('lang') || 'zh-cn';
+    intl.setLang(lang);
     this.calculateStatistic();
   }
   UNSAFE_componentWillReceiveProps(nextProps) {

package/dist/view/wrapper/table/pivot-table-display-name.js

@@ -5,6 +5,7 @@ import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_RESULT_TYPE, getOption, ge
 import { getClientFormulaDisplayString, getKnownCollaboratorByEmail, getColumnOptions, getDateColumnFormat, generateDefaultUser } from '../../../utils';
 import { Collaborator } from '../../../components';
 import intl from '../../../intl';
+import context from '../../../context';
 class PivotTableDisplayName extends React.Component {
   constructor(props) {
     super(props);
@@ -28,14 +29,14 @@ class PivotTableDisplayName extends React.Component {
           email: email,
           name: email
         };
-        window.seaChart.context.updateCollaboratorsCache(email, valueTemplate);
-        window.seaChart.queryUsers([email], emailUserMap => {
+        context.updateCollaboratorsCache(email, valueTemplate);
+        context.queryUsers([email], emailUserMap => {
           creator = emailUserMap && emailUserMap[email] || generateDefaultUser(email);
           const loadedCreator = {
             ...creator,
             loaded: true
           };
-          window.seaChart.context.updateCollaboratorsCache(email, loadedCreator);
+          context.updateCollaboratorsCache(email, loadedCreator);
           this.setState({
             creator
           });
@@ -86,7 +87,7 @@ class PivotTableDisplayName extends React.Component {
         type,
         data
       } = column;
-      const collaborators = window.seaChart.context.getCollaboratorsFromCache();
+      const collaborators = context.getCollaboratorsFromCache();
       let displayName;
       switch (type) {
         case CellType.SINGLE_SELECT:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.1-beta",
+  "version": "0.0.2",
   "main": "./lib/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",