Merge pull request #1872 from sbwalker/dev

create url mapping when page path changes
oqtane · Dec 12, 2021 · e99ab43 · e99ab43
2 parents ba35385 + 1e1aaac
commit e99ab43
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/Oqtane.Client/Modules/Admin/UrlMappings/Index.razor b/Oqtane.Client/Modules/Admin/UrlMappings/Index.razor
@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Admin.UrlMappings
 @inherits ModuleBase
+@inject NavigationManager NavigationManager
 @inject IUrlMappingService UrlMappingService
 @inject ISiteService SiteService
 @inject IStringLocalizer<Index> Localizer
@@ -39,10 +40,10 @@ else
 					<td><ActionLink Action="Edit" Parameters="@($"id=" + context.UrlMappingId.ToString())" ResourceKey="Edit" /></td>
 					<td><ActionDialog Header="Delete Url Mapping" Message="@string.Format(Localizer["Confirm.DeleteUrlMapping"], context.Url)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUrlMapping(context))" ResourceKey="DeleteUrlMapping" /></td>
 					<td>
-						@context.Url
+						<a href="" onclick="@(() => BrowseUrl(context.Url))">@context.Url</a>
 						@if (_mapped)
 						{
-							@((MarkupString)"<br />&gt;&gt;&nbsp;")@context.MappedUrl
+							@((MarkupString)"<br />&gt;&gt;&nbsp;")<a href="" onclick="@(() => BrowseUrl(context.MappedUrl))">@context.MappedUrl</a>
 						}
 					</td>
 					<td>@context.Requests</td>
@@ -95,6 +96,11 @@ else
 		}
 	}
 
+	private void BrowseUrl(string url)
+	{
+		NavigationManager.NavigateTo(url, true);		
+	}
+
 	private async Task DeleteUrlMapping(UrlMapping urlMapping)
 	{
 		try

diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs
@@ -22,18 +22,20 @@ public class PageController : Controller
         private readonly IPermissionRepository _permissionRepository;
         private readonly ISettingRepository _settings;
         private readonly IUserPermissions _userPermissions;
+        private readonly IUrlMappingRepository _urlMappings;
         private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IPermissionRepository permissionRepository, ISettingRepository settings, IUserPermissions userPermissions, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger)
+        public PageController(IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IPermissionRepository permissionRepository, ISettingRepository settings, IUserPermissions userPermissions, IUrlMappingRepository urlMappings, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger)
         {
             _pages = pages;
             _modules = modules;
             _pageModules = pageModules;
             _permissionRepository = permissionRepository;
             _settings = settings;
             _userPermissions = userPermissions;
+            _urlMappings = urlMappings;
             _syncManager = syncManager;
             _logger = logger;
             _alias = tenantManager.GetAlias();
@@ -252,25 +254,41 @@ public Page Post(int id, string userid)
         [Authorize(Roles = RoleNames.Registered)]
         public Page Put(int id, [FromBody] Page page)
         {
-            if (ModelState.IsValid && page.SiteId == _alias.SiteId && _pages.GetPage(page.PageId, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
+            // get current page
+            var currentPage = _pages.GetPage(page.PageId, false);
+
+            if (ModelState.IsValid && page.SiteId == _alias.SiteId && currentPage != null && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
             {
-                // preserve page permissions
-                var oldPermissions = _permissionRepository.GetPermissions(EntityNames.Page, page.PageId).ToList();
+                // get current page permissions
+                var currentPermissions = _permissionRepository.GetPermissions(EntityNames.Page, page.PageId).ToList();
 
                 page = _pages.UpdatePage(page);
 
-                // get differences between old and new page permissions
+                // save url mapping if page path changed
+                if (currentPage.Path != page.Path)
+                {
+                    var url = HttpContext.Request.Scheme + "://" + _alias.Name + "/";
+                    var urlMapping = new UrlMapping();
+                    urlMapping.SiteId = page.SiteId;
+                    urlMapping.Url = url + currentPage.Path;
+                    urlMapping.MappedUrl = url + page.Path;
+                    urlMapping.Requests = 0;
+                    urlMapping.CreatedOn = System.DateTime.UtcNow;
+                    urlMapping.RequestedOn = System.DateTime.UtcNow;
+                    _urlMappings.AddUrlMapping(urlMapping);
+                }
+
+                // get differences between current and new page permissions
                 var newPermissions = _permissionRepository.DecodePermissions(page.Permissions, page.SiteId, EntityNames.Page, page.PageId).ToList();
-                var added = GetPermissionsDifferences(newPermissions, oldPermissions);
-                var removed = GetPermissionsDifferences(oldPermissions, newPermissions);
+                var added = GetPermissionsDifferences(newPermissions, currentPermissions);
+                var removed = GetPermissionsDifferences(currentPermissions, newPermissions);
 
                 // synchronize module permissions
                 if (added.Count > 0 || removed.Count > 0)
                 {
                     foreach (PageModule pageModule in _pageModules.GetPageModules(page.PageId, "").ToList())
                     {
                         var modulePermissions = _permissionRepository.GetPermissions(EntityNames.Module, pageModule.Module.ModuleId).ToList();
-                        //var modulePermissions = _permissionRepository.DecodePermissions(pageModule.Module.Permissions, page.SiteId, EntityNames.Module, pageModule.ModuleId).ToList();
                         // permissions added
                         foreach(Permission permission in added)
                         {