Add Time Zone Select by tvdeyen · Pull Request #6437 · solidusio/solidus

tvdeyen · 2026-04-15T20:42:17Z

Summary

Adding a timezone select into the various admin/backend navigations we have. Allows for users to see dates in the admin in the selected timezone. If the current solidus user record has a preferred timezone this is used instead. The resolved timezone is stored in the users session.

Admin

Backend

Checklist

Check out our PR guidelines for more details.

The following are mandatory for all PRs:

I agree that my PR will be published under the same license as Solidus.
I have written a thorough PR description.
I have kept my commits small and atomic.
I have localized any and all user-facing strings that I added to the source code.
I have used clear, explanatory commit messages.

The following are not always needed:

📖 I have updated the README to account for my changes.
📑 I have documented new code with YARD.
🛣️ I have opened a PR to update the guides.
✅ I have added automated tests to cover my changes.
📸 I have attached screenshots to demo visual changes.

codecov · 2026-04-15T20:45:09Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 92.16%. Comparing base (62ec49d) to head (c0bd481).

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #6437   +/-   ##
=======================================
  Coverage   92.15%   92.16%           
=======================================
  Files        1035     1036    +1     
  Lines       21163    21188   +25     
=======================================
+ Hits        19502    19527   +25     
  Misses       1661     1661

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

tvdeyen · 2026-08-12T11:42:27Z

@jarednorman please re-review.

tvdeyen · 2026-08-12T11:50:10Z

Accompany SAD PR solidusio/solidus_auth_devise#275

jarednorman

Minor nit. Otherwise lgtm.

jarednorman · 2026-08-12T17:26:28Z

+
+        # Checks if we need to change the timezone or not.
+        def timezone_change_needed?
+          params[:solidus_timezone].present? || session[:solidus_timezone].blank?


Wait, does this mean that change your user's time zone doesn't trigger the time zone to change in the session?

Yeah, good catch. Resetting the session from a model update hook is probably not what we want. We could clear the session after we update the user in the controller(s). I will figure something out

Fixed in c0bd481

I changed it such that the session only gets resetted, if the user is the current admin user. Changing another users preferred timezone should not mess with the admin users timezone in the session.

c0bd481

Am I proud of the controller tests? Probably not. Are they working? Yes. And at least they're hand written 😄

By including this module into a controller it will run all controller actions within the defined timezone. The timezone is taken from the params, the session, user preference (if existing), or the default timezone of the app. The resolved timezone is then stored in the session for future reference.

Use the `Spree::Core::ControllerHelpers::Timezone` module to wrap all admin actions inside the selected timezone.

Use the `Spree::Core::ControllerHelpers::Timezone` module to wrap all admin actions inside the selected timezone. Signed-off-by: Thomas von Deyen <vondeyen@blish.cloud>

Spans do not self close and this actually has a closing tag anyway. Signed-off-by: Thomas von Deyen <vondeyen@blish.cloud>

Signed-off-by: Thomas von Deyen <vondeyen@blish.cloud>

If the user has a timezone column we show a select to let admins set the preferred time zone of the user.

We use that in the new main navigation sidebar to match the icons we use in the new Admin in the legacy backend. The timezone select we now display is missing the icon we already have in the new admin.

After switching the current users preferred time zone in the admin/backend we want that to reflect in the session even if the session already has a timezone stored.

jarednorman · 2026-08-13T18:39:42Z

Definitely warrants going into our next minor version bump.

tvdeyen added the type:enhancement Proposed or newly added feature label Apr 15, 2026

tvdeyen self-assigned this Apr 15, 2026

github-actions Bot added changelog:solidus_backend Changes to the solidus_backend gem changelog:solidus_core Changes to the solidus_core gem changelog:solidus_admin labels Apr 15, 2026

github-project-automation Bot added this to Solidus Admin Apr 15, 2026

tvdeyen force-pushed the timezone-select branch 4 times, most recently from 899d5a5 to c8011a0 Compare April 23, 2026 08:11

tvdeyen marked this pull request as ready for review April 23, 2026 08:12

tvdeyen requested a review from a team as a code owner April 23, 2026 08:12

tvdeyen removed their assignment Apr 24, 2026

tvdeyen force-pushed the timezone-select branch from c8011a0 to def12cd Compare April 24, 2026 07:42

jarednorman approved these changes Apr 27, 2026

View reviewed changes

tvdeyen force-pushed the timezone-select branch from def12cd to 2378c1d Compare May 13, 2026 15:15

tvdeyen modified the milestone: 4.8 May 13, 2026

github-project-automation Bot added this to Solidus Public Roadmap May 13, 2026

