edit pub urls without having to delete and readd (#1746)

* edit pub urls without having to delete and readd fix #1113 * uppercase URL in UIs * renamings * revert * protect against editing an existing url into another existing url * misc cleanups, sorry * fix link * fixed log and dropped vars * remove [BindProperty] from Title since it is not passed back to the server --------- Co-authored-by: adelikat <[email protected]>
TASVideos · Jan 21, 2024 · 95ef5d0 · 95ef5d0
1 parent 4c79066
commit 95ef5d0
Show file tree

Hide file tree

Showing 9 changed files with 262 additions and 125 deletions.
diff --git a/TASVideos/Pages/Games/Index.cshtml b/TASVideos/Pages/Games/Index.cshtml
@@ -167,7 +167,7 @@
 <alert type="warning" condition="!Model.Game.Versions.Any()" class="mt-3">
 	No records.
 </alert>
-<table condition="Model.Game.Versions.Any()" class="table table-responsive table-sm">
+<table condition="Model.Game.Versions.Any()" class="table table-bordered table-responsive table-sm">
 	<tr>
 		<th>Type</th>
 		<th>Name</th>

diff --git a/TASVideos/Pages/Games/Models/GameEditModel.cs b/TASVideos/Pages/Games/Models/GameEditModel.cs
@@ -17,7 +17,7 @@ public class GameEditModel
 	public string? Aliases { get; set; }
 
 	[StringLength(250)]
-	[Display(Name = "Screenshot Url")]
+	[Display(Name = "Screenshot URL")]
 	public string? ScreenshotUrl { get; set; }
 
 	[StringLength(300)]

diff --git a/TASVideos/Pages/Publications/Edit.cshtml b/TASVideos/Pages/Publications/Edit.cshtml
@@ -44,19 +44,22 @@
 	}
 </table>
 <hr />
-<a permission="EditPublicationFiles" asp-page="EditUrls" asp-route-id="@Model.Id" class="float-end btn btn-primary btn-sm mb-2"><span class="fa fa-pencil"></span> Edit</a>
+<a permission="EditPublicationFiles"
+   asp-page="Urls/List"
+   asp-route-publicationId="@Model.Id"
+   class="float-end btn btn-primary btn-sm mb-2"><span class="fa fa-pencil"></span> Edit</a>
 <table class="table table-bordered table-sm">
 	<tr>
-		<th>Name</th>
-		<th>Url</th>
 		<th>Type</th>
+		<th>URL</th>
+		<th>Name</th>
 	</tr>
-	@foreach (var url in Model.Publication.Urls.OrderBy(f => f.Type))
+	@foreach (var url in Model.Publication.Urls.OrderBy(f => f.Type).ThenBy(f => f.DisplayName))
 	{
 		<tr>
-			<td>@url.DisplayName</td>
-			<td><a href="@url.Url">@url.Url</a></td>
 			<td>@url.Type</td>
+			<td><a href="@url.Url">@url.Url</a></td>
+			<td>@url.DisplayName</td>
 		</tr>
 	}
 </table>

diff --git a/TASVideos/Pages/Publications/EditFiles.cshtml b/TASVideos/Pages/Publications/EditFiles.cshtml
@@ -8,7 +8,7 @@
 <row condition="Model.Files.Any()">
 	<table class="table table-bordered">
 		<tr>
-			<td>Url</td>
+			<td>URL</td>
 			<td>Type</td>
 			<td>Description</td>
 			<td></td>

