Merge pull request #16610 from craftcms/bugfix/settings-routes-reorde…

…ring Bugfix/settings routes reordering
craftcms · Jan 31, 2025 · f1aeb2a · f1aeb2a
2 parents 19aacc2 + cdf395a
commit f1aeb2a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed a bug where section-specific GraphQL queries (`<sectionHandle>Entries`) weren’t available if a Matrix or CKEditor field existed with the same handle as the section.
+- Fixed an error that could occur after reordering routes. ([#16610](https://github.com/craftcms/cms/pull/16610))
 
 ## 5.6.4 - 2025-01-30
 

diff --git a/src/services/Routes.php b/src/services/Routes.php
@@ -113,6 +113,9 @@ public function getProjectConfigRoutes(): array
         $this->_projectConfigRoutes = [];
 
         foreach ($routes as $route) {
+            if (!array_key_exists('siteUid', $route)) {
+                continue;
+            }
             $key = sprintf('pattern:%s', $route['uriPattern']);
             if (
                 !isset($this->_projectConfigRoutes[$key]) &&

diff --git a/src/web/assets/routes/dist/routes.js b/src/web/assets/routes/dist/routes.js
diff --git a/src/web/assets/routes/dist/routes.js.map b/src/web/assets/routes/dist/routes.js.map
diff --git a/src/web/assets/routes/src/routes.js b/src/web/assets/routes/src/routes.js
@@ -33,7 +33,7 @@ import './routes.scss';
     },
 
     getRoutes: function () {
-      return this.$container.children();
+      return this.$container.children('.route');
     },
 
     updateRouteOrder: function () {

diff --git a/src/web/twig/variables/Routes.php b/src/web/twig/variables/Routes.php
@@ -32,6 +32,9 @@ public function getProjectConfigRoutes(): array
         $results = Craft::$app->getProjectConfig()->get(ProjectConfig::PATH_ROUTES) ?? [];
 
         foreach ($results as $routeUid => $route) {
+            if (!array_key_exists('siteUid', $route)) {
+                continue;
+            }
             $uriDisplayHtml = '';
 
             if (!empty($route['uriParts'])) {