From 6d219062bfa54a7f9ce9c614835f19cc51198a54 Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Fri, 18 Dec 2020 14:56:00 +0300
Subject: [PATCH 1/4] Identity module blazor forms removed

---
 .../Pages/Identity/RoleManagement.razor                   | 8 ++------
 .../Pages/Identity/UserManagement.razor                   | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
index 4a8eba02ca..4bd27cd340 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
@@ -79,7 +79,6 @@
     <Modal @ref="CreateModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
-            <Form id="RoleCreateForm">
                 <ModalHeader>
                     <ModalTitle>@L["NewRole"]</ModalTitle>
                     <CloseButton Clicked="CloseCreateModalAsync" />
@@ -104,9 +103,8 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="RoleCreateForm" Clicked="@CreateEntityAsync" />
+                    <SubmitButton Clicked="@CreateEntityAsync" />
                 </ModalFooter>
-            </Form>
         </ModalContent>
     </Modal>
 }
@@ -116,7 +114,6 @@
     <Modal @ref="EditModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
-            <Form id="RoleEditForm">
                 <ModalHeader>
                     <ModalTitle>@L["Edit"]</ModalTitle>
                     <CloseButton Clicked="CloseEditModalAsync" />
@@ -142,9 +139,8 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="RoleEditForm" Clicked="@UpdateEntityAsync" />
+                    <SubmitButton Clicked="@UpdateEntityAsync" />
                 </ModalFooter>
-            </Form>
         </ModalContent>
     </Modal>
 }
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 676f05c147..30e7d5e63a 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
@@ -80,7 +80,6 @@
     <Modal @ref="CreateModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
-            <Form id="UserCreateForm">
                 <ModalHeader>
                     <ModalTitle>@L["NewUser"]</ModalTitle>
                     <CloseButton Clicked="CloseCreateModalAsync" />
@@ -176,9 +175,8 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="UserCreateForm" Clicked="@CreateEntityAsync" />
+                    <SubmitButton Clicked="@CreateEntityAsync" />
                 </ModalFooter>
-            </Form>
         </ModalContent>
     </Modal>
 }
@@ -189,7 +187,6 @@
     <Modal @ref="EditModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
-            <Form id="UserEditForm">
                 <ModalHeader>
                     <ModalTitle>@L["Edit"]</ModalTitle>
                     <CloseButton Clicked="CloseEditModalAsync" />
@@ -287,9 +284,8 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="UserEditForm" Clicked="@UpdateEntityAsync" />
+                    <SubmitButton Clicked="@UpdateEntityAsync" />
                 </ModalFooter>
-            </Form>
         </ModalContent>
     </Modal>
 }

From 8c5956b08a5fb1dc68034f630afc8f499bcf8843 Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Fri, 18 Dec 2020 14:59:00 +0300
Subject: [PATCH 2/4] Tenant Management module blazor forms removed

---
 .../Pages/TenantManagement/TenantManagement.razor   | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
index f1ced268ca..57d528dd69 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
@@ -72,13 +72,11 @@
     <Modal @ref="CreateModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
-            <Form id="TenantCreateForm">
                 <ModalHeader>
                     <ModalTitle>@L["NewTenant"]</ModalTitle>
                     <CloseButton Clicked="CloseCreateModalAsync" />
                 </ModalHeader>
                 <ModalBody>
-
                     <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
                         <Validation MessageLocalizer="@LH.Localize">
                             <Field>
@@ -114,9 +112,8 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="TenantCreateForm" Clicked="@CreateEntityAsync" />
+                    <SubmitButton Clicked="@CreateEntityAsync" />
                 </ModalFooter>
-            </Form>
         </ModalContent>
     </Modal>
 }
@@ -127,7 +124,6 @@
     <Modal @ref="EditModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
-            <Form id="TenantEditForm">
                 <ModalHeader>
                     <ModalTitle>@L["Edit"]</ModalTitle>
                     <CloseButton Clicked="CloseEditModalAsync" />
@@ -148,9 +144,8 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="TenantEditForm" Clicked="@UpdateEntityAsync" />
+                    <SubmitButton Clicked="@UpdateEntityAsync" />
                 </ModalFooter>
-            </Form>
         </ModalContent>
     </Modal>
 }
@@ -161,7 +156,6 @@
     <Modal @ref="@ManageConnectionStringModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
