Merge pull request #551 from MUnique/dev/adminpanel-breadcrumbs

Implemented Breadcrumb navigation in AdminPanel

src/DataModel/Attributes/PowerUpDefinition.cs

@@ -44,7 +44,6 @@ public override string ToString()
             {
                 value = relation.InputAttribute?.Designation + relation.InputOperator.AsString() + relation.InputOperand;
             }
-
         }
         else
         {

src/DataModel/Configuration/AreaSkillSettings.cs

@@ -79,4 +79,10 @@ public partial class AreaSkillSettings
     /// the chance to hit is 5^0.9 = 0.59.
     /// </summary>
     public float HitChancePerDistanceMultiplier { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return "Area Skill Settings";
+    }
 }

src/DataModel/Configuration/BattleZoneDefinition.cs

@@ -54,4 +54,10 @@ public partial class BattleZoneDefinition
     /// </summary>
     [MemberOfAggregate]
     public virtual Rectangle? RightGoal { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return $"Battle Zone ({this.Type})";
+    }
 }

src/DataModel/Configuration/CharacterClass.cs

@@ -110,4 +110,10 @@ public partial class CharacterClass
     {
         return this.StatAttributes.FirstOrDefault(a => a.Attribute == attributeDefinition);
     }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return this.Name;
+    }
 }

src/DataModel/Configuration/ConnectServerDefinition.cs

@@ -113,6 +113,9 @@ public partial class ConnectServerDefinition : IConnectServerSettings
     /// </summary>
     public int MaxServerListRequests { get; set; }
 
+    /// <summary>
+    /// Initializes the defaults.
+    /// </summary>
     public void InitializeDefaults()
     {
         this.DisconnectOnUnknownPacket = true;
@@ -128,4 +131,10 @@ public void InitializeDefaults()
         this.MaxIpRequests = 5;
         this.MaxServerListRequests = 20;
     }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return this.Description;
+    }
 }

src/DataModel/Configuration/GameClientDefinition.cs

@@ -50,4 +50,10 @@ public partial class GameClientDefinition : IGameClientVersion
     /// Gets or sets the description.
     /// </summary>
     public string Description { get; set; } = string.Empty;
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return this.Description;
+    }
 }

src/DataModel/Configuration/LevelDependentDamage.cs

@@ -7,7 +7,7 @@ namespace MUnique.OpenMU.DataModel.Configuration;
 using MUnique.OpenMU.Annotations;
 
 /// <summary>
-/// Defines a level dependent damage.
+/// Defines a level-dependent damage.
 /// </summary>
 [Cloneable]
 public partial class LevelDependentDamage

src/DataModel/Configuration/MagicEffectDefinition.cs

@@ -62,4 +62,10 @@ public partial class MagicEffectDefinition
     /// </summary>
     [MemberOfAggregate]
     public virtual ICollection<PowerUpDefinition> PowerUpDefinitions { get; protected set; } = null!;
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return $"{this.Name} ({this.Number})";
+    }
 }

src/DataModel/Configuration/MasterSkillDefinition.cs

@@ -83,4 +83,10 @@ public partial class MasterSkillDefinition
     /// The attack damage is also inherited and increased by the damage AND value of the master skill.
     /// </summary>
     public virtual Skill? ReplacedSkill { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return "Master Skill Definition";
+    }
 }

src/DataModel/Configuration/MiniGameChangeEvent.cs

@@ -90,4 +90,10 @@ public partial class MiniGameChangeEvent
     /// </summary>
     [MemberOfAggregate]
     public virtual ICollection<MiniGameTerrainChange> TerrainChanges { get; protected set; } = null!;
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return $"{this.Index}: {this.Description}";
+    }
 }

src/DataModel/Configuration/MiniGameDefinition.cs

@@ -146,4 +146,10 @@ public partial class MiniGameDefinition
     /// </summary>
     [MemberOfAggregate]
     public virtual ICollection<MiniGameChangeEvent> ChangeEvents { get; protected set; } = null!;
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return this.Name;
+    }
 }

src/DataModel/Configuration/MiniGameReward.cs

@@ -107,7 +107,7 @@ public override string ToString()
         {
             result.Append("Rank ").Append(this.Rank.Value).Append(": ");
         }
-        
+
         if (this.RequiredSuccess > 0)
         {
             result.Append(this.RequiredSuccess).Append(": ");

src/DataModel/Configuration/MiniGameSpawnWave.cs

@@ -36,4 +36,10 @@ public partial class MiniGameSpawnWave
     /// Gets or sets the end time of the wave.
     /// </summary>
     public TimeSpan EndTime { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return $"Wave {this.WaveNumber}: {this.Description}";
+    }
 }

