From 491cbd423206030b1bd352af3ea94586b0b1fbd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 9 Sep 2020 08:36:59 +0300
Subject: [PATCH] Complete the initial permission management dialog.

---
 .../PermissionManagementModal.razor           | 32 +++++++------------
 .../PermissionManagementModal.razor.cs        | 15 +++++++--
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
index bbe76dd058..7693325dea 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
@@ -8,28 +8,20 @@
             <ModalTitle>Edit role</ModalTitle>
             <CloseButton Clicked="CloseModal" />
         </ModalHeader>
-        <ModalBody>
+        <ModalBody MaxHeight="50">
             @if (_groups != null)
             {
-                <Tabs Pills="true">
-                    <Items>
-                        @foreach (var group in _groups)
-                        {
-                            <Tab Name="@GetNormalizedGroupName(group.Name)">@group.DisplayName</Tab>
-                        }
-                    </Items>
-                    <Content>
-                        @foreach (var group in _groups)
-                        {
-                            <TabPanel Name="@GetNormalizedGroupName(group.Name)">
-                                @foreach (var permission in group.Permissions)
-                                {
-                                    <Check @bind-checked="@permission.IsGranted" TValue="bool">@permission.DisplayName (@permission.IsGranted.ToString())</Check>
-                                }
-                            </TabPanel>
-                        }
-                    </Content>
-                </Tabs>
+                @foreach (var group in _groups)
+                {
+                    <h3>@group.DisplayName</h3>
+
+                    @foreach (var permission in group.Permissions)
+                    {
+                        <Field>
+                            <Check @bind-checked="@permission.IsGranted" TValue="bool">@permission.DisplayName</Check>
+                        </Field>
+                    }
+                }
             }
         </ModalBody>
         <ModalFooter>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
index e64cacf447..7250c177d7 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
 using Microsoft.AspNetCore.Components;
@@ -16,7 +17,7 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
 
         private string _entityDisplayName;
         private List<PermissionGroupDto> _groups;
-        
+
         public async Task OpenAsync(string providerName, string providerKey)
         {
             _providerName = providerName;
@@ -37,7 +38,17 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
 
         private async Task SaveAsync()
         {
-            
+            var updateDto = new UpdatePermissionsDto
+            {
+                Permissions = _groups
+                    .SelectMany(g => g.Permissions)
+                    .Select(p => new UpdatePermissionDto {IsGranted = p.IsGranted, Name = p.Name})
+                    .ToArray()
+            };
+
+            await PermissionAppService.UpdateAsync(_providerName, _providerKey, updateDto);
+
+            _modal.Hide();
         }
 
         public string GetNormalizedGroupName(string name)