-            <Form id="ConnectionStringEditForm">
                 <ModalHeader>
                     <ModalTitle>@L["ConnectionStrings"]</ModalTitle>
                     <CloseButton Clicked="CloseEditConnectionStringModal" />
@@ -187,9 +181,8 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditConnectionStringModal">@L["Cancel"]</Button>
-                    <SubmitButton Form="ConnectionStringEditForm" Clicked="@UpdateConnectionStringAsync" />
+                    <SubmitButton Clicked="@UpdateConnectionStringAsync" />
                 </ModalFooter>
-            </Form>
         </ModalContent>
     </Modal>
 }

From 43c054055c2c297ab2c942e6e770b6d8f51c7de5 Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Fri, 18 Dec 2020 15:45:12 +0300
Subject: [PATCH 3/4] fix form

---
 .../Pages/Identity/RoleManagement.razor                       | 4 ++++
 .../Pages/Identity/UserManagement.razor                       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
index 4bd27cd340..2465940abd 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
@@ -79,6 +79,7 @@
     <Modal @ref="CreateModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
+            <Form>
                 <ModalHeader>
                     <ModalTitle>@L["NewRole"]</ModalTitle>
                     <CloseButton Clicked="CloseCreateModalAsync" />
@@ -105,6 +106,7 @@
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
                     <SubmitButton Clicked="@CreateEntityAsync" />
                 </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }
@@ -114,6 +116,7 @@
     <Modal @ref="EditModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
+            <Form>
                 <ModalHeader>
                     <ModalTitle>@L["Edit"]</ModalTitle>
                     <CloseButton Clicked="CloseEditModalAsync" />
@@ -141,6 +144,7 @@
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
                     <SubmitButton Clicked="@UpdateEntityAsync" />
                 </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }
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 30e7d5e63a..f4b7e411d9 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
@@ -80,6 +80,7 @@
     <Modal @ref="CreateModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
+            <Form>
                 <ModalHeader>
                     <ModalTitle>@L["NewUser"]</ModalTitle>
                     <CloseButton Clicked="CloseCreateModalAsync" />
@@ -177,6 +178,7 @@
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
                     <SubmitButton Clicked="@CreateEntityAsync" />
                 </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }
@@ -187,6 +189,7 @@
     <Modal @ref="EditModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
+            <Form>
                 <ModalHeader>
                     <ModalTitle>@L["Edit"]</ModalTitle>
                     <CloseButton Clicked="CloseEditModalAsync" />
@@ -286,6 +289,7 @@
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
                     <SubmitButton Clicked="@UpdateEntityAsync" />
                 </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }

From bb21767674db23584da157678696e511e3e2eaf7 Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Fri, 18 Dec 2020 15:47:45 +0300
Subject: [PATCH 4/4] fix form usages of tenantmanagemen.razor

---
 .../Pages/TenantManagement/TenantManagement.razor           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
index 57d528dd69..2a5aabfe8d 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
@@ -72,6 +72,7 @@
     <Modal @ref="CreateModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
+            <Form>
                 <ModalHeader>
                     <ModalTitle>@L["NewTenant"]</ModalTitle>
                     <CloseButton Clicked="CloseCreateModalAsync" />
@@ -114,6 +115,7 @@
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
                     <SubmitButton Clicked="@CreateEntityAsync" />
                 </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }
@@ -124,6 +126,7 @@
     <Modal @ref="EditModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
+            <Form>
                 <ModalHeader>
                     <ModalTitle>@L["Edit"]</ModalTitle>
                     <CloseButton Clicked="CloseEditModalAsync" />
@@ -146,6 +149,7 @@
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
                     <SubmitButton Clicked="@UpdateEntityAsync" />
                 </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }
@@ -156,6 +160,7 @@
     <Modal @ref="@ManageConnectionStringModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
+            <Form>
                 <ModalHeader>
                     <ModalTitle>@L["ConnectionStrings"]</ModalTitle>
                     <CloseButton Clicked="CloseEditConnectionStringModal" />
@@ -183,6 +188,7 @@
                     <Button Color="Color.Secondary" Clicked="CloseEditConnectionStringModal">@L["Cancel"]</Button>
                     <SubmitButton Clicked="@UpdateConnectionStringAsync" />
                 </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }