From 45592e6acdfdd77d3f3ab93017c58c203b396ba6 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Mon, 28 Aug 2023 07:49:06 -0400
Subject: [PATCH] support ~ notation for license urls

---
 .../Admin/ModuleDefinitions/Edit.razor        | 56 ++++++++-----------
 Oqtane.Client/Modules/Admin/Themes/Edit.razor |  4 +-
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index 324ca572..ec3cecb7 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -85,9 +85,9 @@
 					<div class="row mb-1 align-items-center">
 						<Label Class="col-sm-3" For="license" HelpText="The module license terms" ResourceKey="License">License: </Label>
 						<div class="col-sm-9">
-                            @if (_license.StartsWith("http") || _license.StartsWith("/"))
+                            @if (_license.StartsWith("http") || _license.StartsWith("/") || _license.StartsWith("~"))
                             {
-                                <a href="@_license" class="btn btn-info" style="text-decoration: none !important" target="_new">@Localizer["View License"]</a>
+                                <a href="@_license.Replace("~", PageState?.Alias.BaseUrl + "/Modules/" + Utilities.GetTypeName(_moduledefinitionname))" class="btn btn-info" style="text-decoration: none !important" target="_new">@Localizer["View License"]</a>
                             }
                             else
                             {
@@ -95,12 +95,6 @@
                             }
 						</div>
 					</div>
-					<div class="row mb-1 align-items-center">
-						<Label Class="col-sm-3" For="runtimes" HelpText="The Blazor runtimes which this module supports" ResourceKey="Runtimes">Runtimes: </Label>
-						<div class="col-sm-9">
-							<input id="runtimes" class="form-control" @bind="@_runtimes" disabled />
-						</div>
-					</div>
 				</div>
 			</Section>
 			<br />
@@ -223,7 +217,6 @@
     private string _url = "";
     private string _contact = "";
     private string _license = "";
-    private string _runtimes = "";
     private List<Permission> _permissions = null;
     private string _createdby;
     private DateTime _createdon;
@@ -259,7 +252,6 @@
                 _url = moduleDefinition.Url;
                 _contact = moduleDefinition.Contact;
                 _license = moduleDefinition.License;
-                _runtimes = moduleDefinition.Runtimes;
                 _permissions = moduleDefinition.PermissionList;
                 _createdby = moduleDefinition.CreatedBy;
                 _createdon = moduleDefinition.CreatedOn;
@@ -383,27 +375,27 @@
                 AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
             }
         }
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packagename, version);
-			AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
-		}
-	}
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packagename, version);
+            AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+        }
+    }
 
-	private async Task DownloadPackage()
-	{
-		try
-		{
-			await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version, Constants.PackagesFolder);
-			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
-			AddModuleMessage(string.Format(Localizer["Success.Translation.Download"], NavigateUrl("admin/system")), MessageType.Success);
-			_package = null;
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packagename, _version);
-			AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
-		}
-	}
+    private async Task DownloadPackage()
+    {
+        try
+        {
+            await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version, Constants.PackagesFolder);
+            await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
+            AddModuleMessage(string.Format(Localizer["Success.Translation.Download"], NavigateUrl("admin/system")), MessageType.Success);
+            _package = null;
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packagename, _version);
+            AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+        }
+    }
 }
diff --git a/Oqtane.Client/Modules/Admin/Themes/Edit.razor b/Oqtane.Client/Modules/Admin/Themes/Edit.razor
index 7b51edb7..2b84c09d 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Edit.razor
@@ -68,9 +68,9 @@
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="license" HelpText="The license of the theme" ResourceKey="License">License: </Label>
                 <div class="col-sm-9">
-                    @if (_license.StartsWith("http") || _license.StartsWith("/"))
+                    @if (_license.StartsWith("http") || _license.StartsWith("/") || _license.StartsWith("~"))
                     {
-                        <a href="@_license" class="btn btn-info" style="text-decoration: none !important" target="_new">@Localizer["View License"]</a>
+                        <a href="@_license.Replace("~", PageState?.Alias.BaseUrl + "/Themes/" + Utilities.GetTypeName(_themeName))" class="btn btn-info" style="text-decoration: none !important" target="_new">@Localizer["View License"]</a>
                     }
                     else
                     {