Merge pull request #10262 from abpframework/auto-merge/rel-5-0/577

Merge branch dev with rel-5.0

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json

@@ -71,6 +71,7 @@
     "Volo.Abp.Identity:010007": "You can't change your two factor setting.",
     "Volo.Abp.Identity:010008": "It's not allowed to change two factor setting.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Maximum allowed organization unit membership count for a user",
+    "ThisUserIsNotActiveMessage": "This user is not active.",
     "Permission:IdentityManagement": "Identity management",
     "Permission:RoleManagement": "Role management",
     "Permission:Create": "Create",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json

@@ -69,6 +69,7 @@
     "Volo.Abp.Identity:010003": "Kimliği dışarıdan alınan kullanıcıların şifresi değiştirilemez!",
     "Volo.Abp.Identity:010004": "{0} isminde bir birim zaten var. Aynı seviyede aynı isimli iki birim olamaz.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Bir kullanıcı için izin verilen en fazla organizasyon birimi sayısı",
+    "ThisUserIsNotActiveMessage": "Bu kullanıcı aktif değil.",
     "Permission:IdentityManagement": "Kimlik yönetimi",
     "Permission:RoleManagement": "Rol yönetimi",
     "Permission:Create": "Oluşturma",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json

@@ -71,6 +71,7 @@
     "Volo.Abp.Identity:010007": "你不能修改你的双因素身份验证设置",
     "Volo.Abp.Identity:010008": "不允许修改双因素身份验证设置.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "组织单位最大允许的成员资格计数",
+    "ThisUserIsNotActiveMessage": "该用户不可用.",
     "Permission:IdentityManagement": "身份标识管理",
     "Permission:RoleManagement": "角色管理",
     "Permission:Create": "创建",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json

@@ -71,6 +71,7 @@
     "Volo.Abp.Identity:010007": "你不能修改你的雙因素身份驗證設置",
     "Volo.Abp.Identity:010008": "不允許修改雙因素身份驗證設置.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "允許一個使用者至多可隸屬在幾個組織單位",
+    "ThisUserIsNotActiveMessage": "該用戶不可用.",
     "Permission:IdentityManagement": "身份識別管理",
     "Permission:RoleManagement": "角色管理",
     "Permission:Create": "建立",

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js

@@ -60,7 +60,7 @@
                                     _dataTable.ajax.reload();
                                 });
                         },
-                    } 
+                    }
                 ]
             );
         }
@@ -79,6 +79,17 @@
                     {
                         title: l('UserName'),
                         data: 'userName',
+                        render: function (data, type, row) {
+                            row.userName = $.fn.dataTable.render.text().display(row.userName);
+                            if (!row.isActive) {
+                                return  '<i data-toggle="tooltip" data-placement="top" title="' +
+                                    l('ThisUserIsNotActiveMessage') +
+                                    '" class="fa fa-ban text-danger"></i> ' +
+                                    '<span class="opc-65">' + row.userName + '</span>';
+                            }
+
+                            return row.userName;
+                        }
                     },
                     {
                         title: l('EmailAddress'),
@@ -93,7 +104,7 @@
         },
         0 //adds as the first contributor
     );
-    
+
     $(function () {
         var _$wrapper = $('#IdentityUsersWrapper');
         var _$table = _$wrapper.find('table');

npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-props.ts

@@ -1,5 +1,7 @@
+import { LocalizationService } from '@abp/ng.core';
 import { IdentityUserDto } from '@abp/ng.identity/proxy';
 import { EntityProp, ePropType } from '@abp/ng.theme.shared/extensions';
+import { of } from 'rxjs';
 
 export const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany<IdentityUserDto>([
   {
@@ -8,6 +10,20 @@ export const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany<IdentityUserDto>
     displayName: 'AbpIdentity::UserName',
     sortable: true,
     columnWidth: 250,
+    valueResolver: data => {
+      const l10n = data.getInjected(LocalizationService);
+      const t = l10n.instant.bind(l10n);
+
+      const inactiveIcon = `<i title="${t(
+        'AbpIdentity::ThisUserIsNotActiveMessage',
+      )}" class="fas fa-ban text-danger mr-1"></i>`;
+
+      return of(
+        `
+        ${!data.record.isActive ? inactiveIcon : ''}
+        <span class="${!data.record.isActive ? 'text-muted' : ''}">${data.record.userName}</span>`,
+      );
+    },
   },
   {
     type: ePropType.String,