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

Refactor FeaturManagemet Blazor Modal

pull/5614/head
Ahmet 6 years ago
parent
a3d92aed41
commit
826bf4a8f8
2 changed files with 80 additions and 39 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. 26
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
  2. 93
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs

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

@ -1,9 +1,7 @@
@using Microsoft.Extensions.Localization
@using Volo.Abp.FeatureManagement.Localization
@using Volo.Abp.Validation.StringValues
@inject IStringLocalizer<AbpFeatureManagementResource> L
@using Volo.Abp.Validation.StringValues
@using Microsoft.Extensions.Localization
<Modal @ref="_modal">
<Modal @ref="Modal">
<ModalBackdrop />
<ModalContent Size="ModalSize.Large" IsCentered="true">
<ModalHeader>
@ -12,15 +10,15 @@
</ModalHeader>
<ModalBody MaxHeight="50">
<EditForm id="UpdateFeaturesForm" OnValidSubmit="SaveAsync">
@if (_groups == null)
@if (Groups == null)
{
<span>@L["NoFeatureFoundMessage"]</span>
}
else
{
<Tabs TabPosition="TabPosition.Left" Pills="true" SelectedTab="@GetNormalizedGroupName(_groups.First().Name)">
<Tabs TabPosition="TabPosition.Left" Pills="true" SelectedTab="@GetNormalizedGroupName(Groups.First().Name)">
<Items>
@foreach (var group in _groups)
@foreach (var group in Groups)
{
<Tab Name="@GetNormalizedGroupName(group.Name)">
<span>@group.DisplayName</span>
@ -28,7 +26,7 @@
}
</Items>
<Content>
@foreach (var group in _groups)
@foreach (var group in Groups)
{
<TabPanel Name="@GetNormalizedGroupName(group.Name)">
<h4>@group.DisplayName</h4>
@ -58,10 +56,14 @@
<Field>
<FieldLabel>@feature.DisplayName</FieldLabel>
<Select TValue="string" SelectedValue="feature.Value">
<Select
TValue="string"
@bind-SelectedValue="@SelectionStringValues[feature.Name]">
@foreach (var item in items)
{
<SelectItem Value="@item.Value">@item.DisplayText</SelectItem>
<SelectItem Value="@item.Value">
@CreateStringLocalizer(item.DisplayText.ResourceName).GetString(item.DisplayText.Name)
</SelectItem>
}
</Select>
</Field>
@ -70,7 +72,7 @@
if (feature.ValueType is ToggleStringValueType)
{
<Field>
<Check TValue="bool" @bind-checked="@_toggleValues[feature.Name]">@feature.DisplayName</Check>
<Check TValue="bool" @bind-checked="@ToggleValues[feature.Name]">@feature.DisplayName</Check>
</Field>
}
}

93
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
View File

@ -3,74 +3,102 @@ using System.Linq;
using System.Threading.Tasks;
using Blazorise;
using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Options;
using Volo.Abp.AspNetCore.Components.WebAssembly;
using Volo.Abp.FeatureManagement.Localization;
using Volo.Abp.Features;
using Volo.Abp.Localization;
using Volo.Abp.Validation.StringValues;
namespace Volo.Abp.FeatureManagement.Blazor.Components
{
public partial class FeatureManagementModal
{
[Inject] private IFeatureAppService FeatureAppService { get; set; }
[Inject] protected IFeatureAppService FeatureAppService { get; set; }
[Inject] protected IUiMessageService UiMessageService { get; set; }
[Inject] protected IStringLocalizer<AbpFeatureManagementResource> L { get; set; }
[Inject] protected IStringLocalizerFactory HtmlLocalizerFactory { get; set; }
[Inject] protected IOptions<AbpLocalizationOptions> LocalizationOptions { get; set; }
private Modal _modal;
protected Modal Modal;
private string _providerName;
private string _providerKey;
protected string ProviderName;
protected string ProviderKey;
private List<FeatureGroupDto> _groups { get; set; }
protected List<FeatureGroupDto> Groups { get; set; }
private Dictionary<string, bool> _toggleValues;
protected Dictionary<string, bool> ToggleValues;
protected Dictionary<string, string> SelectionStringValues;
public async Task OpenAsync(string providerName, string providerKey)
public virtual async Task OpenAsync(string providerName, string providerKey)
{
_providerName = providerName;
_providerKey = providerKey;
_groups = (await FeatureAppService.GetAsync(_providerName, _providerKey)).Groups;
ProviderName = providerName;
ProviderKey = providerKey;
_toggleValues = _groups
.SelectMany(x => x.Features)
.Where(x => x.ValueType is ToggleStringValueType)
.ToDictionary(x => x.Name, x => bool.Parse(x.Value));
ToggleValues = new Dictionary<string, bool>();
SelectionStringValues = new Dictionary<string, string>();
_modal.Show();
Groups = (await FeatureAppService.GetAsync(ProviderName, ProviderKey)).Groups;
foreach (var featureGroupDto in Groups)
{
foreach (var featureDto in featureGroupDto.Features)
{
if (featureDto.ValueType is ToggleStringValueType)
{
ToggleValues.Add(featureDto.Name, bool.Parse(featureDto.Value));
}
if (featureDto.ValueType is SelectionStringValueType)
{
SelectionStringValues.Add(featureDto.Name, featureDto.Value);
}
}
}
Modal.Show();
}
private void CloseModal()
public virtual Task CloseModal()
{
_modal.Hide();
Modal.Hide();
return Task.CompletedTask;
}
private async Task SaveAsync()
protected virtual async Task SaveAsync()
{
var features = new UpdateFeaturesDto
{
Features = _groups.SelectMany(g => g.Features).Select(f => new UpdateFeatureDto
Features = Groups.SelectMany(g => g.Features).Select(f => new UpdateFeatureDto
{
Name = f.Name,
Value = f.ValueType is ToggleStringValueType ? _toggleValues[f.Name].ToString() : f.Value
Value = f.ValueType is ToggleStringValueType ? ToggleValues[f.Name].ToString() :
f.ValueType is SelectionStringValueType ? SelectionStringValues[f.Name] : f.Value
}).ToList()
};
await FeatureAppService.UpdateAsync(_providerName, _providerKey, features);
await FeatureAppService.UpdateAsync(ProviderName, ProviderKey, features);
_modal.Hide();
Modal.Hide();
}
public string GetNormalizedGroupName(string name)
protected virtual string GetNormalizedGroupName(string name)
{
return "FeatureGroup_" + name.Replace(".", "_");
}
public virtual bool IsDisabled(string providerName)
protected virtual bool IsDisabled(string providerName)
{
return providerName != _providerName && providerName != DefaultValueFeatureValueProvider.ProviderName;
return providerName != ProviderName && providerName != DefaultValueFeatureValueProvider.ProviderName;
}
private async Task OnFeatureValueChangedAsync(string value, FeatureDto feature)
protected virtual async Task OnFeatureValueChangedAsync(string value, FeatureDto feature)
{
if (feature.ValueType.Validator.IsValid(value))
{
@ -81,5 +109,16 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
await UiMessageService.WarnAsync(L["Volo.Abp.FeatureManagement:InvalidFeatureValue", feature.DisplayName]);
}
}
protected virtual void SelectedValueChanged(string featureName, string value)
{
SelectionStringValues[featureName] = value;
}
protected virtual IStringLocalizer CreateStringLocalizer(string resourceName)
{
var resource = LocalizationOptions.Value.Resources.Values.FirstOrDefault(x => x.ResourceName == resourceName);
return HtmlLocalizerFactory.Create(resource != null ? resource.ResourceType : LocalizationOptions.Value.DefaultResourceType);
}
}
}
Write Preview
Loading…
Cancel
Save