From 324e9979fa968b07d0be2628cac9119c492dc9b6 Mon Sep 17 00:00:00 2001
From: Cody Leff <cody@preset.io>
Date: Fri, 16 Sep 2022 02:09:17 -0400
Subject: [PATCH] fix(explore): Fix generic X-axis time grain disappearing
 (#21484)

---
 .../src/shared-controls/index.tsx                         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
index a8a5bea37d..03d4698620 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
@@ -197,8 +197,12 @@ const time_grain_sqla: SharedControlConfig<'SelectControl'> = {
     if (isAdhocColumn(xAxisValue)) {
       return true;
     }
-    if (isPhysicalColumn(xAxisValue)) {
-      return !!xAxis?.options?.[xAxisValue]?.is_dttm;
+    if (isPhysicalColumn(xAxisValue) && Array.isArray(xAxis?.options)) {
+      for (let i = 0; i < xAxis.options.length; i += 1) {
+        if (xAxis.options[i].column_name === xAxisValue) {
+          return !!xAxis.options[i].is_dttm;
+        }
+      }
     }
     return false;
   },