src/DataModel/Configuration/MonsterDefinition.cs

@@ -8,7 +8,6 @@ namespace MUnique.OpenMU.DataModel.Configuration;
 using MUnique.OpenMU.AttributeSystem;
 using MUnique.OpenMU.DataModel.Configuration.Quests;
 using MUnique.OpenMU.DataModel.Entities;
-using MUnique.OpenMU.Interfaces;
 
 /// <summary>
 /// Type of the window which will be openend when talking to the npc.

src/DataModel/Configuration/Rectangle.cs

@@ -31,4 +31,15 @@ public partial class Rectangle
     /// Gets or sets the bottom right corner, y-coordinate.
     /// </summary>
     public byte Y2 { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        if (this.X1 == this.X2 && this.Y1 == this.Y2)
+        {
+            return $"{this.X1} / {this.Y1}";
+        }
+
+        return $"{this.X1} / {this.Y1} to {this.X2} / {this.Y2}";
+    }
 }

src/DataModel/Configuration/Skill.cs

@@ -300,4 +300,10 @@ public partial class Skill
     /// </summary>
     [MemberOfAggregate]
     public virtual AreaSkillSettings? AreaSkillSettings { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return this.Name;
+    }
 }

src/DataModel/Configuration/SkillComboDefinition.cs

@@ -27,4 +27,10 @@ public partial class SkillComboDefinition
     /// </summary>
     [MemberOfAggregate]
     public virtual ICollection<SkillComboStep> Steps { get; protected set; } = null!;
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return this.Name;
+    }
 }

src/DataModel/Configuration/SkillComboStep.cs

@@ -27,4 +27,10 @@ public partial class SkillComboStep
     /// Gets or sets the skill of this step.
     /// </summary>
     public virtual Skill? Skill { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return $"{this.Order} - {this.Skill}";
+    }
 }

src/DataModel/Configuration/SystemConfiguration.cs

@@ -75,4 +75,10 @@ public partial class SystemConfiguration
         Description = nameof(Resources.SystemConfiguration_ReadConsoleInput_Description),
         ResourceType = typeof(Resources))]
     public bool ReadConsoleInput { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return "System Configuration";
+    }
 }

src/DataModel/Configuration/WarpInfo.cs

@@ -37,4 +37,10 @@ public partial class WarpInfo
     /// </summary>
     [Required]
     public virtual ExitGate? Gate { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return this.Name;
+    }
 }

src/DataModel/Entities/AppearanceData.cs

@@ -7,7 +7,7 @@ namespace MUnique.OpenMU.DataModel.Entities;
 using MUnique.OpenMU.DataModel.Configuration;
 
 /// <summary>
-/// The appearance data of an character.
+/// The appearance data of a character.
 /// </summary>
 public class AppearanceData : IAppearanceData
 {
@@ -25,7 +25,7 @@ public class AppearanceData : IAppearanceData
     public virtual CharacterClass? CharacterClass { get; set; }
 
     /// <summary>
-    /// Gets the character status.
+    /// Gets or sets the character status.
     /// </summary>
     public CharacterStatus CharacterStatus { get; set; }
 

src/DataModel/Entities/Guild.cs

@@ -19,4 +19,10 @@ public class Guild : OpenMU.Interfaces.Guild
     /// Gets or sets the members.
     /// </summary>
     public virtual ICollection<GuildMember> Members { get; protected set; } = null!;
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return this.Name ?? "<Guild>";
+    }
 }

src/DataModel/Entities/QuestMonsterKillRequirementState.cs

@@ -20,4 +20,10 @@ public class QuestMonsterKillRequirementState
     /// Gets or sets the monster kill count for this <see cref="Requirement"/>.
     /// </summary>
     public int KillCount { get; set; }
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return $"{this.KillCount}/{this.Requirement?.MinimumNumber} {this.Requirement?.Monster}";
+    }
 }

src/Web/AdminPanel/Components/ItemEdit/ItemEdit.razor

@@ -8,6 +8,7 @@
     return;
 }
 
+<PageTitle>@this._viewModel.Definition?.Name</PageTitle>
 <EditForm Model="_viewModel" OnValidSubmit="OnValidSubmit">
     <DataAnnotationsValidator />
     <ByteField @bind-Value="@_viewModel.ItemSlot" />

src/Web/AdminPanel/Pages/Accounts.razor

@@ -5,6 +5,8 @@
 
 @inject AccountService _accountService;
 
+<PageTitle>OpenMU: Accounts</PageTitle>
+<Breadcrumb IsFirstFromRoot="true" Caption="Accounts" />
 <h1>Accounts</h1>
 
 <div>

