chore: update chart type definition

Author: caoxing9

apps/nestjs-backend/src/features/dashboard/chart.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { PrismaService } from '@teable/db-main-prisma';
-import { ChartType, DataSource, THEMES_KEYS } from '@teable/openapi';
+import { ChartType, DataSource, THEMES_KEYS, DEFAULT_SERIES_ARRAY } from '@teable/openapi';
 
 @Injectable()
 export class ChartService {
@@ -64,12 +64,12 @@ export class ChartService {
         xAxis: defaultFieldId,
         filter: null,
         groupBy: null,
-        seriesArray: 'COUNTA',
+        seriesArray: DEFAULT_SERIES_ARRAY,
       },
       appearance: {
         theme: THEMES_KEYS.BLUE,
         legendVisible: true,
-        labelVisible: true,
+        labelVisible: false,
       },
     };
   }

apps/nextjs-app/src/features/app/blocks/chart-v2/components/form/AxisConfig.tsx

@@ -1,4 +1,5 @@
 import { CellValueType, FieldType } from '@teable/core';
+import { DEFAULT_SERIES_ARRAY } from '@teable/openapi';
 import type { ITableQuery, IStatisticFieldItem } from '@teable/openapi';
 import {
   Label,
@@ -26,7 +27,7 @@ export const AxisConfig = () => {
   const { xAxis, seriesArray, orderBy, groupBy } = (query || {}) as ITableQuery;
 
   const pieChartType = [ChartType.Pie, ChartType.DonutChart].includes(chartType);
-  const countAll = seriesArray === 'COUNTA';
+  const countAll = seriesArray === DEFAULT_SERIES_ARRAY;
 
   const displayGroupBy = useMemo(() => {
     if (pieChartType) {
@@ -128,7 +129,7 @@ export const AxisConfig = () => {
                 value="totalRecords"
                 className="w-full"
                 onClick={() => {
-                  updateStorageByPath(`query.seriesArray`, 'COUNTA');
+                  updateStorageByPath(`query.seriesArray`, DEFAULT_SERIES_ARRAY);
                 }}
               >
                 {t('chartV2.form.axisConfig.totalRecords')}

apps/nextjs-app/src/features/app/blocks/chart-v2/components/form/DataSource.tsx

@@ -1,6 +1,6 @@
 import { useMutation } from '@tanstack/react-query';
 import type { ITableQuery } from '@teable/openapi';
-import { DataSource, getFields } from '@teable/openapi';
+import { DataSource, getFields, DEFAULT_SERIES_ARRAY } from '@teable/openapi';
 import { useTables } from '@teable/sdk/hooks';
 import { Separator, Tabs, TabsContent, TabsList, TabsTrigger } from '@teable/ui-lib/shadcn';
 import { useTranslation } from 'next-i18next';
@@ -62,7 +62,7 @@ export const DataSourceSelect = () => {
                 },
                 {
                   path: 'query.seriesArray',
-                  value: 'COUNTA',
+                  value: DEFAULT_SERIES_ARRAY,
                 },
                 {
                   path: 'query.filter',
@@ -130,7 +130,7 @@ export const DataSourceSelect = () => {
                   },
                   {
                     path: 'query.seriesArray',
-                    value: 'COUNTA',
+                    value: DEFAULT_SERIES_ARRAY,
                   },
                   {
                     path: 'query.xAxis',

apps/nextjs-app/src/features/app/blocks/chart-v2/core/adapters/TableAdapter.ts

@@ -1,6 +1,6 @@
 import type { IFieldVo } from '@teable/core';
 import type { IChartStorage, ITableQuery } from '@teable/openapi';
-import { AGGREGATE_COUNT_KEY } from '@teable/openapi';
+import { AGGREGATE_COUNT_KEY, DEFAULT_SERIES_ARRAY } from '@teable/openapi';
 import { groupBy } from 'lodash';
 import type { ISeriesConfig } from '../types';
 import { getGroupUniqueKey, getGroupKeyName } from '../utils';
@@ -72,7 +72,7 @@ export class TableAdapter extends BaseAdapter<ITableQuery> {
   private buildLegendData(): string[] {
     const { query } = this.storage;
     const { seriesArray } = query;
-    const countAll = seriesArray === 'COUNTA';
+    const countAll = seriesArray === DEFAULT_SERIES_ARRAY;
 
     // no need legend data
     if (countAll) {
@@ -106,7 +106,7 @@ export class TableAdapter extends BaseAdapter<ITableQuery> {
   getSeries(xData: string[], legendData: string[]): ISeriesConfig[] {
     const { query } = this.storage;
     const { seriesArray } = query;
-    const countAll = seriesArray === 'COUNTA';
+    const countAll = seriesArray === DEFAULT_SERIES_ARRAY;
 
     if (countAll) {
       return this.getSeriesByCountAll(xData, legendData);

apps/nextjs-app/src/features/app/blocks/chart-v2/core/charts/PieChart.ts

@@ -1,5 +1,5 @@
 import type { ITableQuery } from '@teable/openapi';
-import { AGGREGATE_COUNT_KEY, DataSource } from '@teable/openapi';
+import { AGGREGATE_COUNT_KEY, DataSource, DEFAULT_SERIES_ARRAY } from '@teable/openapi';
 import type { ISeriesConfig } from '../types';
 import { getGroupKeyName } from '../utils';
 import { BaseChart, type IChartOptions } from './BaseChart';
@@ -90,7 +90,7 @@ export class PieChart extends BaseChart {
     if (dataSource === DataSource.Table) {
       const { seriesArray } = this.storage.query as ITableQuery;
       const fieldMap = this.getFieldMap();
-      return seriesArray === 'COUNTA'
+      return seriesArray === DEFAULT_SERIES_ARRAY
         ? AGGREGATE_COUNT_KEY
         : `${fieldMap?.[(seriesArray as { fieldId: string }[])?.at(0)?.fieldId ?? '']}_${(seriesArray as { rollup: string }[])?.at(0)?.rollup ?? ''}`;
     }

packages/openapi/src/plugin/chart/dashboard-query-v2.ts

@@ -17,8 +17,21 @@ export const baseQuerySchemaVoV2 = z.object({
   ),
 });
 
+export const DEFAULT_SERIES_ARRAY = 'COUNTA';
+
 export type IBaseQueryVoV2 = z.infer<typeof baseQuerySchemaVoV2>;
 
+export enum THEMES_KEYS {
+  BLUE = 'blue',
+  GREEN = 'green',
+  NEUTRAL = 'neutral',
+  ORANGE = 'orange',
+  RED = 'red',
+  ROSE = 'rose',
+  VIOLET = 'violet',
+  YELLOW = 'yellow',
+}
+
 export enum ChartType {
   Bar = 'bar',
   Pie = 'pie',

packages/openapi/src/plugin/types.ts

@@ -81,14 +81,3 @@ export const pluginConfigSchema = z
     }
   });
 export type IPluginConfig = z.infer<typeof pluginConfigSchema>;
-
-export enum THEMES_KEYS {
-  BLUE = 'blue',
-  GREEN = 'green',
-  NEUTRAL = 'neutral',
-  ORANGE = 'orange',
-  RED = 'red',
-  ROSE = 'rose',
-  VIOLET = 'violet',
-  YELLOW = 'yellow',
-}