Revert "Merge branch 'dev' into active-ui"

This reverts commit 6ffec95, reversing changes made to 915f0cc.
abpframework · Oct 7, 2021 · 9bc4500 · 9bc4500
1 parent ae58e39
commit 9bc4500
Show file tree

Hide file tree

Showing 13 changed files with 957 additions and 1,257 deletions.
diff --git a/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/POST.md b/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/POST.md
diff --git a/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/abp-book-cover.png b/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/abp-book-cover.png
diff --git a/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/csharp-proxies.png b/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/csharp-proxies.png
diff --git a/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/email-settings.png b/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/email-settings.png
diff --git a/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/enable-email-tenant.png b/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/enable-email-tenant.png
diff --git a/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/hangfire-dashboard.png b/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/hangfire-dashboard.png
diff --git a/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/js-proxies.png b/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/js-proxies.png
diff --git a/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/tenant-features.png b/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/tenant-features.png
diff --git a/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/user-active.png b/docs/en/Blog-Posts/2021-10-05 v5_0_Beta1/user-active.png
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ToolbarButton.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ToolbarButton.razor
@@ -1,7 +1,7 @@
 <Button Color="@Color" Clicked="@Clicked" Disabled="@Disabled">
     @if (Icon != null)
     {
-        <Icon Name="Icon" Class="mr-1"></Icon>
+        <Icon Name="IconName.Add" Class="mr-1"></Icon>
     }
     @Text
 </Button>
diff --git a/npm/ng-packs/packages/identity/proxy/src/lib/proxy/generate-proxy.json b/npm/ng-packs/packages/identity/proxy/src/lib/proxy/generate-proxy.json
diff --git a/npm/ng-packs/packages/identity/proxy/src/lib/proxy/identity/models.ts b/npm/ng-packs/packages/identity/proxy/src/lib/proxy/identity/models.ts
@@ -44,7 +44,6 @@ export interface IdentityUserCreateOrUpdateDtoBase extends ExtensibleObject {
   surname?: string;
   email: string;
   phoneNumber?: string;
-  isActive: boolean;
   lockoutEnabled: boolean;
   roleNames: string[];
 }
@@ -58,7 +57,6 @@ export interface IdentityUserDto extends ExtensibleFullAuditedEntityDto<string>
   emailConfirmed: boolean;
   phoneNumber?: string;
   phoneNumberConfirmed: boolean;
-  isActive: boolean;
   lockoutEnabled: boolean;
   lockoutEnd?: string;
   concurrencyStamp?: string;

diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts
@@ -47,13 +47,6 @@ export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany<IdentityUserD
     id: 'phone-number',
     validators: () => [Validators.maxLength(16)],
   },
-  {
-    type: ePropType.Boolean,
-    name: 'isActive',
-    displayName: 'AbpIdentity::DisplayName:IsActive',
-    id: 'active-checkbox',
-    defaultValue: true,
-  },
   {
     type: ePropType.Boolean,
     name: 'lockoutEnabled',