tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #25692 from abpframework/maliming/fix-mudblazor-resource-permission-modal 

Fix MudBlazor resource permission management modal
pull/25696/head
Yağmur Çelik 3 months ago
committed by GitHub
parent
202fdc1893 09cdbd4f6c
commit
122f692ce8
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 65 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 136
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor
  2. 8
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs

136
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor
View File

@ -1,7 +1,7 @@
@using global::MudBlazor
@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
<MudDialog DefaultFocus="DefaultFocus.FirstChild" @bind-Visible="@_isVisible" Options="@(new DialogOptions { MaxWidth = MaxWidth.ExtraLarge, FullWidth = true, CloseOnEscapeKey = true, BackdropClick = false })">
<MudDialog DefaultFocus="DefaultFocus.FirstChild" @bind-Visible="@_isVisible" Options="@(new DialogOptions { MaxWidth = MaxWidth.Large, FullWidth = true, CloseOnEscapeKey = true, BackdropClick = false })">
<TitleContent>
<MudText Typo="Typo.h6">@L["ResourcePermissions"] - @ResourceDisplayName</MudText>
</TitleContent>
@ -80,75 +80,69 @@
</MudDialog>
@* Create Resource Permission Dialog *@
@if (_createDialogVisible)
{
<MudDialog DefaultFocus="DefaultFocus.FirstChild" @bind-Visible="@_createDialogVisible" Options="@(new DialogOptions { MaxWidth = MaxWidth.Medium, FullWidth = true, CloseOnEscapeKey = true, BackdropClick = false })">
<TitleContent>
<MudText Typo="Typo.h6">@L["AddResourcePermission"]</MudText>
</TitleContent>
<DialogContent>
<MudForm @ref="@_createFormRef" Model="@CreateEntity">
<MudText Typo="Typo.subtitle1" Class="mb-2">@L["ResourcePermissionTarget"]</MudText>
<MudRadioGroup T="string" SelectedOption="@CurrentLookupService" SelectedOptionChanged="@OnLookupServiceCheckedValueChanged">
@foreach (var keyLookupService in ResourceProviderKeyLookupServices)
{
<MudRadio Color="Color.Primary" T="string" Option="@keyLookupService.Name">@keyLookupService.DisplayName</MudRadio>
}
</MudRadioGroup>
<MudAutocomplete Margin="Margin.Dense" T="SearchProviderKeyInfo"
Value="@_selectedProviderKey"
ValueChanged="@SelectedProviderKeyChanged"
SearchFunc="@SearchProviderKeyAsync"
ToStringFunc="@(item => item?.ProviderDisplayName ?? string.Empty)"
Label="@L["ProviderKey"]"
Required="true"
RequiredError="@L["ThisFieldIsRequired."]"
Class="mt-2" />
<MudText Typo="Typo.subtitle1" Class="mb-2 mt-4">@L["ResourcePermissionPermissions"]</MudText>
<MudSwitch Color="Color.Primary" T="bool" Value="@_grantAllCreate"
ValueChanged="@(async (bool b) => await GrantAllCreateAsync(b))"
Label="@L["GrantAllResourcePermissions"]" />
<div class="mt-2">
@foreach (var permission in CreateEntity.Permissions)
{
<MudCheckBox Color="Color.Primary" UncheckedColor="Color.Default" T="bool" @bind-Value="@permission.IsGranted"
Label="@permission.DisplayName" />
}
</div>
</MudForm>
</DialogContent>
<DialogActions>
<MudButton OnClick="@CloseCreateDialogAsync">@L["Cancel"]</MudButton>
<MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="@CreateResourcePermissionAsync">@L["Save"]</MudButton>
</DialogActions>
</MudDialog>
}
<MudDialog DefaultFocus="DefaultFocus.FirstChild" @bind-Visible="@_createDialogVisible" Options="@(new DialogOptions { MaxWidth = MaxWidth.Medium, FullWidth = true, CloseOnEscapeKey = true, BackdropClick = false })">
<TitleContent>
<MudText Typo="Typo.h6">@L["AddResourcePermission"]</MudText>
</TitleContent>
<DialogContent>
<MudForm @ref="@_createFormRef" Model="@CreateEntity">
<MudText Typo="Typo.subtitle1" Class="mb-2">@L["ResourcePermissionTarget"]</MudText>
<MudRadioGroup T="string" Value="@CurrentLookupService" ValueChanged="@OnLookupServiceCheckedValueChanged">
@foreach (var keyLookupService in ResourceProviderKeyLookupServices)
{
<MudRadio Color="Color.Primary" T="string" Value="@keyLookupService.Name">@keyLookupService.DisplayName</MudRadio>
}
</MudRadioGroup>
<MudAutocomplete Margin="Margin.Dense" T="SearchProviderKeyInfo"
Value="@_selectedProviderKey"
ValueChanged="@SelectedProviderKeyChanged"
SearchFunc="@SearchProviderKeyAsync"
ToStringFunc="@(item => item?.ProviderDisplayName ?? string.Empty)"
Label="@L["SearchProviderKey"]"
Required="true"
RequiredError="@L["ThisFieldIsRequired."]"
Class="mt-2" />
<MudText Typo="Typo.subtitle1" Class="mb-2 mt-4">@L["ResourcePermissionPermissions"]</MudText>
<MudSwitch Color="Color.Primary" T="bool" Value="@CreateEntity.Permissions.All(x => x.IsGranted)"
ValueChanged="@(async (bool b) => await GrantAllCreateAsync(b))"
Label="@L["GrantAllResourcePermissions"]" />
<div class="mt-2">
@foreach (var permission in CreateEntity.Permissions)
{
<MudCheckBox Color="Color.Primary" UncheckedColor="Color.Default" T="bool" @bind-Value="@permission.IsGranted"
Label="@permission.DisplayName" />
}
</div>
</MudForm>
</DialogContent>
<DialogActions>
<MudButton OnClick="@CloseCreateDialogAsync">@L["Cancel"]</MudButton>
<MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="@CreateResourcePermissionAsync">@L["Save"]</MudButton>
</DialogActions>
</MudDialog>
@* Edit Resource Permission Dialog *@
@if (_editDialogVisible)
{
<MudDialog DefaultFocus="DefaultFocus.FirstChild" @bind-Visible="@_editDialogVisible" Options="@(new DialogOptions { MaxWidth = MaxWidth.Medium, FullWidth = true, CloseOnEscapeKey = true, BackdropClick = false })">
<TitleContent>
<MudText Typo="Typo.h6">@L["UpdateResourcePermission"]</MudText>
</TitleContent>
<DialogContent>
<MudForm @ref="@_editFormRef" Model="@EditEntity">
<MudText Typo="Typo.subtitle1" Class="mb-2">@L["ResourcePermissionPermissions"]</MudText>
<MudSwitch Color="Color.Primary" T="bool" Value="@_grantAllEdit"
ValueChanged="@(async (bool b) => await GrantAllEditAsync(b))"
Label="@L["GrantAllResourcePermissions"]" />
<div class="mt-2">
@foreach (var permission in EditEntity.Permissions)
{
<MudCheckBox Color="Color.Primary" UncheckedColor="Color.Default" T="bool" @bind-Value="@permission.IsGranted"
Label="@permission.DisplayName" />
}
</div>
</MudForm>
</DialogContent>
<DialogActions>
<MudButton OnClick="@CloseEditDialogAsync">@L["Cancel"]</MudButton>
<MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="@UpdateResourcePermissionAsync">@L["Save"]</MudButton>
</DialogActions>
</MudDialog>
}
<MudDialog DefaultFocus="DefaultFocus.FirstChild" @bind-Visible="@_editDialogVisible" Options="@(new DialogOptions { MaxWidth = MaxWidth.Medium, FullWidth = true, CloseOnEscapeKey = true, BackdropClick = false })">
<TitleContent>
<MudText Typo="Typo.h6">@L["UpdateResourcePermission"]</MudText>
</TitleContent>
<DialogContent>
<MudForm @ref="@_editFormRef" Model="@EditEntity">
<MudText Typo="Typo.subtitle1" Class="mb-2">@L["ResourcePermissionPermissions"]</MudText>
<MudSwitch Color="Color.Primary" T="bool" Value="@EditEntity.Permissions.All(x => x.IsGranted)"
ValueChanged="@(async (bool b) => await GrantAllEditAsync(b))"
Label="@L["GrantAllResourcePermissions"]" />
<div class="mt-2">
@foreach (var permission in EditEntity.Permissions)
{
<MudCheckBox Color="Color.Primary" UncheckedColor="Color.Default" T="bool" @bind-Value="@permission.IsGranted"
Label="@permission.DisplayName" />
}
</div>
</MudForm>
</DialogContent>
<DialogActions>
<MudButton OnClick="@CloseEditDialogAsync">@L["Cancel"]</MudButton>
<MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="@UpdateResourcePermissionAsync">@L["Save"]</MudButton>
</DialogActions>
</MudDialog>

