fluentcms#2210 Add validation for content type field settings (fluent…

…cms#2211)
pournasserian · Oct 30, 2024 · f107802 · f107802
1 parent 9005840
commit f107802
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 20 deletions.
diff --git a/...CMS.Web.Plugins.Admin/ContentTypeManagement/Components/Boolean/BooleanFieldSettings.razor b/...CMS.Web.Plugins.Admin/ContentTypeManagement/Components/Boolean/BooleanFieldSettings.razor
@@ -21,7 +21,7 @@
                     <FormHiddenInput @bind-Value="Model.Type" />
                     <FormInput @bind-Value="Model.Name" Cols="6" Label="Name" Placeholder="Enter Field Name" Required Disabled="@(CurrentState != FieldManagementState.Create)" />
                     <FormInput @bind-Value="Model.Label" Cols="6" Label="Label" Placeholder="Enter Field Label" Required />
-                    <FormTextarea @bind-Value="Model.Description" Label="Description" Placeholder="Enter Field Description" />
+                    <FormTextarea @bind-Value="Model.Description" Required Label="Description" Placeholder="Enter Field Description" />
                 </Grid>
             </TabPanel>
             <TabPanel Name="View">

diff --git a/...FluentCMS.Web.Plugins.Admin/ContentTypeManagement/Components/Date/DateFieldSettings.razor b/...FluentCMS.Web.Plugins.Admin/ContentTypeManagement/Components/Date/DateFieldSettings.razor
@@ -21,9 +21,9 @@
                     <FormHiddenInput @bind-Value="Model.Type" />
                     <FormInput @bind-Value="Model.Name" Cols="6" Label="Name" Placeholder="Enter Field Name" Required Disabled="@(CurrentState != FieldManagementState.Create)" />
                     <FormInput @bind-Value="Model.Label" Cols="4" Label="Label" Placeholder="Enter Field Label" Required />
-                    <FormSwitch @bind-Value="ContentTypeField!.Required" Cols="2" Label="Required" Required />
-                    <FormInput @bind-Value="Model.Placeholder" Label="Placeholder" Placeholder="Enter Field Placeholder" Required />
-                    <FormTextarea @bind-Value="Model.Description" Label="Description" Placeholder="Enter Field Description" />
+                    <FormSwitch @bind-Value="ContentTypeField!.Required" Cols="2" Label="Required" />
+                    <FormInput @bind-Value="Model.Placeholder" Label="Placeholder" Placeholder="Enter Field Placeholder" />
+                    <FormTextarea @bind-Value="Model.Description" Required Label="Description" Placeholder="Enter Field Description" />
                 </Grid>
             </TabPanel>
             <TabPanel Name="View">

diff --git a/...ugins/FluentCMS.Web.Plugins.Admin/ContentTypeManagement/Components/FieldSettingForm.razor b/...ugins/FluentCMS.Web.Plugins.Admin/ContentTypeManagement/Components/FieldSettingForm.razor
@@ -4,7 +4,8 @@
 @if (Model != null)
 {
     <EditForm Model="@Model" OnSubmit="OnFormSubmit">
-        <Modal Size="ModalSize.Large">
+        <DataAnnotationsValidator />
+        <Modal Placement="ModalPlacement.Top" Size="ModalSize.Large">
             <ModalHeader Closable OnClose="OnCancel">
                 <ModalTitle Visible="@(CurrentState == FieldManagementState.Create)">
                     Create New Field@* New @FieldType?.Title Field *@
@@ -14,8 +15,13 @@
                 </ModalTitle>
             </ModalHeader>
             <ModalBody>
-                <DataAnnotationsValidator />
                 @ChildContent
+                <Alert Visible="Errors.Count > 0" Type="AlertType.Danger">
+                    @foreach (var error in Errors)
+                    {
+                        <p>@error</p>
+                    }
+                </Alert>
             </ModalBody>
             <ModalFooter>
                 <FormActions>

diff --git a/...ns/FluentCMS.Web.Plugins.Admin/ContentTypeManagement/Components/FieldSettingForm.razor.cs b/...ns/FluentCMS.Web.Plugins.Admin/ContentTypeManagement/Components/FieldSettingForm.razor.cs
@@ -20,8 +20,23 @@ public partial class FieldSettingForm
     [Parameter]
     public RenderFragment ChildContent { get; set; } = default!;
 
+    private List<string> Errors { get; set; } = [];
+
     protected async Task OnFormSubmit()
     {
-        await OnSubmit.InvokeAsync();
+        try 
+        {
+            await OnSubmit.InvokeAsync();
+        }
+        catch (ApiClientException ex)
+        {
+            Errors = ex.ApiResult?.Errors?.Select(x => $"{x.Code ?? string.Empty}: {x.Description ?? string.Empty}").ToList() ?? [ex.Message];
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            Errors = [ex.Message];
+            StateHasChanged();
+        }
     }
 }
