More robust route matching for TreeNode<MenuItem>

Author: muratcakir

src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs

@@ -171,11 +171,6 @@ public static T GetOrAdd<T>(this Cache cache, string key, Func<T> acquirer, Time
 
 		public static T GetItem<T>(this HttpContext httpContext, string key, Func<T> factory = null, bool forceCreation = true)
 		{
-			if (httpContext?.Items == null)
-			{
-				return default(T);
-			}
-
 			return GetItem<T>(new HttpContextWrapper(httpContext), key, factory, forceCreation);
 		}
 

src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs

@@ -14,6 +14,7 @@ public static string GetAreaName(this RouteData routeData)
 			{
 				return (area as string);
 			}
+
 			return routeData.Route.GetAreaName();
 		}
 
@@ -24,11 +25,13 @@ public static string GetAreaName(this RouteBase route)
 			{
 				return area.Area;
 			}
+
 			var route2 = route as Route;
 			if ((route2 != null) && (route2.DataTokens != null))
 			{
 				return (route2.DataTokens["area"] as string);
 			}
+
 			return null;
 		}
 

src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs

@@ -77,7 +77,7 @@ public override RouteData GetRouteData(HttpContextBase httpContext)
                 var urlRecord = urlRecordService.GetBySlug(slug);
                 if (urlRecord == null)
                 {
-                    //no URL record found
+                    // no URL record found
 					data.Values["controller"] = "Error";
 					data.Values["action"] = "NotFound";
                     return data;				
@@ -105,7 +105,8 @@ public override RouteData GetRouteData(HttpContextBase httpContext)
                     }
                 }
 