diff --git a/TASVideos/Pages/Publications/EditUrls.cshtml b/TASVideos/Pages/Publications/EditUrls.cshtml
diff --git a/TASVideos/Pages/Publications/Urls/Edit.cshtml b/TASVideos/Pages/Publications/Urls/Edit.cshtml
@@ -0,0 +1,49 @@
+@page "/Publications/{publicationId}/Urls/Edit/{urlId?}/{handler?}"
+@model EditUrlsModel
+@{
+	string saveBtnName;
+	string iconClass;
+	if (Model.UrlId.HasValue)
+	{
+		ViewData.SetTitle($"Editing URL #{Model.UrlId} for {Model.Title}");
+		saveBtnName = "Save";
+		iconClass = "fa fa-save";
+	}
+	else
+	{
+		ViewData.SetTitle("Add A New URL");
+		saveBtnName = "Add";
+		iconClass = "fa fa-plus";
+	}
+}
+
+<form method="post">
+	<input type="hidden" asp-for="Title" />
+	<row>
+        <column lg="6">
+            <fieldset>
+                <label asp-for="UrlType"></label>
+                <select asp-for="UrlType" asp-items="Model.AvailableTypes" class="form-control"></select>
+                <span asp-validation-for="UrlType" class="text-danger"></span>
+            </fieldset>
+			<fieldset>
+				<label asp-for="CurrentUrl"></label>
+				<input type="text" asp-for="CurrentUrl" class="form-control" />
+				<span asp-validation-for="CurrentUrl" class="text-danger"></span>
+			</fieldset>
+            <fieldset>
+                <label asp-for="DisplayName"></label>
+                <input type="text" asp-for="DisplayName" class="form-control" />
+                <span asp-validation-for="DisplayName" class="text-danger"></span>
+            </fieldset>
+			<div class="text-center mt-3">
+				<submit-button class="btn btn-primary"><span class="@iconClass"></span> @saveBtnName</submit-button>
+				<a asp-page="List" asp-route-PublicationId="@Model.PublicationId" class="btn btn-secondary"><span class="fa fa-times"></span> Cancel</a>
+			</div>
+		</column>
+	</row>
+</form>
+
+@section Scripts {
+	<partial name="_ValidationScriptsPartial" />
+}
diff --git a/...eos/Pages/Publications/EditUrls.cshtml.cs → ...os/Pages/Publications/Urls/Edit.cshtml.cs b/...eos/Pages/Publications/EditUrls.cshtml.cs → ...os/Pages/Publications/Urls/Edit.cshtml.cs
@@ -8,7 +8,7 @@
 using TASVideos.Data;
 using TASVideos.Data.Entity;
 
-namespace TASVideos.Pages.Publications;
+namespace TASVideos.Pages.Publications.Urls;
 
 [RequirePermission(PermissionTo.EditPublicationFiles)]
 public class EditUrlsModel : BasePageModel
@@ -47,7 +47,10 @@ public EditUrlsModel(
 			});
 
 	[FromRoute]
-	public int Id { get; set; }
+	public int PublicationId { get; set; }
+
+	[FromRoute]
+	public int? UrlId { get; set; }
 
 	[BindProperty]
 	public string Title { get; set; } = "";
