Move Hint & Required to FieldSettings (#18099)

hishamco · web-flow · commit 221707d37b7b · 2025-08-28T01:25:47.000+03:00
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/BooleanFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/BooleanFieldSettings.cs
@@ -1,8 +1,10 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
+
 namespace OrchardCore.ContentFields.Settings;
 
-public class BooleanFieldSettings
+public class BooleanFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
     public string Label { get; set; }
+
     public bool DefaultValue { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/ContentPickerFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/ContentPickerFieldSettings.cs
@@ -1,13 +1,10 @@
 using System.ComponentModel;
+using OrchardCore.ContentManagement.Metadata.Settings;
 
 namespace OrchardCore.ContentFields.Settings;
 
-public class ContentPickerFieldSettings
+public class ContentPickerFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
-
-    public bool Required { get; set; }
-
     public bool Multiple { get; set; }
 
     public bool DisplayAllContentTypes { get; set; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateFieldSettings.cs
@@ -1,7 +1,5 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
+
 namespace OrchardCore.ContentFields.Settings;
 
-public class DateFieldSettings
-{
-    public string Hint { get; set; }
-    public bool Required { get; set; }
-}
+public class DateFieldSettings : FieldSettings;
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateTimeFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/DateTimeFieldSettings.cs
@@ -1,7 +1,5 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
+
 namespace OrchardCore.ContentFields.Settings;
 
-public class DateTimeFieldSettings
-{
-    public string Hint { get; set; }
-    public bool Required { get; set; }
-}
+public class DateTimeFieldSettings : FieldSettings;
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/HtmlFieldSettings.cs
@@ -1,11 +1,10 @@
 using System.ComponentModel;
+using OrchardCore.ContentManagement.Metadata.Settings;
 
 namespace OrchardCore.ContentFields.Settings;
 
-public class HtmlFieldSettings
+public class HtmlFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
-
     [DefaultValue(true)]
     public bool SanitizeHtml { get; set; } = true;
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettings.cs
@@ -1,21 +1,27 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
+
 namespace OrchardCore.ContentFields.Settings;
 
-public class LinkFieldSettings
+public class LinkFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
+    public LinkFieldSettings()
+    {
+        LinkTextMode = LinkTextMode.Optional;
+    }
+
     public string HintLinkText { get; set; }
-    public bool Required { get; set; }
+
     public LinkTextMode LinkTextMode { get; set; }
+
     public string UrlPlaceholder { get; set; }
+
     public string TextPlaceholder { get; set; }
+
     public string DefaultUrl { get; set; }
+
     public string DefaultText { get; set; }
-    public string DefaultTarget { get; set; }
 
-    public LinkFieldSettings()
-    {
-        LinkTextMode = LinkTextMode.Optional;
-    }
+    public string DefaultTarget { get; set; }
 }
 
 public enum LinkTextMode
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LocalizationSetContentPickerFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LocalizationSetContentPickerFieldSettings.cs
@@ -1,12 +1,12 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.Modules;
 
 namespace OrchardCore.ContentFields.Settings;
 
 [RequireFeatures("OrchardCore.ContentLocalization")]
-public class LocalizationSetContentPickerFieldSettings
+public class LocalizationSetContentPickerFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
-    public bool Required { get; set; }
     public bool Multiple { get; set; }
+
     public string[] DisplayedContentTypes { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/MultiTextFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/MultiTextFieldSettings.cs
@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
+using OrchardCore.ContentManagement.Metadata.Settings;
 
 namespace OrchardCore.ContentFields.Settings;
 
-public class MultiTextFieldSettings
+public class MultiTextFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
-    public bool Required { get; set; }
     public MultiTextFieldValueOption[] Options { get; set; } = [];
 }
 
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/NumericFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/NumericFieldSettings.cs
@@ -1,12 +1,16 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
+
 namespace OrchardCore.ContentFields.Settings;
 
-public class NumericFieldSettings
+public class NumericFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
-    public bool Required { get; set; }
     public int Scale { get; set; }
+
     public decimal? Minimum { get; set; }
+
     public decimal? Maximum { get; set; }
+
     public string Placeholder { get; set; }
+
     public string DefaultValue { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettings.cs
@@ -1,8 +1,8 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
+
 namespace OrchardCore.ContentFields.Settings;
 
-public class TextFieldSettings
+public class TextFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
-    public bool Required { get; set; }
     public string DefaultValue { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TimeFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TimeFieldSettings.cs
@@ -1,8 +1,8 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
+
 namespace OrchardCore.ContentFields.Settings;
 
-public class TimeFieldSettings
+public class TimeFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
-    public bool Required { get; set; }
     public string Step { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettings.cs
@@ -1,14 +1,14 @@
 using System.ComponentModel;
+using OrchardCore.ContentManagement.Metadata.Settings;
 
 namespace OrchardCore.ContentFields.Settings;
 
-public class UserPickerFieldSettings
+public class UserPickerFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
-    public bool Required { get; set; }
     public bool Multiple { get; set; }
 
     [DefaultValue(true)]
     public bool DisplayAllUsers { get; set; } = true;
+
     public string[] DisplayedRoles { get; set; } = [];
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/YoutubeFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/YoutubeFieldSettings.cs
@@ -1,10 +1,12 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
+
 namespace OrchardCore.ContentFields.Settings;
 
-public class YoutubeFieldSettings
+public class YoutubeFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
     public string Label { get; set; }
+
     public int Width { get; set; }
+
     public int Height { get; set; }
-    public bool Required { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Settings/MarkdownFieldSettings.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel;
+using OrchardCore.ContentManagement.Metadata.Settings;
 
 namespace OrchardCore.Markdown.Settings;
 
-public class MarkdownFieldSettings
+public class MarkdownFieldSettings : FieldSettings
 {
     [DefaultValue(true)]
     public bool SanitizeHtml { get; set; } = true;
-    public string Hint { get; set; }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/Settings/GeoPointFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.Spatial/Settings/GeoPointFieldSettings.cs
@@ -1,7 +1,5 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
+
 namespace OrchardCore.Spatial.Settings;
 
-public class GeoPointFieldSettings
-{
-    public string Hint { get; set; }
-    public bool Required { get; set; }
-}
+public class GeoPointFieldSettings : FieldSettings;
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldSettings.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Settings/TaxonomyFieldSettings.cs
@@ -1,14 +1,9 @@
+using OrchardCore.ContentManagement.Metadata.Settings;
+
 namespace OrchardCore.Taxonomies.Settings;
 
-public class TaxonomyFieldSettings
+public class TaxonomyFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
-
-    /// <summary>
-    /// Whether a selection is required.
-    /// </summary>
-    public bool Required { get; set; }
-
     /// <summary>
     /// The content item id of the taxonomy to choose from.
     /// </summary>
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/FieldSettings.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Metadata/Settings/FieldSettings.cs
@@ -0,0 +1,8 @@
+namespace OrchardCore.ContentManagement.Metadata.Settings;
+
+public abstract class FieldSettings
+{
+    public string Hint { get; set; }
+
+    public bool Required { get; set; }
+}
diff --git a/src/OrchardCore/OrchardCore.Media.Core/Settings/MediaFieldSettings.cs b/src/OrchardCore/OrchardCore.Media.Core/Settings/MediaFieldSettings.cs
@@ -1,13 +1,10 @@
 using System.ComponentModel;
+using OrchardCore.ContentManagement.Metadata.Settings;
 
 namespace OrchardCore.Media.Settings;
 
-public class MediaFieldSettings
+public class MediaFieldSettings : FieldSettings
 {
-    public string Hint { get; set; }
-
-    public bool Required { get; set; }
-
     [DefaultValue(true)]
     public bool Multiple { get; set; } = true;
 

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
	`1`	`+using OrchardCore.ContentManagement.Metadata.Settings;`
	`2`	`+`
`1`	`3`	`namespace OrchardCore.ContentFields.Settings;`
`2`	`4`
`3`		`-public class BooleanFieldSettings`
	`5`	`+public class BooleanFieldSettings : FieldSettings`
`4`	`6`	`{`
`5`		`- public string Hint { get; set; }`
`6`	`7`	`public string Label { get; set; }`
	`8`	`+`
`7`	`9`	`public bool DefaultValue { get; set; }`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`using System.ComponentModel;`
	`2`	`+using OrchardCore.ContentManagement.Metadata.Settings;`
`2`	`3`
`3`	`4`	`namespace OrchardCore.ContentFields.Settings;`
`4`	`5`
`5`		`-public class HtmlFieldSettings`
	`6`	`+public class HtmlFieldSettings : FieldSettings`
`6`	`7`	`{`
`7`		`- public string Hint { get; set; }`
`8`		`-`
`9`	`8`	`[DefaultValue(true)]`
`10`	`9`	`public bool SanitizeHtml { get; set; } = true;`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
	`1`	`+using OrchardCore.ContentManagement.Metadata.Settings;`
`1`	`2`	`using OrchardCore.Modules;`
`2`	`3`
`3`	`4`	`namespace OrchardCore.ContentFields.Settings;`
`4`	`5`
`5`	`6`	`[RequireFeatures("OrchardCore.ContentLocalization")]`
`6`		`-public class LocalizationSetContentPickerFieldSettings`
	`7`	`+public class LocalizationSetContentPickerFieldSettings : FieldSettings`
`7`	`8`	`{`
`8`		`- public string Hint { get; set; }`
`9`		`- public bool Required { get; set; }`
`10`	`9`	`public bool Multiple { get; set; }`
	`10`	`+`
`11`	`11`	`public string[] DisplayedContentTypes { get; set; } = [];`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`using System.Text.Json.Serialization;`
	`2`	`+using OrchardCore.ContentManagement.Metadata.Settings;`
`2`	`3`
`3`	`4`	`namespace OrchardCore.ContentFields.Settings;`
`4`	`5`
`5`		`-public class MultiTextFieldSettings`
	`6`	`+public class MultiTextFieldSettings : FieldSettings`
`6`	`7`	`{`
`7`		`- public string Hint { get; set; }`
`8`		`- public bool Required { get; set; }`
`9`	`8`	`public MultiTextFieldValueOption[] Options { get; set; } = [];`
`10`	`9`	`}`
`11`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
	`1`	`+using OrchardCore.ContentManagement.Metadata.Settings;`
	`2`	`+`
`1`	`3`	`namespace OrchardCore.ContentFields.Settings;`
`2`	`4`
`3`		`-public class TextFieldSettings`
	`5`	`+public class TextFieldSettings : FieldSettings`
`4`	`6`	`{`
`5`		`- public string Hint { get; set; }`
`6`		`- public bool Required { get; set; }`
`7`	`7`	`public string DefaultValue { get; set; }`
`8`	`8`	`}`