Merge pull request #6976 from abpframework/auto-merge/rel-4-1/31

Merge branch dev with rel-4.1

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js

@@ -96,7 +96,7 @@
             get: _get
         };
     })();
-    
+
     function initializeObjectExtensions() {
 
         var getShortEnumTypeName = function (enumType) {
@@ -149,7 +149,7 @@
 
             return defaultValue;
         }
-        
+
         function localizeEnumMember(property, enumMemberValue) {
             var enumType = property.config.type;
             var enumInfo = abp.objectExtensions.enums[enumType];
@@ -188,10 +188,28 @@
                 var propertyName = propertyNames[i];
                 var propertyConfig = objectConfig.properties[propertyName];
                 if (propertyConfig.ui.onTable.isVisible) {
-                    tableProperties.push({
-                        name: propertyName,
-                        config: propertyConfig
-                    });
+                    if (propertyName.endsWith("_Text")) {
+                        var lookupPropertyName = propertyName.replace("_Text", "");
+                        var lookupProperty = objectConfig.properties[lookupPropertyName];
+                        if (lookupProperty) {
+                            tableProperties.push({
+                                name: propertyName,
+                                config: propertyConfig,
+                                lookupPropertyName: lookupPropertyName,
+                                lookupPropertyDisplayName: lookupProperty.displayName
+                            });
+                        } else {
+                            tableProperties.push({
+                                name: propertyName,
+                                config: propertyConfig,
+                            });
+                        }
+                    } else {
+                        tableProperties.push({
+                            name: propertyName,
+                            config: propertyConfig,
+                        });
+                    }
                 }
             }
 
@@ -199,19 +217,23 @@
         }
 
         function getValueFromRow(property, row) {
-            return row.extraProperties[property.name];;
+            return row.extraProperties[property.name];
         }
 
         function convertPropertyToColumnConfig(property) {
             var columnConfig = {
-                title: localizeDisplayName(property.name, property.config.displayName),
                 data: "extraProperties." + property.name,
                 orderable: false
             };
 
+            if (property.lookupPropertyName) {
+                columnConfig.title = localizeDisplayName(property.lookupPropertyName, property.lookupPropertyDisplayName);
+            } else {
+                columnConfig.title = localizeDisplayName(property.name, property.config.displayName);
+            }
 
             if (property.config.typeSimple === 'enum') {
-                columnConfig.render = function(data, type, row) {
+                columnConfig.render = function (data, type, row) {
                     var value = getValueFromRow(property, row);
                     return localizeEnumMember(property, value);
                 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@@ -206,6 +206,12 @@ namespace Volo.Abp.Cli.ProjectModification
         {
             var srcPath = Path.Combine(Path.GetDirectoryName(moduleSolutionFile), targetFolder);
             var projectFolderPath = Directory.GetDirectories(srcPath).FirstOrDefault(d=> d.EndsWith(postFix));
+
+            if(projectFolderPath == null)
+            {
+                return;
+            }
+
             await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile, new DirectoryInfo(projectFolderPath).Name);
 
             if (Directory.Exists(projectFolderPath))

framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs

@@ -67,7 +67,8 @@ namespace Volo.Abp.ObjectExtending.Modularity
                lookupTextPropertyName,
                () => new ExtensionPropertyConfiguration(this, typeof(string), lookupTextPropertyName)
            );
-            lookupTextPropertyInfo.DisplayName = propertyInfo.DisplayName ?? new FixedLocalizableString(propertyInfo.Name);
+            
+            lookupTextPropertyInfo.DisplayName = propertyInfo.DisplayName;
         }
 
         [NotNull]

modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RoleDeletedEventHandler.cs

@@ -0,0 +1,26 @@
+using System.Threading.Tasks;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities.Events;
+using Volo.Abp.EventBus;
+using Volo.Abp.Identity;
+
+namespace Volo.Abp.PermissionManagement.Identity
+{
+    public class RoleDeletedEventHandler :
+        ILocalEventHandler<EntityDeletedEventData<IdentityRole>>,
+        ITransientDependency
+    {
+        protected IPermissionManager PermissionManager { get; }
+
+        public RoleDeletedEventHandler(IPermissionManager permissionManager)
+        {
+            PermissionManager = permissionManager;
+        }
+
+        public virtual async Task HandleEventAsync(EntityDeletedEventData<IdentityRole> eventData)
+        {
+            await PermissionManager.DeleteAsync(RolePermissionValueProvider.ProviderName, eventData.Entity.Name);
+        }
+    }
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionManager.cs

@@ -15,5 +15,7 @@ namespace Volo.Abp.PermissionManagement
         Task SetAsync(string permissionName, string providerName, string providerKey, bool isGranted);
 
         Task<PermissionGrant> UpdateProviderKeyAsync(PermissionGrant permissionGrant, string providerKey);
+
+        Task DeleteAsync(string providerName, string providerKey);
     }
-}
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManager.cs

@@ -111,6 +111,16 @@ namespace Volo.Abp.PermissionManagement
             return await PermissionGrantRepository.UpdateAsync(permissionGrant);
         }
 
+        public virtual async Task DeleteAsync(string providerName, string providerKey)
+        {
+            var permissionGrants = await PermissionGrantRepository.GetListAsync(providerName, providerKey);
+            //TODO: Use DeleteManyAsync method
+            foreach (var permissionGrant in permissionGrants)
+            {
+                await PermissionGrantRepository.DeleteAsync(permissionGrant);
+            }
+        }
+
         protected virtual async Task<PermissionWithGrantedProviders> GetInternalAsync(PermissionDefinition permission, string providerName, string providerKey)
         {
             var result = new PermissionWithGrantedProviders(permission.Name, false);
@@ -143,4 +153,4 @@ namespace Volo.Abp.PermissionManagement
             return result;
         }
     }
-}
+}