tvdeyen force-pushed the timezone-select branch from 2378c1d to b703657 Compare June 10, 2026 15:04

houndci-bot reviewed Jun 10, 2026

View reviewed changes

jarednorman requested changes Aug 12, 2026

View reviewed changes

Comment thread admin/app/components/solidus_admin/users/edit/component.html.erb Outdated

tvdeyen force-pushed the timezone-select branch 2 times, most recently from 57e3df4 to b57c763 Compare August 12, 2026 11:40

tvdeyen requested a review from jarednorman August 12, 2026 11:42

tvdeyen moved this to Review in Solidus Admin Aug 12, 2026

tvdeyen moved this to In Progress in Solidus Public Roadmap Aug 12, 2026

tvdeyen mentioned this pull request Aug 12, 2026

feat(User): Add timezone solidusio/solidus_auth_devise#275

Merged

5 tasks

tvdeyen force-pushed the timezone-select branch 2 times, most recently from 1889258 to 4a57b8f Compare August 12, 2026 12:10

tvdeyen commented Aug 12, 2026

View reviewed changes

Comment thread admin/app/components/solidus_admin/users/edit/component.html.erb

tvdeyen commented Aug 12, 2026

View reviewed changes

Comment thread backend/app/views/spree/admin/shared/_navigation_solidus_admin.html.erb

jarednorman approved these changes Aug 12, 2026

View reviewed changes

Comment thread admin/app/components/solidus_admin/users/edit/component.html.erb Outdated

jarednorman requested changes Aug 12, 2026

View reviewed changes

tvdeyen added 9 commits August 12, 2026 20:50

feat(backend): Handle timezone changes

2408b66

Use the `Spree::Core::ControllerHelpers::Timezone` module to wrap all admin actions inside the selected timezone.

feat(admin): Handle timezone changes

5127aa7

Use the `Spree::Core::ControllerHelpers::Timezone` module to wrap all admin actions inside the selected timezone. Signed-off-by: Thomas von Deyen <vondeyen@blish.cloud>

fix(admin navigation): Remove invalid html closing tag

3333fd0

Spans do not self close and this actually has a closing tag anyway. Signed-off-by: Thomas von Deyen <vondeyen@blish.cloud>

feat(admin): Add timezone select

e5e97b9

Signed-off-by: Thomas von Deyen <vondeyen@blish.cloud>

feat(backend): Add timezone select

d3a2bca

Signed-off-by: Thomas von Deyen <vondeyen@blish.cloud>

feat(backend): Add timezone select to users form

f9843b8

If the user has a timezone column we show a select to let admins set the preferred time zone of the user.

feat(admin): Add timezone select to users form

3dd506e

If the user has a timezone column we show a select to let admins set the preferred time zone of the user.

chore(backend): Update the remixicon symbol

eab8a66

We use that in the new main navigation sidebar to match the icons we use in the new Admin in the legacy backend. The timezone select we now display is missing the icon we already have in the new admin.

tvdeyen force-pushed the timezone-select branch from 4a57b8f to f8ecf57 Compare August 12, 2026 18:50

jarednorman approved these changes Aug 12, 2026

View reviewed changes

feat: Reset session timezone if user timezone changed

c0bd481

After switching the current users preferred time zone in the admin/backend we want that to reflect in the session even if the session already has a timezone stored.

tvdeyen force-pushed the timezone-select branch from f8ecf57 to c0bd481 Compare August 13, 2026 07:17

adammathys approved these changes Aug 13, 2026

View reviewed changes

tvdeyen merged commit 4697059 into solidusio:main Aug 13, 2026
39 checks passed

tvdeyen deleted the timezone-select branch August 13, 2026 21:38

github-project-automation Bot moved this from In Progress to Done in Solidus Public Roadmap Aug 13, 2026

github-project-automation Bot moved this from Review to Done in Solidus Admin Aug 13, 2026

Uh oh!

Uh oh!

Conversation

tvdeyen commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Admin

Backend

Checklist

Uh oh!

codecov Bot commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tvdeyen commented Aug 12, 2026

Uh oh!

tvdeyen commented Aug 12, 2026

Uh oh!

Uh oh!

Uh oh!

jarednorman left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jarednorman Aug 12, 2026

Choose a reason for hiding this comment

Uh oh!

tvdeyen Aug 12, 2026

Choose a reason for hiding this comment

Uh oh!

tvdeyen Aug 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tvdeyen Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

tvdeyen Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

jarednorman commented Aug 13, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

tvdeyen commented Apr 15, 2026 •

edited

Loading

codecov Bot commented Apr 15, 2026 •

edited

Loading

tvdeyen Aug 12, 2026 •

edited

Loading