@@ -62,8 +65,8 @@ public EditUrlsModel(
 	[Required]
 	[BindProperty]
 	[Url]
-	[Display(Name = "Url")]
-	public string PublicationUrl { get; set; } = "";
+	[Display(Name = "URL")]
+	public string CurrentUrl { get; set; } = "";
 
 	[Required]
 	[BindProperty]
@@ -73,7 +76,7 @@ public EditUrlsModel(
 	public async Task<IActionResult> OnGet()
 	{
 		var title = await _db.Publications
-			.Where(p => p.Id == Id)
+			.Where(p => p.Id == PublicationId)
 			.Select(p => p.Title)
 			.SingleOrDefaultAsync();
 
@@ -84,16 +87,34 @@ public async Task<IActionResult> OnGet()
 
 		Title = title;
 		CurrentUrls = await _db.PublicationUrls
-			.Where(u => u.PublicationId == Id)
+			.Where(u => u.PublicationId == PublicationId)
 			.ToListAsync();
 
+		if (!UrlId.HasValue)
+		{
+			return Page();
+		}
+
+		var url = CurrentUrls
+			.SingleOrDefault(u => u.Id == UrlId.Value);
+
+		if (url is null || url.Url is null)
+		{
+			return NotFound();
+		}
+
+		PublicationId = url.PublicationId;
+		DisplayName = url.DisplayName;
+		UrlType = url.Type;
+		CurrentUrl = url.Url;
+
 		return Page();
 	}
 
 	public async Task<IActionResult> OnPost()
 	{
 		var publication = await _db.Publications
-			.Where(p => p.Id == Id)
+			.Where(p => p.Id == PublicationId)
 			.Select(p => new
 			{
 				Title,
@@ -110,47 +131,64 @@ public async Task<IActionResult> OnPost()
 			return NotFound();
 		}
 
-		var publicationWiki = await _wikiPages.PublicationPage(Id);
+		var publicationWiki = await _wikiPages.PublicationPage(PublicationId);
 
 		CurrentUrls = publication.PublicationUrls;
 
-		if (CurrentUrls.Any(u => u.Type == UrlType && u.Url == PublicationUrl))
+		if (CurrentUrls.Any(u => u.Type == UrlType && u.Url == CurrentUrl && u.Id != UrlId))
 		{
-			ModelState.AddModelError($"{nameof(PublicationUrl)}", $"The {UrlType} url: {PublicationUrl} already exists");
+			ModelState.AddModelError($"{nameof(CurrentUrl)}", $"The {UrlType} URL: {CurrentUrl} already exists");
 		}
 
 		if (!ModelState.IsValid)
 		{
 			return Page();
 		}
 
-		var publicationUrl = new PublicationUrl
+		string[] logWording;
+
+		if (UrlId.HasValue)
+		{
+			var url = CurrentUrls
+				.Single(u => u.Id == UrlId.Value);
+
+			url.PublicationId = PublicationId;
+			url.DisplayName = DisplayName;
+			url.Type = UrlType;
+			url.Url = CurrentUrl;
+
+			logWording = new[] { "Chang", "chang" };
+		}
+		else
 		{
-			PublicationId = Id,
-			Url = PublicationUrl,
-			Type = UrlType,
-			DisplayName = DisplayName
-		};
+			_db.PublicationUrls.Add(new PublicationUrl
+			{
+				PublicationId = PublicationId,
+				Url = CurrentUrl,
+				Type = UrlType,
+				DisplayName = DisplayName
+			});
 
-		_db.PublicationUrls.Add(publicationUrl);
+			logWording = new[] { "Add", "add" };
+		}
 
-		string log = $"Added {DisplayName} {UrlType} url {PublicationUrl}";
-		await _publicationMaintenanceLogger.Log(Id, User.GetUserId(), log);
-		var result = await ConcurrentSave(_db, log, "Unable to add url.");
+		string log = $"{logWording[0]}ed {DisplayName} {UrlType} URL {CurrentUrl}";
+		await _publicationMaintenanceLogger.Log(PublicationId, User.GetUserId(), log);
+		var result = await ConcurrentSave(_db, log, $"Unable to {logWording[1]} URL.");
 		if (result)
 		{
 			await _publisher.SendPublicationEdit(
-				$"{Id}M edited by {User.Name()}",
-				$"[{Id}M]({{0}}) edited by {User.Name()}",
-				$"Added {UrlType} url | {Title}",
-				$"{Id}M");
+				$"{PublicationId}M edited by {User.Name()}",
+				$"[{PublicationId}M]({{0}}) edited by {User.Name()}",
+				$"{logWording[0]}ed {UrlType} URL | {Title}",
+				$"{PublicationId}M");
 
-			if (UrlType == PublicationUrlType.Streaming && _youtubeSync.IsYoutubeUrl(PublicationUrl))
+			if (UrlType == PublicationUrlType.Streaming && _youtubeSync.IsYoutubeUrl(CurrentUrl))
 			{
 				YoutubeVideo video = new(
-					Id,
+					PublicationId,
 					publication.CreateTimestamp,
-					PublicationUrl,
+					CurrentUrl,
 					DisplayName,
 					publication.Title,
 					publicationWiki!,
@@ -161,32 +199,6 @@ await _publisher.SendPublicationEdit(
 			}
 		}
 
-		return RedirectToPage("EditUrls", new { Id });
-	}
-
-	public async Task<IActionResult> OnPostDelete(int publicationUrlId)
-	{
-		var url = await _db.PublicationUrls
-			.SingleOrDefaultAsync(pf => pf.Id == publicationUrlId);
-
-		if (url != null)
-		{
-			_db.PublicationUrls.Remove(url);
-			string log = $"Deleted {url.DisplayName} {url.Type} url {url.Url}";
-			await _publicationMaintenanceLogger.Log(url.PublicationId, User.GetUserId(), log);
-			var result = await ConcurrentSave(_db, log, "Unable to remove url.");
-			if (result)
-			{
-				await _publisher.SendPublicationEdit(
-					$"{Id}M edited by {User.Name()}",
-					$"[{Id}M]({{0}}) edited by {User.Name()}",
-					$"Deleted {url.Type} url",
-					$"{Id}M");
-
-				await _youtubeSync.UnlistVideo(url.Url!);
-			}
-		}
-
-		return RedirectToPage("EditUrls", new { Id });
+		return RedirectToPage("List", new { PublicationId });
 	}
 }