@volo/abp.ng.identity 6.0.1 → 6.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -24,7 +24,7 @@ export const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany([
24
24
  name: 'email',
25
25
  displayName: 'AbpIdentity::EmailAddress',
26
26
  sortable: true,
27
- columnWidth: 250,
27
+ columnWidth: 300,
28
28
  valueResolver: data => {
29
29
  const { email, emailConfirmed } = data.record;
30
30
  return of((email || '') + (emailConfirmed ? `<i class="fa fa-check text-success ms-1"></i>` : ''));
@@ -35,7 +35,7 @@ export const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany([
35
35
  name: 'roleNames',
36
36
  displayName: 'AbpIdentity::Roles',
37
37
  columnWidth: 250,
38
- valueResolver: data => of(data.record.roleNames.join(', ')),
38
+ valueResolver: data => of(data.record.roleNames.reduce((acc, curr) => `${acc ? acc + ',' : ''} ${escapeHtmlChars(curr)}`, '')),
39
39
  },
40
40
  {
41
41
  type: "string" /* ePropType.String */,
@@ -113,4 +113,4 @@ export const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany([
113
113
  columnWidth: 200,
114
114
  },
115
115
  ]);
116
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"default-users-entity-props.js","sourceRoot":"","sources":["../../../../../../packages/identity/src/lib/defaults/default-users-entity-props.ts"],"names":[],"mappings":"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","sourcesContent":["import { escapeHtmlChars, LocalizationService } from '@abp/ng.core';\r\nimport { EntityProp, ePropType } from '@abp/ng.theme.shared/extensions';\r\nimport { IdentityUserDto } from '@volo/abp.ng.identity/proxy';\r\nimport { of } from 'rxjs';\r\n\r\nexport const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany<IdentityUserDto>([\r\n  {\r\n    type: ePropType.String,\r\n    name: 'userName',\r\n    displayName: 'AbpIdentity::UserName',\r\n    sortable: true,\r\n    columnWidth: 250,\r\n    valueResolver: data => {\r\n      const l10n = data.getInjected(LocalizationService);\r\n      const t = l10n.instant.bind(l10n);\r\n\r\n      const lockOutIcon = `<i title=\"${t(\r\n        'AbpIdentity::ThisUserIsLockedOutMessage',\r\n      )}\" class=\"fas fa-lock text-danger me-1\"></i>`;\r\n\r\n      const inactiveIcon = `<i title=\"${t(\r\n        'AbpIdentity::ThisUserIsNotActiveMessage',\r\n      )}\" class=\"fas fa-ban text-danger me-1\"></i>`;\r\n\r\n      return of(\r\n        `\r\n        ${data.record.isLockedOut ? lockOutIcon : ''}\r\n        ${!data.record.isActive ? inactiveIcon : ''}\r\n        <span class=\"${\r\n          data.record.isLockedOut || !data.record.isActive ? 'opc-65' : ''\r\n        }\">${escapeHtmlChars(data.record.userName)}</span>`,\r\n      );\r\n    },\r\n  },\r\n  {\r\n    type: ePropType.String,\r\n    name: 'email',\r\n    displayName: 'AbpIdentity::EmailAddress',\r\n    sortable: true,\r\n    columnWidth: 250,\r\n    valueResolver: data => {\r\n      const { email, emailConfirmed } = data.record;\r\n\r\n      return of(\r\n        (email || '') + (emailConfirmed ? `<i class=\"fa fa-check text-success ms-1\"></i>` : ''),\r\n      );\r\n    },\r\n  },\r\n  {\r\n    type: ePropType.String,\r\n    name: 'roleNames',\r\n    displayName: 'AbpIdentity::Roles',\r\n    columnWidth: 250,\r\n    valueResolver: data => of(data.record.roleNames.join(', ')),\r\n  },\r\n  {\r\n    type: ePropType.String,\r\n    name: 'phoneNumber',\r\n    displayName: 'AbpIdentity::PhoneNumber',\r\n    sortable: true,\r\n    columnWidth: 250,\r\n    valueResolver: data => {\r\n      const { phoneNumber, phoneNumberConfirmed } = data.record;\r\n\r\n      return of(\r\n        (escapeHtmlChars(phoneNumber) || '') +\r\n          (phoneNumberConfirmed ? `<i class=\"fa fa-check text-success ms-1\"></i>` : ''),\r\n      );\r\n    },\r\n  },\r\n  {\r\n    type: ePropType.String,\r\n    name: 'name',\r\n    displayName: 'AbpIdentity::Name',\r\n    sortable: true,\r\n    columnWidth: 250,\r\n  },\r\n  {\r\n    type: ePropType.String,\r\n    name: 'surname',\r\n    displayName: 'AbpIdentity::Surname',\r\n    sortable: true,\r\n    columnWidth: 250,\r\n  },\r\n  {\r\n    type: ePropType.Boolean,\r\n    name: 'isActive',\r\n    displayName: 'AbpIdentity::DisplayName:IsActive',\r\n    sortable: true,\r\n    columnWidth: 100,\r\n  },\r\n  {\r\n    type: ePropType.Boolean,\r\n    name: 'lockoutEnabled',\r\n    displayName: 'AbpIdentity::DisplayName:LockoutEnabled',\r\n    sortable: false,\r\n    columnWidth: 100,\r\n  },\r\n  {\r\n    type: ePropType.Boolean,\r\n    name: 'emailConfirmed',\r\n    displayName: 'AbpIdentity::DisplayName:EmailConfirmed',\r\n    sortable: true,\r\n    columnWidth: 100,\r\n  },\r\n  {\r\n    type: ePropType.Boolean,\r\n    name: 'twoFactorEnabled',\r\n    displayName: 'AbpIdentity::DisplayName:TwoFactorEnabled',\r\n    sortable: true,\r\n    columnWidth: 100,\r\n  },\r\n  {\r\n    type: ePropType.Number,\r\n    name: 'accessFailedCount',\r\n    displayName: 'AbpIdentity::DisplayName:AccessFailedCount',\r\n    sortable: true,\r\n    columnWidth: 100,\r\n  },\r\n  {\r\n    type: ePropType.DateTime,\r\n    name: 'creationTime',\r\n    displayName: 'AbpIdentity::CreationTime',\r\n    sortable: true,\r\n    columnWidth: 200,\r\n  },\r\n  {\r\n    type: ePropType.DateTime,\r\n    name: 'lastModificationTime',\r\n    displayName: 'AbpIdentity::LastModificationTime',\r\n    sortable: true,\r\n    columnWidth: 200,\r\n  },\r\n]);\r\n"]}
116
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"default-users-entity-props.js","sourceRoot":"","sources":["../../../../../../packages/identity/src/lib/defaults/default-users-entity-props.ts"],"names":[],"mappings":"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","sourcesContent":["import { escapeHtmlChars, LocalizationService } from '@abp/ng.core';\r\nimport { EntityProp, ePropType } from '@abp/ng.theme.shared/extensions';\r\nimport { IdentityUserDto } from '@volo/abp.ng.identity/proxy';\r\nimport { of } from 'rxjs';\r\n\r\nexport const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany<IdentityUserDto>([\r\n  {\r\n    type: ePropType.String,\r\n    name: 'userName',\r\n    displayName: 'AbpIdentity::UserName',\r\n    sortable: true,\r\n    columnWidth: 250,\r\n    valueResolver: data => {\r\n      const l10n = data.getInjected(LocalizationService);\r\n      const t = l10n.instant.bind(l10n);\r\n\r\n      const lockOutIcon = `<i title=\"${t(\r\n        'AbpIdentity::ThisUserIsLockedOutMessage',\r\n      )}\" class=\"fas fa-lock text-danger me-1\"></i>`;\r\n\r\n      const inactiveIcon = `<i title=\"${t(\r\n        'AbpIdentity::ThisUserIsNotActiveMessage',\r\n      )}\" class=\"fas fa-ban text-danger me-1\"></i>`;\r\n\r\n      return of(\r\n        `\r\n        ${data.record.isLockedOut ? lockOutIcon : ''}\r\n        ${!data.record.isActive ? inactiveIcon : ''}\r\n        <span class=\"${\r\n          data.record.isLockedOut || !data.record.isActive ? 'opc-65' : ''\r\n        }\">${escapeHtmlChars(data.record.userName)}</span>`,\r\n      );\r\n    },\r\n  },\r\n  {\r\n    type: ePropType.String,\r\n    name: 'email',\r\n    displayName: 'AbpIdentity::EmailAddress',\r\n    sortable: true,\r\n    columnWidth: 300,\r\n    valueResolver: data => {\r\n      const { email, emailConfirmed } = data.record;\r\n\r\n      return of(\r\n        (email || '') + (emailConfirmed ? `<i class=\"fa fa-check text-success ms-1\"></i>` : ''),\r\n      );\r\n    },\r\n  },\r\n  {\r\n    type: ePropType.String,\r\n    name: 'roleNames',\r\n    displayName: 'AbpIdentity::Roles',\r\n    columnWidth: 250,\r\n    valueResolver: data =>\r\n      of(\r\n        data.record.roleNames.reduce(\r\n          (acc, curr) => `${acc ? acc + ',' : ''} ${escapeHtmlChars(curr)}`,\r\n          '',\r\n        ),\r\n      ),\r\n  },\r\n  {\r\n    type: ePropType.String,\r\n    name: 'phoneNumber',\r\n    displayName: 'AbpIdentity::PhoneNumber',\r\n    sortable: true,\r\n    columnWidth: 250,\r\n    valueResolver: data => {\r\n      const { phoneNumber, phoneNumberConfirmed } = data.record;\r\n\r\n      return of(\r\n        (escapeHtmlChars(phoneNumber) || '') +\r\n          (phoneNumberConfirmed ? `<i class=\"fa fa-check text-success ms-1\"></i>` : ''),\r\n      );\r\n    },\r\n  },\r\n  {\r\n    type: ePropType.String,\r\n    name: 'name',\r\n    displayName: 'AbpIdentity::Name',\r\n    sortable: true,\r\n    columnWidth: 250,\r\n  },\r\n  {\r\n    type: ePropType.String,\r\n    name: 'surname',\r\n    displayName: 'AbpIdentity::Surname',\r\n    sortable: true,\r\n    columnWidth: 250,\r\n  },\r\n  {\r\n    type: ePropType.Boolean,\r\n    name: 'isActive',\r\n    displayName: 'AbpIdentity::DisplayName:IsActive',\r\n    sortable: true,\r\n    columnWidth: 100,\r\n  },\r\n  {\r\n    type: ePropType.Boolean,\r\n    name: 'lockoutEnabled',\r\n    displayName: 'AbpIdentity::DisplayName:LockoutEnabled',\r\n    sortable: false,\r\n    columnWidth: 100,\r\n  },\r\n  {\r\n    type: ePropType.Boolean,\r\n    name: 'emailConfirmed',\r\n    displayName: 'AbpIdentity::DisplayName:EmailConfirmed',\r\n    sortable: true,\r\n    columnWidth: 100,\r\n  },\r\n  {\r\n    type: ePropType.Boolean,\r\n    name: 'twoFactorEnabled',\r\n    displayName: 'AbpIdentity::DisplayName:TwoFactorEnabled',\r\n    sortable: true,\r\n    columnWidth: 100,\r\n  },\r\n  {\r\n    type: ePropType.Number,\r\n    name: 'accessFailedCount',\r\n    displayName: 'AbpIdentity::DisplayName:AccessFailedCount',\r\n    sortable: true,\r\n    columnWidth: 100,\r\n  },\r\n  {\r\n    type: ePropType.DateTime,\r\n    name: 'creationTime',\r\n    displayName: 'AbpIdentity::CreationTime',\r\n    sortable: true,\r\n    columnWidth: 200,\r\n  },\r\n  {\r\n    type: ePropType.DateTime,\r\n    name: 'lastModificationTime',\r\n    displayName: 'AbpIdentity::LastModificationTime',\r\n    sortable: true,\r\n    columnWidth: 200,\r\n  },\r\n]);\r\n"]}