From a62fb7be317213ce8d62686bdf12ea48ce8695e0 Mon Sep 17 00:00:00 2001
From: Mladen Macanovic <mladen.macanovic@gmail.com>
Date: Tue, 3 Nov 2020 12:21:30 +0100
Subject: [PATCH] Validation for Tenant create and edit modals

---
 .../TenantCreateOrUpdateDtoBase.cs            |   3 +-
 .../TenantManagement/TenantManagement.razor   | 175 +++++++++++-------
 .../TenantManagement.razor.cs                 |  32 ++--
 3 files changed, 127 insertions(+), 83 deletions(-)

diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateOrUpdateDtoBase.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateOrUpdateDtoBase.cs
index 9f047af2fd..eb5b71ba05 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateOrUpdateDtoBase.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateOrUpdateDtoBase.cs
@@ -8,11 +8,12 @@ namespace Volo.Abp.TenantManagement
     {
         [Required]
         [DynamicStringLength(typeof(TenantConsts), nameof(TenantConsts.MaxNameLength))]
+        [Display(Name = "TenantName")]
         public string Name { get; set; }
 
         public TenantCreateOrUpdateDtoBase() : base(false)
         {
-            
+
         }
     }
 }
\ No newline at end of file
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 81c61ae9fa..1d62dc6be0 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
@@ -1,15 +1,15 @@
 @page "/tenant-management/tenants"
-@attribute [Authorize(TenantManagementPermissions.Tenants.Default)]
+@attribute [Authorize( TenantManagementPermissions.Tenants.Default )]
 @using Microsoft.AspNetCore.Authorization
 @using Volo.Abp.FeatureManagement.Blazor.Components
 @using Microsoft.AspNetCore.Components.Forms
-
+@using Volo.Abp.TenantManagement.Localization
+@inject AbpBlazorMessageLocalizerHelper<AbpTenantManagementResource> LH
 @inherits AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
-
 @* ************************* PAGE HEADER ************************* *@
 <Row>
     <Column ColumnSize="ColumnSize.Is6">
-        <h1>@L["Tenants"]</h1>
+        <Heading Size="HeadingSize.Is1">@L["Tenants"]</Heading>
     </Column>
     <Column ColumnSize="ColumnSize.Is6">
         @if (HasCreatePermission)
