Add configurationService for navigation menu : Fix #446 (#447)

* add configurationService for navigation menu * fix unit tests * fix indentation
STARIONGROUP · Sep 8, 2023 · ce3541b · ce3541b
1 parent e05e195
commit ce3541b
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 9 deletions.
diff --git a/COMET.Web.Common.Tests/Shared/TopMenuTestFixture.cs b/COMET.Web.Common.Tests/Shared/TopMenuTestFixture.cs
@@ -38,6 +38,7 @@ namespace COMET.Web.Common.Tests.Shared
 
     using COMET.Web.Common.Components;
     using COMET.Web.Common.Model;
+    using COMET.Web.Common.Services.ConfigurationService;
     using COMET.Web.Common.Services.NotificationService;
     using COMET.Web.Common.Services.RegistrationService;
     using COMET.Web.Common.Services.SessionManagement;
@@ -71,6 +72,7 @@ public class TopMenuTestFixture
         private Mock<IAuthenticationService> authenticationService;
         private Mock<IRegistrationService> registrationService;
         private Mock<IVersionService> versionService;
+        private Mock<IConfigurationService> configurationService;
         private SourceList<Iteration> sourceList;
         private List<Type> registeredMenuEntries;
         private List<Application> registeredApplications;
@@ -103,6 +105,8 @@ public void Setup()
             this.context.Services.AddSingleton<IModelMenuViewModel, ModelMenuViewModel>();
             this.context.Services.AddSingleton<IAuthorizedMenuEntryViewModel, AuthorizedMenuEntryViewModel>();
             this.context.Services.AddSingleton<INotificationService, NotificationService>();
+            this.configurationService = new Mock<IConfigurationService>();
+            this.context.Services.AddSingleton(this.configurationService.Object);
             this.context.ConfigureDevExpressBlazor();
         }
 
@@ -271,8 +275,8 @@ public void VerifyReturnToHomeWithTitle()
             navigationManager.NavigateTo("/AnUrl");
             var renderer = this.context.RenderComponent<TopMenu>();
             var topMenuTitle = renderer.FindComponent<TopMenuTitle>();
-            var link =(ElementWrapper) topMenuTitle.Find("a");
-            var htmlAnchor = (IHtmlAnchorElement) link.WrappedElement;
+            var link = (ElementWrapper)topMenuTitle.Find("a");
+            var htmlAnchor = (IHtmlAnchorElement)link.WrappedElement;
             Assert.That(navigationManager.Uri, Does.EndWith("AnUrl"));
             navigationManager.NavigateTo(htmlAnchor.Href);
             Assert.That(navigationManager.Uri, Does.Not.EndWith("AnUrl"));
@@ -283,7 +287,7 @@ public void VerifyCustomTitleHeader()
         {
             this.registrationService.Setup(x => x.CustomHeader).Returns(typeof(CustomHeader));
             var renderer = this.context.RenderComponent<TopMenu>();
-            
+
             Assert.Multiple(() =>
             {
                 Assert.That(() => renderer.FindComponent<TopMenuTitle>(), Throws.Exception);
@@ -295,7 +299,7 @@ private class TestAuthorizedMenuEntry : AuthorizedMenuEntry
         {
         }
 
-        private class CustomHeader: MenuEntryBase
+        private class CustomHeader : MenuEntryBase
         {
         }
     }

diff --git a/COMET.Web.Common/Enumerations/TextConfigurationKind.cs b/COMET.Web.Common/Enumerations/TextConfigurationKind.cs
@@ -63,6 +63,21 @@ public enum TextConfigurationKind
         /// <summary>
         /// The title to use in the landing page
         /// </summary>
-        LandingPageTitle = 6
+        LandingPageTitle = 6,
+
+        /// <summary>
+        /// The caption to use as navigation application selector title
+        /// </summary>
+        NavigationApplicationSelectorTitle = 7,
+
+        /// <summary>
+        /// The caption to use as navigation model selector title
+        /// </summary>
+        NavigationModelSelectorTitle = 8,
+
+        /// <summary>
+        /// The caption to use as title for the open button
+        /// </summary>
+        ModelOpenButtonCaption = 9,
     }
 }
diff --git a/COMET.Web.Common/Shared/TopMenuEntry/ApplicationMenu.razor b/COMET.Web.Common/Shared/TopMenuEntry/ApplicationMenu.razor
@@ -21,9 +21,10 @@
 ------------------------------------------------------------------------------->
 @namespace COMET.Web.Common.Shared.TopMenuEntry
 
+@using COMET.Web.Common.Enumerations
 @inherits AuthorizedMenuEntry
 
