Merge branch 'dev' into feature/migrating-abp-packages-to-standalone-structure

framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorCachedApplicationConfigurationClient.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.JSInterop;
+using Volo.Abp.AspNetCore.Components.Web.Security;
 using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
 using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ClientProxies;
 using Volo.Abp.AspNetCore.Mvc.Client;
@@ -23,6 +24,8 @@ namespace Volo.Abp.AspNetCore.Components.MauiBlazor
 
         protected ICurrentTimezoneProvider CurrentTimezoneProvider { get; }
 
+        protected ApplicationConfigurationChangedService ApplicationConfigurationChangedService { get; }
+
         protected IJSRuntime JSRuntime { get; }
 
         protected IClock Clock { get; }
@@ -34,6 +37,7 @@ namespace Volo.Abp.AspNetCore.Components.MauiBlazor
             ICurrentTimezoneProvider currentTimezoneProvider,
             AuthenticationStateProvider authenticationStateProvider,
             AbpApplicationLocalizationClientProxy applicationLocalizationClientProxy,
+            ApplicationConfigurationChangedService applicationConfigurationChangedService,
             IJSRuntime jsRuntime,
             IClock clock)
         {
@@ -42,6 +46,7 @@ namespace Volo.Abp.AspNetCore.Components.MauiBlazor
             CurrentTenantAccessor = currentTenantAccessor;
             CurrentTimezoneProvider = currentTimezoneProvider;
             ApplicationLocalizationClientProxy = applicationLocalizationClientProxy;
+            ApplicationConfigurationChangedService = applicationConfigurationChangedService;
             JSRuntime = jsRuntime;
             Clock = clock;
 
@@ -81,6 +86,8 @@ namespace Volo.Abp.AspNetCore.Components.MauiBlazor
 
                 await JSRuntime.InvokeAsync<string>("abp.clock.setBrowserTimeZoneToCookie");
             }
+
+            ApplicationConfigurationChangedService.NotifyChanged();
         }
 
         public virtual Task<ApplicationConfigurationDto> GetAsync()

framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiCurrentApplicationConfigurationCacheResetService.cs

@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Volo.Abp.AspNetCore.Components.Web.Configuration;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Components.MauiBlazor;
+
+[Dependency(ReplaceServices = true)]
+public class MauiCurrentApplicationConfigurationCacheResetService :
+    ICurrentApplicationConfigurationCacheResetService,
+    ITransientDependency
+{
+    private readonly MauiBlazorCachedApplicationConfigurationClient _mauiBlazorCachedApplicationConfigurationClient;
+
+    public MauiCurrentApplicationConfigurationCacheResetService(MauiBlazorCachedApplicationConfigurationClient mauiBlazorCachedApplicationConfigurationClient)
+    {
+        _mauiBlazorCachedApplicationConfigurationClient = mauiBlazorCachedApplicationConfigurationClient;
+    }
+
+    public async Task ResetAsync()
+    {
+        await _mauiBlazorCachedApplicationConfigurationClient.InitializeAsync();
+    }
+}

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

@@ -552,6 +552,11 @@ public abstract class AbpCrudPageBase<
 
     protected virtual async Task OnDeletedEntityAsync()
     {
+        if (Entities.Count == 1 && CurrentPage > 1)
+        {
+            CurrentPage -= 1;
+        }
+
         await GetEntitiesAsync();
         await InvokeAsync(StateHasChanged);
         await Notify.Success(GetDeleteMessage());

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliUrls.cs

@@ -5,9 +5,24 @@ namespace Volo.Abp.Cli;
 
 public static class CliUrls
 {
-    public static string WwwAbpIo = WwwAbpIoProduction;
-    public static string AccountAbpIo = AccountAbpIoProduction;
-    public static string NuGetRootPath = NuGetRootPathProduction;
+    public static string WwwAbpIo
+    {
+        get => WwwAbpIoProduction;
+        set => WwwAbpIoProduction = value;
+    }
+
+    public static string AccountAbpIo
+    {
+        get => AccountAbpIoProduction;
+        set => AccountAbpIoProduction = value;
+    }
+
+    public static string NuGetRootPath
+    {
+        get => NuGetRootPathProduction;
+        set => NuGetRootPathProduction = value;
+    }
+
     public static string LatestVersionCheckFullPath = "https://raw.githubusercontent.com/abpframework/abp/dev/latest-versions.json";
 
     public static string WwwAbpIoProduction = "https://abp.io/";

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

@@ -17,12 +17,14 @@
             <ModalBody>
                 <Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@SelectedTabName">
                     <Items>
-                        @foreach (var group in Groups)
-                        {
-                            <Tab Name="@GetNormalizedGroupName(group.Name)">
-                                <span>@group.DisplayName</span>
-                            </Tab>
-                        }
+                        <div class="pt-3">
+                            @foreach (var group in Groups)
+                            {
+                                <Tab Name="@GetNormalizedGroupName(group.Name)">
+                                    <span>@group.DisplayName</span>
+                                </Tab>
+                            }
+                        </div>
                     </Items>
                     <Content>
                         @for (var i = 0; i < Groups.Count; i++)

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.css

@@ -1,7 +1,11 @@
+#FeaturesTabsContent {
+    padding-top: 0 !important;
+}
+
 .custom-scroll-content {
     max-height: 400px;
 }
 
 .custom-scroll-container > .col-md-4 {
     max-height: 500px;
-}
+}

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor

@@ -11,21 +11,22 @@
 </PageHeader>
 
 <Card>
-    <CardBody>
+    <CardBody Class="pt-0">
         <Tabs @bind-SelectedTab="@SelectedGroup" TabPosition="TabPosition.Start" Pills="true" RenderMode="TabsRenderMode.LazyReload" VerticalItemsColumnSize="ColumnSize.Is3.OnDesktop.Is6.OnTablet.Is12.OnMobile">
             <Items>
-                @foreach (var group in SettingComponentCreationContext.Groups)
-                {
-                    <Tab Name="@GetNormalizedString(group.Id)">
-                        @group.DisplayName
-                    </Tab>
-                }
+                <div class="pt-3">
+                    @foreach (var group in SettingComponentCreationContext.Groups)
+                    {
+                        <Tab Name="@GetNormalizedString(group.Id)">
+                            @group.DisplayName
+                        </Tab>
+                    }
+                </div>
             </Items>
             <Content>
                 @foreach (var group in SettingComponentCreationContext.Groups)
                 {
                     <TabPanel Name="@GetNormalizedString(group.Id)" class="abp-md-form">
-                       
                         @{
                             SettingItemRenders.Add(builder =>
                             {

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml

@@ -35,7 +35,7 @@
                     </ul>
                 </div>
                 <div class="col-md-9">
-                    <div class="tab-content" id="tab-content">
+                    <div class="tab-content pt-0" id="tab-content">
                     </div>
                 </div>
             </div>