diff --git a/...Plugins.Admin/ContentTypeManagement/Components/MultiSelect/MultiSelectFieldSettings.razor b/...Plugins.Admin/ContentTypeManagement/Components/MultiSelect/MultiSelectFieldSettings.razor
@@ -21,8 +21,8 @@
                     <FormHiddenInput @bind-Value="Model.Type" />
                     <FormInput @bind-Value="Model.Name" Cols="6" Label="Name" Placeholder="Enter Field Name" Required Disabled="@(CurrentState != FieldManagementState.Create)" />
                     <FormInput @bind-Value="Model.Label" Cols="4" Label="Label" Placeholder="Enter Field Label" Required />
-                    <FormSwitch @bind-Value="ContentTypeField!.Required" Cols="2" Label="Required" Required />
-                    <FormTextarea @bind-Value="Model.Description" Label="Description" Placeholder="Enter Field Description" />
+                    <FormSwitch @bind-Value="ContentTypeField!.Required" Cols="2" Label="Required" />
+                    <FormTextarea @bind-Value="Model.Description" Required Label="Description" Placeholder="Enter Field Description" />
                 </Grid>
             </TabPanel>
             <TabPanel Name="View">

diff --git a/...ntCMS.Web.Plugins.Admin/ContentTypeManagement/Components/Number/NumberFieldSettings.razor b/...ntCMS.Web.Plugins.Admin/ContentTypeManagement/Components/Number/NumberFieldSettings.razor
@@ -21,11 +21,11 @@
                     <FormHiddenInput @bind-Value="Model.Type" />
                     <FormInput @bind-Value="Model.Name" Cols="6" Label="Name" Placeholder="Enter Field Name" Required Disabled="@(CurrentState != FieldManagementState.Create)" />
                     <FormInput @bind-Value="Model.Label" Cols="4" Label="Label" Placeholder="Enter Field Label" Required />
-                    <FormSwitch @bind-Value="ContentTypeField!.Required" Cols="2" Label="Required" Required />
+                    <FormSwitch @bind-Value="ContentTypeField!.Required" Cols="2" Label="Required" />
                     <FormNumberInput @bind-Value="Model.MinimumValue" Min="0" Cols="6" Label="Minimum Value" Placeholder="Enter Minimum value" />
                     <FormNumberInput @bind-Value="Model.MaximumValue" Min="0" Cols="6" Label="Maximum Value" Placeholder="Enter Maximum value" />
-                    <FormInput @bind-Value="Model.Placeholder" Label="Placeholder" Placeholder="Enter Field Placeholder" Required />
-                    <FormTextarea @bind-Value="Model.Description" Label="Description" Placeholder="Enter Field Description" />
+                    <FormInput @bind-Value="Model.Placeholder" Label="Placeholder" Placeholder="Enter Field Placeholder" />
+                    <FormTextarea @bind-Value="Model.Description" Required Label="Description" Placeholder="Enter Field Description" />
                 </Grid>
             </TabPanel>
             <TabPanel Name="View">

diff --git a/...ntCMS.Web.Plugins.Admin/ContentTypeManagement/Components/Select/SelectFieldSettings.razor b/...ntCMS.Web.Plugins.Admin/ContentTypeManagement/Components/Select/SelectFieldSettings.razor
@@ -21,9 +21,9 @@
                     <FormHiddenInput @bind-Value="Model.Type" />
                     <FormInput @bind-Value="Model.Name" Cols="6" Label="Name" Placeholder="Enter Field Name" Required Disabled="@(CurrentState != FieldManagementState.Create)" />
                     <FormInput @bind-Value="Model.Label" Cols="4" Label="Label" Placeholder="Enter Field Label" Required />
-                    <FormSwitch @bind-Value="ContentTypeField!.Required" Cols="2" Label="Required" Required />
-                    <FormInput @bind-Value="Model.Placeholder" Label="Placeholder" Placeholder="Enter Field Placeholder" Required />
-                    <FormTextarea @bind-Value="Model.Description" Label="Description" Placeholder="Enter Field Description" />
+                    <FormSwitch @bind-Value="ContentTypeField!.Required" Cols="2" Label="Required" />
+                    <FormInput @bind-Value="Model.Placeholder" Label="Placeholder" Placeholder="Enter Field Placeholder" />
+                    <FormTextarea @bind-Value="Model.Description" Required Label="Description" Placeholder="Enter Field Description" />
                 </Grid>
             </TabPanel>
             <TabPanel Name="View">

diff --git a/...b.Plugins.Admin/ContentTypeManagement/Components/SingleFile/SingleFileFieldSettings.razor b/...b.Plugins.Admin/ContentTypeManagement/Components/SingleFile/SingleFileFieldSettings.razor
@@ -18,8 +18,8 @@
                     <FormHiddenInput @bind-Value="Model.Type" />
                     <FormInput @bind-Value="Model.Name" Cols="6" Label="Name" Placeholder="Enter Field Name" Required Disabled="@(CurrentState != FieldManagementState.Create)" />
                     <FormInput @bind-Value="Model.Label" Cols="4" Label="Label" Placeholder="Enter Field Label" Required />
