From bb75242a4f32c39465dbe9a9d34c20d7cc9a2408 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Fri, 27 Aug 2021 08:17:48 -0400
Subject: [PATCH] fix #1617 convert line break to comma when saving aliases,
 improve license acceptance user experience

---
 Oqtane.Client/Modules/Admin/Languages/Add.razor        | 10 +++++++---
 .../Modules/Admin/ModuleDefinitions/Add.razor          | 10 +++++++---
 Oqtane.Client/Modules/Admin/Site/Index.razor           |  1 +
 Oqtane.Client/Modules/Admin/Themes/Add.razor           | 10 +++++++---
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor
index 3befe0fd..cb426201 100644
--- a/Oqtane.Client/Modules/Admin/Languages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor
@@ -133,11 +133,12 @@ else
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h5 class="modal-title">@_productname  @Localizer["License Terms"]</h5>
+                        <h5 class="modal-title">@Localizer["License Terms"]</h5>
                         <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
                     </div>
                     <div class="modal-body">
                         <p style="height: 200px; overflow-y: scroll;">
+                            <h3>@_productname</h3>
                             @if (!string.IsNullOrEmpty(_license))
                             {
                                 @((MarkupString)_license)
@@ -216,7 +217,7 @@ else
             await logger.LogError(ex, "Error On PriceChanged");
         }
     }
-    
+
     private async Task Search()
     {
         try
@@ -297,7 +298,10 @@ else
             if (package != null)
             {
                 _productname = package.Name;
-                _license = package.License.Replace("\n", "<br />");
+                if (!string.IsNullOrEmpty(package.License))
+                {
+                    _license = package.License.Replace("\n", "<br />");
+                }
                 _packageid = package.PackageId;
                 _version = package.Version;
             }
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 9b922552..3315aebc 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -85,11 +85,12 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h5 class="modal-title">@_productname  @Localizer["License Terms"]</h5>
+                        <h5 class="modal-title">@Localizer["License Terms"]</h5>
                         <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
                     </div>
                     <div class="modal-body">
                         <p style="height: 200px; overflow-y: scroll;">
+                            <h3>@_productname</h3>
                             @if (!string.IsNullOrEmpty(_license))
                             {
                                 @((MarkupString)_license)
@@ -168,7 +169,7 @@
             await logger.LogError(ex, "Error On PriceChanged");
         }
     }
-    
+
     private async Task Search()
     {
         try
@@ -209,7 +210,10 @@
             if (package != null)
             {
                 _productname = package.Name;
-                _license = package.License.Replace("\n", "<br />");
+                if (!string.IsNullOrEmpty(package.License))
+                {
+                    _license = package.License.Replace("\n", "<br />");
+                }
                 _packageid = package.PackageId;
                 _version = package.Version;
             }
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 974eb07b..9b78e016 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -391,6 +391,7 @@
                 var unique = true;
                 if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
                 {
+                    _urls = _urls.Replace("\n", ",");
                     foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                     {
                         if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId))
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 771fda7a..dcfaea37 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -86,11 +86,12 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h5 class="modal-title">@_productname  @Localizer["License Terms"]</h5>
+                        <h5 class="modal-title">@Localizer["License Terms"]</h5>
                         <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
                     </div>
                     <div class="modal-body">
                         <p style="height: 200px; overflow-y: scroll;">
+                            <h3>@_productname</h3>
                             @if (!string.IsNullOrEmpty(_license))
                             {
                                 @((MarkupString)_license)
@@ -169,7 +170,7 @@
             await logger.LogError(ex, "Error On PriceChanged");
         }
     }
-    
+
     private async Task Search()
     {
         try
@@ -210,7 +211,10 @@
             if (package != null)
             {
                 _productname = package.Name;
-                _license = package.License.Replace("\n", "<br />");
+                if (!string.IsNullOrEmpty(package.License))
+                {
+                    _license = package.License.Replace("\n", "<br />");
+                }
                 _packageid = package.PackageId;
                 _version = package.Version;
             }