Merge pull request #10675 from abpframework/auto-merge/rel-5-0/641

Merge branch dev with rel-5.0

framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs

@@ -8,9 +8,7 @@ namespace Volo.Abp.AspNetCore.Components.Server.Theming.Bundling
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
             context.Files.AddIfNotContains("/_framework/blazor.server.js");
-            context.Files.AddIfNotContains("/_content/Blazorise/blazorise.js");
-            context.Files.AddIfNotContains("/_content/Blazorise.Bootstrap5/blazorise.bootstrap5.js");
             context.Files.AddIfNotContains("/_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/abp.js");
         }
     }
-}
+}

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ComponentsComponentsBundleContributor.cs

@@ -7,8 +7,6 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming
         public void AddScripts(BundleContext context)
         {
             context.Add("_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js");
-            context.Add("_content/Blazorise/blazorise.js");
-            context.Add("_content/Blazorise.Bootstrap5/blazorise.bootstrap5.js");
             context.Add("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/abp.js");
             context.Add("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/lang-utils.js");
         }
@@ -23,7 +21,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming
             {
                 Source = "_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/fontawesome/css/all.css"
             });
-            
+
             context.Add("_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/flag-icon/css/flag-icon.css");
             context.Add("_content/Blazorise/blazorise.css");
             context.Add("_content/Blazorise.Bootstrap5/blazorise.bootstrap5.css");

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs

@@ -45,11 +45,13 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
             var cacheKey = CreateCacheKey();
             var httpContext = HttpContextAccessor?.HttpContext;
 
-            if (httpContext != null && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration)
+            if (httpContext != null && !httpContext.WebSockets.IsWebSocketRequest && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration)
             {
+
                 return configuration;
             }
 
+
             configuration = await Cache.GetOrAddAsync(
                 cacheKey,
                 async () => await ApplicationConfigurationAppService.GetAsync(),
@@ -59,7 +61,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
                 }
             );
 
-            if (httpContext != null)
+            if (httpContext != null && !httpContext.WebSockets.IsWebSocketRequest)
             {
                 httpContext.Items[cacheKey] = configuration;
             }
@@ -72,7 +74,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
             var cacheKey = CreateCacheKey();
             var httpContext = HttpContextAccessor?.HttpContext;
 
-            if (httpContext != null && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration)
+            if (httpContext != null  && !httpContext.WebSockets.IsWebSocketRequest && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration)
             {
                 return configuration;
             }

framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs

@@ -353,10 +353,12 @@ namespace Volo.Abp.BlazoriseUI
             return InvokeAsync(CreateModal.Hide);
         }
 
-        protected virtual void ClosingCreateModal(ModalClosingEventArgs eventArgs)
+        protected virtual Task ClosingCreateModal(ModalClosingEventArgs eventArgs)
         {
             // cancel close if clicked outside of modal area
             eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
+
+            return Task.CompletedTask;
         }
 
         protected virtual async Task OpenEditModalAsync(TListViewModel entity)
@@ -421,10 +423,12 @@ namespace Volo.Abp.BlazoriseUI
             return Task.CompletedTask;
         }
 
-        protected virtual void ClosingEditModal(ModalClosingEventArgs eventArgs)
+        protected virtual Task ClosingEditModal(ModalClosingEventArgs eventArgs)
         {
             // cancel close if clicked outside of modal area
             eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
+
+            return Task.CompletedTask;
         }
 
         protected virtual async Task CreateEntityAsync()

framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs

@@ -147,10 +147,12 @@ namespace Volo.Abp.BlazoriseUI.Components
             });
         }
 
-        protected virtual void OnModalClosing(ModalClosingEventArgs eventArgs)
+        protected virtual Task OnModalClosing(ModalClosingEventArgs eventArgs)
         {
             eventArgs.Cancel = eventArgs.CloseReason == CloseReason.EscapeClosing
                 || eventArgs.CloseReason == CloseReason.FocusLostClosing;
+
+            return Task.CompletedTask;
         }
     }
 }

framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj

@@ -14,10 +14,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise" Version="0.9.5-preview2.1" />
-        <PackageReference Include="Blazorise.DataGrid" Version="0.9.5-preview2.1" />
-        <PackageReference Include="Blazorise.Snackbar" Version="0.9.5-preview2.1" />
-        <PackageReference Include="Blazorise.Components" Version="0.9.5-preview2.1" />
+        <PackageReference Include="Blazorise" Version="0.9.5" />
+        <PackageReference Include="Blazorise.DataGrid" Version="0.9.5" />
+        <PackageReference Include="Blazorise.Snackbar" Version="0.9.5" />
+        <PackageReference Include="Blazorise.Components" Version="0.9.5" />
     </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs

@@ -70,7 +70,7 @@ namespace Volo.Abp.Uow.MongoDB
             var databaseName = mongoUrl.DatabaseName;
             if (databaseName.IsNullOrWhiteSpace())
             {
-                databaseName = ConnectionStringNameAttribute.GetConnStringName<TMongoDbContext>();
+                databaseName = ConnectionStringNameAttribute.GetConnStringName(targetDbContextType);
             }
 
             //TODO: Create only single MongoDbClient per connection string in an application (extract MongoClientCache for example).
@@ -98,7 +98,7 @@ namespace Volo.Abp.Uow.MongoDB
             var databaseName = mongoUrl.DatabaseName;
             if (databaseName.IsNullOrWhiteSpace())
             {
-                databaseName = ConnectionStringNameAttribute.GetConnStringName<TMongoDbContext>();
+                databaseName = ConnectionStringNameAttribute.GetConnStringName(targetDbContextType);
             }
 
             //TODO: Create only single MongoDbClient per connection string in an application (extract MongoClientCache for example).
@@ -184,7 +184,18 @@ namespace Volo.Abp.Uow.MongoDB
                     session.AdvanceOperationTime(new BsonTimestamp(unitOfWork.Options.Timeout.Value));
                 }
 
-                session.StartTransaction();
+                try
+                {
+                    session.StartTransaction();
+                }
+                catch (NotSupportedException e)
+                {
+                    Logger.LogError("The current MongoDB database does not support transactions, All operations will be performed in non-transactions, This may cause errors.");
+                    Logger.LogException(e);
+
+                    dbContext.ToAbpMongoDbContext().InitializeDatabase(database, client, null);
+                    return dbContext;
+                }
 
                 unitOfWork.AddTransactionApi(
                     transactionApiKey,
@@ -224,8 +235,19 @@ namespace Volo.Abp.Uow.MongoDB
                     session.AdvanceOperationTime(new BsonTimestamp(unitOfWork.Options.Timeout.Value));
                 }
 
-                session.StartTransaction();
+                try
+                {
+                    session.StartTransaction();
+                }
+                catch (NotSupportedException e)
+                {
+                    Logger.LogError("The current MongoDB database does not support transactions, All operations will be performed in non-transactions, This may cause errors.");
+                    Logger.LogException(e);
 
+                    dbContext.ToAbpMongoDbContext().InitializeDatabase(database, client, null);
+                    return dbContext;
+                }
+                
                 unitOfWork.AddTransactionApi(
                     transactionApiKey,
                     new MongoDbTransactionApi(

modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs

@@ -24,7 +24,7 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
         [Inject] protected IStringLocalizerFactory HtmlLocalizerFactory { get; set; }
 
         [Inject] protected IOptions<AbpLocalizationOptions> LocalizationOptions { get; set; }
-        
+
         [Inject] private ICurrentApplicationConfigurationCacheResetService CurrentApplicationConfigurationCacheResetService { get; set; }
 
         protected Modal Modal;
@@ -198,9 +198,11 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
             return HtmlLocalizerFactory.Create(resource != null ? resource.ResourceType : LocalizationOptions.Value.DefaultResourceType);
         }
 
-        protected virtual void ClosingModal( ModalClosingEventArgs eventArgs )
+        protected virtual Task ClosingModal(ModalClosingEventArgs eventArgs)
         {
             eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
+
+            return Task.CompletedTask;
         }
     }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs

@@ -235,9 +235,10 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
             );
         }
 