-<DxMenuItem Text="Application" IconCssClass="oi oi-layers" Enabled="@this.AuthorizedMenuEntryViewModel.IsAuthenticated">
+<DxMenuItem Text="@this.ConfigurationService.GetText(TextConfigurationKind.NavigationApplicationSelectorTitle)" IconCssClass="oi oi-layers" Enabled="@this.AuthorizedMenuEntryViewModel.IsAuthenticated">
 	<Items>
 		@foreach (var applicationEntry in this.RegistrationService.RegisteredApplications)
 		{

diff --git a/COMET.Web.Common/Shared/TopMenuEntry/ApplicationMenu.razor.cs b/COMET.Web.Common/Shared/TopMenuEntry/ApplicationMenu.razor.cs
@@ -26,6 +26,7 @@
 namespace COMET.Web.Common.Shared.TopMenuEntry
 {
     using COMET.Web.Common.Model;
+    using COMET.Web.Common.Services.ConfigurationService;
     using COMET.Web.Common.Services.RegistrationService;
 
     using Microsoft.AspNetCore.Components;
@@ -40,5 +41,11 @@ public partial class ApplicationMenu
         /// </summary>
         [Inject]
         internal IRegistrationService RegistrationService { get; set; }
+
+        /// <summary>
+        /// The <see cref="IConfigurationService"/>
+        /// </summary>
+        [Inject]
+        public IConfigurationService ConfigurationService { get; set; }
     }
 }
diff --git a/COMET.Web.Common/Shared/TopMenuEntry/ModelMenu.razor b/COMET.Web.Common/Shared/TopMenuEntry/ModelMenu.razor
@@ -20,6 +20,7 @@
 //   limitations under the License.
 ------------------------------------------------------------------------------->
 @namespace COMET.Web.Common.Shared.TopMenuEntry
+@using COMET.Web.Common.Enumerations
 @inherits AuthorizedMenuEntry
 
 <ConfirmCancelPopup ViewModel="@(this.ViewModel.ConfirmCancelViewModel)" />
@@ -32,14 +33,14 @@
 	<OpenModel />
 </DxPopup>
 
-<DxMenuItem Name="model-entry" Text="Models" IconCssClass="icon icon-folder" Enabled="@(this.AuthorizedMenuEntryViewModel.IsAuthenticated)">
+<DxMenuItem Name="model-entry" Text="@this.ConfigurationService.GetText(TextConfigurationKind.NavigationModelSelectorTitle)" IconCssClass="icon icon-folder" Enabled="@(this.AuthorizedMenuEntryViewModel.IsAuthenticated)">
     <TextTemplate>
         <span id="@context.Name">
             @context.Text
         </span>
     </TextTemplate>
     <Items>
-        <DxMenuItem Name="model-entry-open" Text="Open Model" Click="@this.ViewModel.AskToOpenIteration">
+        <DxMenuItem Name="model-entry-open" Text="@this.ConfigurationService.GetText(TextConfigurationKind.ModelOpenButtonCaption)" Click="@this.ViewModel.AskToOpenIteration">
             <TextTemplate Context="contextSwitch">
                 <span id="@contextSwitch.Name">
                     @contextSwitch.Text

diff --git a/COMET.Web.Common/Shared/TopMenuEntry/ModelMenu.razor.cs b/COMET.Web.Common/Shared/TopMenuEntry/ModelMenu.razor.cs
@@ -27,6 +27,7 @@ namespace COMET.Web.Common.Shared.TopMenuEntry
 {
     using CDP4Common.EngineeringModelData;
 
+    using COMET.Web.Common.Services.ConfigurationService;
     using COMET.Web.Common.ViewModels.Shared.TopMenuEntry;
 
     using Microsoft.AspNetCore.Components;
@@ -44,6 +45,12 @@ public partial class ModelMenu
         [Inject]
         public IModelMenuViewModel ViewModel { get; set; }
 
+        /// <summary>
+        /// The <see cref="IConfigurationService"/>
+        /// </summary>
+        [Inject]
+        public IConfigurationService ConfigurationService { get; set; }
+
         /// <summary>
         /// Method invoked when the component is ready to start, having received its
         /// initial parameters from its parent in the render tree.

diff --git a/COMET.Web.Common/wwwroot/DefaultTextConfiguration.json b/COMET.Web.Common/wwwroot/DefaultTextConfiguration.json
@@ -5,5 +5,8 @@
   "ModelTitleCaption": "Model",
   "IterationTitleCaption": "Iteration",
   "DomainTitleCaption": "Domain",
-  "LandingPageTitle" : "" 
+  "LandingPageTitle": "",
+  "NavigationApplicationSelectorTitle": "Application",
+  "NavigationModelSelectorTitle": "Models",
+  "ModelOpenButtonCaption": "Open Model"
 }