From 1c58c35644c5cf9abca8646001b9042a8b5fc00b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20KILI=C3=87?= <fsk202@gmail.com>
Date: Mon, 21 Nov 2022 17:07:07 +0300
Subject: [PATCH 1/5] Edit permission-management.component. Disabled select all
 when permission denied.

---
 .../permission-management.component.html      |  3 +-
 .../permission-management.component.ts        | 38 +++++++++++--------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
index 5a9fa0dd5a..58d95c9a8b 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
+++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
@@ -35,7 +35,7 @@
               >
                 <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 +53,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">{{
diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
index 34c12bc99c..c825245d5f 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
+++ b/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;
@@ -137,8 +139,11 @@ export class PermissionManagementComponent
 
   isGrantedByOtherProviderName(grantedProviders: ProviderInfoDto[]): boolean {
     if (grantedProviders.length) {
+      this.disableSelectAllTab =
+        grantedProviders.findIndex(p => p.providerName !== this.providerName) > -1;
       return grantedProviders.findIndex(p => p.providerName !== this.providerName) > -1;
     }
+    this.disableSelectAllTab = false;
     return false;
   }
 
@@ -150,24 +155,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);

From b157e5a52e579a5162e3b3731d2477a30433e063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20KILI=C3=87?= <fsk202@gmail.com>
Date: Tue, 22 Nov 2022 16:40:51 +0300
Subject: [PATCH 2/5] add method for disable

---
 .../src/lib/components/permission-management.component.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
index c825245d5f..1b8649edd6 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
+++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
@@ -137,13 +137,15 @@ export class PermissionManagementComponent
     return (this.permissions.find(per => per.name === name) || { isGranted: false }).isGranted;
   }
 
+  setDisabled(grantedProviders) {
+    this.disableSelectAllTab = grantedProviders.some(p => p.providerName !== this.providerName);
+  }
+
   isGrantedByOtherProviderName(grantedProviders: ProviderInfoDto[]): boolean {
+    this.setDisabled(grantedProviders);
     if (grantedProviders.length) {
-      this.disableSelectAllTab =
-        grantedProviders.findIndex(p => p.providerName !== this.providerName) > -1;
       return grantedProviders.findIndex(p => p.providerName !== this.providerName) > -1;
     }
-    this.disableSelectAllTab = false;
     return false;
   }
 

From adc26e0b0831f3ab5878a03c25e30669af0dbe98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20KILI=C3=87?= <fsk202@gmail.com>
Date: Wed, 23 Nov 2022 17:09:55 +0300
Subject: [PATCH 3/5] disable when permission granted

---
 .../components/permission-management.component.html |  1 +
 .../components/permission-management.component.ts   | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
index 58d95c9a8b..c76807bd90 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
+++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
@@ -32,6 +32,7 @@
                 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 }}
diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
index 1b8649edd6..5de0311fcb 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
+++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
@@ -138,11 +138,18 @@ export class PermissionManagementComponent
   }
 
   setDisabled(grantedProviders) {
-    this.disableSelectAllTab = grantedProviders.some(p => p.providerName !== this.providerName);
+    if (grantedProviders.length) {
+      grantedProviders.forEach(permission => {
+        this.disableSelectAllTab = permission.grantedProviders?.some(
+          p => p.providerName !== this.providerName,
+        );
+      });
+    } else {
+      this.disableSelectAllTab = false;
+    }
   }
 
   isGrantedByOtherProviderName(grantedProviders: ProviderInfoDto[]): boolean {
-    this.setDisabled(grantedProviders);
     if (grantedProviders.length) {
       return grantedProviders.findIndex(p => p.providerName !== this.providerName) > -1;
     }
@@ -239,6 +246,7 @@ export class PermissionManagementComponent
   }
 
   onChangeGroup(group: PermissionGroupDto) {
+    this.setDisabled(group.permissions);
     this.selectedGroup = group;
     this.setTabCheckboxState();
   }
@@ -291,6 +299,7 @@ export class PermissionManagementComponent
   initModal() {
     // TODO: Refactor
     setTimeout(() => {
+      this.setDisabled(this.data.groups[0]?.permissions);
       this.setTabCheckboxState();
       this.setGrantCheckboxState();
     });

From bc1d4de16ad587042a9f1e7693a0208d9b655e9e Mon Sep 17 00:00:00 2001
From: liangshiwei <shiwei.liang@volosoft.com>
Date: Thu, 24 Nov 2022 19:33:03 +0800
Subject: [PATCH 4/5] Add IMauiBlazorSelectedLanguageProvider

---
 ...lo.Abp.AspNetCore.Components.MauiBlazor.csproj |  1 -
 .../AbpMauiBlazorClientHttpMessageHandler.cs      | 15 +++++++--------
 .../IMauiBlazorSelectedLanguageProvider.cs        |  8 ++++++++
 .../NullMauiBlazorSelectedLanguageProvider.cs     | 12 ++++++++++++
 4 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/IMauiBlazorSelectedLanguageProvider.cs
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/NullMauiBlazorSelectedLanguageProvider.cs

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo.Abp.AspNetCore.Components.MauiBlazor.csproj b/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo.Abp.AspNetCore.Components.MauiBlazor.csproj
index 5340bdfb1c..b1b9dcde81 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo.Abp.AspNetCore.Components.MauiBlazor.csproj
+++ b/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>
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/AbpMauiBlazorClientHttpMessageHandler.cs b/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/AbpMauiBlazorClientHttpMessageHandler.cs
index 5520eed966..90471ba6b4 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/AbpMauiBlazorClientHttpMessageHandler.cs
+++ b/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;
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/IMauiBlazorSelectedLanguageProvider.cs b/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/IMauiBlazorSelectedLanguageProvider.cs
new file mode 100644
index 0000000000..c6b4722f58
--- /dev/null
+++ b/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();
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/NullMauiBlazorSelectedLanguageProvider.cs b/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/NullMauiBlazorSelectedLanguageProvider.cs
new file mode 100644
index 0000000000..b617b96da4
--- /dev/null
+++ b/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);
+    }
+}
\ No newline at end of file

From 98a5ca31eb554cba0f8cd20c9f24e606c33f346d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20KILI=C3=87?= <fsk202@gmail.com>
Date: Thu, 24 Nov 2022 14:42:47 +0300
Subject: [PATCH 5/5] change value in initModal

---
 .../src/lib/components/permission-management.component.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
index 5de0311fcb..e503396540 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
+++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
@@ -299,7 +299,7 @@ export class PermissionManagementComponent
   initModal() {
     // TODO: Refactor
     setTimeout(() => {
-      this.setDisabled(this.data.groups[0]?.permissions);
+      this.setDisabled(this.permissions);
       this.setTabCheckboxState();
       this.setGrantCheckboxState();
     });