Merge pull request #14817 from abpframework/auto-merge/rel-7-0/1495

Merge branch dev with rel-7.0

framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo.Abp.AspNetCore.Components.MauiBlazor.csproj

@@ -11,7 +11,6 @@
         <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
         <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
         <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-        <UseMaui>true</UseMaui>
         <RootNamespace />
     </PropertyGroup>
 

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

@@ -4,7 +4,6 @@ using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Maui.Storage;
 using Volo.Abp.AspNetCore.Components.Progression;
 using Volo.Abp.DependencyInjection;
 
@@ -13,11 +12,13 @@ namespace Volo.Abp.AspNetCore.Components.MauiBlazor;
 public class AbpMauiBlazorClientHttpMessageHandler : DelegatingHandler, ITransientDependency
 {
     private readonly IUiPageProgressService _uiPageProgressService;
-    
-    private const string SelectedLanguageName = "Abp.SelectedLanguage";
+    private readonly IMauiBlazorSelectedLanguageProvider _mauiBlazorSelectedLanguageProvider;
 
-    public AbpMauiBlazorClientHttpMessageHandler(IClientScopeServiceProviderAccessor clientScopeServiceProviderAccessor)
+    public AbpMauiBlazorClientHttpMessageHandler(
+        IClientScopeServiceProviderAccessor clientScopeServiceProviderAccessor,
+        IMauiBlazorSelectedLanguageProvider mauiBlazorSelectedLanguageProvider)
     {
+        _mauiBlazorSelectedLanguageProvider = mauiBlazorSelectedLanguageProvider;
         _uiPageProgressService = clientScopeServiceProviderAccessor.ServiceProvider.GetRequiredService<IUiPageProgressService>();
     }
 
@@ -40,16 +41,14 @@ public class AbpMauiBlazorClientHttpMessageHandler : DelegatingHandler, ITransie
         }
     }
 
-    private Task SetLanguageAsync(HttpRequestMessage request)
+    private async Task SetLanguageAsync(HttpRequestMessage request)
     {
-        var selectedLanguage = Preferences.Get(SelectedLanguageName, string.Empty);
+        var selectedLanguage = await _mauiBlazorSelectedLanguageProvider.GetSelectedLanguageAsync();
 
         if (!selectedLanguage.IsNullOrWhiteSpace())
         {
             request.Headers.AcceptLanguage.Clear();
             request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(selectedLanguage));
         }
-        
-        return Task.CompletedTask;
     }
 }

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

@@ -0,0 +1,8 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.AspNetCore.Components.MauiBlazor;
+
+public interface IMauiBlazorSelectedLanguageProvider
+{
+    Task<string> GetSelectedLanguageAsync();
+}

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

@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Components.MauiBlazor;
+
+public class NullMauiBlazorSelectedLanguageProvider : IMauiBlazorSelectedLanguageProvider, ITransientDependency
+{
+    public Task<string> GetSelectedLanguageAsync()
+    {
+        return Task.FromResult((string)null);
+    }
+}

npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html

@@ -32,10 +32,11 @@
                 class="nav-link pointer"
                 [class.active]="selectedGroup?.name === group?.name"
                 (click)="onChangeGroup(group)"
+                (select)="setDisabled(group.permissions)"
               >
                 <div [class.font-weight-bold]="count.assignedCount">
                   {{ group?.displayName }}
-                  <span>({{ count.assignedCount }})</span>
+                  <span *ngIf="count.assignedCount > 0">({{ count.assignedCount }})</span>
                 </div>
               </a>
             </li>
@@ -53,6 +54,7 @@
                 name="select-all-in-this-tabs"
                 class="form-check-input"
                 [(ngModel)]="selectThisTab"
+                [disabled]="disableSelectAllTab"
                 (click)="onClickSelectThisTab()"
               />
               <label class="form-check-label" for="select-all-in-this-tabs">{{

npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts

@@ -104,6 +104,8 @@ export class PermissionManagementComponent
 
   selectAllTab = false;
 
+  disableSelectAllTab = false;
+
   modalBusy = false;
 
   trackByFn: TrackByFunction<PermissionGroupDto> = (_, item) => item.name;
@@ -135,6 +137,18 @@ export class PermissionManagementComponent
     return (this.permissions.find(per => per.name === name) || { isGranted: false }).isGranted;
   }
 
+  setDisabled(grantedProviders) {
+    if (grantedProviders.length) {
+      grantedProviders.forEach(permission => {
+        this.disableSelectAllTab = permission.grantedProviders?.some(
+          p => p.providerName !== this.providerName,
+        );
+      });
+    } else {
+      this.disableSelectAllTab = false;
+    }
+  }
+
   isGrantedByOtherProviderName(grantedProviders: ProviderInfoDto[]): boolean {
     if (grantedProviders.length) {
       return grantedProviders.findIndex(p => p.providerName !== this.providerName) > -1;
@@ -150,24 +164,25 @@ export class PermissionManagementComponent
       return;
 
     setTimeout(() => {
-      this.permissions = this.permissions.map(per => {
-        if (clickedPermission.name === per.name) {
-          return { ...per, isGranted: !per.isGranted };
-        } else if (clickedPermission.name === per.parentName && clickedPermission.isGranted) {
-          return { ...per, isGranted: false };
-        } else if (clickedPermission.parentName === per.name && !clickedPermission.isGranted) {
-          return { ...per, isGranted: true };
-        }
-
-        return per;
-      }).map((per,index,permissions) => {
-        const childrens = permissions
-          .filter(p => p.parentName === per.name);
-          if(childrens.length > 0 && childrens.every(x => !x.isGranted)){
+      this.permissions = this.permissions
+        .map(per => {
+          if (clickedPermission.name === per.name) {
+            return { ...per, isGranted: !per.isGranted };
+          } else if (clickedPermission.name === per.parentName && clickedPermission.isGranted) {
             return { ...per, isGranted: false };
+          } else if (clickedPermission.parentName === per.name && !clickedPermission.isGranted) {
+            return { ...per, isGranted: true };
           }
-        return per
-      });
+
+          return per;
+        })
+        .map((per, index, permissions) => {
+          const childrens = permissions.filter(p => p.parentName === per.name);
+          if (childrens.length > 0 && childrens.every(x => !x.isGranted)) {
+            return { ...per, isGranted: false };
+          }
+          return per;
+        });
       this.setTabCheckboxState();
       this.setGrantCheckboxState();
     }, 0);
@@ -231,6 +246,7 @@ export class PermissionManagementComponent
   }
 
   onChangeGroup(group: PermissionGroupDto) {
+    this.setDisabled(group.permissions);
     this.selectedGroup = group;
     this.setTabCheckboxState();
   }
@@ -283,6 +299,7 @@ export class PermissionManagementComponent
   initModal() {
     // TODO: Refactor
     setTimeout(() => {
+      this.setDisabled(this.permissions);
       this.setTabCheckboxState();
       this.setGrantCheckboxState();
     });