Smaller refactoring

Author: linkdotnet

LinkDotNet.Blog.IntegrationTests/Web/Pages/BlogPostPageTests.cs

@@ -87,6 +87,7 @@ private void RegisterComponents(TestContextBase ctx, ILocalStorageService localS
             ctx.Services.AddScoped(_ => new Mock<IToastService>().Object);
             ctx.Services.AddScoped(_ => new Mock<IHeadElementHelper>().Object);
             ctx.Services.AddScoped(_ => new Mock<IUserRecordService>().Object);
+            ctx.Services.AddScoped(_ => new Mock<IGiscusService>().Object);
         }
     }
 }

LinkDotNet.Blog.UnitTests/Web/Pages/AboutMeTests.cs

@@ -26,7 +26,7 @@ public class AboutMeTests : TestContext
         public void ShouldPassIsAuthenticated()
         {
             this.AddTestAuthorization().SetAuthorized("test");
-            var config = CreateAppConfiguration(true);
+            var config = CreateAppConfiguration(new ProfileInformation { ProfilePictureUrl = string.Empty });
             SetupMocks(config);
 
             var cut = RenderComponent<AboutMe>();
@@ -39,7 +39,7 @@ public void ShouldPassIsAuthenticated()
         public void ShouldNotShowWhenEnabledFalse()
         {
             this.AddTestAuthorization().SetNotAuthorized();
-            var config = CreateAppConfiguration(false);
+            var config = CreateAppConfiguration();
             SetupMocks(config);
 
             var cut = RenderComponent<AboutMe>();
@@ -57,7 +57,7 @@ public void ShouldSetOgData()
                 Name = "My Name",
                 ProfilePictureUrl = "someurl",
             };
-            var config = CreateAppConfiguration(false, profileInformation);
+            var config = CreateAppConfiguration(profileInformation);
             SetupMocks(config);
 
             var cut = RenderComponent<AboutMe>();
@@ -69,15 +69,11 @@ public void ShouldSetOgData()
             ogData.Description.Should().Contain("About Me,My Name");
         }
 
-        private static AppConfiguration CreateAppConfiguration(bool pageEnabled, ProfileInformation info = null)
+        private static AppConfiguration CreateAppConfiguration(ProfileInformation info = null)
         {
             return new AppConfiguration
             {
-                IsAboutMeEnabled = pageEnabled,
-                ProfileInformation = info ?? new ProfileInformation
-                {
-                    ProfilePictureUrl = "not null",
-                },
+                ProfileInformation = info,
             };
         }
 

LinkDotNet.Blog.UnitTests/Web/Pages/Admin/DashboardTests.cs

@@ -38,7 +38,7 @@ private static AppConfiguration CreateAppConfiguration(bool aboutMeEnabled)
         {
             return new AppConfiguration
             {
-                IsAboutMeEnabled = aboutMeEnabled,
+                ProfileInformation = aboutMeEnabled ? new ProfileInformation() : null,
             };
         }
     }

LinkDotNet.Blog.UnitTests/Web/Shared/Services/GiscusServiceTests.cs

@@ -24,5 +24,16 @@ public async Task ShouldInitGiscus()
             init.Arguments.Should().Contain("giscus");
             init.Arguments.Should().Contain(giscus);
         }
+
+        [Fact]
+        public async Task ShouldNotEnabledGiscussWhenNotSet()
+        {
+            JSInterop.Mode = JSRuntimeMode.Loose;
+            var sut = new GiscusService(JSInterop.JSRuntime, new AppConfiguration { Giscus = null });
+
+            await sut.EnableCommentSection("div");
+
+            JSInterop.Invocations.Any(i => i.Identifier == "initGiscus").Should().BeFalse();
+        }
     }
 }

LinkDotNet.Blog.Web/AppConfiguration.cs

@@ -23,12 +23,12 @@ public record AppConfiguration
 
         public int BlogPostsPerPage { get; init; }
 
-        public bool IsAboutMeEnabled { get; init; }
+        public bool IsAboutMeEnabled => ProfileInformation != null;
 
         public ProfileInformation ProfileInformation { get; init; }
 
         public Giscus Giscus { get; init; }
-        
-        public bool IsGiscusEnabled { get; init; }
+
+        public bool IsGiscusEnabled => Giscus != null;
     }
 }

LinkDotNet.Blog.Web/AppConfigurationFactory.cs

@@ -20,9 +20,7 @@ public static AppConfiguration Create(IConfiguration config)
                 DatabaseName = config["DatabaseName"],
                 BlogPostsPerPage = int.Parse(config["BlogPostsPerPage"]),
                 ProfileInformation = profileInformation,
-                IsAboutMeEnabled = profileInformation != null,
                 Giscus = giscus,
-                IsGiscusEnabled = giscus != null,
             };
 
             return configuration;

LinkDotNet.Blog.Web/Pages/AboutMe.razor

@@ -5,13 +5,13 @@
 @inject AuthenticationStateProvider authenticationStateProvider
 @inject IUserRecordService userRecordService
 @inject NavigationManager navigationManager
-<OgData Title="@("About Me - " + appConfiguration.ProfileInformation.Name)"
-        Description="@("About Me," + appConfiguration.ProfileInformation.Name)"
-        Keywords="@appConfiguration.ProfileInformation.Name"
-        AbsolutePreviewImageUrl="@ImageUrl"></OgData>
-
 @if (appConfiguration.IsAboutMeEnabled)
 {
+    <OgData Title="@("About Me - " + appConfiguration.ProfileInformation.Name)"
+            Description="@("About Me," + appConfiguration.ProfileInformation.Name)"
+            Keywords="@appConfiguration.ProfileInformation.Name"
+            AbsolutePreviewImageUrl="@ImageUrl"></OgData>
+
     <div class="page">
         <div class="container">
             <div class="row">

LinkDotNet.Blog.Web/Shared/Services/GiscusService.cs

@@ -16,7 +16,10 @@ public GiscusService(IJSRuntime jsRuntime, AppConfiguration appConfiguration)
 
         public async Task EnableCommentSection(string className)
         {
-            await jsRuntime.InvokeVoidAsync("initGiscus", "giscus", appConfiguration.Giscus);
+            if (appConfiguration.IsGiscusEnabled)
+            {
+                await jsRuntime.InvokeVoidAsync("initGiscus", "giscus", appConfiguration.Giscus);
+            }
         }
     }
 }