fix cypress

apache · Sep 30, 2022 · d9c2575 · d9c2575
1 parent a58e167
commit d9c2575
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 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
@@ -186,11 +186,13 @@ const time_grain_sqla: SharedControlConfig<'SelectControl'> = {
   label: TIME_FILTER_LABELS.time_grain_sqla,
   initialValue: (control: ControlState, state: ControlPanelState) => {
     if (!isDefined(state)) {
-      // should return control value if the chart is from Dashboard
+      // If a chart is in a Dashboard, the ControlPanelState is empty.
       return control.value;
     }
-    // use default value 'P1D' for a new chart only.
-    return isDefined(state.slice) ? control.value : 'P1D';
+    // if a chart is a new one that isn't saved, the 'time_grain_sqla' isn't in the form_data.
+    return 'time_grain_sqla' in (state?.form_data ?? {})
+      ? state.form_data?.time_grain_sqla
+      : 'P1D';
   },
   description: t(
     'The time granularity for the visualization. This ' +

diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
@@ -86,7 +86,6 @@ export interface ControlPanelState {
   form_data: QueryFormData;
   datasource: Dataset | QueryResponse | null;
   controls: ControlStateMapping;
-  slice?: AnyDict;
 }
 
 /**