src/Web/AdminPanel/Pages/AdminUsers.razor

@@ -4,6 +4,8 @@
 
 @inject IUserService UserService;
 
+<PageTitle>OpenMU: Admin Users</PageTitle>
+<Breadcrumb IsFirstFromRoot="true" Caption="Admin Users"/>
 <h1>Admin Users</h1>
 
 <div>

src/Web/AdminPanel/Pages/CreateConnectServerConfig.razor

@@ -2,6 +2,8 @@
 
 @using MUnique.OpenMU.Persistence
 
+<PageTitle>OpenMU: Create Connect Server</PageTitle>
+<Breadcrumb Caption="Create Connect Server"/>
 <h1>Create Connect Server Definition</h1>
 
 

src/Web/AdminPanel/Pages/CreateGameServerConfig.razor

@@ -2,6 +2,8 @@
 
 @using MUnique.OpenMU.Persistence
 
+<PageTitle>OpenMU: Create Game Server</PageTitle>
+<Breadcrumb Caption="Create Game Server"/>
 <h1>Create Game Server Definition</h1>
 
 

src/Web/AdminPanel/Pages/EditBase.cs

@@ -92,6 +92,12 @@ private enum DataLoadingState
     [Inject]
     public NavigationManager NavigationManager { get; set; } = null!;
 
+    /// <summary>
+    /// Gets or sets the navigation history.
+    /// </summary>
+    [Inject]
+    public NavigationHistory NavigationHistory { get; set; } = null!;
+
     /// <summary>
     /// Gets or sets the java script runtime.
     /// </summary>
@@ -172,13 +178,14 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
 
         var downloadMarkup = this.GetDownloadMarkup();
         var editorsMarkup = this.GetEditorsMarkup();
-        builder.AddMarkupContent(0, $"<h1>Edit {CaptionHelper.GetTypeCaption(this.Type!)}</h1>{downloadMarkup}{editorsMarkup}\r\n");
-        builder.OpenComponent<CascadingValue<IContext>>(1);
-        builder.AddAttribute(2, nameof(CascadingValue<IContext>.Value), this._persistenceContext);
-        builder.AddAttribute(3, nameof(CascadingValue<IContext>.IsFixed), this._isOwningContext);
-        builder.AddAttribute(4, nameof(CascadingValue<IContext>.ChildContent), (RenderFragment)(builder2 =>
+
+        builder.AddMarkupContent(10, $"<h1>Edit {CaptionHelper.GetTypeCaption(this.Type!)}</h1>{downloadMarkup}{editorsMarkup}\r\n");
+        builder.OpenComponent<CascadingValue<IContext>>(11);
+        builder.AddAttribute(12, nameof(CascadingValue<IContext>.Value), this._persistenceContext);
+        builder.AddAttribute(13, nameof(CascadingValue<IContext>.IsFixed), this._isOwningContext);
+        builder.AddAttribute(14, nameof(CascadingValue<IContext>.ChildContent), (RenderFragment)(builder2 =>
         {
-            var sequence = 4;
+            var sequence = 14;
             this.AddFormToRenderTree(builder2, ref sequence);
         }));
 
@@ -198,7 +205,7 @@ protected override Task OnInitializedAsync()
     /// <param name="builder">The builder.</param>
     /// <param name="currentSequence">The current sequence.</param>
     protected abstract void AddFormToRenderTree(RenderTreeBuilder builder, ref int currentSequence);
-    
+
     /// <inheritdoc />
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
@@ -222,6 +229,11 @@ await this.InvokeAsync(() =>
             }).ConfigureAwait(false);
         }
 
+        if (this._loadingState == DataLoadingState.Loaded && this.Model is { } model)
+        {
+            this.NavigationHistory.AddCurrentPageToHistory(model.GetName());
+        }
+
         await base.OnAfterRenderAsync(firstRender).ConfigureAwait(true);
     }
 

src/Web/AdminPanel/Pages/EditConfigGrid.razor

@@ -4,7 +4,9 @@
 
 @if (this.Type is not null)
 {
-    <h1>@CaptionHelper.GetPluralizedTypeCaption(this.Type)</h1>
+  <h1>@CaptionHelper.GetPluralizedTypeCaption(this.Type)</h1>
+  <PageTitle>@CaptionHelper.GetPluralizedTypeCaption(this.Type)</PageTitle>
+    <Breadcrumb Caption=@CaptionHelper.GetPluralizedTypeCaption(this.Type) IsFirstFromRoot="true"></Breadcrumb>
 }
 
 @if (this.ViewModels is null)