Address comments

apache · Feb 7, 2022 · 18ebae0 · 18ebae0
1 parent 1503925
commit 18ebae0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/superset-frontend/src/explore/components/DataTableControl/index.tsx b/superset-frontend/src/explore/components/DataTableControl/index.tsx
@@ -117,7 +117,7 @@ export const RowCount = ({
 
 enum FormatPickerValue {
   Formatted,
-  Epoch,
+  Original,
 }
 
 const FormatPicker = ({
@@ -129,7 +129,7 @@ const FormatPicker = ({
 }) => (
   <Radio.Group value={value} onChange={onChange}>
     <Space direction="vertical">
-      <Radio value={FormatPickerValue.Epoch}>{t('Original value')}</Radio>
+      <Radio value={FormatPickerValue.Original}>{t('Original value')}</Radio>
       <Radio value={FormatPickerValue.Formatted}>{t('Formatted date')}</Radio>
     </Space>
   </Radio.Group>
@@ -167,7 +167,10 @@ const DataTableTemporalHeaderCell = ({
       if (!datasourceId) {
         return;
       }
-      if (e.target.value === FormatPickerValue.Epoch && isColumnTimeFormatted) {
+      if (
+        e.target.value === FormatPickerValue.Original &&
+        isColumnTimeFormatted
+      ) {
         dispatch(
           unsetTimeFormattedColumn(datasourceId, timeFormattedColumnIndex),
         );
@@ -204,7 +207,7 @@ const DataTableTemporalHeaderCell = ({
             value={
               isColumnTimeFormatted
                 ? FormatPickerValue.Formatted
-                : FormatPickerValue.Epoch
+                : FormatPickerValue.Original
             }
           />
         </FormatPickerContainer>

diff --git a/superset/views/core.py b/superset/views/core.py
@@ -452,7 +452,7 @@ def get_raw_results(self, viz_obj: BaseViz) -> FlaskResponse:
         return self.json_response(
             {
                 "data": payload["df"].to_dict("records"),
-                "colnames": payload["colnames"],
+                "colnames": payload.get("colnames"),
                 "coltypes": payload.get("coltypes"),
             },
         )

diff --git a/superset/viz.py b/superset/viz.py
@@ -261,7 +261,7 @@ def get_samples(self) -> Dict[str, Any]:
         payload = self.get_df_payload(query_obj)  # leverage caching logic
         return {
             "data": payload["df"].to_dict(orient="records"),
-            "colnames": payload["colnames"],
+            "colnames": payload.get("colnames"),
             "coltypes": payload.get("coltypes"),
         }