Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forms: Add multiline input #4942

Merged
merged 8 commits into from May 10, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 26 additions & 0 deletions BTCPayServer/Forms/FieldValueMirror.cs
@@ -0,0 +1,26 @@
using System.Collections.Generic;
using BTCPayServer.Abstractions.Form;

namespace BTCPayServer.Forms;

public class FieldValueMirror : IFormComponentProvider
{
public string View { get; } = null;
public void Validate(Form form, Field field)
{
if (form.GetFieldByFullName(field.Value) is null)
{
field.ValidationErrors = new List<string> { $"{field.Name} requires {field.Value} to be present" };
}
}

public void Register(Dictionary<string, IFormComponentProvider> typeToComponentProvider)
{
typeToComponentProvider.Add("mirror", this);
}

public string GetValue(Form form, Field field)
{
return form.GetFieldByFullName(field.Value)?.Value;
}
}
1 change: 1 addition & 0 deletions BTCPayServer/Forms/FormDataExtensions.cs
Expand Up @@ -12,6 +12,7 @@ public static void AddForms(this IServiceCollection serviceCollection)
serviceCollection.AddSingleton<FormDataService>();
serviceCollection.AddSingleton<FormComponentProviders>();
serviceCollection.AddSingleton<IFormComponentProvider, HtmlInputFormProvider>();
serviceCollection.AddSingleton<IFormComponentProvider, HtmlTextareaFormProvider>();
serviceCollection.AddSingleton<IFormComponentProvider, HtmlFieldsetFormProvider>();
serviceCollection.AddSingleton<IFormComponentProvider, HtmlSelectFormProvider>();
serviceCollection.AddSingleton<IFormComponentProvider, FieldValueMirror>();
Expand Down
21 changes: 0 additions & 21 deletions BTCPayServer/Forms/HtmlInputFormProvider.cs
Expand Up @@ -5,27 +5,6 @@

namespace BTCPayServer.Forms;

public class FieldValueMirror : IFormComponentProvider
{
public string View { get; } = null;
public void Validate(Form form, Field field)
{
if (form.GetFieldByFullName(field.Value) is null)
{
field.ValidationErrors = new List<string>() { $"{field.Name} requires {field.Value} to be present" };
}
}

public void Register(Dictionary<string, IFormComponentProvider> typeToComponentProvider)
{
typeToComponentProvider.Add("mirror", this);
}

public string GetValue(Form form, Field field)
{
return form.GetFieldByFullName(field.Value)?.Value;
}
}
public class HtmlInputFormProvider : FormComponentProviderBase
{
public override void Register(Dictionary<string, IFormComponentProvider> typeToComponentProvider)
Expand Down
5 changes: 2 additions & 3 deletions BTCPayServer/Forms/HtmlSelectFormProvider.cs
Expand Up @@ -9,10 +9,9 @@ public class HtmlSelectFormProvider : FormComponentProviderBase
{
public override void Register(Dictionary<string, IFormComponentProvider> typeToComponentProvider)
{
foreach (var t in new[] {
"select"})
typeToComponentProvider.Add(t, this);
typeToComponentProvider.Add("select", this);
}

public override string View => "Forms/SelectElement";

public override void Validate(Form form, Field field)
Expand Down
23 changes: 23 additions & 0 deletions BTCPayServer/Forms/HtmlTextareaFormProvider.cs
@@ -0,0 +1,23 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using BTCPayServer.Abstractions.Form;

namespace BTCPayServer.Forms;

public class HtmlTextareaFormProvider : FormComponentProviderBase
{
public override void Register(Dictionary<string, IFormComponentProvider> typeToComponentProvider)
{
typeToComponentProvider.Add("textarea", this);
}

public override string View => "Forms/TextareaElement";

public override void Validate(Form form, Field field)
{
if (field.Required)
{
ValidateField<RequiredAttribute>(field);
}
}
}
28 changes: 28 additions & 0 deletions BTCPayServer/Views/Shared/Forms/TextareaElement.cshtml
@@ -0,0 +1,28 @@
@model BTCPayServer.Abstractions.Form.Field
@{
var isInvalid = ViewContext.ModelState[Model.Name]?.ValidationState is Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState.Invalid;
var errors = isInvalid ? ViewContext.ModelState[Model.Name].Errors : null;
}
<div class="form-group">
<label class="form-label" for="@Model.Name"@(Model.Required ? " data-required" : "")>
@Model.Label
</label>
<textarea id="@Model.Name" type="@Model.Type" class="form-control @(errors is null ? "" : "is-invalid")"
dennisreimann marked this conversation as resolved.
Show resolved Hide resolved
name="@Model.Name" data-val="true"
@if (!string.IsNullOrEmpty(Model.HelpText))
{
@Safe.Raw($" aria-describedby=\"HelpText-{Model.Name}\"")
}
@if (Model.Required)
{
@Safe.Raw($" data-val-required=\"{Model.Label} is required.\" required")
}
>@Model.Value</textarea>
<span class="text-danger" data-valmsg-for="@Model.Name" data-valmsg-replace="true">@(isInvalid && errors.Any() ? errors.First().ErrorMessage : string.Empty)</span>
@if (!string.IsNullOrEmpty(Model.HelpText))
{
<div id="@($"HelpText-{Model.Name}")" class="form-text">
@Safe.Raw(Model.HelpText)
</div>
}
</div>
8 changes: 5 additions & 3 deletions BTCPayServer/Views/Shared/PosData.cshtml
@@ -1,3 +1,5 @@
@using System.Text.RegularExpressions
@using Microsoft.AspNetCore.Mvc.TagHelpers
@model (Dictionary<string, object> Items, int Level)

@functions {
Expand Down Expand Up @@ -26,13 +28,13 @@
}
else
{
@value?.ToString()
@Safe.Raw(Regex.Replace(str.Trim(), @"(\r\n)|\n|\r", "<br/>"))
dennisreimann marked this conversation as resolved.
Show resolved Hide resolved
}
</td>
}
else if (value is Dictionary<string, object> {Count: > 0 } subItems)
else if (value is Dictionary<string, object> { Count: > 0 } subItems)
{
<td colspan="2" >
<td colspan="2">
@{
Write(Html.Raw($"<h{Model.Level + 3} class=\"mt-4 mb-3\">"));
Write(key);
Expand Down
7 changes: 6 additions & 1 deletion BTCPayServer/Views/UIForms/Modify.cshtml
Expand Up @@ -39,7 +39,12 @@
<div class="row">
<div class="col-xl-10 col-xxl-constrain">
<div class="d-flex align-items-center justify-content-between mb-3">
<h3 class="mb-0">@ViewData["Title"]</h3>
<h3 class="mb-0">
<span>@ViewData["Title"]</span>
<a href="https://docs.btcpayserver.org/Forms" target="_blank" rel="noreferrer noopener" title="More information...">
<vc:icon symbol="info" />
</a>
</h3>
<div class="d-flex gap-3 mt-3 mt-sm-0">
<button type="submit" class="btn btn-primary order-sm-1" id="SaveButton">Save</button>
@if (!isNew)
Expand Down