-                    <FormSwitch @bind-Value="Model.Required" Cols="2" Label="Required" Required />
-                    <FormTextarea @bind-Value="Model.Description" Label="Description" Placeholder="Enter Field Description" />
+                    <FormSwitch @bind-Value="Model.Required" Cols="2" Label="Required" />
+                    <FormTextarea @bind-Value="Model.Description" Required Label="Description" Placeholder="Enter Field Description" />
                 </Grid>
             </TabPanel>
             <TabPanel Name="View">

diff --git a/...ntCMS.Web.Plugins.Admin/ContentTypeManagement/Components/String/StringFieldSettings.razor b/...ntCMS.Web.Plugins.Admin/ContentTypeManagement/Components/String/StringFieldSettings.razor
@@ -21,11 +21,11 @@
                     <FormHiddenInput @bind-Value="Model.Type" />
                     <FormInput @bind-Value="Model.Name" Cols="6" Label="Name" Placeholder="Enter Field Name" Required Disabled="@(CurrentState != FieldManagementState.Create)" />
                     <FormInput @bind-Value="Model.Label" Cols="4" Label="Label" Placeholder="Enter Field Label" Required />
-                    <FormSwitch @bind-Value="ContentTypeField!.Required" Cols="2" Label="Required" Required />
+                    <FormSwitch @bind-Value="ContentTypeField!.Required" Cols="2" Label="Required" />
                     <FormNumberInput @bind-Value="Model.MinimumLength" Min="0" Cols="6" Label="Minimum Length" Placeholder="Enter Minimum Length" />
                     <FormNumberInput @bind-Value="Model.MaximumLength" Min="0" Cols="6" Label="Maximum Length" Placeholder="Enter Maximum Length" />
-                    <FormInput @bind-Value="Model.Placeholder" Label="Placeholder" Placeholder="Enter Field Placeholder" Required />
-                    <FormTextarea @bind-Value="Model.Description" Label="Description" Placeholder="Enter Field Description" />
+                    <FormInput @bind-Value="Model.Placeholder" Label="Placeholder" Placeholder="Enter Field Placeholder" />
+                    <FormTextarea @bind-Value="Model.Description" Required Label="Description" Placeholder="Enter Field Description" />
                 </Grid>
             </TabPanel>
             <TabPanel Name="View">

diff --git a/src/Frontend/Plugins/FluentCMS.Web.Plugins.Admin/ContentTypeManagement/Models/FieldModel.cs b/src/Frontend/Plugins/FluentCMS.Web.Plugins.Admin/ContentTypeManagement/Models/FieldModel.cs
@@ -1,17 +1,26 @@
 namespace FluentCMS.Web.Plugins.Admin.ContentTypeManagement;
 public interface IFieldModel
 {
+    [Required]
     public string Name { get; set; }
     public string Type { get; set; }
     public bool Required { get; set; }
     public bool Unique { get; set; }
+
+    [Required]
     public string Description { get; set; }
     public int DataTableColumnOrder { get; set; }
     public bool DataTableVisible { get; set; }
+
+    [Required]
     public string DataTableViewComponent { get; set; }
     public int FormViewOrder { get; set; }
     public int FormColWidth { get; set; }
+
+    [Required]
     public string FormViewComponent { get; set; }
+
+    [Required]
     public string Label { get; set; }
 }
 
@@ -22,17 +31,26 @@ public interface IFieldModel<T> : IFieldModel
 
 public abstract class FieldModel<T> : IFieldModel<T>
 {
+    [Required]
     public string Name { get; set; } = string.Empty;
     public abstract string Type { get; set; }
     public bool Required { get; set; }
     public bool Unique { get; set; }
+
+    [Required]
     public string Description { get; set; } = string.Empty;
     public int DataTableColumnOrder { get; set; } = 0;
     public bool DataTableVisible { get; set; } = true;
+
+    [Required]
     public string DataTableViewComponent { get; set; } = default!;
     public int FormViewOrder { get; set; } = 0;
     public int FormColWidth { get; set; } = 12;
+
+    [Required]
     public string FormViewComponent { get; set; } = default!;
+
+    [Required]
     public string Label { get; set; } = string.Empty;
     public T DefaultValue { get; set; } = default!;
 }
diff --git a/src/Frontend/Plugins/FluentCMS.Web.Plugins.Admin/_GlobalUsings.cs b/src/Frontend/Plugins/FluentCMS.Web.Plugins.Admin/_GlobalUsings.cs
@@ -3,3 +3,4 @@
 global using Microsoft.AspNetCore.Components;
 global using Microsoft.AspNetCore.Components.Forms;
 global using Microsoft.AspNetCore.Http;
+global using System.ComponentModel.DataAnnotations;