@nocobase/plugin-data-visualization 0.14.0-alpha.6 → 0.14.0-alpha.8

package/dist/externalVersion.js

@@ -1,20 +1,20 @@
 module.exports = {
-  "@ant-design/icons": "5.1.4",
-  "@formily/antd-v5": "1.1.0",
-  "@nocobase/client": "0.14.0-alpha.6",
-  "antd": "5.8.6",
+  "@nocobase/client": "0.14.0-alpha.8",
   "react": "18.2.0",
   "@formily/react": "2.2.27",
   "@formily/shared": "2.2.27",
-  "@nocobase/cache": "0.14.0-alpha.6",
-  "@nocobase/server": "0.14.0-alpha.6",
+  "@nocobase/cache": "0.14.0-alpha.8",
+  "@nocobase/server": "0.14.0-alpha.8",
+  "@ant-design/icons": "5.1.4",
   "dayjs": "1.11.9",
+  "@formily/antd-v5": "1.1.7",
   "@formily/core": "2.2.27",
+  "antd": "5.8.6",
   "lodash": "4.17.21",
+  "@emotion/css": "11.11.2",
   "react-i18next": "11.18.6",
   "ahooks": "3.7.8",
-  "@emotion/css": "11.11.2",
-  "@nocobase/actions": "0.14.0-alpha.6",
-  "@nocobase/database": "0.14.0-alpha.6",
-  "@nocobase/utils": "0.14.0-alpha.6"
+  "@nocobase/actions": "0.14.0-alpha.8",
+  "@nocobase/database": "0.14.0-alpha.8",
+  "@nocobase/utils": "0.14.0-alpha.8"
 };

package/dist/node_modules/koa-compose/package.json

@@ -1 +1 @@
-{"name":"koa-compose","description":"compose Koa middleware","repository":"koajs/compose","version":"4.1.0","keywords":["koa","middleware","compose"],"files":["index.js"],"dependencies":{},"devDependencies":{"codecov":"^3.0.0","jest":"^21.0.0","matcha":"^0.7.0","standard":"^10.0.3"},"scripts":{"bench":"matcha bench/bench.js","lint":"standard --fix .","test":"jest --forceExit --coverage"},"jest":{"testEnvironment":"node"},"license":"MIT","_lastModified":"2023-09-22T08:35:25.495Z"}
+{"name":"koa-compose","description":"compose Koa middleware","repository":"koajs/compose","version":"4.1.0","keywords":["koa","middleware","compose"],"files":["index.js"],"dependencies":{},"devDependencies":{"codecov":"^3.0.0","jest":"^21.0.0","matcha":"^0.7.0","standard":"^10.0.3"},"scripts":{"bench":"matcha bench/bench.js","lint":"standard --fix .","test":"jest --forceExit --coverage"},"jest":{"testEnvironment":"node"},"license":"MIT","_lastModified":"2023-11-01T02:12:00.125Z"}

package/dist/server/actions/query.js

@@ -133,7 +133,8 @@ const parseBuilder = async (ctx, next) => {
       include,
       group,
       order,
-      limit: limit > 2e3 ? 2e3 : limit,
+      limit: limit || 2e3,
+      subQuery: false,
       raw: true
     },
     fieldMap
@@ -144,7 +145,7 @@ const parseFieldAndAssociations = async (ctx, next) => {
   const { collection: collectionName, measures, dimensions, orders, filter } = ctx.action.params.values;
   const collection = ctx.db.getCollection(collectionName);
   const fields = collection.fields;
-  const underscored = ctx.db.options.underscored;
+  const underscored = collection.options.underscored;
   const models = {};
   const parseField = (selected) => {
     var _a, _b, _c;
@@ -272,9 +273,7 @@ const cacheMiddleware = async (ctx, next) => {
   }
   await next();
   if (useCache) {
-    console.log(uid, ctx.body);
     await cache.set(uid, ctx.body, (cacheConfig == null ? void 0 : cacheConfig.ttl) || 30);
-    console.log(cache.get(uid));
   }
 };
 const checkPermission = (ctx, next) => {
@@ -296,13 +295,11 @@ const query = async (ctx, next) => {
       parseBuilder,
       queryData,
       postProcess
-    ])(ctx, async () => {
-    });
+    ])(ctx, next);
   } catch (err) {
     ctx.app.logger.error("charts query: ", err);
     ctx.throw(500, err);
   }
