From 0d75e0f555e0dbbbd2417f3dc11faa26223a50a7 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Wed, 11 Feb 2026 14:12:15 -0500 Subject: [PATCH] Revert "Revert "Rename client and server module services"" --- .../Client/Modules/[Owner].Module.[Module]/Edit.razor | 10 +++++----- .../Client/Modules/[Owner].Module.[Module]/Index.razor | 8 ++++---- .../{[Module]Service.cs => Client[Module]Service.cs} | 4 ++-- .../Templates/Internal/Client/Startup/ClientStartup.cs | 2 +- .../{[Module]Service.cs => Server[Module]Service.cs} | 0 5 files changed, 12 insertions(+), 12 deletions(-) rename Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Services/{[Module]Service.cs => Client[Module]Service.cs} (90%) rename Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Services/{[Module]Service.cs => Server[Module]Service.cs} (100%) diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Edit.razor b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Edit.razor index 59badca4..a9406963 100644 --- a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Edit.razor +++ b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Edit.razor @@ -4,7 +4,7 @@ @namespace [Owner].Module.[Module] @inherits ModuleBase -@inject I[Module]Service [Module]Service +@inject I[Module]Service Client[Module]Service @inject NavigationManager NavigationManager @inject IStringLocalizer Localizer @@ -50,7 +50,7 @@ if (PageState.Action == "Edit") { _id = Int32.Parse(PageState.QueryString["id"]); - [Module] [Module] = await [Module]Service.Get[Module]Async(_id, ModuleState.ModuleId); + [Module] [Module] = await Client[Module]Service.Get[Module]Async(_id, ModuleState.ModuleId); if ([Module] != null) { _name = [Module].Name; @@ -81,14 +81,14 @@ [Module] [Module] = new [Module](); [Module].ModuleId = ModuleState.ModuleId; [Module].Name = _name; - [Module] = await [Module]Service.Add[Module]Async([Module]); + [Module] = await Client[Module]Service.Add[Module]Async([Module]); await logger.LogInformation("[Module] Added {[Module]}", [Module]); } else { - [Module] [Module] = await [Module]Service.Get[Module]Async(_id, ModuleState.ModuleId); + [Module] [Module] = await Client[Module]Service.Get[Module]Async(_id, ModuleState.ModuleId); [Module].Name = _name; - await [Module]Service.Update[Module]Async([Module]); + await Client[Module]Service.Update[Module]Async([Module]); await logger.LogInformation("[Module] Updated {[Module]}", [Module]); } NavigationManager.NavigateTo(NavigateUrl()); diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Index.razor b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Index.razor index af8a4839..b53e5d23 100644 --- a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Index.razor +++ b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Index.razor @@ -3,7 +3,7 @@ @namespace [Owner].Module.[Module] @inherits ModuleBase -@inject I[Module]Service [Module]Service +@inject I[Module]Service Client[Module]Service @inject NavigationManager NavigationManager @inject IStringLocalizer Localizer @@ -52,7 +52,7 @@ else { try { - _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId); + _[Module]s = await Client[Module]Service.Get[Module]sAsync(ModuleState.ModuleId); } catch (Exception ex) { @@ -65,9 +65,9 @@ else { try { - await [Module]Service.Delete[Module]Async([Module].[Module]Id, ModuleState.ModuleId); + await Client[Module]Service.Delete[Module]Async([Module].[Module]Id, ModuleState.ModuleId); await logger.LogInformation("[Module] Deleted {[Module]}", [Module]); - _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId); + _[Module]s = await Client[Module]Service.Get[Module]sAsync(ModuleState.ModuleId); StateHasChanged(); } catch (Exception ex) diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Services/[Module]Service.cs b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Services/Client[Module]Service.cs similarity index 90% rename from Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Services/[Module]Service.cs rename to Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Services/Client[Module]Service.cs index 24046476..ec451c42 100644 --- a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Services/[Module]Service.cs +++ b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Services/Client[Module]Service.cs @@ -8,9 +8,9 @@ using Oqtane.Shared; namespace [Owner].Module.[Module].Services { - public class [Module]Service : ServiceBase, I[Module]Service + public class Client[Module]Service : ServiceBase, I[Module]Service { - public [Module]Service(HttpClient http, SiteState siteState) : base(http, siteState) { } + public Client[Module]Service(HttpClient http, SiteState siteState) : base(http, siteState) { } private string Apiurl => CreateApiUrl("[Module]"); diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Startup/ClientStartup.cs b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Startup/ClientStartup.cs index 95ed096c..14170a14 100644 --- a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Startup/ClientStartup.cs +++ b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Startup/ClientStartup.cs @@ -11,7 +11,7 @@ namespace [Owner].Module.[Module].Startup { if (!services.Any(s => s.ServiceType == typeof(I[Module]Service))) { - services.AddScoped(); + services.AddScoped(); } } } diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Services/[Module]Service.cs b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Services/Server[Module]Service.cs similarity index 100% rename from Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Services/[Module]Service.cs rename to Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Server/Services/Server[Module]Service.cs