test(chart): add drill option requst builder tests

Author: Cuiyansong

frontend/src/app/models/ChartDataRequestBuilder.ts

@@ -381,14 +381,34 @@ export class ChartDataRequestBuilder {
 
         if (this.aggregation === false) {
           if (
-            cur.type === ChartDataSectionType.GROUP ||
             cur.type === ChartDataSectionType.COLOR ||
             cur.type === ChartDataSectionType.AGGREGATE ||
             cur.type === ChartDataSectionType.SIZE ||
             cur.type === ChartDataSectionType.INFO ||
             cur.type === ChartDataSectionType.MIXED
           ) {
             return acc.concat(cur.rows);
+          } else if (cur.type === ChartDataSectionType.GROUP) {
+            if (cur.drillable) {
+              if (
+                !this.drillOption ||
+                this.drillOption?.mode === DrillMode.Normal ||
+                !this.drillOption?.getCurrentFields()
+              ) {
+                return acc.concat(cur.rows?.[0] || []);
+              }
+              return acc.concat(
+                cur.rows?.filter(field => {
+                  return Boolean(
+                    this.drillOption
+                      ?.getCurrentFields()
+                      ?.some(df => df.uid === field.uid),
+                  );
+                }) || [],
+              );
+            } else {
+              return acc.concat(cur.rows);
+            }
           }
         }
 

frontend/src/app/models/__tests__/ChartDataRequestBuilder.test.ts

@@ -23,6 +23,7 @@ import {
   DataViewFieldType,
   FilterConditionType,
 } from 'app/constants';
+import { getChartDrillOption } from 'app/utils/internalChartHelper';
 import { FilterSqlOperator, RECOMMEND_TIME } from 'globalConstants';
 import moment from 'moment';
 import { ChartDataRequestBuilder } from '../ChartDataRequestBuilder';
@@ -1072,4 +1073,120 @@ describe('ChartDataRequestBuild Test', () => {
       'name',
     ]);
   });
+
+  test('should get select columns with drill option', () => {
+    const dataView = { id: 'view-id' } as any;
+    const chartDataConfigs = [
+      {
+        type: ChartDataSectionType.GROUP,
+        key: 'GROUP',
+        drillable: true,
+        rows: [
+          {
+            uid: 'group-r1',
+            colName: 'group-r1',
+            type: '',
+            category: '',
+          },
+          {
+            uid: 'group-r2',
+            colName: 'group-r2',
+            type: '',
+            category: '',
+          },
+        ],
+      },
+      {
+        type: ChartDataSectionType.AGGREGATE,
+        key: 'aggregation',
+        rows: [
+          {
+            colName: 'amount',
+            type: '',
+            category: '',
+          },
+        ],
+      },
+      {
+        type: ChartDataSectionType.SIZE,
+        key: 'size',
+        rows: [
+          {
+            colName: 'size',
+            type: '',
+            category: '',
+          },
+        ],
+      },
+      {
+        type: ChartDataSectionType.INFO,
+        key: 'info',
+        rows: [
+          {
+            colName: 'info',
+            type: '',
+            category: '',
+          },
+        ],
+      },
+      {
+        type: ChartDataSectionType.COLOR,
+        key: 'color',
+        rows: [
+          {
+            colName: 'color',
+            type: '',
+            category: '',
+          },
+        ],
+      },
+      {
+        type: ChartDataSectionType.MIXED,
+        key: 'MIXED',
+        rows: [
+          {
+            colName: 'mix',
+            type: '',
+            category: '',
+          },
+        ],
+      },
+      {
+        type: ChartDataSectionType.FILTER,
+        key: 'filter',
+        rows: [
+          {
+            colName: 'filter',
+            type: '',
+            category: '',
+          },
+        ],
+      },
+    ] as any;
+    const chartSettingConfigs = [];
+    const pageInfo = {};
+    const enableScript = false;
+    const enableAggregation = false;
+    const drillOption = getChartDrillOption(chartDataConfigs);
+    drillOption?.drillDown();
+
+    const builder = new ChartDataRequestBuilder(
+      dataView,
+      chartDataConfigs,
+      chartSettingConfigs,
+      pageInfo,
+      enableScript,
+      enableAggregation,
+    ).addDrillOption(drillOption);
+    const requestParams = builder.build();
+
+    expect(requestParams.columns).toEqual([
+      'group-r2',
+      'amount',
+      'size',
+      'info',
+      'color',
+      'mix',
+    ]);
+  });
 });