Revert "chore: Refactor ExploreMixin to power both Datasets (SqlaTabl…

…e) and Query models (apache#22853)" This reverts commit ba7b6fd.
preset-io · Apr 13, 2023 · 42422e1 · 42422e1
1 parent c748f69
commit 42422e1
Show file tree

Hide file tree

Showing 10 changed files with 961 additions and 413 deletions.
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
@@ -61,7 +61,7 @@ export type ExploreQuery = QueryResponse & {
 };
 
 export interface ISimpleColumn {
-  column_name?: string | null;
+  name?: string | null;
   type?: string | null;
   is_dttm?: boolean | null;
 }
@@ -216,7 +216,7 @@ export const SaveDatasetModal = ({
         ...formDataWithDefaults,
         datasource: `${datasetToOverwrite.datasetid}__table`,
         ...(defaultVizType === 'table' && {
-          all_columns: datasource?.columns?.map(column => column.column_name),
+          all_columns: datasource?.columns?.map(column => column.name),
         }),
       }),
     ]);
@@ -301,7 +301,7 @@ export const SaveDatasetModal = ({
           ...formDataWithDefaults,
           datasource: `${data.table_id}__table`,
           ...(defaultVizType === 'table' && {
-            all_columns: selectedColumns.map(column => column.column_name),
+            all_columns: selectedColumns.map(column => column.name),
           }),
         }),
       )

diff --git a/superset-frontend/src/SqlLab/fixtures.ts b/superset-frontend/src/SqlLab/fixtures.ts
@@ -692,17 +692,17 @@ export const testQuery: ISaveableDatasource = {
   sql: 'SELECT *',
   columns: [
     {
-      column_name: 'Column 1',
+      name: 'Column 1',
       type: DatasourceType.Query,
       is_dttm: false,
     },
     {
-      column_name: 'Column 3',
+      name: 'Column 3',
       type: DatasourceType.Query,
       is_dttm: false,
     },
     {
-      column_name: 'Column 2',
+      name: 'Column 2',
       type: DatasourceType.Query,
       is_dttm: true,
     },

diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricOption.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricOption.jsx
@@ -48,7 +48,7 @@ class AdhocMetricOption extends React.PureComponent {
   }
 
   onRemoveMetric(e) {
-    e?.stopPropagation();
+    e.stopPropagation();
     this.props.onRemoveMetric(this.props.index);
   }