Merge pull request #7 from Parziwal/fix/blazor-components

Fix blazor components issues
+semver:patch

Author: tibitoth

.github/workflows/AutSoftCore_CD.yml

@@ -31,7 +31,11 @@ jobs:
 
     - name: Restore dependencies
       run: dotnet restore
-      
+    
+    # Reason for this build: https://github.com/microsoft/TypeScript/issues/42907
+    - name: Build
+      run: dotnet build --no-restore --configuration Release
+
     - name: Pack
       run: dotnet pack --no-restore --configuration Release --output artifacts
 

.gitignore

@@ -360,3 +360,10 @@ MigrationBackup/
 
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
+
+# JS files generated by Blazor projects at build
+**/AutSoft.AspNetCore.Blazor/wwwroot/app/AutSoft.AspNetCore.Blazor.js
+**/AutSoft.AspNetCore.Blazor/wwwroot/app/AutSoft.AspNetCore.Blazor.js.map
+
+**/AutSoft.Mud.Blazor/wwwroot/app/AutSoft.Mud.Blazor.js
+**/AutSoft.Mud.Blazor/wwwroot/app/AutSoft.Mud.Blazor.js.map

pipelines/autsoft-core-packages-cd.yml

@@ -1,5 +1,4 @@
 using AutSoft.AspNetCore.Auth;
-using AutSoft.AspNetCore.Blazor;
 using AutSoft.Common;
 using AutSoft.Mud.Blazor;
 
@@ -20,7 +19,6 @@ public static IServiceCollection AddAutSoftAll(this IServiceCollection services)
     {
         services.AddAutSoftAspNetCoreAuth();
         services.AddAutSoftCommon();
-        services.AddAutSoftAspNetCoreBlazor();
         services.AddAutSoftMudBlazor();
 
         return services;

pipelines/autsoft-core-packages-ci.yml

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -26,7 +26,7 @@
 
   <Target Name="RemoveTSConfigFileFromPackage" AfterTargets="CompileTypeScriptWithTSConfig">
     <ItemGroup>
-        <Content Remove="**\tsconfig.json" />
+      <Content Remove="tsconfig.json" />
     </ItemGroup>
   </Target>
 </Project>

src/AutSoft.All/ServiceCollectionExtensions.cs

@@ -39,7 +39,7 @@ public async Task<IEnumerable<TKey>> SearchAsync(string search)
     /// <summary>
     /// Gets or sets the currently selected item.
     /// </summary>
-    /// <param name="i">Index,</param>
+    /// <param name="key">Index,</param>
     /// <returns>Item type.</returns>
     public TItem? this[TKey? key]
     {

src/AutSoft.AspNetCore.Blazor/AutSoft.AspNetCore.Blazor.csproj

@@ -1,4 +1,5 @@
 using AutSoft.Common.Concurrency;
+using AutSoft.Common.Enumeration;
 
 using Microsoft.Extensions.Logging;
 
@@ -7,7 +8,7 @@ namespace AutSoft.AspNetCore.Blazor.Enumeration;
 /// <inheritdoc />
 public class EnumerationCache<TEnum> : IEnumerationCache<TEnum>, IDisposable where TEnum : Enum
 {
-    private readonly Dictionary<TEnum, List<EnumerationItem>> _enumerations = new();
+    private readonly Dictionary<TEnum, List<EnumerationObjectItem>> _enumerations = new();
 
     private readonly AsyncLock _downloadLock = new();
 
@@ -57,23 +58,23 @@ private async Task TryEnsureHasCachedEnumerationAsync(params TEnum[] enumeration
     }
 
     /// <inheritdoc />
-    public async Task<string?> ResolveDisplayNameAsync(TEnum type, int key)
+    public async Task<string?> ResolveDisplayNameAsync(TEnum type, int id)
     {
         await TryEnsureHasCachedEnumerationAsync(type);
 
         if (!_enumerations.ContainsKey(type))
             return null;
 
-        return _enumerations[type].SingleOrDefault(i => i.Id == key)?.DisplayName;
+        return _enumerations[type].SingleOrDefault(i => i.Id == id)?.DisplayName;
     }
 
     /// <inheritdoc />
-    public async Task<List<EnumerationItem>> ResolveEnumerationItemsAsync(TEnum type)
+    public async Task<List<EnumerationObjectItem>> ResolveEnumerationItemsAsync(TEnum type)
     {
         await TryEnsureHasCachedEnumerationAsync(type);
 
         if (!_enumerations.ContainsKey(type))
-            return new List<EnumerationItem>();
+            return new List<EnumerationObjectItem>();
 
         return _enumerations[type];
     }

src/AutSoft.AspNetCore.Blazor/Autocomplete/AutoCompleteDataSource.cs

@@ -1,3 +1,9 @@
+using AutSoft.Common.Enumeration;
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
 namespace AutSoft.AspNetCore.Blazor.Enumeration;
 
 /// <summary>
@@ -19,7 +25,7 @@ public interface IEnumerationCache<TEnum> where TEnum : Enum
     /// </summary>
     /// <param name="type">Enumeration type.</param>
     /// <returns>Enumeration items.</returns>
-    Task<List<EnumerationItem>> ResolveEnumerationItemsAsync(TEnum type);
+    Task<List<EnumerationObjectItem>> ResolveEnumerationItemsAsync(TEnum type);
 
     /// <summary>
     /// Caches the specified enumeration types if they are not in the cache.

src/AutSoft.AspNetCore.Blazor/Enumeration/EnumerationCache.cs

@@ -1,3 +1,5 @@
+using AutSoft.Common.Enumeration;
+
 namespace AutSoft.AspNetCore.Blazor.Enumeration;
 
 /// <summary>
@@ -11,5 +13,5 @@ public interface IEnumerationService<TEnum> where TEnum : Enum
     /// </summary>
     /// <param name="enumerationTypes">Enumeration types.</param>
     /// <returns>Values of the enumeration types.</returns>
-    Task<List<Enumeration<TEnum>>> ListEnumerationsAsync(List<TEnum> enumerationTypes);
+    Task<List<EnumerationObject<TEnum>>> ListEnumerationsAsync(List<TEnum> enumerationTypes);
 }