Changing to non-temporal variable, then back, causes time grain to no longer function in 4.0.2rc2

[sfirke]

Bug description

Based on this comment about a bugfix in 4.0.2rc1 I tested this out and indeed get a problem I don't have in 4.0.0. I don't have immediate access to a 4.0.1 environment so can't say for sure if it's a regression introduced in 4.0.2 or 4.0.1.

When I have a temporal variable on the x-axis, then switch to a non-temporal, I can verify that the advanced analytics section gets hidden (good). Then I switch back to the temporal variable -- and the chart no longer respects the value set for Time Grain.

How to reproduce the bug

1. Create line chart with temporal x-axis column and COUNT(*) metric and a specific time grain like Month
2. Switch the x-axis variable to categorical or numeric variable instead and click Update Chart
3. Switch the x-axis variable back to the original variable.

Time grain "Month" is no longer respected, data shows at finest granularity.

Screenshots/recordings

Time.Grain.not.applying.to.line.chart.4.0.2rc1.mp4

Superset version

master / latest-dev

Python version

I don't know

Node version

I don't know

Browser

Firefox

Additional context

No response

Checklist

• I have searched Superset docs and Slack and didn't find a solution to my problem.
• I have searched the GitHub issue tracker and didn't find a similar bug report.
• I have checked Superset's logs for errors and if I found a relevant Python stacktrace, I included it here as text in the "additional context" section.