Merge pull request #1874 from oqtane/dev

3.0.1 release
oqtane · Dec 13, 2021 · 99b0c9c · 99b0c9c
2 parents 7e69913 + e99ab43
commit 99b0c9c
Show file tree

Hide file tree

Showing 157 changed files with 6,698 additions and 3,095 deletions.
diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor
@@ -15,7 +15,7 @@
             <div style="@_display">
                 <CascadingAuthenticationState>
                     <CascadingValue Value="@PageState">
-                        <SiteRouter Runtime="@Runtime" RenderMode="@RenderMode" OnStateChange="@ChangeState" />
+                        <SiteRouter Runtime="@Runtime" RenderMode="@RenderMode" VisitorId="@VisitorId" OnStateChange="@ChangeState" />
                     </CascadingValue>
                 </CascadingAuthenticationState>
             </div>
@@ -39,6 +39,9 @@
     [Parameter]
     public string RenderMode { get; set; }
 
+    [Parameter]
+    public int VisitorId { get; set; }
+
     private bool _initialized = false;
     private string _display = "display: none;";
     private Installation _installation = new Installation { Success = false, Message = "" };

diff --git a/Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs
@@ -46,6 +46,8 @@ internal static IServiceCollection AddOqtaneScopedServices(this IServiceCollecti
             services.AddScoped<ILocalizationService, LocalizationService>();
             services.AddScoped<ILanguageService, LanguageService>();
             services.AddScoped<IDatabaseService, DatabaseService>();
+            services.AddScoped<IUrlMappingService, UrlMappingService>();
+            services.AddScoped<IVisitorService, VisitorService>();
             services.AddScoped<ISyncService, SyncService>();
 
             return services;

diff --git a/Oqtane.Client/Installer/Installer.razor b/Oqtane.Client/Installer/Installer.razor
@@ -158,8 +158,8 @@
         if (firstRender)
         {
             var interop = new Interop(JSRuntime);
-            await interop.IncludeLink("", "stylesheet", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.0.2/css/bootstrap.min.css", "text/css", "sha512-usVBAd66/NpVNfBge19gws2j6JZinnca12rAe2l+d+QkLU9fiG02O1X8Q6hepIpr/EYKZvKx/I9WsnujJuOmBA==", "anonymous", "");
-            await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.0.2/js/bootstrap.min.js", "sha512-a6ctI6w1kg3J4dSjknHj3aWLEbjitAXAjLDRUxo2wyYmDFRcz2RJuQr5M3Kt8O/TtUSp8n2rAyaXYy1sjoKmrQ==", "anonymous", "", "head", "");
+            await interop.IncludeLink("", "stylesheet", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css", "text/css", "sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==", "anonymous", "");
+            await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.bundle.min.js", "sha512-pax4MlgXjHEPfCwcJLQhigY7+N8rt6bVvWLFyUMuxShv170X53TRzGPmPkZmGBhk+jikR8WBM4yl7A9WMHHqvg==", "anonymous", "", "head", "");
         }
     }
 

diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor
@@ -113,7 +113,7 @@ else
         <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Language: </Label>
+                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="LanguageUpload">Language: </Label>
                     <div class="col-sm-9">
                         <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
                     </div>
@@ -350,7 +350,7 @@ else
             var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
             await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360);
 
-            NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true);
+            NavigationManager.NavigateTo(NavigationManager.Uri, true);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
@@ -10,108 +10,40 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
     <div class="container">
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-
-    </div>
        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
+            <Label Class="col-sm-3" For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
             <div class="col-sm-9">
                 <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
+            <Label Class="col-sm-3" For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
             <div class="col-sm-9">
                 <input id="level" class="form-control" @bind="@_level" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
+            <Label Class="col-sm-3" For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
             <div class="col-sm-9">
                 <input id="feature" class="form-control" @bind="@_feature" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-                 <Label Class="col-sm-3" For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
+            <Label Class="col-sm-3" For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
             <div class="col-sm-9">
                 <input id="function" class="form-control" @bind="@_function" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-               <Label Class="col-sm-3" For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