-  await next();
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server/migrations/20230926211750-rename-charttype.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@nocobase/server';
+export default class RenameChartTypeMigration extends Migration {
+    up(): Promise<void>;
+}

package/dist/server/migrations/20230926211750-rename-charttype.js

@@ -0,0 +1,50 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var rename_charttype_exports = {};
+__export(rename_charttype_exports, {
+  default: () => RenameChartTypeMigration
+});
+module.exports = __toCommonJS(rename_charttype_exports);
+var import_server = require("@nocobase/server");
+class RenameChartTypeMigration extends import_server.Migration {
+  async up() {
+    const result = await this.app.version.satisfies("<=0.14.0-alpha.7");
+    if (!result) {
+      return;
+    }
+    const r = this.db.getRepository("uiSchemas");
+    const items = await r.find({
+      filter: {
+        "schema.x-decorator": "ChartRendererProvider"
+      }
+    });
+    await this.db.sequelize.transaction(async (transaction) => {
+      var _a, _b;
+      for (const item of items) {
+        const schema = item.schema;
+        const chartType = (_b = (_a = schema["x-decorator-props"]) == null ? void 0 : _a.config) == null ? void 0 : _b.chartType;
+        if (!chartType || chartType.startsWith("Built-in.")) {
+          continue;
+        }
+        schema["x-decorator-props"].config.chartType = `Built-in.${chartType}`;
+        item.set("schema", schema);
+        await item.save({ transaction });
+      }
+    });
+  }
+}

package/dist/server/plugin.js

@@ -24,6 +24,7 @@ module.exports = __toCommonJS(plugin_exports);
 var import_cache = require("@nocobase/cache");
 var import_server = require("@nocobase/server");
 var import_query = require("./actions/query");
+var import_path = require("path");
 class DataVisualizationPlugin extends import_server.Plugin {
   cache;
   afterAdd() {
@@ -38,6 +39,13 @@ class DataVisualizationPlugin extends import_server.Plugin {
     this.app.acl.allow("charts", "query", "loggedIn");
   }
   async load() {
+    this.db.addMigrations({
+      namespace: "data-visulization",
+      directory: (0, import_path.resolve)(__dirname, "migrations"),
+      context: {
+        plugin: this
+      }
+    });
     this.cache = (0, import_cache.createCache)({
       ttl: 30,
       // seconds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "0.14.0-alpha.6",
+  "version": "0.14.0-alpha.8",
   "displayName": "Data Visualization",
   "displayName.zh-CN": "数据可视化",
   "description": "Provides business intelligence and data visualization features",
@@ -33,5 +33,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "7f2858222231c207030b57704a0bb6ebc98e4e45"
+  "gitHead": "59c82fef6e34707802b5841f5ec4d9b3b6b68abb"
 }

package/dist/client/Settings.d.ts

@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const Settings: () => React.JSX.Element;

package/dist/client/chart/library.d.ts

@@ -1,28 +0,0 @@
-import React from 'react';
-import { ChartType } from './chart';
-export type ChartLibraries = {
-    [library: string]: {
-        enabled: boolean;
-        charts: ChartType[];
-    };
-};
-export declare const ChartLibraryContext: React.Context<ChartLibraries>;
-export declare const useCharts: () => {
-    [name: string]: ChartType;
-};
-export declare const useChartTypes: () => {
-    label: string;
-    children: {
-        key: string;
-        label: string;
-        value: string;
-    }[];
-}[];
-export declare const useDefaultChartType: () => string;
-export declare const useToggleChartLibrary: () => {
-    toggle: (library: string) => void;
-};
-export declare const ChartLibraryProvider: React.FC<{
-    name: string;
-    charts: ChartType[];
-}>;