Merge branch 'dev-client-validation' into dev-ui-notification

framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs

@@ -294,8 +294,6 @@ namespace Volo.Abp.BlazoriseUI
             await InvokeAsync(() => StateHasChanged());
 
             CreateModal.Show();
-
-            await OnOpeningCreateModalAsync();
         }
 
         protected virtual Task OnOpeningCreateModalAsync()
@@ -303,11 +301,6 @@ namespace Volo.Abp.BlazoriseUI
             return Task.CompletedTask;
         }
 
-        protected virtual Task OnOpenedCreateModalAsync()
-        {
-            return Task.CompletedTask;
-        }
-
         protected virtual Task CloseCreateModalAsync()
         {
             CreateModal.Hide();
@@ -330,8 +323,6 @@ namespace Volo.Abp.BlazoriseUI
             await InvokeAsync(() => StateHasChanged());
 
             EditModal.Show();
-
-            await OnOpenedEditModalAsync(id);
         }
 
         protected virtual Task OnOpeningEditModalAsync(TKey id)
@@ -339,11 +330,6 @@ namespace Volo.Abp.BlazoriseUI
             return Task.CompletedTask;
         }
 
-        protected virtual Task OnOpenedEditModalAsync(TKey id)
-        {
-            return Task.CompletedTask;
-        }
-
         protected virtual TUpdateViewModel MapToEditingEntity(TGetOutputDto entityDto)
         {
             return ObjectMapper.Map<TGetOutputDto, TUpdateViewModel>(entityDto);

framework/src/Volo.Abp.Core/System/AbpObjectExtensions.cs

@@ -106,62 +106,5 @@ namespace System
 
             return obj;
         }
-
-        /// <summary>
-        /// Resets all fields of a given object to their default values.
-        /// </summary>
-        /// <typeparam name="T">Type of the object.</typeparam>
-        /// <param name="obj">An object</param>
-        /// <param name="customReset">Alternative custom method to reset the values.</param>
-        /// <returns>Returns the original object.</returns>
-        public static T ResetState<T>(this T obj, Action<T> customReset = null)
-        {
-            if (customReset != null)
-            {
-                customReset(obj);
-            }
-            else
-            {
-                var properties = typeof(T).GetProperties();
-
-                foreach (var property in properties)
-                {
-                    if (!property.CanWrite)
-                    {
-                        continue;
-                    }
-
-                    property.SetValue(obj, null);
-                }
-            }
-
-            return obj;
-        }
-
-        /// <summary>
-        /// Applies all fields of a given object from it's counterpart.
-        /// </summary>
-        /// <typeparam name="T">Type of the object.</typeparam>
-        /// <param name="obj">An object.</param>
-        /// <param name="other">An object from which we copy the values.</param>
-        /// <returns>Returns the original object.</returns>
-        public static T ApplyState<T>(this T obj, T other)
-        {
-            // This code is not production ready and it should be removed once
-            // the proper validation in Blazorise is done!
-            var properties = typeof(T).GetProperties();
-
-            foreach (var property in properties)
-            {
-                if (!property.CanWrite)
-                {
-                    continue;
-                }
-
-                property.SetValue(obj, typeof(T).GetProperty(property.Name).GetValue(other));
-            }
-
-            return obj;
-        }
     }
 }

modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorMessageLocalizerExtensions.cs

@@ -7,17 +7,17 @@ namespace Volo.Abp.Identity.Blazor
 {
     public static class AbpIdentityBlazorMessageLocalizerExtensions
     {
-        public static string Localize<T>(this IStringLocalizer<T> stringLocalizer, string format, IEnumerable<string> arguments)
+        public static string Localize<T>(this IStringLocalizer<T> stringLocalizer, string message, IEnumerable<string> arguments)
         {
             try
             {
                 return arguments?.Count() > 0
-                    ? string.Format(stringLocalizer[format], LocalizeMessageArguments(stringLocalizer, arguments)?.ToArray())
-                    : stringLocalizer[format];
+                    ? stringLocalizer[message, LocalizeMessageArguments(stringLocalizer, arguments)?.ToArray()]
+                    : stringLocalizer[message];
             }
             catch
             {
-                return stringLocalizer[format];
+                return stringLocalizer[message];
             }
         }
 

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor

@@ -1,5 +1,5 @@
 @page "/identity/roles"
-@attribute [Authorize( IdentityPermissions.Roles.Default )]
+@attribute [Authorize(IdentityPermissions.Roles.Default)]
 @using Volo.Abp.Identity
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.Extensions.Localization

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

@@ -1,5 +1,5 @@
 @page "/identity/users"
-@attribute [Authorize( IdentityPermissions.Users.Default )]
+@attribute [Authorize(IdentityPermissions.Users.Default)]
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.Extensions.Localization
 @using Volo.Abp.Identity.Localization