@@ -65,31 +65,52 @@
 {
     <Modal @ref="CreateModal">
         <ModalBackdrop />
-        <ModalContent IsCentered="true">
-            <ModalHeader>
-                <ModalTitle>@L["NewTenant"]</ModalTitle>
-                <CloseButton Clicked="CloseCreateModalAsync" />
-            </ModalHeader>
-            <ModalBody>
-                <EditForm id="TenantCreateForm" Model="@NewEntity" OnValidSubmit="CreateEntityAsync">
-                    <Field>
-                        <FieldLabel>@L["TenantName"]</FieldLabel>
-                        <TextEdit @bind-text="@NewEntity.Name" />
-                    </Field>
-                    <Field>
-                        <FieldLabel>@L["DisplayName:AdminEmailAddress"]</FieldLabel>
-                        <TextEdit Role="@TextRole.Email" @bind-text="@NewEntity.AdminEmailAddress" />
-                    </Field>
-                    <Field>
-                        <FieldLabel>@L["DisplayName:AdminPassword"]</FieldLabel>
-                        <TextEdit Role="@TextRole.Password" @bind-text="@NewEntity.AdminPassword" />
-                    </Field>
-                </EditForm>
-            </ModalBody>
-            <ModalFooter>
-                <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                <Button form="TenantCreateForm" Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
-            </ModalFooter>
+        <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>
+                                <FieldLabel>@L["TenantName"]</FieldLabel>
+                                <TextEdit @bind-Text="@NewEntity.Name">
+                                    <Feedback>
+                                        <ValidationError />
+                                    </Feedback>
+                                </TextEdit>
+                            </Field>
+                        </Validation>
+                        <Validation MessageLocalizer="@LH.Localize">
+                            <Field>
+                                <FieldLabel>@L["DisplayName:AdminEmailAddress"]</FieldLabel>
+                                <TextEdit Role="@TextRole.Email" @bind-Text="@NewEntity.AdminEmailAddress">
+                                    <Feedback>
+                                        <ValidationError />
+                                    </Feedback>
+                                </TextEdit>
+                            </Field>
+                        </Validation>
+                        <Validation MessageLocalizer="@LH.Localize">
+                            <Field>
+                                <FieldLabel>@L["DisplayName:AdminPassword"]</FieldLabel>
+                                <TextEdit Role="@TextRole.Password" @bind-Text="@NewEntity.AdminPassword">
+                                    <Feedback>
+                                        <ValidationError />
+                                    </Feedback>
+                                </TextEdit>
+                            </Field>
+                        </Validation>
+                    </Validations>
+                </ModalBody>
+                <ModalFooter>
+                    <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
+                    <Button form="TenantCreateForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
+                </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }
@@ -99,23 +120,31 @@
 {
     <Modal @ref="EditModal">
         <ModalBackdrop />
-        <ModalContent IsCentered="true">
-            <ModalHeader>
-                <ModalTitle>@L["Edit"]</ModalTitle>
-                <CloseButton Clicked="CloseEditModalAsync" />
-            </ModalHeader>
-            <ModalBody>
-                <EditForm id="TenantEditForm" Model="@EditingEntity" OnValidSubmit="UpdateEntityAsync">
-                    <Field>
-                        <FieldLabel>@L["TenantName"]</FieldLabel>
-                        <TextEdit @bind-text="@EditingEntity.Name" />
-                    </Field>
-                </EditForm>
-            </ModalBody>
-            <ModalFooter>
-                <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                <Button form="TenantEditForm" Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
-            </ModalFooter>
+        <ModalContent Centered="true">
+            <Form id="TenantEditForm">
+                <ModalHeader>
+                    <ModalTitle>@L["Edit"]</ModalTitle>
+                    <CloseButton Clicked="CloseEditModalAsync" />
+                </ModalHeader>
+                <ModalBody>
+                    <Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false">
+                        <Validation MessageLocalizer="@LH.Localize">
+                            <Field>
+                                <FieldLabel>@L["TenantName"]</FieldLabel>
+                                <TextEdit @bind-Text="@EditingEntity.Name">
+                                    <Feedback>
+                                        <ValidationError />
+                                    </Feedback>
+                                </TextEdit>
+                            </Field>
+                        </Validation>
+                    </Validations>
+                </ModalBody>
+                <ModalFooter>
+                    <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
+                    <Button form="TenantEditForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
+                </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }
@@ -125,30 +154,36 @@
 {
     <Modal @ref="@ManageConnectionStringModal">
         <ModalBackdrop />
-        <ModalContent IsCentered="true">
-            <ModalHeader>
-                <ModalTitle>@L["ConnectionStrings"]</ModalTitle>
-                <CloseButton Clicked="CloseEditConnectionStringModal" />
-            </ModalHeader>
-            <ModalBody>
-                <EditForm id="ConnectionStringEditForm" Model="@TenantInfo" OnValidSubmit="UpdateConnectionStringAsync">
-                    <Field>
-                        <FieldLabel>@L["DisplayName:DefaultConnectionString"]</FieldLabel>
-                        <Check TValue="bool" @bind-Checked="@TenantInfo.UseSharedDatabase" Cursor="@Cursor.Pointer" />
-                    </Field>
-                    @if (!TenantInfo.UseSharedDatabase)
-                    {
-                        <Field>
-                            <FieldLabel>@L["DisplayName:DefaultConnectionString"]</FieldLabel>
-                            <TextEdit @bind-text="@TenantInfo.DefaultConnectionString" />
-                        </Field>
-                    }
-                </EditForm>
-            </ModalBody>
-            <ModalFooter>
-                <Button Color="Color.Secondary" Clicked="CloseEditConnectionStringModal">@L["Cancel"]</Button>
-                <Button form="ConnectionStringEditForm" Color="Color.Primary" Clicked="UpdateConnectionStringAsync">@L["Save"]</Button>
-            </ModalFooter>
+        <ModalContent Centered="true">
+            <Form id="ConnectionStringEditForm">
+                <ModalHeader>
+                    <ModalTitle>@L["ConnectionStrings"]</ModalTitle>
+                    <CloseButton Clicked="CloseEditConnectionStringModal" />
+                </ModalHeader>
+                <ModalBody>
+                    <Validations @ref="@ManageConnectionStringValidations" Model="@TenantInfo" ValidateOnLoad="false">
+                        <Validation MessageLocalizer="@LH.Localize">
+                            <Field>
+                                <FieldLabel>@L["DisplayName:DefaultConnectionString"]</FieldLabel>
+                                <Check TValue="bool" @bind-Checked="@TenantInfo.UseSharedDatabase" Cursor="@Cursor.Pointer" />
+                            </Field>
+                        </Validation>
+                        @if (!TenantInfo.UseSharedDatabase)
+                        {
+                            <Validation MessageLocalizer="@LH.Localize">
+                                <Field>
+                                    <FieldLabel>@L["DisplayName:DefaultConnectionString"]</FieldLabel>
+                                    <TextEdit @bind-Text="@TenantInfo.DefaultConnectionString" />
+                                </Field>
+                            </Validation>
+                        }
+                    </Validations>
+                </ModalBody>
+                <ModalFooter>
+                    <Button Color="Color.Secondary" Clicked="CloseEditConnectionStringModal">@L["Cancel"]</Button>
+                    <Button form="ConnectionStringEditForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="UpdateConnectionStringAsync">@L["Save"]</Button>
+                </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
index e5fcc9c4a3..ad33b68e5c 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Blazorise;
 using Microsoft.AspNetCore.Authorization;
@@ -20,9 +21,10 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
         protected FeatureManagementModal FeatureManagementModal;
 
         protected Modal ManageConnectionStringModal;
+        protected Validations ManageConnectionStringValidations;
 
         protected TenantInfoModel TenantInfo;
-        
+
         public TenantManagement()
         {
             LocalizationResource = typeof(AbpTenantManagementResource);
@@ -36,7 +38,7 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
 
             TenantInfo = new TenantInfoModel();
         }
-        
+
         protected async override Task SetPermissionsAsync()
         {
             await base.SetPermissionsAsync();
@@ -47,6 +49,8 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
 
         protected virtual async Task OpenEditConnectionStringModalAsync(Guid id)
         {
+            ManageConnectionStringValidations.ClearAll();
+
             var tenantConnectionString = await AppService.GetDefaultConnectionStringAsync(id);
 
             TenantInfo = new TenantInfoModel
@@ -67,18 +71,21 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
 
         protected virtual async Task UpdateConnectionStringAsync()
         {
-            await CheckPolicyAsync(ManageConnectionStringsPolicyName);
-
-            if (TenantInfo.UseSharedDatabase || TenantInfo.DefaultConnectionString.IsNullOrWhiteSpace())
+            if (ManageConnectionStringValidations.ValidateAll())
             {
-                await AppService.DeleteDefaultConnectionStringAsync(TenantInfo.Id);
+                await CheckPolicyAsync(ManageConnectionStringsPolicyName);
+
+                if (TenantInfo.UseSharedDatabase || TenantInfo.DefaultConnectionString.IsNullOrWhiteSpace())
+                {
+                    await AppService.DeleteDefaultConnectionStringAsync(TenantInfo.Id);
+                }
+                else
+                {
+                    await AppService.UpdateDefaultConnectionStringAsync(TenantInfo.Id, TenantInfo.DefaultConnectionString);
+                }
+
+                ManageConnectionStringModal.Hide();
             }
-            else
-            {
-                await AppService.UpdateDefaultConnectionStringAsync(TenantInfo.Id, TenantInfo.DefaultConnectionString);
-            }
-
-            ManageConnectionStringModal.Hide();
         }
 
         protected override string GetDeleteConfirmationMessage(TenantDto entity)
@@ -93,6 +100,7 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
 
         public bool UseSharedDatabase { get; set; }
 
+        [Required]
         public string DefaultConnectionString { get; set; }
     }
 }
\ No newline at end of file