From 63378e16540988a6b6b0e7fd5d5308dd5bafdf36 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sun, 23 May 2021 11:17:23 -0400
Subject: [PATCH] implemented Label component in Installer for consistency and
 removed redundant logic

---
 .../Installer/Controls/LocalDBConfig.razor    | 36 ++-------
 .../Installer/Controls/MySQLConfig.razor      | 35 ++-------
 .../Installer/Controls/PostgreSQLConfig.razor | 74 +++++-------------
 .../Installer/Controls/SqlServerConfig.razor  | 75 +++++--------------
 .../Installer/Controls/SqliteConfig.razor     | 35 ++-------
 Oqtane.Client/Installer/Installer.razor       | 21 +++---
 Oqtane.Client/Modules/Admin/Sites/Add.razor   |  3 +-
 .../Interfaces/IDatabaseConfigControl.cs      |  2 -
 8 files changed, 73 insertions(+), 208 deletions(-)

diff --git a/Oqtane.Client/Installer/Controls/LocalDBConfig.razor b/Oqtane.Client/Installer/Controls/LocalDBConfig.razor
index 9080675b..0785fe04 100644
--- a/Oqtane.Client/Installer/Controls/LocalDBConfig.razor
+++ b/Oqtane.Client/Installer/Controls/LocalDBConfig.razor
@@ -1,8 +1,5 @@
 @namespace Oqtane.Installer.Controls
-
-@using System.ComponentModel.Design.Serialization
 @implements Oqtane.Interfaces.IDatabaseConfigControl
