From 09900423f8754aa79f546ba90e4a8b7df7f8ad9f Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Wed, 23 Sep 2020 10:28:01 +0300
Subject: [PATCH] Added Create&Edit Forms to Identity.Users

---
 .../Pages/Identity/UserManagement.razor       | 174 +++++++++---------
 1 file changed, 89 insertions(+), 85 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
index 016b4e1403..77d424a7ab 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
@@ -92,50 +92,52 @@
                         <Tab Name="Roles">@L["Roles"]</Tab>
                     </Items>
                     <Content>
-                        <TabPanel Name="UserInformations">
-                            <Field>
-                                <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
-                                <TextEdit @bind-text="NewEntity.UserName"/>
-                            </Field>
-                            <Field>
-                                <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
-                                <TextEdit @bind-text="NewEntity.Name"/>
-                            </Field>
-                            <Field>
-                                <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
-                                <TextEdit @bind-text="NewEntity.Surname"/>
-                            </Field>
-                            <Field>
-                                <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
-                                <TextEdit Role="TextRole.Password" @bind-text="NewEntity.Password"/>
-                            </Field>
-                            <Field>
-                                <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
-                                <TextEdit @bind-text="NewEntity.Email"/>
-                            </Field>
-                            <Field>
-                                <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
-                                <TextEdit @bind-text="NewEntity.PhoneNumber"/>
-                            </Field>
-                            <Field>
-                                <Check TValue="bool" @bind-checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
-                            </Field>
-                            <Field>
-                                <Check TValue="bool" @bind-checked="@NewEntity.TwoFactorEnabled">@L["DisplayName:TwoFactorEnabled"]</Check>
-                            </Field>
-                        </TabPanel>
-                        <TabPanel Name="Roles">
-                            @if (NewUserRoles != null)
-                            {
-                                @foreach (var role in NewUserRoles)
+                        <EditForm id="IdentityUserCreateForm" Model="@NewEntity" OnValidSubmit="CreateEntityAsync">
+                            <TabPanel Name="UserInformations">
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
+                                    <TextEdit @bind-text="NewEntity.UserName"/>
+                                </Field>
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
+                                    <TextEdit @bind-text="NewEntity.Name"/>
+                                </Field>
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
+                                    <TextEdit @bind-text="NewEntity.Surname"/>
+                                </Field>
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
+                                    <TextEdit Role="TextRole.Password" @bind-text="NewEntity.Password"/>
+                                </Field>
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
+                                    <TextEdit @bind-text="NewEntity.Email"/>
+                                </Field>
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
+                                    <TextEdit @bind-text="NewEntity.PhoneNumber"/>
+                                </Field>
+                                <Field>
+                                    <Check TValue="bool" @bind-checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
+                                </Field>
+                                <Field>
+                                    <Check TValue="bool" @bind-checked="@NewEntity.TwoFactorEnabled">@L["DisplayName:TwoFactorEnabled"]</Check>
+                                </Field>
+                            </TabPanel>
+                            <TabPanel Name="Roles">
+                                @if (NewUserRoles != null)
                                 {
-                                    <Field>
-                                        <input type="hidden" @bind-value="@role.Name"/>
-                                        <Check TValue="bool" @bind-checked="@role.IsAssigned">@role.Name</Check>
-                                    </Field>
+                                    @foreach (var role in NewUserRoles)
+                                    {
+                                        <Field>
+                                            <input type="hidden" @bind-value="@role.Name"/>
+                                            <Check TValue="bool" @bind-checked="@role.IsAssigned">@role.Name</Check>
+                                        </Field>
+                                    }
                                 }
-                            }
-                        </TabPanel>
+                            </TabPanel>
+                        </EditForm>
                     </Content>
                 </Tabs>
             </ModalBody>
@@ -166,50 +168,52 @@
                         <Tab Name="Roles">@L["Roles"]</Tab>
                     </Items>
                     <Content>
-                        <TabPanel Name="UserInformations">
-                            <Field>
-                                <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
-                                <TextEdit @bind-text="EditingEntity.UserName"/>
-                            </Field>
-                            <Field>
-                                <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
-                                <TextEdit @bind-text="EditingEntity.Name"/>
-                            </Field>
-                            <Field>
-                                <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
-                                <TextEdit @bind-text="EditingEntity.Surname"/>
-                            </Field>
-                            <Field>
-                                <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
-                                <TextEdit Role="TextRole.Password" @bind-text="EditingEntity.Password"/>
-                            </Field>
-                            <Field>
-                                <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
-                                <TextEdit @bind-text="EditingEntity.Email"/>
-                            </Field>
-                            <Field>
-                                <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
-                                <TextEdit @bind-text="EditingEntity.PhoneNumber"/>
-                            </Field>
-                            <Field>
-                                <Check TValue="bool" @bind-checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
-                            </Field>
-                            <Field>
-                                <Check TValue="bool" @bind-checked="EditingEntity.TwoFactorEnabled">@L["DisplayName:TwoFactorEnabled"]</Check>
-                            </Field>
-                        </TabPanel>
-                        <TabPanel Name="Roles">
-                            @if (EditUserRoles != null)
-                            {
-                                @foreach (var role in EditUserRoles)
+                        <EditForm id="IdentityUserEditForm" Model="@EditingEntity" OnValidSubmit="UpdateEntityAsync">
+                            <TabPanel Name="UserInformations">
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
+                                    <TextEdit @bind-text="EditingEntity.UserName"/>
+                                </Field>
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
+                                    <TextEdit @bind-text="EditingEntity.Name"/>
+                                </Field>
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
+                                    <TextEdit @bind-text="EditingEntity.Surname"/>
+                                </Field>
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
+                                    <TextEdit Role="TextRole.Password" @bind-text="EditingEntity.Password"/>
+                                </Field>
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
+                                    <TextEdit @bind-text="EditingEntity.Email"/>
+                                </Field>
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
+                                    <TextEdit @bind-text="EditingEntity.PhoneNumber"/>
+                                </Field>
+                                <Field>
+                                    <Check TValue="bool" @bind-checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
+                                </Field>
+                                <Field>
+                                    <Check TValue="bool" @bind-checked="EditingEntity.TwoFactorEnabled">@L["DisplayName:TwoFactorEnabled"]</Check>
+                                </Field>
+                            </TabPanel>
+                            <TabPanel Name="Roles">
+                                @if (EditUserRoles != null)
                                 {
-                                    <Field>
-                                        <input type="hidden" @bind-value="@role.Name"/>
-                                        <Check TValue="bool" @bind-checked="@role.IsAssigned">@role.Name</Check>
-                                    </Field>
+                                    @foreach (var role in EditUserRoles)
+                                    {
+                                        <Field>
+                                            <input type="hidden" @bind-value="@role.Name"/>
+                                            <Check TValue="bool" @bind-checked="@role.IsAssigned">@role.Name</Check>
+                                        </Field>
+                                    }
                                 }
-                            }
-                        </TabPanel>
+                            </TabPanel>
+                        </EditForm>
                     </Content>
                 </Tabs>
             </ModalBody>
@@ -221,4 +225,4 @@
     </Modal>
 }
 
-<PermissionManagementModal @ref="PermissionManagementModal"/>
+<PermissionManagementModal @ref="PermissionManagementModal"/>
\ No newline at end of file