feat: select resource from system

Aguafrommars · Jun 4, 2020 · 5cac5ff · 5cac5ff
1 parent c98eb07
commit 5cac5ff
Show file tree

Hide file tree

Showing 16 changed files with 147 additions and 51 deletions.
diff --git a/src/Aguacongas.TheIdServer/Startup.cs b/src/Aguacongas.TheIdServer/Startup.cs
@@ -192,6 +192,7 @@ public void Configure(IApplicationBuilder app)
                     options.DefaultRequestCulture = new RequestCulture("en-US");
                     options.SupportedCultures = supportedCulture.Select(c => new CultureInfo(c)).ToList();
                     options.SupportedUICultures = options.SupportedCultures;
+                    options.FallBackToParentCultures = true;
                 })
                 .UseSerilogRequestLogging();
 

diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/AutoCompleteModel.cs b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/AutoCompleteModel.cs
@@ -5,13 +5,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace Aguacongas.TheIdServer.BlazorApp.Components
 {
     public abstract class AutoCompleteModel<T> : ComponentBase, IDisposable
     {
+        private Expression<Func<object>> _fieldExpression;
         private FieldIdentifier _fieldIdentifier;
 
         [Inject]
@@ -29,6 +31,17 @@ public abstract class AutoCompleteModel<T> : ComponentBase, IDisposable
         [Parameter]
         public EventCallback<T> ValueChanged { get; set; }
 
+        [Parameter]
+        public Expression<Func<object>> FieldExpression 
+        {
+            get => _fieldExpression;
+            set
+            {
+                _fieldExpression = value;
+                _fieldIdentifier = FieldIdentifier.Create(value);
+            }
+        }
+
         [CascadingParameter]
         EditContext EditContext { get; set; }
 
@@ -52,18 +65,21 @@ protected string FieldClass
             => EditContext.FieldCssClass(_fieldIdentifier);
 
 
-        protected Task SetSelectedValue(string value)
+        protected async Task SetSelectedValue(string value)
         {
             SetValue(value);
-            EditContext.NotifyFieldChanged(_fieldIdentifier);
             FilteredValues = null;
-            return ValueChanged.InvokeAsync(Entity);
+            await ValueChanged.InvokeAsync(Entity).ConfigureAwait(false);
+            EditContext.NotifyFieldChanged(_fieldIdentifier);
         }
 
         protected override void OnParametersSet()
         {
             base.OnParametersSet();
-            _fieldIdentifier = new FieldIdentifier(Entity, PropertyName);
+            if (_fieldExpression == null)
+            {
+                _fieldIdentifier = new FieldIdentifier(Entity, PropertyName);
+            }
         }
 
         protected override void OnInitialized()
@@ -89,7 +105,7 @@ protected Task Filter()
             _cancellationTokenSource = new CancellationTokenSource();
             var token = _cancellationTokenSource.Token;
 
-            return Task.Delay(250, token)
+            return Task.Delay(200, token)
                     .ContinueWith(async task =>
                     {
                         if (task.IsCanceled)
@@ -106,7 +122,7 @@ protected Task Filter()
                     }, TaskScheduler.Default);
         }
 
-        protected Task OnInputChanged(ChangeEventArgs e)
+        protected virtual Task OnInputChanged(ChangeEventArgs e)
         {
             SelectedValue = e.Value as string;
             SetValue(SelectedValue);

diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/ClaimType.razor b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/ClaimType.razor
@@ -13,7 +13,7 @@
 else
 {
     <div id="@Id" class="input-group input-group-sm mb-3" data-toggle="dropdown">
-        <input type="text" class="form-control new-claim" placeholder="@Localizer["claim type"]"
+        <input type="text" class="form-control new-claim @FieldClass" placeholder="@Localizer["claim type"]"
                @oninput="OnInputChanged" />
         <div class="input-group-append" @onclick="() => SetSelectedValue(SelectedValue)">
             <span class="input-group-text oi oi-plus" />

diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/ClientComponents/GrantType.razor b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/ClientComponents/GrantType.razor
@@ -13,7 +13,7 @@ else
 {
     <div id="@Id" class="input-group input-group-sm mb-3" data-toggle="dropdown">
         <input type="text" class="form-control new-claim @FieldClass" placeholder="@Localizer["grant type"]" value="@SelectedValue"
-               @oninput="OnInputChanged" @onfocus='() => OnInputChanged(new ChangeEventArgs { Value = "" })' />
+               @oninput="OnInputChanged" @onfocus="() => OnInputChanged(new ChangeEventArgs { Value = string.Empty })" />
         <div class="input-group-append">
             <span class="input-group-text oi oi-plus" />
         </div>

diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/CultureInfos.razor b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/CultureInfos.razor
@@ -0,0 +1,21 @@
+@using System.Globalization
+@inherits AutoCompleteModel<CultureInfo>
+
+    <div class="input-group" data-toggle="dropdown">
+        <input id="@Id" type="text" class="form-control @FieldClass" placeholder="@Localizer["culture"]" value="@Entity.Name"
+               @oninput="OnInputChanged" @onfocus="() => OnInputChanged(new ChangeEventArgs { Value = Entity.Name })" />
+    </div>
+<div class="dropdown-menu m-0">
+    @if (_filterValues != null)
+    {
+        foreach (var value in _filterValues)
+        {
+            <button class="dropdown-item m-0 p-0 pl-1 pr-1" type="button" @onclick="() => SetSelectedValue(value.Name)">
+                @value.Name
+                <div>
+                    <em><small>@value.DisplayName</small></em>
+                </div>
+            </button>
+        }
+    }
+</div>
diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/CultureInfos.razor.cs b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/CultureInfos.razor.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Aguacongas.TheIdServer.BlazorApp.Components
+{
+    public partial class CultureInfos
+    {
+        private IEnumerable<CultureInfo> _filterValues;
+        protected override bool IsReadOnly => false;
+
+        protected override string PropertyName => "Name";
+
+        protected override Task<IEnumerable<string>> GetFilteredValues(string term)
+        {
+            term = term ?? string.Empty;
+            _filterValues = CultureInfo.GetCultures(CultureTypes.AllCultures)
+                .Where(c => c.Name.Contains(term, StringComparison.OrdinalIgnoreCase) || c.DisplayName.Contains(term, StringComparison.OrdinalIgnoreCase))
+                .Take(5);
+
+            return Task.FromResult(_filterValues.Select(c => c.Name));
+        }
+
+        protected override void SetValue(string inputValue)
+        {
+            var cultureInfo = CultureInfo.GetCultures(CultureTypes.AllCultures)
+                .FirstOrDefault(c => c.Name == inputValue);
+            if (cultureInfo != null)
+            {
+                Entity = cultureInfo;
+            }
+        }
+    }
+}
diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/EntityResourceTranslatation.razor b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/EntityResourceTranslatation.razor
@@ -1,8 +1,17 @@
 @inject IStringLocalizerAsync<EntityResourceTranslatation> Localizer
 
-<div class="col" for="culture">
-    <AuthorizeText Id="@($"culture{Resource.CultureId}")" Placeholder="@Localizer["culture"]" @bind-Value="@Resource.CultureId" />
-</div>
+    <div class="col" for="culture">
+        @if (Resource.Id == null)
+        {
+            <CultureInfos Entity="@_cultureInfo" ValueChanged="CultureSelected" FieldExpression="FieldExpression" />
+        }
+        else
+        {
+            <div class="col-form-label">
+                @Resource.CultureId <em><small>@Localizer[_cultureInfo?.DisplayName ?? string.Empty]</small></em>
+            </div>
+        }        
+    </div>
 <div class="col-lg-9 col-sm-12">
     @if (Resource.ResourceKind == Entity.EntityResourceKind.DisplayName)
     {

diff --git a/...lazorApp/Aguacongas.TheIdServer.BlazorApp.Components/EntityResourceTranslatation.razor.cs b/...lazorApp/Aguacongas.TheIdServer.BlazorApp.Components/EntityResourceTranslatation.razor.cs
@@ -2,27 +2,44 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 using System;
+using System.Globalization;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 
 namespace Aguacongas.TheIdServer.BlazorApp.Components
 {
     public partial class EntityResourceTranslatation
     {
+        private CultureInfo _cultureInfo = CultureInfo.InvariantCulture;
+
         [Parameter]
         public IEntityResource Resource { get; set; }
 
         [Parameter]
         public EventCallback<IEntityResource> DeleteResource { get; set; }
+
+        [Parameter]
+        public Expression<Func<object>> FieldExpression { get; set; }
+
         protected override void OnInitialized()
         {
-            Console.WriteLine($"Resource = {Resource}");
             Localizer.OnResourceReady = () => InvokeAsync(StateHasChanged);
+            if (Resource.CultureId != null)
+            {
+                _cultureInfo = CultureInfo.GetCultureInfo(Resource.CultureId);
+            }
             base.OnInitialized();
         }
 
         private Task OnDeleteClick(MouseEventArgs args)
         {
             return DeleteResource.InvokeAsync(Resource);
         }
+
+        private void CultureSelected(CultureInfo cultureInfo)
+        {
+            _cultureInfo = cultureInfo;
+            Resource.CultureId = cultureInfo.Name;
+        }
     }
 }
diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/EntityResources.razor b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/EntityResources.razor
@@ -4,6 +4,6 @@
 @foreach (var resource in Collection.Where(r => r.ResourceKind == ResourceKind))
 {
     <div @key="@resource" class="form-group row">
-        <EntityResourceTranslatation Resource="resource" DeleteResource="OnDeleteResource" />
+        <EntityResourceTranslatation Resource="resource" DeleteResource="OnDeleteResource" FieldExpression="() => resource.CultureId" />
     </div>
 }
diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/EntityResourcesComponentBase.cs b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/EntityResourcesComponentBase.cs
@@ -20,7 +20,7 @@ public abstract class EntityResourcesComponentBase<T> : ComponentBase where T:IE
         protected Task OnDeleteResource(IEntityResource resource)
         {
             Collection.Remove((T)resource);
-            HandleModificationState.EntityDeleted(resource);
+            HandleModificationState.EntityDeleted((T)resource);
             return Task.CompletedTask;
         }
     }

diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Culture.razor b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Culture.razor
@@ -15,11 +15,15 @@ else
                 <div class="col">
                     @if (IsNew)
                     {
-                        <AuthorizeText Id="id" Placeholder="@Localizer["culture name"]" @bind-Value="@Model.Id" />
+                        <AuthorizeView>
+                            <Authorized Context="culture">
+                                <CultureInfos Entity="_culture" ValueChanged="CultureSelected" FieldExpression="() => Model.Id" />
+                            </Authorized>
+                        </AuthorizeView>                        
                     }
                     else
                     {
-                        <h3>@Model.Id</h3>
+                        <h3>@Model.Id <small><em>@Info.DisplayName</em></small></h3>
                     }
                 </div>
                 <div>

diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Culture.razor.cs b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Culture.razor.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.JSInterop;
 using System;
+using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -13,6 +14,7 @@ namespace Aguacongas.TheIdServer.BlazorApp.Pages
     public partial class Culture
     {
         private readonly GridState _gridState = new GridState();
+        private CultureInfo _culture = CultureInfo.InvariantCulture;
         private bool _hasMore;
         private CancellationTokenSource _cancellationTokenSource;
         private PageRequest _pageRequest;
@@ -23,6 +25,7 @@ public Task ScrollBottomReach()
             return LoadMoreAsync();
         }
 
+        private CultureInfo Info => CultureInfo.GetCultureInfo(Id);
         protected override string Expand => null;
 
         protected override bool NonEditable => false;
@@ -184,5 +187,12 @@ private async Task LoadMoreAsync()
             _hasMore = resourceList.Count < page.Count;
             StateHasChanged();
         }
+
+        private void CultureSelected(CultureInfo culture)
+        {
+            Console.WriteLine($"culture {culture}");
+            _culture = culture;
+            Model.Id = culture.Name;
+        }
     }
 }
diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Cultures.razor b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Cultures.razor
@@ -1,4 +1,5 @@
-@using Microsoft.AspNetCore.Identity
+@using System.Globalization
+
 @page "/cultures"
 @inherits EntitiesModel<Entity.Culture>
 
@@ -29,7 +30,12 @@ else
         <EntitiesGrid Items="EntityList" TableClass="table table-hover"
                       RowClicked="(Entity.Culture item) => OnRowClicked(item)">
             <RowTemplate>
-                <td>@context.Id</td>
+                <td>
+                    @context.Id
+                    <div>
+                        <em>@CultureInfo.GetCultureInfo(context.Id).DisplayName</em>
+                    </div>
+                </td>
             </RowTemplate>
         </EntitiesGrid>
     </div>

diff --git a/src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/ConfigurationDbContext.cs b/src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/ConfigurationDbContext.cs
@@ -103,30 +103,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<ExternalClaimTransformation>()
                 .HasIndex(e => new { e.Scheme, e.FromClaimType })
                 .IsUnique(true);
-            modelBuilder.Entity<ApiLocalizedResource>()
-                .HasOne(e => e.Api)
-                .WithMany(a => a.Resources)
-                .HasForeignKey(e => e.ApiId)
-                .IsRequired(true)
-                .OnDelete(DeleteBehavior.Cascade);
-            modelBuilder.Entity<ApiScopeLocalizedResource>()
-                .HasOne(e => e.ApiScope)
-                .WithMany(a => a.Resources)
-                .HasForeignKey(e => e.ApiScopeId)
-                .IsRequired(true)
-                .OnDelete(DeleteBehavior.Cascade);
-            modelBuilder.Entity<ClientLocalizedResource>()
-                .HasOne(e => e.Client)
-                .WithMany(a => a.Resources)
-                .HasForeignKey(e => e.ClientId)
-                .IsRequired(true)
-                .OnDelete(DeleteBehavior.Cascade);
-            modelBuilder.Entity<IdentityLocalizedResource>()
-                .HasOne(e => e.Identity)
-                .WithMany(a => a.Resources)
-                .HasForeignKey(e => e.IdentityId)
-                .IsRequired(true)
-                .OnDelete(DeleteBehavior.Cascade);
 
             modelBuilder.Entity<SchemeDefinition>(b =>
             {

diff --git a/src/IdentityServer/Aguacongas.IdentityServer.Store/Entity/LocalizedResource.cs b/src/IdentityServer/Aguacongas.IdentityServer.Store/Entity/LocalizedResource.cs
@@ -34,6 +34,14 @@ public class LocalizedResource : LocalizedResourceBase, IAuditable
         /// </value>
         public string Location { get; set; }
 
+        /// <summary>
+        /// Gets or sets the culture.
+        /// </summary>
+        /// <value>
+        /// The culture.
+        /// </value>
+        public virtual Culture Culture { get; set; }
+
     }
 
     /// <summary>
@@ -67,14 +75,6 @@ public abstract class LocalizedResourceBase : IAuditable
         [Required]
         public string CultureId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the culture.
-        /// </summary>
-        /// <value>
-        /// The culture.
-        /// </value>
-        public virtual Culture Culture { get; set; }
-
         /// <summary>
         /// Gets or sets the created at.
         /// </summary>

diff --git a/test/Microsoft.AspNetCore.Components.Testing/TestHost.cs b/test/Microsoft.AspNetCore.Components.Testing/TestHost.cs
@@ -65,7 +65,7 @@ public void WaitForNextRender(Action trigger = null)
         public void WaitForNoRender()
         {
             var task = Renderer.NextRender;
-            while(task.Wait(200))
+            while(task.Wait(500))
             {
                 task = Renderer.NextRender;
             }