FIX Correctly route from non-react to react section.

Author: GuySartorelli

client/dist/js/bundle.js

@@ -173,6 +173,16 @@ class BootRoutes {
           lastPath = window.location.pathname;
         }
 
+        // When navigating from a non-react route to a react route, we must
+        // completely load the page for react's router to kick in.
+        if (ctx.state?.path && this.matchesReactRoute(ctx.state.path)) {
+          // Add the current path to the history so we can go back to it
+          history.pushState({}, '');
+          // Navigate to the new path
+          window.location = ctx.state.path;
+          return;
+        }
+
         // Verify that this is a true state change. E.g. not a hash change.
         // This emulates behaviour of old html history.js
         const forceReload = ctx.state && ctx.state.__forceReload;

client/src/boot/BootRoutes.js

@@ -5,11 +5,20 @@ Feature: Single-page routing works as expected
   So that I can get to the areas I want to get to
 
   Background:
-    Given I have a config file "fake-asset-admin.yml"
+    Given the "Company" "Company A" with "Category"="Other"
       And the "Employee" "Employee A" with "Email"="test@example.com" and "Biography"="<p>some content here</p>" and "DateOfBirth"="1990-06-09"
-      And the "group" "EDITOR" has permissions "Access to 'Test ModelAdmin' section" and "TEST_DATAOBJECT_EDIT"
+      # Page access is required to see the Company object
+      And the "group" "EDITOR" has permissions "Access to 'Pages' section" and "Access to 'Test ModelAdmin' section" and "CMS_ACCESS_AssetAdmin" and "TEST_DATAOBJECT_EDIT"
       And I am logged in as a member of "EDITOR" group
 
+  Scenario: Non-react sections correctly route to react sections
+    When I go to "/admin/test"
+    Then I wait for 2 seconds
+    Then I click "Company A" in the "#Form_EditForm" element
+    And I click "behat link to file" in the "#Form_ItemEditForm" element
+    Then I should see "Files" in the ".cms-content.AssetAdmin .breadcrumb__container" element
+
   Scenario: Admin sections can start with the same string as a react section
+    Given I have a config file "fake-asset-admin.yml"
     When I go to "/admin/assets-test"
     Then I should see "Add Company"

tests/behat/features/admin-routing.feature

@@ -16,7 +16,6 @@ Feature: GridField inline delete
     And I go to "/admin/test"
 
   Scenario: I can see toast message when I successfully delete a record by clicking the Delete button in action menu
-  Given I take a screenshot after every step
     When I click "Company C" in the "#Form_EditForm" element
     And I click "Employees" in the ".ui-tabs-nav" element
     Then I should see "Employee A" in the "#Form_ItemEditForm_Employees" element