@nocobase/plugin-data-visualization 0.11.1-alpha.5 → 0.12.0-alpha.2

package/{lib → dist}/client/renderer/ChartRendererProvider.d.ts

@@ -40,14 +40,7 @@ export type ChartRendererProps = {
     mode?: 'builder' | 'sql';
 };
 export declare const ChartRendererContext: React.Context<{
-    collection: string;
-    config?: {
-        chartType: string;
-        general: any;
-        advanced: any;
-    };
-    transform?: TransformProps[];
     service: any;
     data?: any[];
-}>;
+} & ChartRendererProps>;
 export declare const ChartRendererProvider: React.FC<ChartRendererProps>;

package/{lib → dist}/client/renderer/index.d.ts

@@ -1,4 +1,2 @@
-export * from './ChartLibrary';
 export * from './ChartRenderer';
 export * from './ChartRendererProvider';
-export * from './library';

package/{lib → dist}/client/utils.d.ts

@@ -93,4 +93,4 @@ export declare const getSelectedFields: (fields: FieldOption[], query: QueryProp
     target?: string;
     targetFields?: FieldOption[];
 }[];
-export declare const processData: (fields: FieldOption[], data: any[], scope: any) => {}[];
+export declare const processData: (selectedFields: FieldOption[], data: any[], scope: any) => {}[];

package/{lib → dist}/index.d.ts

@@ -1 +1,2 @@
+export * from './server';
 export { default } from './server';

package/dist/index.js

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var server = require('./server');
+
+
+
+Object.defineProperty(exports, 'default', {
+  enumerable: true,
+  get: function () { return server__namespace.default; }
+});
+Object.keys(server).forEach(function (k) {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return server[k]; }
+  });
+});

package/dist/locale/en-US.js

@@ -0,0 +1,26 @@
+'use strict';
+
+var en_US_default = {
+  Edit: "Edit",
+  Delete: "Delete",
+  Cancel: "Cancel",
+  Submit: "Submit",
+  Actions: "Actions",
+  Title: "Title",
+  Enable: "Enable",
+  "SAML manager": "SAML manager",
+  "SAML Providers": "SAML Providers",
+  "Redirect url": "Redirect url",
+  "SP entity id": "SP entity id",
+  "Add provider": "Add",
+  "Edit provider": "Edit",
+  "Client id": "Client id",
+  "Entity id or issuer": "Entity id or issuer",
+  "Login Url": "Login Url",
+  "Public cert": "Public cert",
+  "Delete provider": "Delete",
+  "Are you sure you want to delete it?": "Are you sure you want to delete it?",
+  "Sign in button name, which will be displayed on the sign in page": "Sign in button name, which will be displayed on the sign in page"
+};
+
+module.exports = en_US_default;

package/dist/locale/fr-FR.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var fr_FR_default = {};
+
+module.exports = fr_FR_default;

package/dist/locale/ja-JP.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var ja_JP_default = {};
+
+module.exports = ja_JP_default;

package/dist/locale/pt-BR.js

@@ -0,0 +1,26 @@
+'use strict';
+
+var pt_BR_default = {
+  Edit: "Editar",
+  Delete: "Delete",
+  Cancel: "Cancelar",
+  Submit: "Enviar",
+  Actions: "A\xE7\xF5es",
+  Title: "Titulo",
+  Enable: "Ativo",
+  "SAML manager": "Gerenciador SAML",
+  "SAML Providers": "Provedores SAML",
+  "Redirect url": "URL de redirecionamento",
+  "SP entity id": "ID de entidade do provedor de servi\xE7o (SP)",
+  "Add provider": "Adicionar",
+  "Edit provider": "Editar",
+  "Client id": "ID do cliente",
+  "Entity id or issuer": "ID de entidade ou emissor",
+  "Login Url": "URL de login",
+  "Public cert": "Certificado p\xFAblico",
+  "Delete provider": "Excluir",
+  "Are you sure you want to delete it?": "Tem certeza de que deseja exclu\xED-lo?",
+  "Sign in button name, which will be displayed on the sign in page": "Nome do bot\xE3o de login, que ser\xE1 exibido na p\xE1gina de login"
+};
+
+module.exports = pt_BR_default;

package/dist/locale/ru-RU.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var ru_RU_default = {};
+
+module.exports = ru_RU_default;

package/dist/locale/tr-TR.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var tr_TR_default = {};
+
+module.exports = tr_TR_default;

package/dist/locale/zh-CN.js

@@ -0,0 +1,74 @@
+'use strict';
+
+var zh_CN_default = {
+  Edit: "\u7F16\u8F91",
+  Delete: "\u5220\u9664",
+  Cancel: "\u53D6\u6D88",
+  Submit: "\u63D0\u4EA4",
+  Actions: "\u64CD\u4F5C",
+  Title: "\u540D\u79F0",
+  Enable: "\u542F\u7528",
+  Chart: "\u56FE\u8868",
+  ChartV2: "\u56FE\u8868V2",
+  Charts: "\u56FE\u8868",
+  Configure: "\u914D\u7F6E",
+  Duplicate: "\u590D\u5236",
+  "Configure chart": "\u914D\u7F6E\u56FE\u8868",
+  Transform: "\u6570\u636E\u8F6C\u6362",
+  "Chart type": "\u56FE\u8868\u7C7B\u578B",
+  "JSON config": "JSON \u914D\u7F6E",
+  Query: "\u67E5\u8BE2",
+  Data: "\u6570\u636E",
+  "Run query": "\u6267\u884C\u67E5\u8BE2",
+  Measures: "\u5EA6\u91CF",
+  Dimensions: "\u7EF4\u5EA6",
+  Filter: "\u8FC7\u6EE4",
+  Sort: "\u6392\u5E8F",
+  Limit: "\u7ED3\u679C\u6570\u91CF",
+  "Enable cache": "\u542F\u7528\u7F13\u5B58",
+  "TTL (second)": "\u7F13\u5B58\u65F6\u95F4 (\u79D2)",
+  Field: "\u5B57\u6BB5",
+  Aggregation: "\u805A\u5408",
+  Alias: "\u522B\u540D",
+  Format: "\u683C\u5F0F",
+  "The first 10 records of the query result:": "\u67E5\u8BE2\u7ED3\u679C\u7684\u524D 10 \u6761\u8BB0\u5F55\uFF1A",
+  "Please run query to retrive data.": "\u8BF7\u6267\u884C\u67E5\u8BE2\u6765\u83B7\u53D6\u6570\u636E\u3002",
+  Type: "\u7C7B\u578B",
+  "Add field": "\u6DFB\u52A0\u5B57\u6BB5",
+  "Add chart": "\u6DFB\u52A0\u56FE\u8868",
+  xField: "x\u8F74\u5B57\u6BB5",
+  yField: "y\u8F74\u5B57\u6BB5",
+  seriesField: "\u5206\u7C7B\u5B57\u6BB5",
+  angleField: "\u89D2\u5EA6\u5B57\u6BB5",
+  colorField: "\u989C\u8272\u5B57\u6BB5",
+  "Line Chart": "\u6298\u7EBF\u56FE",
+  "Area Chart": "\u9762\u79EF\u56FE",
+  "Column Chart": "\u67F1\u72B6\u56FE",
+  "Bar Chart": "\u6761\u5F62\u56FE",
+  "Pie Chart": "\u997C\u56FE",
+  "Dual Axes Chart": "\u53CC\u8F74\u56FE",
+  "Scatter Chart": "\u6563\u70B9\u56FE",
+  "Gauge Chart": "\u4EEA\u8868\u76D8",
+  Statistic: "\u7EDF\u8BA1",
+  Currency: "\u8D27\u5E01",
+  Percent: "\u767E\u5206\u6BD4",
+  Exponential: "\u79D1\u5B66\u8BB0\u6570\u6CD5",
+  Abbreviation: "\u7F29\u5199",
+  "Please configure and run query": "\u8BF7\u914D\u7F6E\u5E76\u6267\u884C\u6570\u636E\u67E5\u8BE2",
+  "Please configure chart": "\u8BF7\u914D\u7F6E\u56FE\u8868",
+  "Are you sure to cancel?": "\u786E\u5B9A\u8981\u53D6\u6D88\u5417\uFF1F",
+  "You changes are not saved. If you click OK, your changes will be lost.": "\u60A8\u7684\u66F4\u6539\u5C1A\u672A\u4FDD\u5B58\u3002\u5982\u679C\u60A8\u70B9\u51FB\u201C\u786E\u5B9A\u201D\uFF0C\u60A8\u7684\u66F4\u6539\u5C06\u4E22\u5931\u3002",
+  "Same properties set in the form above will be overwritten by this JSON config.": "\u4E0A\u9762\u8868\u5355\u4E2D\u8BBE\u7F6E\u7684\u76F8\u540C\u5C5E\u6027\u5C06\u88ABJSON\u914D\u7F6E\u8986\u76D6\u3002",
+  "Built-in": "\u5185\u7F6E\u56FE\u8868",
+  "Config reference: ": "\u914D\u7F6E\u53C2\u8003: ",
+  Table: "\u8868\u683C",
+  Sum: "\u6C42\u548C",
+  Avg: "\u5E73\u5747\u503C",
+  Count: "\u8BA1\u6570",
+  Min: "\u6700\u5C0F\u503C",
+  Max: "\u6700\u5927\u503C",
+  "Please select a chart type.": "\u8BF7\u9009\u62E9\u56FE\u8868\u7C7B\u578B",
+  Collection: "\u6570\u636E\u8868"
+};
+
+module.exports = zh_CN_default;

