kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1388 from sbwalker/dev

Browse Source 
implemented Label component in Installer for consistency and removed redundant logic
This commit is contained in:
Shaun Walker 2021-05-23 11:13:42 -04:00 committed by GitHub
commit d69ceecb41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 73 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Oqtane.Client/Installer/Controls/LocalDBConfig.razor
View File

@ -1,8 +1,5 @@
@namespace Oqtane.Installer.Controls @namespace Oqtane.Installer.Controls
@using System.ComponentModel.Design.Serialization
@implements Oqtane.Interfaces.IDatabaseConfigControl @implements Oqtane.Interfaces.IDatabaseConfigControl
@inject IStringLocalizer<Installer> Localizer @inject IStringLocalizer<Installer> Localizer
@{ @{
@ -11,19 +8,6 @@
var fieldId = field.Name.ToLowerInvariant(); var fieldId = field.Name.ToLowerInvariant();
field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
if (IsInstaller)
{
<tr>
<td>
<label class="control-label" style="font-weight: bold">@Localizer[$"{field.FriendlyName}:"]</label>
</td>
<td>
<input type="text" class="form-control" @bind="@field.Value" />
</td>
</tr>
}
else
{
<tr> <tr>
<td> <td>
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
@ -34,12 +18,8 @@
</tr> </tr>
} }
} }
}
@code { @code {
[Parameter]
public bool IsInstaller { get; set; }
private readonly List<ConnectionStringField> _connectionStringFields = new() private readonly List<ConnectionStringField> _connectionStringFields = new()
{ {
new() {Name = "Server", FriendlyName = "Server", Value = "(LocalDb)\\MSSQLLocalDB", HelpText="Enter the database server"}, new() {Name = "Server", FriendlyName = "Server", Value = "(LocalDb)\\MSSQLLocalDB", HelpText="Enter the database server"},

19
Oqtane.Client/Installer/Controls/MySQLConfig.razor
View File

@ -1,7 +1,5 @@
@namespace Oqtane.Installer.Controls @namespace Oqtane.Installer.Controls
@implements Oqtane.Interfaces.IDatabaseConfigControl @implements Oqtane.Interfaces.IDatabaseConfigControl
@inject IStringLocalizer<Installer> Localizer @inject IStringLocalizer<Installer> Localizer
@{ @{
@ -11,19 +9,6 @@
var fieldType = (field.Name == "Pwd") ? "password" : "text"; var fieldType = (field.Name == "Pwd") ? "password" : "text";
field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
if (IsInstaller)
{
<tr>
<td>
<label class="control-label" style="font-weight: bold">@Localizer[$"{field.FriendlyName}:"]</label>
</td>
<td>
<input type="@fieldType" class="form-control" @bind="@field.Value" />
</td>
</tr>
}
else
{
<tr> <tr>
<td> <td>
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
@ -34,12 +19,8 @@
</tr> </tr>
} }
} }
}
@code { @code {
[Parameter]
public bool IsInstaller { get; set; }
private readonly List<ConnectionStringField> _connectionStringFields = new() private readonly List<ConnectionStringField> _connectionStringFields = new()
{ {
new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"}, new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"},

36
Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor
View File

@ -1,7 +1,5 @@
@namespace Oqtane.Installer.Controls @namespace Oqtane.Installer.Controls
@implements Oqtane.Interfaces.IDatabaseConfigControl @implements Oqtane.Interfaces.IDatabaseConfigControl
@inject IStringLocalizer<Installer> Localizer @inject IStringLocalizer<Installer> Localizer
@{ @{
@ -23,19 +21,6 @@
field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
if (IsInstaller)
{
<tr style="@isVisible">
<td>
<label class="control-label" style="font-weight: bold">@Localizer[$"{field.FriendlyName}:"]</label>
</td>
<td>
<input type="@fieldType" class="form-control" @bind="@field.Value" />
</td>
</tr>
}
else
{
<tr style="@isVisible"> <tr style="@isVisible">
<td> <td>
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
@ -45,23 +30,6 @@
</td> </td>
</tr> </tr>
} }
}
else
{
if (IsInstaller)
{
<tr>
<td>
<label class="control-label" style="font-weight: bold">@Localizer[$"{field.FriendlyName}:"]</label>
</td>
<td>
<select class="custom-select" @bind="@field.Value">
<option value="true" selected>@Localizer["True"]</option>
<option value="false">@Localizer["False"]</option>
</select>
</td>
</tr>
}
else else
{ {
<tr> <tr>
@ -78,12 +46,8 @@
} }
} }
} }
}
@code { @code {
[Parameter]
public bool IsInstaller { get; set; }
private readonly List<ConnectionStringField> _connectionStringFields = new() private readonly List<ConnectionStringField> _connectionStringFields = new()
{ {
new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"}, new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"},

37
Oqtane.Client/Installer/Controls/SqlServerConfig.razor
View File

@ -1,7 +1,5 @@
@namespace Oqtane.Installer.Controls @namespace Oqtane.Installer.Controls
@implements Oqtane.Interfaces.IDatabaseConfigControl @implements Oqtane.Interfaces.IDatabaseConfigControl
@inject IStringLocalizer<Installer> Localizer @inject IStringLocalizer<Installer> Localizer
@{ @{
@ -23,19 +21,6 @@
field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
if (IsInstaller)
{
<tr style="@isVisible">
<td>
<label class="control-label" style="font-weight: bold">@Localizer[$"{field.FriendlyName}:"]</label>
</td>
<td>
<input type="@fieldType" class="form-control" @bind="@field.Value" />
</td>
</tr>
}
else
{
<tr style="@isVisible"> <tr style="@isVisible">
<td> <td>
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
@ -45,23 +30,6 @@
</td> </td>
</tr> </tr>
} }
}
else
{
if (IsInstaller)
{
<tr>
<td>
<label class="control-label" style="font-weight: bold">@Localizer[$"{field.FriendlyName}:"]</label>
</td>
<td>
<select class="custom-select" @bind="@field.Value">
<option value="true" selected>@Localizer["True"]</option>
<option value="false">@Localizer["False"]</option>
</select>
</td>
</tr>
}
else else
{ {
<tr> <tr>
@ -78,13 +46,8 @@
} }
} }
} }
}
@code { @code {
[Parameter]
public bool IsInstaller { get; set; }
private readonly List<ConnectionStringField> _connectionStringFields = new() private readonly List<ConnectionStringField> _connectionStringFields = new()
{ {
new() {Name = "Server", FriendlyName = "Server", Value = ".", HelpText="Enter the database server"}, new() {Name = "Server", FriendlyName = "Server", Value = ".", HelpText="Enter the database server"},

19
Oqtane.Client/Installer/Controls/SqliteConfig.razor
View File

@ -1,7 +1,5 @@
@namespace Oqtane.Installer.Controls @namespace Oqtane.Installer.Controls
@implements Oqtane.Interfaces.IDatabaseConfigControl @implements Oqtane.Interfaces.IDatabaseConfigControl
@inject IStringLocalizer<Installer> Localizer @inject IStringLocalizer<Installer> Localizer
@{ @{
@ -10,19 +8,6 @@
var fieldId = field.Name.ToLowerInvariant(); var fieldId = field.Name.ToLowerInvariant();
field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm"));
if (IsInstaller)
{
<tr>
<td>
<label class="control-label" style="font-weight: bold">@Localizer[$"{field.FriendlyName}:"]</label>
</td>
<td>
<input type="text" class="form-control" @bind="@field.Value" />
</td>
</tr>
}
else
{
<tr> <tr>
<td> <td>
<Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label> <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
@ -33,12 +18,8 @@
</tr> </tr>
} }
} }
}
@code { @code {
[Parameter]
public bool IsInstaller { get; set; }
private readonly List<ConnectionStringField> _connectionStringFields = new() private readonly List<ConnectionStringField> _connectionStringFields = new()
{ {
new() {Name = "Server", FriendlyName = "File Name", Value = "Oqtane-{{Date}}.db", HelpText="Enter the file name to use for the database"} new() {Name = "Server", FriendlyName = "File Name", Value = "Oqtane-{{Date}}.db", HelpText="Enter the file name to use for the database"}

21
Oqtane.Client/Installer/Installer.razor
View File

@ -23,10 +23,10 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<label class="control-label" style="font-weight: bold">@Localizer["Database Type:"]</label> <Label For="databasetype" HelpText="Select the type of database you wish to create" ResourceKey="DatabaseType">Database Type:</Label>
</td> </td>
<td> <td>
<select class="custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))"> <select id="databasetype" class="custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
@if (_databases != null) @if (_databases != null)
{ {
foreach (var database in _databases) foreach (var database in _databases)
@ -52,31 +52,31 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<label class="control-label" style="font-weight: bold">@Localizer["Username:"] </label> <Label For="username" HelpText="The username of the host user account ( this is not customizable )" ResourceKey="Username">Username:</Label>
</td> </td>
<td> <td>
<input type="text" class="form-control" @bind="@_hostUsername" readonly /> <input id="username" type="text" class="form-control" @bind="@_hostUsername" readonly />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label" style="font-weight: bold">@Localizer["Password:"] </label> <Label For="password" HelpText="Provide the password for the host user account" ResourceKey="Password">Password:</Label>
</td> </td>
<td> <td>
<input type="password" class="form-control" @bind="@_hostPassword" /> <input id="password" type="password" class="form-control" @bind="@_hostPassword" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label" style="font-weight: bold">@Localizer["Confirm:"] </label> <Label For="confirm" HelpText="Please confirm the password entered above by entering it again" ResourceKey="Confirm">Confirm:</Label>
</td> </td>
<td> <td>
<input type="password" class="form-control" @bind="@_confirmPassword" /> <input id="confirm" type="password" class="form-control" @bind="@_confirmPassword" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label class="control-label" style="font-weight: bold">@Localizer["Email:"] </label> <Label For="email" HelpText="Provide the email address for the host user account" ResourceKey="Email">Email:</Label>
</td> </td>
<td> <td>
<input type="text" class="form-control" @bind="@_hostEmail" /> <input type="text" class="form-control" @bind="@_hostEmail" />
@ -139,8 +139,7 @@
DatabaseConfigComponent = builder => DatabaseConfigComponent = builder =>
{ {
builder.OpenComponent(0, _databaseConfigType); builder.OpenComponent(0, _databaseConfigType);
builder.AddAttribute(1, "IsInstaller", true); builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
builder.AddComponentReferenceCapture(2, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
builder.CloseComponent(); builder.CloseComponent();
}; };
} }

3
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -224,8 +224,7 @@ else
DatabaseConfigComponent = builder => DatabaseConfigComponent = builder =>
{ {
builder.OpenComponent(0, _databaseConfigType); builder.OpenComponent(0, _databaseConfigType);
builder.AddAttribute(1, "IsInstaller", false); builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
builder.AddComponentReferenceCapture(2, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
builder.CloseComponent(); builder.CloseComponent();
}; };
} }

2
Oqtane.Shared/Interfaces/IDatabaseConfigControl.cs
View File

@ -3,7 +3,5 @@ namespace Oqtane.Interfaces
public interface IDatabaseConfigControl public interface IDatabaseConfigControl
{ {
string GetConnectionString(); string GetConnectionString();
bool IsInstaller { get; set; }
} }
} }