8
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs
View File

@ -59,8 +59,6 @@ public partial class ResourcePermissionManagementModal
Permissions = new List<ResourcePermissionModel>()
};
protected bool _grantAllCreate;
protected bool _grantAllEdit;
public ResourcePermissionManagementModal()
{
@ -124,7 +122,6 @@ public partial class ResourcePermissionManagementModal
}).ToList()
};
_grantAllCreate = false;
_createDialogVisible = true;
await InvokeAsync(StateHasChanged);
}
@ -140,8 +137,6 @@ public partial class ResourcePermissionManagementModal
{
permission.IsGranted = permissionGrants.Permissions.Any(p => p.Name == permission.Name && p.Providers.Contains(CurrentLookupService) && p.IsGranted);
}
_grantAllCreate = CreateEntity.Permissions.All(x => x.IsGranted);
}
await InvokeAsync(StateHasChanged);
@ -162,7 +157,6 @@ public partial class ResourcePermissionManagementModal
protected virtual async Task GrantAllCreateAsync(bool value)
{
_grantAllCreate = value;
foreach (var permission in CreateEntity.Permissions)
{
permission.IsGranted = value;
@ -172,7 +166,6 @@ public partial class ResourcePermissionManagementModal
protected virtual async Task GrantAllEditAsync(bool value)
{
_grantAllEdit = value;
foreach (var permission in EditEntity.Permissions)
{
permission.IsGranted = value;
@ -195,7 +188,6 @@ public partial class ResourcePermissionManagementModal
}).ToList()
};
_grantAllEdit = EditEntity.Permissions.All(x => x.IsGranted);
_editDialogVisible = true;
await InvokeAsync(StateHasChanged);
}

Write Preview
Loading…
Cancel
Save