Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the Spree::Backend navigation menu to match the upcoming SolidusAdmin #5392

Merged
merged 20 commits into from
Sep 27, 2023

Conversation

elia
Copy link
Member

@elia elia commented Sep 21, 2023

Summary

image

These (except the last 5) are commits extracted from the nebulab/admin branch and kept untouched except for changes applying to the admin/ directory. This is done to minimize conflicts when nebulab/admin will be eventually rebased on them.

The last 5 commits are further adjustments and backports on top of the same branch that were either missing or which commits didn't make sense outside of the branch.

Contents

This PR basically takes care of two things:

  • Match the nav bar style to the upcoming SolidusAdmin one
  • Add a toggle to switch to SolidusAdmin and show it if SolidusAdmin is installed

Checklist

Check out our PR guidelines for more details.

The following are mandatory for all PRs:

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.

@elia elia self-assigned this Sep 21, 2023
@github-actions github-actions bot added changelog:solidus_backend Changes to the solidus_backend gem changelog:solidus_core Changes to the solidus_core gem changelog:repository Changes to the repository not within any gem labels Sep 21, 2023
@elia elia force-pushed the elia/admin-support branch from 210449e to e73d2a3 Compare September 25, 2023 08:35
@github-actions github-actions bot added changelog:solidus Changes to the solidus meta-gem and removed changelog:repository Changes to the repository not within any gem labels Sep 25, 2023
@elia elia force-pushed the elia/admin-support branch from e73d2a3 to a08b606 Compare September 25, 2023 08:37
@github-actions github-actions bot removed the changelog:solidus Changes to the solidus meta-gem label Sep 25, 2023
@elia elia force-pushed the elia/admin-support branch from a08b606 to 335bd5f Compare September 25, 2023 08:38
@codecov
Copy link

codecov bot commented Sep 25, 2023

Codecov Report

Merging #5392 (38cd7b0) into main (69ba182) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #5392   +/-   ##
=======================================
  Coverage   88.76%   88.77%           
=======================================
  Files         564      564           
  Lines       13960    13972   +12     
=======================================
+ Hits        12392    12404   +12     
  Misses       1568     1568           
Files Coverage Δ
...ckend/app/helpers/spree/admin/navigation_helper.rb 91.08% <100.00%> (+0.46%) ⬆️
backend/lib/spree/backend_configuration.rb 100.00% <100.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@github-actions github-actions bot added the changelog:repository Changes to the repository not within any gem label Sep 25, 2023
@elia elia force-pushed the elia/admin-support branch 2 times, most recently from c15ac78 to c445c25 Compare September 25, 2023 15:39
@elia elia added this to the 4.2 milestone Sep 25, 2023
@elia elia force-pushed the elia/admin-support branch from c445c25 to 665d974 Compare September 26, 2023 13:59
@elia elia changed the title [Backend] Backport changes from the SolidusAdmin branch Update the _backend_ navigation menu to match the upcoming SolidusAdmin Sep 26, 2023
@elia elia changed the title Update the _backend_ navigation menu to match the upcoming SolidusAdmin Update the Spree::backend navigation menu to match the upcoming SolidusAdmin` Sep 26, 2023
@elia elia changed the title Update the Spree::backend navigation menu to match the upcoming SolidusAdmin` Update the Spree::Backend navigation menu to match the upcoming SolidusAdmin Sep 26, 2023
@elia elia marked this pull request as ready for review September 26, 2023 14:09
@elia elia requested a review from a team as a code owner September 26, 2023 14:09
@elia elia requested a review from rainerdema September 26, 2023 14:10
elia and others added 12 commits September 26, 2023 17:20
As the cookie was set relative to the path where the switcher was
clicked, it created as many cookies as paths where the switcher
was clicked. That was causing the switcher to not work when a previous
cookie was also encompassing the current path.

To reproduce (in Chrome):

1. Initiate the sandbox application (new admin is on by default)
2. Go to the product creation page. It falls back to the legacy admin
but the switcher is still on the new admin.
3. Click on the switcher to go back to the legacy admin. It works. The
cookie is set for `/admin/products` to `false`.
4. Go to the product listing. Switch again to the new admin. It sets the
cookie for `/admin` to `true`, but as the `/admin/products` cookie
also applies and takes precedence, the new route is not taken into account.
Now defaults to the english translation that we know to be present,
previously it was rendering HTML within an attribute, thus breaking
the page.
Fix the sidebar menu stickyness at different window heights.
`link_tree` seems to be failing when the server is restarted.
Given we're just providing two themes we can list them individually.
@elia elia force-pushed the elia/admin-support branch from 665d974 to 38cd7b0 Compare September 26, 2023 15:20
@elia elia merged commit 1ca7101 into main Sep 27, 2023
4 checks passed
@elia elia deleted the elia/admin-support branch September 27, 2023 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog:repository Changes to the repository not within any gem changelog:solidus_backend Changes to the solidus_backend gem changelog:solidus_core Changes to the solidus_core gem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants