fix smells

Author: Apfelwurm

NetEvent/Client/Pages/Administration/SystemInfo.razor

@@ -71,7 +71,7 @@
         </MudTable> 
     </MudTabPanel>
     <MudTabPanel Text="@Localize["Administration.Systeminfo.ClientComponents"]">
-        <MudTable Items="@_ClientComponents" Dense="true" Hover="true" Bordered="false" Striped="true" Filter="new Func<SystemInfoComponentEntryDto,bool>(FilterFuncClientComponents1)"> 
+        <MudTable Items="@_ClientComponents" Dense="true" Hover="true" Bordered="false" Striped="true" Filter="new Func<SystemInfoComponentEntryDto,bool>(FilterFuncComponents1)"> 
         <ToolBarContent>
             <MudSpacer />
              <MudTextField @bind-Value="searchStringClientComponents" Placeholder="@Localize["Administration.Systeminfo.ClientComponents.SearchPlaceholder"]" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField> 

NetEvent/Client/Pages/Administration/SystemInfo.razor.cs

@@ -17,8 +17,6 @@ public partial class SystemInfo
         private ISystemInfoDataService _SystemInfoDataService { get; set; } = default!;
 
         #endregion
-
-        // TODO: deceide if _ClientComponents should be SystemInfoComponentEntryDto or not
         private readonly IList<SystemInfoComponentEntryDto> _ClientComponents = new List<SystemInfoComponentEntryDto>();
         private SystemInfoDto _SystemInfos = new SystemInfoDto();
         private string searchStringComponents = string.Empty;
@@ -39,7 +37,6 @@ protected override async Task OnInitializedAsync()
             }
         }
 
-        // TODO: maybe consolidate filter functions?
         private bool FilterFuncComponents1(SystemInfoComponentEntryDto systeminfocomponententry) => FilterFuncComponents(systeminfocomponententry, searchStringComponents);
 
         private static bool FilterFuncComponents(SystemInfoComponentEntryDto systeminfocomponententry, string searchString)
@@ -62,28 +59,6 @@ private static bool FilterFuncComponents(SystemInfoComponentEntryDto systeminfoc
             return false;
         }
 
-        private bool FilterFuncClientComponents1(SystemInfoComponentEntryDto systeminfocomponententry) => FilterFuncClientComponents(systeminfocomponententry, searchStringClientComponents);
-
-        private static bool FilterFuncClientComponents(SystemInfoComponentEntryDto systeminfocomponententry, string searchString)
-        {
-            if (string.IsNullOrWhiteSpace(searchString))
-            {
-                return true;
-            }
-
-            if (systeminfocomponententry.Component.Contains(searchString, StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-
-            if (systeminfocomponententry.Version.Contains(searchString, StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
         private bool FilterFuncVersions1(SystemInfoVersionEntryDto systeminfoversionentry) => FilterFuncVersions(systeminfoversionentry, searchStringVersions);
 
         private static bool FilterFuncVersions(SystemInfoVersionEntryDto systeminfoversionentry, string searchString)

NetEvent/Client/Services/SystemInfoDataService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading;
@@ -8,6 +9,7 @@
 
 namespace NetEvent.Client.Services
 {
+    [ExcludeFromCodeCoverage(Justification = "Ignore UI Services")]
     public class SystemInfoDataService : ISystemInfoDataService
     {
         private readonly IHttpClientFactory _HttpClientFactory;

NetEvent/Server.Tests/SystemModuleTest.cs

@@ -115,8 +115,6 @@ public async Task GetSystemInfoVersionsSetted_Test()
             Assert.NotNull(response?.Versions);
             Assert.NotEmpty(response?.Health);
             Assert.NotEmpty(response?.Versions);
-            Assert.NotEqual(0, response?.Health.Count);
-            Assert.NotEqual(0, response?.Versions.Count);
             Assert.Equal("TEST", response?.Versions?.Find(x => x.Component.Equals("BUILDNODE"))?.Version);
             Assert.Equal("TEST", response?.Versions?.Find(x => x.Component.Equals("BUILDID"))?.Version);
             Assert.Equal("TEST", response?.Versions?.Find(x => x.Component.Equals("BUILDNUMBER"))?.Version);

NetEvent/Server/Modules/System/Endpoints/GetSystemInfo/GetSystemInfoHandler.cs

@@ -27,12 +27,11 @@ public Task<GetSystemInfoResponse> Handle(GetSystemInfoRequest request, Cancella
                 systeminfocomponents.Add(new SystemInfoComponentEntryDto(assem.ManifestModule.Name.ToString(), assem.ToString()));
             }
 
-            // TODO: is it possible to make that better?
             systeminfoversions.Add(new SystemInfoVersionEntryDto("NETEVENT", Assembly.GetEntryAssembly()?.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion));
-            systeminfoversions.Add(new SystemInfoVersionEntryDto("BUILDNODE", string.IsNullOrEmpty(Environment.GetEnvironmentVariable("BUILDNODE")) ? "dev" : Environment.GetEnvironmentVariable("BUILDNODE")));
-            systeminfoversions.Add(new SystemInfoVersionEntryDto("BUILDID", string.IsNullOrEmpty(Environment.GetEnvironmentVariable("BUILDID")) ? "dev" : Environment.GetEnvironmentVariable("BUILDNODE")));
-            systeminfoversions.Add(new SystemInfoVersionEntryDto("BUILDNUMBER", string.IsNullOrEmpty(Environment.GetEnvironmentVariable("BUILDNUMBER")) ? "dev" : Environment.GetEnvironmentVariable("BUILDNODE")));
-            systeminfoversions.Add(new SystemInfoVersionEntryDto("SOURCE_COMMIT", string.IsNullOrEmpty(Environment.GetEnvironmentVariable("SOURCE_COMMIT")) ? "dev" : Environment.GetEnvironmentVariable("BUILDNODE")));
+            systeminfoversions.Add(CreateSystemInfoVersionEntryFromEnv("BUILDNODE"));
+            systeminfoversions.Add(CreateSystemInfoVersionEntryFromEnv("BUILDID"));
+            systeminfoversions.Add(CreateSystemInfoVersionEntryFromEnv("BUILDNUMBER"));
+            systeminfoversions.Add(CreateSystemInfoVersionEntryFromEnv("SOURCE_COMMIT"));
 
             // TODO: think about healthchecks and healthcheck modularity (to perform checks on various services like game servers, the mail server, payment apis ...) and remove dummy services
             systeminfohealth.Add(new SystemInfoHealthEntryDto("NETEVENT Server", string.Empty, true));
@@ -42,5 +41,10 @@ public Task<GetSystemInfoResponse> Handle(GetSystemInfoRequest request, Cancella
 
             return Task.FromResult(new GetSystemInfoResponse(systeminfo));
         }
+
+        private static SystemInfoVersionEntryDto CreateSystemInfoVersionEntryFromEnv(string envName)
+        {
+            return new SystemInfoVersionEntryDto(envName, string.IsNullOrEmpty(Environment.GetEnvironmentVariable(envName)) ? "dev" : Environment.GetEnvironmentVariable(envName));
+        }
     }
 }