From 6ea561f8bb55f438df1db05fab9213f75b4ee873 Mon Sep 17 00:00:00 2001 From: Robin Dadswell <19610103+RobinDadswell@users.noreply.github.com> Date: Sun, 14 Nov 2021 21:49:21 +0000 Subject: [PATCH] Frontend Placeholders from the Backend (cherry picked from commit 69f5963f6f1e80e3f598bdb13792b7413fcc13b1) --- frontend/src/Components/Form/ProviderFieldFormGroup.js | 3 +++ src/Lidarr.Http/ClientSchema/Field.cs | 1 + src/Lidarr.Http/ClientSchema/SchemaBuilder.cs | 3 ++- src/NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/src/Components/Form/ProviderFieldFormGroup.js b/frontend/src/Components/Form/ProviderFieldFormGroup.js index f6c9c6d71..c2f03c21b 100644 --- a/frontend/src/Components/Form/ProviderFieldFormGroup.js +++ b/frontend/src/Components/Form/ProviderFieldFormGroup.js @@ -65,6 +65,7 @@ function ProviderFieldFormGroup(props) { label, helpText, helpLink, + placeholder, value, type, advanced, @@ -97,6 +98,7 @@ function ProviderFieldFormGroup(props) { label={label} helpText={helpText} helpLink={helpLink} + placeholder={placeholder} value={value} values={getSelectValues(selectOptions)} errors={errors} @@ -122,6 +124,7 @@ ProviderFieldFormGroup.propTypes = { label: PropTypes.string.isRequired, helpText: PropTypes.string, helpLink: PropTypes.string, + placeholder: PropTypes.string, value: PropTypes.any, type: PropTypes.string.isRequired, advanced: PropTypes.bool.isRequired, diff --git a/src/Lidarr.Http/ClientSchema/Field.cs b/src/Lidarr.Http/ClientSchema/Field.cs index 1028c8eff..4d7861818 100644 --- a/src/Lidarr.Http/ClientSchema/Field.cs +++ b/src/Lidarr.Http/ClientSchema/Field.cs @@ -18,6 +18,7 @@ namespace Lidarr.Http.ClientSchema public string SelectOptionsProviderAction { get; set; } public string Section { get; set; } public string Hidden { get; set; } + public string Placeholder { get; set; } public Field Clone() { diff --git a/src/Lidarr.Http/ClientSchema/SchemaBuilder.cs b/src/Lidarr.Http/ClientSchema/SchemaBuilder.cs index 10d742f9f..19006727a 100644 --- a/src/Lidarr.Http/ClientSchema/SchemaBuilder.cs +++ b/src/Lidarr.Http/ClientSchema/SchemaBuilder.cs @@ -103,7 +103,8 @@ namespace Lidarr.Http.ClientSchema Order = fieldAttribute.Order, Advanced = fieldAttribute.Advanced, Type = fieldAttribute.Type.ToString().FirstCharToLower(), - Section = fieldAttribute.Section + Section = fieldAttribute.Section, + Placeholder = fieldAttribute.Placeholder }; if (fieldAttribute.Type == FieldType.Select || fieldAttribute.Type == FieldType.TagSelect) diff --git a/src/NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs b/src/NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs index 977caf934..1eabc5e7b 100644 --- a/src/NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs +++ b/src/NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs @@ -23,6 +23,7 @@ namespace NzbDrone.Core.Annotations public string Section { get; set; } public HiddenType Hidden { get; set; } public PrivacyLevel Privacy { get; set; } + public string Placeholder { get; set; } } [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]