-        protected virtual void ClosingModal(ModalClosingEventArgs eventArgs)
+        protected virtual Task ClosingModal(ModalClosingEventArgs eventArgs)
         {
             eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
+            return Task.CompletedTask;
         }
     }
 }

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/grid-actions/grid-actions.component.html

@@ -10,7 +10,7 @@
   <div ngbDropdownMenu>
     <ng-container
       *ngFor="let action of actionList; trackBy: trackByFn"
-      [ngTemplateOutlet]="btnItem"
+      [ngTemplateOutlet]="dropDownBtnItemTmp"
       [ngTemplateOutletContext]="{ $implicit: action }"
     >
     </ng-container>
@@ -19,25 +19,44 @@
 
 <ng-container
   *ngIf="actionList.length === 1"
-  [ngTemplateOutlet]="btnItem"
+  [ngTemplateOutlet]="btnTmp"
   [ngTemplateOutletContext]="{ $implicit: actionList.get(0).value }"
 ></ng-container>
 
-<ng-template #btnItem let-action>
+<ng-template #dropDownBtnItemTmp let-action>
   <ng-container *ngIf="action.visible(data)">
     <button
       ngbDropdownItem
       *abpPermission="action.permission"
       (click)="action.action(data)"
       type="button"
-      class="{{ actionList.length === 1 ? 'btn btn-primary' : '' }}"
-      [class.text-center]="actionList.length === 1"
     >
-      <i [ngClass]="action.icon" [class.me-1]="action.icon"></i>
-      <span *ngIf="action.icon; else ellipsis">{{ action.text | abpLocalization }}</span>
-      <ng-template #ellipsis>
-        <div abpEllipsis>{{ action.text | abpLocalization }}</div>
-      </ng-template>
+      <ng-container
+        *ngTemplateOutlet="buttonContentTmp; context: { $implicit: action }"
+      ></ng-container>
+    </button>
+  </ng-container>
+</ng-template>
+
+<ng-template #buttonContentTmp let-action>
+  <i [ngClass]="action.icon" [class.me-1]="action.icon"></i>
+  <span *ngIf="action.icon; else ellipsis">{{ action.text | abpLocalization }}</span>
+  <ng-template #ellipsis>
+    <div abpEllipsis>{{ action.text | abpLocalization }}</div>
+  </ng-template>
+</ng-template>
+
+<ng-template #btnTmp let-action>
+  <ng-container *ngIf="action.visible(data)">
+    <button
+      *abpPermission="action.permission"
+      (click)="action.action(data)"
+      type="button"
+      class="btn btn-primary text-center"
+    >
+      <ng-container
+        *ngTemplateOutlet="buttonContentTmp; context: { $implicit: action }"
+      ></ng-container>
     </button>
   </ng-container>
 </ng-template>

npm/ng-packs/packages/theme-shared/extensions/src/tests/enum.util.spec.ts

@@ -7,6 +7,7 @@ import { createEnum, createEnumOptions, createEnumValueResolver } from '../lib/u
 const mockSessionState = {
   languageChange$: new BehaviorSubject('tr'),
   getLanguage: () => 'tr',
+  getLanguage$: () => of('tr'),
   onLanguageChange$: () => new BehaviorSubject('tr'),
 } as any;
 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj

@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5-preview2.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj

@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5-preview2.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5-preview2.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" />
   </ItemGroup>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=637720550480184672" rel="stylesheet"/>
+    <link href="global.css?_v=637728566120563110" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
     <link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
@@ -23,7 +23,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=637720550482804343"></script>
+    <script src="global.js?_v=637728566121956479"></script>
     <!--/ABP:Scripts-->
 </body>
 </html>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5-preview2.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly"  Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" />
   </ItemGroup>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=637720550515221023" rel="stylesheet"/>
+    <link href="global.css?_v=637728566152161888" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
 </head>
@@ -22,7 +22,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=637720550517503330"></script>
+    <script src="global.js?_v=637728566153545942"></script>
     <!--/ABP:Scripts-->
 </body>
 </html>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj

@@ -12,8 +12,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5-preview2.1" />
-        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" />
+        <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
+        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
         <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" />