+            <Label Class="col-sm-3" For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
             <div class="col-sm-9">
                 <input id="category" class="form-control" @bind="@_category" readonly />
             </div>
        </div>
         @if (_pageName != string.Empty)
         {
            <div class="row mb-1 align-items-center">
-                   <Label Class="col-sm-3" For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
+                <Label Class="col-sm-3" For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
                 <div class="col-sm-9">
                     <input id="page" class="form-control" @bind="@_pageName" readonly />
                 </div>
@@ -120,7 +52,7 @@
         @if (_moduleTitle != string.Empty)
         {
            <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
+                <Label Class="col-sm-3" For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
                 <div class="col-sm-9">
                     <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
                 </div>
@@ -129,51 +61,52 @@
         @if (_username != string.Empty)
         {
            <div class="row mb-1 align-items-center">
-                   <Label Class="col-sm-3" For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
+                <Label Class="col-sm-3" For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
                  <div class="col-sm-9">
                     <input id="user" class="form-control" @bind="@_username" readonly />
                 </div>
            </div>
         }
        <div class="row mb-1 align-items-center">
-               <Label Class="col-sm-3" For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
+            <Label Class="col-sm-3" For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
             <div class="col-sm-9">
                 <input id="url" class="form-control" @bind="@_url" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-               <Label Class="col-sm-3" For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
+            <Label Class="col-sm-3" For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
             <div class="col-sm-9">
                 <input id="template" class="form-control" @bind="@_template" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-                 <Label Class="col-sm-3" For="message" HelpText="The message that the system generated" ResourceKey="Message">Message: </Label>
+            <Label Class="col-sm-3" For="message" HelpText="The message that the system generated" ResourceKey="Message">Message: </Label>
             <div class="col-sm-9">
                 <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
             </div>
        </div>
         @if (!string.IsNullOrEmpty(_exception))
         {
            <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
-               <div class="col-sm-9">
+                <Label Class="col-sm-3" For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
+				<div class="col-sm-9">
                     <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
                 </div>
            </div>
         }
        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
+            <Label Class="col-sm-3" For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
             <div class="col-sm-9">
                 <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
-           <div class="col-sm-9">
+            <Label Class="col-sm-3" For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
+			<div class="col-sm-9">
                 <input id="server" class="form-control" @bind="@_server" readonly />
             </div>
         </div>
+    </div>
 
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 

diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -51,11 +51,11 @@ else
     {
         <Pager Items="@_logs">
             <Header>
-            <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Date"]</th>
-            <th>@Localizer["Level"]</th>
-            <th>@Localizer["Feature"]</th>
-            <th>@Localizer["Function"]</th>
+				<th style="width: 1px;">&nbsp;</th>
+				<th>@Localizer["Date"]</th>
+				<th>@Localizer["Level"]</th>
+				<th>@Localizer["Feature"]</th>
+				<th>@Localizer["Function"]</th>
             </Header>
             <Row>
                 <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>

diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/ModuleInfo.cs b/Oqtane.Client/Modules/Admin/ModuleCreator/ModuleInfo.cs
@@ -1,7 +1,9 @@
-using Oqtane.Models;
+using Oqtane.Documentation;
+using Oqtane.Models;
 
 namespace Oqtane.Modules.Admin.ModuleCreator
 {
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
     public class ModuleInfo : IModule
     {
         public ModuleDefinition ModuleDefinition => new ModuleDefinition

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -22,6 +22,7 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
             <th>@SharedLocalizer["Version"]</th>
+            <th>@Localizer["InUse"]</th>
             <th>@SharedLocalizer["Expires"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
@@ -35,6 +36,16 @@ else
             </td>
             <td>@context.Name</td>
             <td>@context.Version</td>
+            <td>
+                @if(context.AssemblyName == "Oqtane.Client" || PageState.Modules.Where(m => m.ModuleDefinition.ModuleDefinitionId == context.ModuleDefinitionId).Count() > 0)
+                {
+                    <span>@SharedLocalizer["Yes"]</span>
+                }
+                else
+                {
+                    <span>@SharedLocalizer["No"]</span>
+                }
+            </td>
             <td>
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>