From 988f68191bbd93ce225205ae2a0ebcdf9df45655 Mon Sep 17 00:00:00 2001 From: Jake Mannens Date: Tue, 5 Sep 2023 01:01:24 +1000 Subject: Tag names and aliases are now verified to be unique --- Exception.cs | 34 +++++++++++- IDialog.cs | 8 +++ Pages/Component/AboutDialog.razor | 1 + Pages/Component/Dialog.razor | 4 +- Pages/Component/TagEditDialog.razor | 96 +++++++++++++++++++++++++++++++++ Pages/Component/TagEditDialog.razor.css | 11 ++++ Pages/Component/TagSelectDialog.razor | 9 ++-- Pages/TagDefinitions.razor | 89 ++++++------------------------ Pages/TagDefinitions.razor.css | 3 -- Services/TagService.cs | 45 ++++++++++++++-- wwwroot/styles/global.css | 1 + 11 files changed, 216 insertions(+), 85 deletions(-) create mode 100644 IDialog.cs create mode 100644 Pages/Component/TagEditDialog.razor create mode 100644 Pages/Component/TagEditDialog.razor.css delete mode 100644 Pages/TagDefinitions.razor.css diff --git a/Exception.cs b/Exception.cs index 2005b1a..1e070eb 100644 --- a/Exception.cs +++ b/Exception.cs @@ -10,14 +10,44 @@ public class HBException : Exception { } public class ObjectNotFoundException : HBException { - public Guid Guid { get; set; } + public Guid Guid { get; private init; } public ObjectNotFoundException(Guid guid) : base($"Object not found: {guid}") {} } +public class TagException : HBException { + public TagDefinition? TagDefinition { get; private init; } + + public TagException(string message) : base(message) {} + public TagException(string message, TagDefinition tagDefinition) + : base(message) => + TagDefinition = tagDefinition; +} + +public class TagDuplicateException : TagException { + public bool NameExists { get; private init; } + public bool AliasExists { get; private init; } + + public TagDuplicateException(bool nameExists, bool aliasExists) + : base(GenerateMessage(nameExists, aliasExists)) { + + NameExists = nameExists; + AliasExists = aliasExists; + } + + private static string GenerateMessage(bool nameExists, bool aliasExists) { + if(nameExists && aliasExists) + return $"Both tag name and alias already exist!"; + else if(nameExists) + return $"Tag name already exists!"; + else + return $"Tag alias already exists"; + } +} + public class MediaException : HBException { - public Media? Media { get; set; } + public Media? Media { get; private init; } public MediaException(string message) : base(message) {} public MediaException(string message, Media media) : base(message) => diff --git a/IDialog.cs b/IDialog.cs new file mode 100644 index 0000000..41e86a8 --- /dev/null +++ b/IDialog.cs @@ -0,0 +1,8 @@ +namespace HyperBooru; + +public interface IDialog { + public bool Visible { get; set; } + + public void Show(); + public void Hide(); +} diff --git a/Pages/Component/AboutDialog.razor b/Pages/Component/AboutDialog.razor index 9823761..9ffbad4 100644 --- a/Pages/Component/AboutDialog.razor +++ b/Pages/Component/AboutDialog.razor @@ -1,6 +1,7 @@ @using System.Reflection @using Microsoft.AspNetCore.Hosting @inject IHostingEnvironment hostingEnvironment +@implements IDialog

@Title

diff --git a/Pages/Component/Dialog.razor b/Pages/Component/Dialog.razor index ded2d2d..f479368 100644 --- a/Pages/Component/Dialog.razor +++ b/Pages/Component/Dialog.razor @@ -1,4 +1,6 @@ -
+@implements IDialog + +
@if(Title is not null) {

@Title

diff --git a/Pages/Component/TagEditDialog.razor b/Pages/Component/TagEditDialog.razor new file mode 100644 index 0000000..2e443d4 --- /dev/null +++ b/Pages/Component/TagEditDialog.razor @@ -0,0 +1,96 @@ +@inject IDbContextFactory dbFactory; +@inject ITagService tagService +@implements IDialog + + + + + + + + + + + + + + +@code { + [Parameter] + public TagDefinition? TagDefinition { get; set; } + + [Parameter] + public EventHandler OnTagUpdate { get; set; } + + public bool Visible { + get => visible; + set { + if(value) + Load(); + visible = dialog.Visible = value; + } + } + + private string Title => + TagDefinition is null ? "Create a new tag definition" : "Edit tag definition"; + + private Dialog dialog; + + private string? tagName; + private string? tagNamespace; + private string? tagAlias; + + private bool nameExists = false; + private bool aliasExists = false; + + private bool visible = false; + + public void Show() => Visible = true; + public void Hide() => Visible = false; + + public void Show(TagDefinition? toEdit) { + TagDefinition = toEdit; + Visible = true; + } + + public void Show(string? @namespace) { + TagDefinition = null; + Visible = true; + tagNamespace = @namespace; + } + + private void Load() { + tagName = TagDefinition?.Name; + tagNamespace = TagDefinition?.Namespace; + tagAlias = TagDefinition?.Alias; + nameExists = false; + aliasExists = false; + } + + private void Submit() { + try { + if(TagDefinition is null) { + tagService.CreateTagDefinition(tagName, tagNamespace, tagAlias); + } else { + tagService.UpdateTagDefinition(TagDefinition, tagName, tagNamespace, tagAlias); + } + } catch(TagDuplicateException e) { + nameExists = e.NameExists; + aliasExists = e.AliasExists; + return; + } + + OnTagUpdate.Invoke(this, new EventArgs()); + Hide(); + } +} diff --git a/Pages/Component/TagEditDialog.razor.css b/Pages/Component/TagEditDialog.razor.css new file mode 100644 index 0000000..02781c0 --- /dev/null +++ b/Pages/Component/TagEditDialog.razor.css @@ -0,0 +1,11 @@ +p.error { + color: var(--col-error-pri); + display: inline; + font-size: 8pt; + margin-left: 5px; + vertical-align: middle; +} + +input { + width: 100%; +} diff --git a/Pages/Component/TagSelectDialog.razor b/Pages/Component/TagSelectDialog.razor index 916a070..88e1471 100644 --- a/Pages/Component/TagSelectDialog.razor +++ b/Pages/Component/TagSelectDialog.razor @@ -2,6 +2,7 @@ @inject ITagService tagService @inject IUserService userService @implements IDisposable +@implements IDialog @@ -36,11 +37,11 @@
@code { - [Parameter] - public string? Title { get; set; } + [Parameter] + public string? Title { get; set; } - [Parameter] - public EventCallback OnSubmit { get; set; } + [Parameter] + public EventCallback OnSubmit { get; set; } public TagDefinition[] SelectedTags { get; set; } = Array.Empty(); diff --git a/Pages/TagDefinitions.razor b/Pages/TagDefinitions.razor index 75bcba0..95253b7 100644 --- a/Pages/TagDefinitions.razor +++ b/Pages/TagDefinitions.razor @@ -8,7 +8,7 @@
- + @@ -45,7 +45,7 @@ - PromptToEdit(tagDef))>Edit + tagEditDialog.Show(tagDef))>Edit PromptToDelete(tagDef))> Delete @@ -66,36 +66,6 @@
- -
- - - - - - - - - - -
- - - -
- - - - - - - - - - -
- - @@ -103,23 +73,19 @@ + + @code { private TabContainer tabContainer; - private Dialog createTagDialog; private Dialog deleteTagDialog; - private Dialog editTagDialog; + private TagEditDialog tagEditDialog; private TagSelectDialog implicitTagDialog; - private string tagName; - private string? tagNamespace; - private string? tagAlias; - private TagDefinition? toDelete; - private TagDefinition? toEdit; private TagDefinition? toEditImplicit; private TagDefinition[] tagDefinitions; @@ -157,39 +123,6 @@ .ToArray(); } - private void PromptToCreate() { - var curTitle = tabContainer.ActivePane?.Title; - tagNamespace = curTitle == "Default" ? null : curTitle; - createTagDialog.Show(); - } - - private void CreateTagDefinition() { - if(string.IsNullOrEmpty(tagNamespace)) - tagNamespace = null; - - tagService.CreateTagDefinition(tagName, tagNamespace, tagAlias); - createTagDialog.Hide(); - LoadTags(); - StateHasChanged(); - } - - private void PromptToEdit(TagDefinition toEdit) { - this.toEdit = toEdit; - tagName = toEdit.Name; - tagNamespace = toEdit.Namespace; - tagAlias = toEdit.Alias; - editTagDialog.Show(); - } - - private void EditTagDefinition() { - if(toEdit is null) - return; - - tagService.UpdateTagDefinition(toEdit, tagName, tagNamespace, tagAlias); - LoadTags(); - StateHasChanged(); - } - private void PromptToDelete(TagDefinition toDelete) { this.toDelete = toDelete; deleteTagDialog.Show(); @@ -205,6 +138,18 @@ StateHasChanged(); } + private void PromptTagCreate() { + string? @namespace = tabContainer.ActivePane?.Title; + if(@namespace == "Default") + @namespace = null; + tagEditDialog.Show(@namespace); + } + + private void TagUpdated(object? sender, EventArgs e) { + LoadTags(); + StateHasChanged(); + } + private void PromptImplicitTags(TagDefinition toEditImplicit) { this.toEditImplicit = toEditImplicit; implicitTagDialog.SelectedTags = diff --git a/Pages/TagDefinitions.razor.css b/Pages/TagDefinitions.razor.css deleted file mode 100644 index b66d491..0000000 --- a/Pages/TagDefinitions.razor.css +++ /dev/null @@ -1,3 +0,0 @@ -form > input { - width: 100%; -} \ No newline at end of file diff --git a/Services/TagService.cs b/Services/TagService.cs index 2648bb3..56aba04 100644 --- a/Services/TagService.cs +++ b/Services/TagService.cs @@ -126,14 +126,34 @@ public class TagService : ITagService { public void CreateTagDefinition(string name, string? @namespace = null, string? alias = null) { using var db = dbFactory.CreateDbContext(); - TagDefinition tagdef = new() { + if(string.IsNullOrEmpty(@namespace)) + @namespace = null; + if(string.IsNullOrEmpty(alias)) + alias = null; + + // Remove leading and trailing whitespace + name = name.Trim(); + @namespace = @namespace?.Trim(); + alias = alias?.Trim(); + + TagDefinition tagDef = new() { Source = TagSource.UserTag, Namespace = @namespace, Name = name, Alias = alias }; - if(!db.TagDefinitions.Contains(tagdef)) - db.TagDefinitions.Add(tagdef); + + bool nameExists = db.TagDefinitions.Any(td => td.Name.ToLower() == name.ToLower()); + bool aliasExists = false; + if(alias is not null) + aliasExists = db.TagDefinitions + .Where(td => td.Alias != null) + .Any(td => td.Alias!.ToLower() == alias.ToLower()); + if(nameExists || aliasExists) + throw new TagDuplicateException(nameExists, aliasExists); + + if(!db.TagDefinitions.Contains(tagDef)) + db.TagDefinitions.Add(tagDef); db.SaveChanges(); } @@ -162,8 +182,27 @@ public class TagService : ITagService { if(string.IsNullOrEmpty(@namespace)) @namespace = null; + if(string.IsNullOrEmpty(alias)) + alias = null; + + // Remove leading and trailing whitespace + name = name.Trim(); + @namespace = @namespace?.Trim(); + alias = alias?.Trim(); var tag = db.TagDefinitions.First(td => td.Guid == tagDef); + + TagDefinition? nameExisting = db.TagDefinitions.FirstOrDefault(td => td.Name.ToLower() == name.ToLower()); + TagDefinition? aliasExisting = null; + if(alias is not null) + aliasExisting = db.TagDefinitions + .Where(td => td.Alias != null) + .FirstOrDefault(td => td.Alias!.ToLower() == alias.ToLower()); + bool nameExists = nameExisting is not null && nameExisting != tag; + bool aliasExists = aliasExisting is not null && aliasExisting != tag; + if(nameExists || aliasExists) + throw new TagDuplicateException(nameExists, aliasExists); + tag.Name = name; tag.Namespace = @namespace; tag.Alias = alias; diff --git a/wwwroot/styles/global.css b/wwwroot/styles/global.css index 50f20f1..a8c4202 100644 --- a/wwwroot/styles/global.css +++ b/wwwroot/styles/global.css @@ -3,6 +3,7 @@ :root { --col-accent-pri: #0aa; --col-accent-pri-hl: #0cc; + --col-error-pri: #ffaa00; --col-bg: #222; --col-dialog-bg: #333; --col-navbar-bg: var(--col-accent-pri); -- cgit v1.3