-                // process URL
+				// process URL
+				data.DataTokens["UrlRecord"] = urlRecord;
 				data.Values["SeName"] = urlRecord.Slug;
                 switch (urlRecord.EntityName.ToLowerInvariant())
                 {

src/Presentation/SmartStore.Web.Framework/UI/Extensions/NavigatableExtensions.cs

@@ -6,23 +6,81 @@
 using System.Web.Mvc;
 using System.Web;
 using SmartStore.Collections;
+using SmartStore.Web.Framework.Seo;
+using SmartStore.Core.Domain.Seo;
+using SmartStore.Services.Localization;
 
 namespace SmartStore.Web.Framework.UI
 {  
     public static class NavigatableExtensions
     {
-        public static bool HasValue(this INavigatable navigatable)
+		class PathInfo
+		{
+			public string RequestPath { get; set; }
+			public string RoutePath { get; set; }
+		}
+
+		public static bool HasValue(this INavigatable navigatable)
         {
             return (((navigatable.ActionName.HasValue() && navigatable.ControllerName.HasValue()) || navigatable.ActionName.HasValue() || navigatable.RouteName.HasValue()) || navigatable.Url.HasValue());
         }
 
         public static bool IsCurrent(this INavigatable navigatable, ControllerContext controllerContext)
         {
-            string pathAndQuery = controllerContext.HttpContext.Request.Url.PathAndQuery;
-            string url = navigatable.GenerateUrl(controllerContext.RequestContext);
-            string comparing = new UrlHelper(controllerContext.RequestContext).RouteUrl(controllerContext.RequestContext.RouteData.Values);
-            return (url.IsCaseInsensitiveEqual(pathAndQuery) || url.IsCaseInsensitiveEqual(comparing));
-        }
+			var url = navigatable.GenerateUrl(controllerContext.RequestContext);
+			var compare = GetCurrentPathInfo(controllerContext);
+
+			if (url.IsCaseInsensitiveEqual(compare.RequestPath))
+			{
+				return true;
+			}
+
+			if (compare.RoutePath.HasValue() && url.IsCaseInsensitiveEqual(compare.RoutePath))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		private static PathInfo GetCurrentPathInfo(ControllerContext controllerContext)
+		{
+			var cacheKey = "CurrentPathInfoForSitemapMatching";
+
+			return controllerContext.HttpContext.GetItem<PathInfo>(cacheKey, () =>
+			{
+				var requestContext = controllerContext.RequestContext;
+				var request = controllerContext.HttpContext.Request;
+				var info = new PathInfo
+				{
+					RequestPath = request.RawUrl
+				};
+
+				// Path generated by Routing
+				var routeValues = requestContext.RouteData.Values;
+				if (requestContext.RouteData.Route is GenericPathRoute)
+				{
+					// We pushed matching UrlRecord instance to DataTokens in GenericPathRoute class
+					var urlRecord = requestContext.RouteData.DataTokens["UrlRecord"] as UrlRecord;
+					if (urlRecord != null)
+					{
+						var routeName = urlRecord.EntityName;
+
+						// Also SeName has been pushed to current RouteValues in GenericPathRoute class
+						if (routeValues.ContainsKey("SeName"))
+						{
+							info.RoutePath = new UrlHelper(requestContext).RouteUrl(routeName, new { SeName = routeValues["SeName"] });
+						}
+					}
+				}
+				else
+				{
+					info.RoutePath = new UrlHelper(requestContext).RouteUrl(routeValues);
+				}
+
+				return info;
+			});
+		}
 
         public static void Action(this INavigatable navigatable, RouteValueDictionary routeValues)
         {
@@ -154,7 +212,7 @@ public static string GenerateUrl(this INavigatable navigatable, UrlHelper urlHel
 				routeValues[param.Name] = param.Value;
 
 				var requestContext = urlHelper.RequestContext;
-				if (requestContext.RouteData != null && requestContext.RouteData.Route != null)
+				if (requestContext.RouteData?.Route != null)
 				{
 					var virtualPath = requestContext.RouteData.Route.GetVirtualPath(requestContext, routeValues);
 					if (virtualPath != null)

src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs

@@ -180,7 +180,7 @@ public ActionResult List(GridCommand command, TopicListModel model)
 					if (model.WidgetZone.HasValue())
 						q2 = q2.Where(x => x.WidgetZone.Contains(model.WidgetZone));
 
-					return q2;
+					return q2.OrderBy(x => x.SystemName);
 				});
 
 				gridModel.Data = topics.Select(x =>

src/Presentation/SmartStore.Web/Administration/Scripts/admin.globalinit.js

@@ -5,7 +5,7 @@
 	var _commonPluginFactories = [
 		// panel toggling
 		function (ctx) {
-			ctx.find('input[type=checkbox][data-toggler-for]').each(function (i, el) {
+            ctx.find('input[type=checkbox][data-toggler-for]').each(function (i, el) {
 				SmartStore.Admin.togglePanel(el, false);
 			});
 		},

src/Presentation/SmartStore.Web/Administration/Views/Topic/_CreateOrUpdate.cshtml

@@ -23,7 +23,7 @@
 
 @helper TabInfo()
 { 
-    <table class="adminContent">
+    <table class="adminContent mb-3">
         <tr>
             <td class="adminTitle">
                 @Html.SmartLabelFor(model => model.SystemName)
@@ -101,7 +101,7 @@
                 @Html.SmartLabelFor(model => model.RenderAsWidget)
             </td>
             <td class="adminData">
-				@Html.CheckBoxFor(model => model.RenderAsWidget, new { data_toggler_for = "#pnlRenderAsWidget, #pnlWidgetWrapContent" })
+				@Html.CheckBoxFor(model => model.RenderAsWidget, new { data_toggler_for = "#pnlRenderAsWidget" })
                 @Html.ValidationMessageFor(model => model.RenderAsWidget)
             </td>
         </tr>
@@ -125,7 +125,7 @@
 				</td>
 			</tr>
 		</tbody>
-		<tbody id="pnlWidgetWrapContent hide">
+		<tbody id="pnlWidgetWrapContent">
 			<tr>
 				<td class="adminTitle">
 					@Html.SmartLabelFor(model => model.WidgetShowTitle)

src/Presentation/SmartStore.Web/Infrastructure/Routes/3_GenericRoutes.cs

@@ -10,7 +10,7 @@ public partial class SeoRoutes : IRouteProvider
     {
         public void RegisterRoutes(RouteCollection routes)
         {
-            //generic URLs
+            // Generic URLs
             routes.MapGenericPathRoute("GenericUrl",
                 "{*generic_se_name}",
                 new { controller = "Common", action = "GenericUrl" },