From 2c17551d50253d796c935555ae2bcf0e2a4fee1f Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 16 Feb 2024 15:36:23 -0500 Subject: [PATCH] remove PageRepository reference in App --- Oqtane.Server/Components/App.razor | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor index 1b741832..c566722d 100644 --- a/Oqtane.Server/Components/App.razor +++ b/Oqtane.Server/Components/App.razor @@ -21,7 +21,6 @@ @inject IConfigManager ConfigManager @inject ITenantManager TenantManager @inject ISiteService SiteService -@inject IPageRepository PageRepository @inject IThemeRepository ThemeRepository @inject ILanguageRepository LanguageRepository @inject IServerStateManager ServerStateManager @@ -140,12 +139,19 @@ _prerender = site.Prerender; Route route = new Route(url, alias.Path); - var page = PageRepository.GetPage(route.PagePath, site.SiteId); - if (page == null && route.PagePath == "" && site.HomePageId != null) + var page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase)); + if (page == null && route.PagePath == "") // naked path refers to site home page { - page = PageRepository.GetPage(site.HomePageId.Value); + if (site.HomePageId != null) + { + page = site.Pages.FirstOrDefault(item => item.PageId == site.HomePageId); + } + if (page == null) + { + // fallback to use the first page in the collection + page = site.Pages.FirstOrDefault(); + } } - if (page == null || page.IsDeleted) { HandlePageNotFound(site, page, route); @@ -233,10 +239,6 @@ } // create initial PageState - // page needs to be populated - // site.modules need to be populated - // user needs to be populated - _pageState = new PageState { Alias = alias,