package management modifications

Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor

@@ -7,12 +7,10 @@
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_packages != null)
+<TabStrip>
-{
-    <TabStrip>
-        @if (_packages.Count > 0)
-        {
     <TabPanel Name="Download" ResourceKey="Download">
+        @if (_packages != null && _packages.Count > 0)
+        {
             <ModuleMessage Type="MessageType.Info" Message="Download one or more modules from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
 
             <table class="table table-borderless" style=" margin: auto; width: 50% !important;">
@@ -39,8 +37,12 @@
                     </td>
                 </Row>
             </Pager>
-            </TabPanel>
         }
+        else
+        {
+            <ModuleMessage Type="MessageType.Info" Message="No Modules Available For Download "></ModuleMessage>
+        }
+    </TabPanel>
     <TabPanel Name="Upload" ResourceKey="Upload">
         <table class="table table-borderless">
             <tr>
@@ -53,11 +55,10 @@
             </tr>
         </table>
     </TabPanel>
-    </TabStrip>
+</TabStrip>
 
-    <button type="button" class="btn btn-success" @onclick="InstallModules">@Localizer["Install"]</button>
+<button type="button" class="btn btn-success" @onclick="InstallModules">@Localizer["Install"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
-}
 
 @code {
     private List<Package> _packages;
@@ -83,6 +84,8 @@
         var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
         _packages = await PackageService.GetPackagesAsync("module", _search);
 
+        if (_packages != null)
+        {
             foreach (Package package in _packages.ToArray())
             {
                 if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
@@ -91,6 +94,7 @@
                 }
             }
         }
+    }
 
     private async Task Search()
     {

Oqtane.Client/Modules/Admin/Themes/Add.razor

@@ -7,12 +7,10 @@
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_packages != null)
+<TabStrip>
-{
-    <TabStrip>
-        @if (_packages.Count > 0)
-        {
     <TabPanel Name="Download" ResourceKey="Download">
+        @if (_packages != null && _packages.Count > 0)
+        {
             <ModuleMessage Type="MessageType.Info" Message="Download one or more themes from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
 
             <table class="table table-borderless" style=" margin: auto; width: 50% !important;">
@@ -39,8 +37,12 @@
                     </td>
                 </Row>
             </Pager>
-            </TabPanel>
         }
+        else
+        {
+            <ModuleMessage Type="MessageType.Info" Message="No Themes Available For Download"></ModuleMessage>
+        }
+    </TabPanel>
     <TabPanel Name="Upload" ResourceKey="Upload">
         <table class="table table-borderless">
             <tr>
@@ -53,11 +55,10 @@
             </tr>
         </table>
     </TabPanel>
-    </TabStrip>
+</TabStrip>
 
-    <button type="button" class="btn btn-success" @onclick="InstallThemes">@Localizer["Install"]</button>
+<button type="button" class="btn btn-success" @onclick="InstallThemes">@Localizer["Install"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
-}
 
 @code {
     private List<Package> _packages;
@@ -83,6 +84,8 @@
         var themes = await ThemeService.GetThemesAsync();
         _packages = await PackageService.GetPackagesAsync("theme", _search);
 
+        if (_packages != null)
+        {
             foreach (Package package in _packages.ToArray())
             {
                 if (themes.Exists(item => item.PackageName == package.PackageId))
@@ -91,6 +94,7 @@
                 }
             }
         }
+    }
 
     private async Task Search()
     {

Oqtane.Client/Modules/Admin/Upgrade/Index.razor

@@ -6,11 +6,9 @@
 @inject IInstallationService InstallationService
 @inject IStringLocalizer<Index> Localizer
 
-@if (_package != null)
+<TabStrip>
-{
-    <TabStrip>
     <TabPanel Name="Download" ResourceKey="Download">
-            @if (_upgradeavailable)
+        @if (_package != null && _upgradeavailable)
         {
             <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Download The Framework Upgrade Package And Then Select Upgrade"></ModuleMessage>
             <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@Localizer["Download"] @_package.Version</button>
@@ -35,8 +33,7 @@
         </table>
         <button type="button" class="btn btn-success" @onclick="Upgrade">@Localizer["Upgrade"]</button>
     </TabPanel>
-    </TabStrip>
+</TabStrip>
-}
 
 @code {
     private Package _package;

Oqtane.Client/UI/SiteRouter.razor

@@ -172,13 +172,8 @@
             }
 
             // format path and remove alias
-            path = path.Replace("//", "/");
+            path = path.Replace("//", "/"); // in case of doubleslash at end
-
+            path += (!path.EndsWith("/")) ? "/" : "";
-            if (!path.EndsWith("/"))
-            {
-                path += "/";
-            }
-
             if (SiteState.Alias.Path != "" && path.StartsWith(SiteState.Alias.Path))
             {
                 path = path.Substring(SiteState.Alias.Path.Length + 1);

Oqtane.Package/release.cmd

@@ -1,4 +1,5 @@
 del "*.nupkg"
+del "*.zip"
 dotnet clean -c Release ..\Oqtane.sln 
 dotnet build -c Release ..\Oqtane.sln
 copy /Y/B/V "..\Oqtane.Server\bin\Release\net5.0\System.Drawing.Common.dll" "..\Oqtane.Server\bin\Release\net5.0\publish\System.Drawing.Common.dll"