fix(annotation): Address regression from #24694 (#24874)

apache · Aug 3, 2023 · f05638b · f05638b
1 parent cfadbeb
commit f05638b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/AnnotationLayer.ts b/superset-frontend/packages/superset-ui-core/src/query/types/AnnotationLayer.ts
@@ -159,7 +159,6 @@ export function isTableAnnotationLayer(
 }
 
 export type RecordAnnotationResult = {
-  columns: string[];
   records: DataRecord[];
 };
 
@@ -181,7 +180,7 @@ export function isTimeseriesAnnotationResult(
 export function isRecordAnnotationResult(
   result: any,
 ): result is RecordAnnotationResult {
-  return Array.isArray(result?.columns) && Array.isArray(result?.records);
+  return Array.isArray(result?.records);
 }
 
 export type AnnotationData = { [key: string]: AnnotationResult };

diff --git a/superset-frontend/packages/superset-ui-core/test/query/types/AnnotationLayer.test.ts b/superset-frontend/packages/superset-ui-core/test/query/types/AnnotationLayer.test.ts
@@ -93,7 +93,6 @@ describe('AnnotationLayer type guards', () => {
     },
   ];
   const recordAnnotationResult: RecordAnnotationResult = {
-    columns: ['col1', 'col2'],
     records: [
       { a: 1, b: 2 },
       { a: 2, b: 3 },

diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/utils/annotation.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/utils/annotation.test.ts
@@ -130,7 +130,6 @@ describe('extractAnnotationLabels', () => {
     ];
     const results: AnnotationData = {
       'My Interval': {
-        columns: ['col'],
         records: [{ col: 1 }],
       },
       'My Line': [