-
 @inject IStringLocalizer<Installer> Localizer
 
 @{
@@ -11,35 +8,18 @@
         var fieldId = field.Name.ToLowerInvariant();
         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>
-                <td>
-                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                </td>
-                <td>
-                    <input id="@fieldId" type="text" class="form-control" @bind="@field.Value" />
-                </td>
-            </tr>
-        }        
+        <tr>
+            <td>
+                <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
+            </td>
+            <td>
+                <input id="@fieldId" type="text" class="form-control" @bind="@field.Value" />
+            </td>
+        </tr>
     }
 }
 
 @code {
-    [Parameter]
-    public bool IsInstaller { get; set; }
-
     private readonly List<ConnectionStringField> _connectionStringFields = new()
     {
         new() {Name = "Server", FriendlyName = "Server", Value = "(LocalDb)\\MSSQLLocalDB", HelpText="Enter the database server"},
diff --git a/Oqtane.Client/Installer/Controls/MySQLConfig.razor b/Oqtane.Client/Installer/Controls/MySQLConfig.razor
index 8655e0fd..7bd1f512 100644
--- a/Oqtane.Client/Installer/Controls/MySQLConfig.razor
+++ b/Oqtane.Client/Installer/Controls/MySQLConfig.razor
@@ -1,7 +1,5 @@
 @namespace Oqtane.Installer.Controls
-
 @implements Oqtane.Interfaces.IDatabaseConfigControl
-
 @inject IStringLocalizer<Installer> Localizer
 
 @{
@@ -11,35 +9,18 @@
         var fieldType = (field.Name == "Pwd") ? "password" : "text";
         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>
-                <td>
-                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                </td>
-                <td>
-                    <input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" />
-                </td>
-            </tr>
-        }   
+        <tr>
+            <td>
+                <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
+            </td>
+            <td>
+                <input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" />
+            </td>
+        </tr>
     }
 }
 
 @code {
-    [Parameter]
-    public bool IsInstaller { get; set; }
-
     private readonly List<ConnectionStringField> _connectionStringFields = new()
     {
         new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"},
diff --git a/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor b/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor
index 93f72576..ac46bb69 100644
--- a/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor
+++ b/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor
@@ -1,7 +1,5 @@
 @namespace Oqtane.Installer.Controls
-
 @implements Oqtane.Interfaces.IDatabaseConfigControl
-
 @inject IStringLocalizer<Installer> Localizer
 
 @{
@@ -23,67 +21,33 @@
 
             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">
-                    <td>
-                        <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                    </td>
-                    <td>
-                        <input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" />
-                    </td>
-                </tr>
-            }    
+            <tr style="@isVisible">
+                <td>
+                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
+                </td>
+                <td>
+                    <input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" />
+                </td>
+            </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
-            {
-                <tr>
-                    <td>
-                        <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                    </td>
-                    <td>
-                        <select id="@fieldId" class="custom-select" @bind="@field.Value">
-                            <option value="true" selected>@Localizer["True"]</option>
-                            <option value="false">@Localizer["False"]</option>
-                        </select>
-                    </td>
-                </tr>
-            }
+            <tr>
+                <td>
+                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
+                </td>
+                <td>
+                    <select id="@fieldId" class="custom-select" @bind="@field.Value">
+                        <option value="true" selected>@Localizer["True"]</option>
+                        <option value="false">@Localizer["False"]</option>
+                    </select>
+                </td>
+            </tr>
         }
     }
 }
 
 @code {
-    [Parameter]
-    public bool IsInstaller { get; set; }
-
     private readonly List<ConnectionStringField> _connectionStringFields = new()
     {
         new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"},
diff --git a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor
index 3fdbd0c7..302959f9 100644
--- a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor
+++ b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor
@@ -1,7 +1,5 @@
 @namespace Oqtane.Installer.Controls
-
 @implements Oqtane.Interfaces.IDatabaseConfigControl
-
 @inject IStringLocalizer<Installer> Localizer
 
 @{
@@ -23,68 +21,33 @@
 
             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">
-                    <td>
-                        <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                    </td>
-                    <td>
-                        <input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" />
-                    </td>
-                </tr>
-            }        
+            <tr style="@isVisible">
+                <td>
+                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
+                </td>
+                <td>
+                    <input id="@fieldId" type="@fieldType" class="form-control" @bind="@field.Value" />
+                </td>
+            </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
-            {
-                <tr>
-                    <td>
-                        <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                    </td>
-                    <td>
-                        <select id="@fieldId" class="custom-select" @bind="@field.Value">
-                            <option value="true" selected>@Localizer["True"]</option>
-                            <option value="false">@Localizer["False"]</option>
-                        </select>
-                    </td>
-                </tr>
-            }
+            <tr>
+                <td>
+                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
+                </td>
+                <td>
+                    <select id="@fieldId" class="custom-select" @bind="@field.Value">
+                        <option value="true" selected>@Localizer["True"]</option>
+                        <option value="false">@Localizer["False"]</option>
+                    </select>
+                </td>
+            </tr>
         }
     }
 }
 
 @code {
-    
-    [Parameter]
-    public bool IsInstaller { get; set; }
-
     private readonly List<ConnectionStringField> _connectionStringFields = new()
     {
         new() {Name = "Server", FriendlyName = "Server", Value = ".", HelpText="Enter the database server"},
diff --git a/Oqtane.Client/Installer/Controls/SqliteConfig.razor b/Oqtane.Client/Installer/Controls/SqliteConfig.razor
index 23682365..e0445c7c 100644
--- a/Oqtane.Client/Installer/Controls/SqliteConfig.razor
+++ b/Oqtane.Client/Installer/Controls/SqliteConfig.razor
@@ -1,7 +1,5 @@
 @namespace Oqtane.Installer.Controls
-
 @implements Oqtane.Interfaces.IDatabaseConfigControl
-
 @inject IStringLocalizer<Installer> Localizer
 
 @{
@@ -10,35 +8,18 @@
         var fieldId = field.Name.ToLowerInvariant();
         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>
-                <td>
-                    <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
-                </td>
-                <td>
-                    <input id="@fieldId" type="text" class="form-control" @bind="@field.Value" />
-                </td>
-            </tr>
-        }       
+        <tr>
+            <td>
+                <Label For="@fieldId" HelpText="@field.HelpText" ResourceKey="@field.Name">@Localizer[$"{field.FriendlyName}:"]</Label>
+            </td>
+            <td>
+                <input id="@fieldId" type="text" class="form-control" @bind="@field.Value" />
+            </td>
+        </tr>
     }
 }
 
 @code {
-    [Parameter]
-    public bool IsInstaller { get; set; }
-
     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"}
diff --git a/Oqtane.Client/Installer/Installer.razor b/Oqtane.Client/Installer/Installer.razor
index dd1dcfec..019e12d5 100644
--- a/Oqtane.Client/Installer/Installer.razor
+++ b/Oqtane.Client/Installer/Installer.razor
@@ -23,10 +23,10 @@
                 <tbody>
                     <tr>
                         <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>
-                            <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)
                                 {
                                     foreach (var database in _databases)
@@ -52,31 +52,31 @@
                 <tbody>
                     <tr>
                         <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>
-                            <input type="text" class="form-control" @bind="@_hostUsername" readonly />
+                            <input id="username" type="text" class="form-control" @bind="@_hostUsername" readonly />
                         </td>
                     </tr>
                     <tr>
                         <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>
-                            <input type="password" class="form-control" @bind="@_hostPassword" />
+                            <input id="password" type="password" class="form-control" @bind="@_hostPassword" />
                         </td>
                     </tr>
                     <tr>
                         <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>
-                            <input type="password" class="form-control" @bind="@_confirmPassword" />
+                            <input id="confirm" type="password" class="form-control" @bind="@_confirmPassword" />
                         </td>
                     </tr>
                     <tr>
                         <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>
                             <input type="text" class="form-control" @bind="@_hostEmail" />
@@ -139,8 +139,7 @@
             DatabaseConfigComponent = builder =>
             {
                 builder.OpenComponent(0, _databaseConfigType);
-                builder.AddAttribute(1, "IsInstaller", true);
-                builder.AddComponentReferenceCapture(2, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+                builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
                 builder.CloseComponent();
             };
         }
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index da496c79..9a93ab17 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -224,8 +224,7 @@ else
             DatabaseConfigComponent = builder =>
             {
                 builder.OpenComponent(0, _databaseConfigType);
-                builder.AddAttribute(1, "IsInstaller", false);
-                builder.AddComponentReferenceCapture(2, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+                builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
                 builder.CloseComponent();
             };
         }
diff --git a/Oqtane.Shared/Interfaces/IDatabaseConfigControl.cs b/Oqtane.Shared/Interfaces/IDatabaseConfigControl.cs
index b9ab5159..8a5de946 100644
--- a/Oqtane.Shared/Interfaces/IDatabaseConfigControl.cs
+++ b/Oqtane.Shared/Interfaces/IDatabaseConfigControl.cs
@@ -3,7 +3,5 @@ namespace Oqtane.Interfaces
     public interface IDatabaseConfigControl
     {
         string GetConnectionString();
-
-        bool IsInstaller { get; set; }
     }
 }