package/dist/server/actions/formatter.js

@@ -0,0 +1,41 @@
+'use strict';
+
+const dateFormatFn = (sequelize, dialect, field, format) => {
+  switch (dialect) {
+    case "sqlite":
+      format = format.replace(/YYYY/g, "%Y").replace(/MM/g, "%m").replace(/DD/g, "%d").replace(/hh/g, "%H").replace(/mm/g, "%M").replace(/ss/g, "%S");
+      return sequelize.fn("strftime", format, sequelize.col(field));
+    case "mysql":
+      format = format.replace(/YYYY/g, "%Y").replace(/MM/g, "%m").replace(/DD/g, "%d").replace(/hh/g, "%H").replace(/mm/g, "%i").replace(/ss/g, "%S");
+      return sequelize.fn("date_format", sequelize.col(field), format);
+    case "postgres":
+      format = format.replace(/hh/g, "HH24").replace(/mm/g, "MI").replace(/ss/g, "SS");
+      return sequelize.fn("to_char", sequelize.col(field), format);
+    default:
+      return field;
+  }
+};
+const formatFn = (sequelize, dialect, field, format) => {
+  switch (dialect) {
+    case "sqlite":
+    case "postgres":
+      return sequelize.fn("format", format, sequelize.col(field));
+    default:
+      return field;
+  }
+};
+const formatter = (sequelize, type, field, format) => {
+  const dialect = sequelize.getDialect();
+  switch (type) {
+    case "date":
+    case "datetime":
+    case "time":
+      return dateFormatFn(sequelize, dialect, field, format);
+    default:
+      return formatFn(sequelize, dialect, field, format);
+  }
+};
+
+exports.dateFormatFn = dateFormatFn;
+exports.formatFn = formatFn;
+exports.formatter = formatter;

package/{src/server/actions/query.ts → dist/server/actions/query.js}

@@ -1,62 +1,18 @@
-import { Context, Next } from '@nocobase/actions';
-import { Cache } from '@nocobase/cache';
-import { Field, FilterParser, snakeCase } from '@nocobase/database';
-import ChartsV2Plugin from '../plugin';
-import { formatter } from './formatter';
+'use strict';
 
-type MeasureProps = {
-  field: string | string[];
-  type?: string;
-  aggregation?: string;
-  alias?: string;
-};
-
-type DimensionProps = {
-  field: string | string[];
-  type?: string;
-  alias?: string;
-  format?: string;
-};
-
-type OrderProps = {
-  field: string | string[];
-  alias?: string;
-  order?: 'asc' | 'desc';
-};
-
-type QueryParams = Partial<{
-  uid: string;
-  collection: string;
-  measures: MeasureProps[];
-  dimensions: DimensionProps[];
-  orders: OrderProps[];
-  filter: any;
-  limit: number;
-  sql: {
-    fields?: string;
-    clauses?: string;
-  };
-  cache: {
-    enabled: boolean;
-    ttl: number;
-  };
-  // Get the latest data from the database
-  refresh: boolean;
-}>;
+var database = require('@nocobase/database');
+var formatter = require('./formatter');
 
