From 5a2af6d0f921aae4db905fdda22cb63523bb5f19 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 17 Jul 2024 16:17:10 -0400 Subject: [PATCH] update module template to .NET 8.0.7 --- .../HtmlText/Manager/HtmlTextManager.cs | 4 +-- .../[Owner].Module.[Module]/Index.razor | 3 +- .../[Owner].Module.[Module].Client.csproj | 6 ++-- .../Server/Manager/[Module]Manager.cs | 33 ++++++++++--------- .../[Owner].Module.[Module].Server.csproj | 8 ++--- 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs index 6c61c25e7..d0a9f3025 100644 --- a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs +++ b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs @@ -66,8 +66,8 @@ public async Task> GetSearchContentsAsync(PageModule pageMod Title = pageModule.Module.Title, Description = string.Empty, Body = htmltext.Content, - ContentModifiedBy = htmltext.ModifiedBy, - ContentModifiedOn = htmltext.ModifiedOn + ContentModifiedBy = htmltext.CreatedBy, + ContentModifiedOn = htmltext.CreatedOn }); } } diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].Module.[Module]/Index.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].Module.[Module]/Index.razor index ac84a97ef..4c68ada60 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].Module.[Module]/Index.razor +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].Module.[Module]/Index.razor @@ -38,8 +38,7 @@ else } @code { - // uncomment the following line to use Static render mode for this component - // public override string RenderMode => RenderModes.Static; + public override string RenderMode => RenderModes.Static; public override List Resources => new List() { diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj index 4181f2df0..1360e50b4 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Manager/[Module]Manager.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Manager/[Module]Manager.cs index dcd9e4325..63945d3de 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Manager/[Module]Manager.cs +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Manager/[Module]Manager.cs @@ -9,6 +9,7 @@ using Oqtane.Enums; using Oqtane.Repository; using [Owner].Module.[Module].Repository; +using System.Threading.Tasks; namespace [Owner].Module.[Module].Manager { @@ -60,23 +61,25 @@ public void ImportModule(Oqtane.Models.Module module, string content, string ver } } - public List GetSearchContents(Oqtane.Models.Module module, DateTime startTime) + public Task> GetSearchContentsAsync(PageModule pageModule, DateTime lastIndexedOn) { - var searchContentList = new List(); + var searchContentList = new List(); - var [Module]s = _[Module]Repository.Get[Module]s(module.ModuleId); - foreach (var [Module] in [Module]s) - { - searchContentList.Add(new SearchContent - { - Title = module.Title, - Description = string.Empty, - Body = [Module].Name, - ModifiedTime = [Module].ModifiedOn - }); - } + foreach (var [Module] in _[Module]Repository.Get[Module]s(pageModule.ModuleId)) + { + if ([Module].ModifiedOn >= lastIndexedOn) + { + searchContentList.Add(new SearchContent + { + Title = pageModule.Module.Title, + Body = [Module].Name, + ContentModifiedBy = [Module].ModifiedBy, + ContentModifiedOn = [Module].ModifiedOn + }); + } + } - return searchContentList; + return Task.FromResult(searchContentList); } -} + } } diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj index 43859eccb..e76e299d9 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj @@ -19,10 +19,10 @@ - - - - + + + +