Merge pull request #21450 from dolunay/dev

Updated VirtualFileExplorer demo and Blazor columns to support HTML rendering

framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor

@@ -112,7 +112,7 @@
                                                 Sortable="@column.Sortable"
                                                 Displayable="column.Visible">
                                     <DisplayTemplate>
-                                        @(GetConvertedFieldValue(context, column))
+                                        @((MarkupString)GetConvertedFieldValue(context, column))
                                     </DisplayTemplate>
                                 </DataGridColumn>
                             }
@@ -140,7 +140,7 @@
                                         {
                                             if (column.ValueConverter != null)
                                             {
-                                                @(GetConvertedFieldValue(context, column))
+                                                @((MarkupString)GetConvertedFieldValue(context, column))
                                             }
                                             else
                                             {

modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Program.cs

@@ -1,5 +1,7 @@
 using System;
-using Microsoft.AspNetCore.Hosting;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
@@ -8,7 +10,7 @@ namespace Volo.Abp.VirtualFileExplorer.DemoApp;
 
 public class Program
 {
-    public static int Main(string[] args)
+    public static async Task<int> Main(string[] args)
     {
         Log.Logger = new LoggerConfiguration()
             .MinimumLevel.Debug()
@@ -19,8 +21,17 @@ public class Program
 
         try
         {
-            Log.Information("Starting web host.");
-            CreateHostBuilder(args).Build().Run();
+            Log.Information("Starting web host.");
+            var builder = WebApplication.CreateBuilder(args);
+            builder.Host
+                .AddAppSettingsSecretsJson()
+                .UseSerilog()
+                .UseAutofac()
+                ;
+            await builder.AddApplicationAsync<AbpVirtualFileExplorerDemoAppModule>();
+            var app = builder.Build();
+            await app.InitializeApplicationAsync();
+            await app.RunAsync();
             return 0;
         }
         catch (Exception ex)
@@ -33,10 +44,4 @@ public class Program
             Log.CloseAndFlush();
         }
     }
-
-    internal static IHostBuilder CreateHostBuilder(string[] args) =>
-        Host.CreateDefaultBuilder(args)
-            .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); })
-            .UseAutofac()
-            .UseSerilog();
 }

modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Startup.cs

@@ -1,19 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace Volo.Abp.VirtualFileExplorer.DemoApp;
-
-public class Startup
-{
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddApplication<AbpVirtualFileExplorerDemoAppModule>();
-    }
-
-    public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
-    {
-        app.InitializeApplication();
-    }
-}

modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Navigation/VirtualFileExplorerMenuNames.cs

@@ -2,7 +2,7 @@
 
 public class VirtualFileExplorerMenuNames
 {
-    public const string GroupName = "AbpVirualFileExplorer";
+    public const string GroupName = "AbpVirtualFileExplorer";
 
     public const string Index = GroupName + ".Index";
 }

modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Pages/VirtualFileExplorer/Index.cshtml

@@ -62,10 +62,10 @@
                                     <div class="dropdown action-button">
                                         <ul class="dropdown-menu">
                                             <li>
-                                                <a onclick="showContent('@item.FilePath')">@L["FileContent"]</a>
+                                                <a class="dropdown-item" onclick="showContent('@item.FilePath')">@L["FileContent"]</a>
                                             </li>
                                         </ul>
-                                        <button class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">
+                                        <button class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown">
                                             <i class="fa fa-cog me-1"></i>@UiLocalizer["Actions"]
                                         </button>
                                     </div>