-export const parseFieldAndAssociations = (ctx: Context, params: QueryParams) => {
+const parseFieldAndAssociations = (ctx, params) => {
   const { collection: collectionName, measures, dimensions, orders, filter } = params;
   const collection = ctx.db.getCollection(collectionName);
   const fields = collection.fields;
   const underscored = ctx.db.options.underscored;
-  const models: {
-    [target: string]: {
-      type: string;
-    };
-  } = {};
-  const parseField = (selected: { field: string | string[]; alias?: string }) => {
-    let target: string;
-    let name: string;
+  const models = {};
+  const parseField = (selected) => {
+    var _a, _b, _c;
+    let target;
+    let name;
     if (!Array.isArray(selected.field)) {
       name = selected.field;
     } else if (selected.field.length === 1) {
@@ -64,16 +20,16 @@ export const parseFieldAndAssociations = (ctx: Context, params: QueryParams) =>
     } else if (selected.field.length > 1) {
       [target, name] = selected.field;
     }
-    let field = underscored ? snakeCase(name) : name;
-    let fieldType = fields.get(name)?.type;
+    let field = underscored ? database.snakeCase(name) : name;
+    let fieldType = (_a = fields.get(name)) == null ? void 0 : _a.type;
     if (target) {
-      const targetField = fields.get(target) as Field;
+      const targetField = fields.get(target);
       const targetCollection = ctx.db.getCollection(targetField.target);
       const targetFields = targetCollection.fields;
-      fieldType = targetFields.get(name)?.type;
+      fieldType = (_b = targetFields.get(name)) == null ? void 0 : _b.type;
       field = `${target}.${field}`;
       name = `${target}.${name}`;
-      const targetType = fields.get(target)?.type;
+      const targetType = (_c = fields.get(target)) == null ? void 0 : _c.type;
       if (!models[target]) {
         models[target] = { type: targetType };
       }
@@ -85,40 +41,37 @@ export const parseFieldAndAssociations = (ctx: Context, params: QueryParams) =>
       field,
       name,
       type: fieldType,
-      alias: selected.alias || name,
+      alias: selected.alias || name
     };
   };
-
-  const parsedMeasures = measures?.map(parseField) || [];
-  const parsedDimensions = dimensions?.map(parseField) || [];
-  const parsedOrders = orders?.map(parseField) || [];
+  const parsedMeasures = (measures == null ? void 0 : measures.map(parseField)) || [];
+  const parsedDimensions = (dimensions == null ? void 0 : dimensions.map(parseField)) || [];
+  const parsedOrders = (orders == null ? void 0 : orders.map(parseField)) || [];
   const include = Object.entries(models).map(([target, { type }]) => ({
     association: target,
     attributes: [],
-    ...(type === 'belongsToMany' ? { through: { attributes: [] } } : {}),
+    ...type === "belongsToMany" ? { through: { attributes: [] } } : {}
   }));
-
-  const filterParser = new FilterParser(filter, {
-    collection,
+  const filterParser = new database.FilterParser(filter, {
+    collection
   });
   const { where, include: filterInclude } = filterParser.toSequelizeParams();
-  const parsedFilterInclude = filterInclude?.map((item) => {
-    if (fields.get(item.association)?.type === 'belongsToMany') {
+  const parsedFilterInclude = filterInclude == null ? void 0 : filterInclude.map((item) => {
+    var _a;
+    if (((_a = fields.get(item.association)) == null ? void 0 : _a.type) === "belongsToMany") {
       item.through = { attributes: [] };
     }
     return item;
   });
-
   return {
     where,
     measures: parsedMeasures,
     dimensions: parsedDimensions,
     orders: parsedOrders,
-    include: [...include, ...(parsedFilterInclude || [])],
+    include: [...include, ...parsedFilterInclude || []]
   };
 };
-
-export const parseBuilder = (ctx: Context, builder: QueryParams) => {
+const parseBuilder = (ctx, builder) => {
   const { sequelize } = ctx.db;
   const { limit } = builder;
   const { measures, dimensions, orders, include, where } = parseFieldAndAssociations(ctx, builder);
@@ -127,8 +80,7 @@ export const parseBuilder = (ctx: Context, builder: QueryParams) => {
   const order = [];
   const fieldMap = {};
   let hasAgg = false;
-
-  measures.forEach((measure: MeasureProps & { field: string }) => {
+  measures.forEach((measure) => {
     const { field, aggregation, alias } = measure;
     const attribute = [];
     const col = sequelize.col(field);
@@ -144,13 +96,12 @@ export const parseBuilder = (ctx: Context, builder: QueryParams) => {
     attributes.push(attribute.length > 1 ? attribute : attribute[0]);
     fieldMap[alias || field] = measure;
   });
-
-  dimensions.forEach((dimension: DimensionProps & { field: string }) => {
+  dimensions.forEach((dimension) => {
     const { field, format, alias, type } = dimension;
     const attribute = [];
     const col = sequelize.col(field);
     if (format) {
-      attribute.push(formatter(sequelize, type, field, format));
+      attribute.push(formatter.formatter(sequelize, type, field, format));
     } else {
       attribute.push(col);
     }
@@ -163,13 +114,11 @@ export const parseBuilder = (ctx: Context, builder: QueryParams) => {
     }
     fieldMap[alias || field] = dimension;
   });
-
-  orders.forEach((item: OrderProps) => {
+  orders.forEach((item) => {
     const alias = sequelize.getQueryInterface().quoteIdentifier(item.alias);
-    const name = hasAgg ? sequelize.literal(alias) : sequelize.col(item.field as string);
-    order.push([name, item.order || 'ASC']);
+    const name = hasAgg ? sequelize.literal(alias) : sequelize.col(item.field);
+    order.push([name, item.order || "ASC"]);
   });
-
   return {
     queryParams: {
       where,
@@ -177,28 +126,26 @@ export const parseBuilder = (ctx: Context, builder: QueryParams) => {
       include,
       group,
       order,
-      limit: limit > 2000 ? 2000 : limit,
-      raw: true,
+      limit: limit > 2e3 ? 2e3 : limit,
+      raw: true
     },
-    fieldMap,
+    fieldMap
   };
 };
-
-export const processData = (ctx: Context, data: any[], fieldMap: { [source: string]: { type?: string } }) => {
+const processData = (ctx, data, fieldMap) => {
   const { sequelize } = ctx.db;
   const dialect = sequelize.getDialect();
   switch (dialect) {
-    case 'postgres':
-      // https://github.com/sequelize/sequelize/issues/4550
+    case "postgres":
       return data.map((record) => {
         const result = {};
         Object.entries(record).forEach(([key, value]) => {
           const { type } = fieldMap[key] || {};
           switch (type) {
-            case 'bigInt':
-            case 'integer':
-            case 'float':
-            case 'double':
+            case "bigInt":
+            case "integer":
+            case "float":
+            case "double":
               value = Number(value);
               break;
           }
@@ -210,37 +157,19 @@ export const processData = (ctx: Context, data: any[], fieldMap: { [source: stri
       return data;
   }
 };
-
-export const queryData = async (ctx: Context, builder: QueryParams) => {
+const queryData = async (ctx, builder) => {
   const { collection, measures, dimensions, orders, filter, limit, sql } = builder;
   const model = ctx.db.getModel(collection);
   const { queryParams, fieldMap } = parseBuilder(ctx, { collection, measures, dimensions, orders, filter, limit });
   const data = await model.findAll(queryParams);
   return processData(ctx, data, fieldMap);
-  // if (!sql) {
-  //   return await repository.find(parseBuilder(ctx, { collection, measures, dimensions, orders, filter, limit }));
-  // }
-
-  // const statement = `SELECT ${sql.fields} FROM ${collection} ${sql.clauses}`;
-  // const [data] = await ctx.db.sequelize.query(statement);
-  // return data;
 };
-
-export const cacheWrap = async (
-  cache: Cache,
-  options: {
-    func: () => Promise<any>;
-    key: string;
-    ttl?: number;
-    useCache?: boolean;
-    refresh?: boolean;
-  },
-) => {
+const cacheWrap = async (cache, options) => {
   const { func, key, ttl, useCache, refresh } = options;
   if (useCache && !refresh) {
-    const data = await cache.get(key);
-    if (data) {
-      return data;
+    const data2 = await cache.get(key);
+    if (data2) {
+      return data2;
     }
   }
   const data = await func();
@@ -249,32 +178,45 @@ export const cacheWrap = async (
   }
   return data;
 };
-
-export const query = async (ctx: Context, next: Next) => {
-  const { uid, collection, measures, dimensions, orders, filter, limit, sql, cache: cacheConfig, refresh } = ctx.action
-    .params.values as QueryParams;
-  const roleName = ctx.state.currentRole || 'anonymous';
-  const can = ctx.app.acl.can({ role: roleName, resource: collection, action: 'list' });
-  if (!can && roleName !== 'root') {
-    ctx.throw(403, 'No permissions');
+const query = async (ctx, next) => {
+  const {
+    uid,
+    collection,
+    measures,
+    dimensions,
+    orders,
+    filter,
+    limit,
+    sql,
+    cache: cacheConfig,
+    refresh
+  } = ctx.action.params.values;
+  const roleName = ctx.state.currentRole || "anonymous";
+  const can = ctx.app.acl.can({ role: roleName, resource: collection, action: "list" });
+  if (!can && roleName !== "root") {
+    ctx.throw(403, "No permissions");
   }
-
-  const plugin = ctx.app.getPlugin('data-visualization') as ChartsV2Plugin;
+  const plugin = ctx.app.getPlugin("data-visualization");
   const cache = plugin.cache;
-  const useCache = cacheConfig?.enabled && uid;
-
+  const useCache = (cacheConfig == null ? void 0 : cacheConfig.enabled) && uid;
   try {
     ctx.body = await cacheWrap(cache, {
       func: async () => await queryData(ctx, { collection, measures, dimensions, orders, filter, limit, sql }),
       key: uid,
-      ttl: cacheConfig?.ttl || 30,
+      ttl: (cacheConfig == null ? void 0 : cacheConfig.ttl) || 30,
       useCache: useCache ? true : false,
-      refresh,
+      refresh
     });
   } catch (err) {
-    ctx.app.logger.error('charts query: ', err);
+    ctx.app.logger.error("charts query: ", err);
     ctx.throw(500, err);
   }
-
   await next();
 };
+
+exports.cacheWrap = cacheWrap;
+exports.parseBuilder = parseBuilder;
+exports.parseFieldAndAssociations = parseFieldAndAssociations;
+exports.processData = processData;
+exports.query = query;
+exports.queryData = queryData;

package/dist/server/index.js

@@ -0,0 +1,11 @@
+'use strict';
+
+var plugin = require('./plugin');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var plugin__default = /*#__PURE__*/_interopDefault(plugin);
+
+
+
+module.exports = plugin__default.default;

package/dist/server/plugin.js

@@ -0,0 +1,42 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var cache = require('@nocobase/cache');
+var server = require('@nocobase/server');
+var query = require('./actions/query');
+
+class DataVisualizationPlugin extends server.Plugin {
+  cache;
+  afterAdd() {
+  }
+  beforeLoad() {
+    this.app.resource({
+      name: "charts",
+      actions: {
+        query: query.query
+      }
+    });
+    this.app.acl.allow("charts", "query", "loggedIn");
+  }
+  async load() {
+    this.cache = cache.createCache({
+      ttl: 30,
+      // seconds
+      max: 1e3,
+      store: "memory"
+    });
+  }
+  async install(options) {
+  }
+  async afterEnable() {
+  }
+  async afterDisable() {
+  }
+  async remove() {
+  }
+}
+var plugin_default = DataVisualizationPlugin;
+
+exports.DataVisualizationPlugin = DataVisualizationPlugin;
+exports.default = plugin_default;