GH-69 :: adjust cherry-picked code

src/TrainingGuides.Web/Features/Articles/Widgets/ArticleList/ArticleListWidgetProperties.cs

@@ -2,7 +2,6 @@
 using Kentico.PageBuilder.Web.Mvc;
 using Kentico.Xperience.Admin.Base.FormAnnotations;
 using Kentico.Xperience.Admin.Websites.FormAnnotations;
-using TrainingGuides.Web.Features.Shared.OptionProviders;
 
 namespace TrainingGuides.Web.Features.Articles.Widgets.ArticleList;
 
@@ -27,16 +26,7 @@ public class ArticleListWidgetProperties : IWidgetProperties
 
     [DropDownComponent(
         Label = "Order articles by",
-        DataProviderType = typeof(DropdownEnumOptionProvider<OrderByOption>),
+        Options = "NewestFirst;Newest first\r\nOldestFirst;Oldest first",
         Order = 40)]
-    public string OrderBy { get; set; } = OrderByOption.NewestFirst.ToString();
-}
-
-public enum OrderByOption
-{
-    [Description("Newest first")]
-    NewestFirst,
-    [Description("Oldest first")]
-    OldestFirst
-
+    public string OrderBy { get; set; } = "NewstFirst";
 }

src/TrainingGuides.Web/Features/Articles/Widgets/ArticleList/ArticleListWidgetViewComponent.cs

@@ -53,7 +53,7 @@ public async Task<ViewViewComponentResult> InvokeAsync(ArticleListWidgetProperti
                 selectedPagePath,
                 3);
 
-            model.Articles = (properties.OrderBy.Equals(OrderByOption.OldestFirst.ToString())
+            model.Articles = (properties.OrderBy.Equals("OldestFirst", StringComparison.OrdinalIgnoreCase)
                 ? (await GetArticlePageViewModels(articlePages)).OrderBy(article => article.CreatedOn)
                 : (await GetArticlePageViewModels(articlePages)).OrderByDescending(article => article.CreatedOn))
                 .Take(properties.TopN)

src/TrainingGuides.Web/Features/Shared/Services/ContentItemRetrieverService.cs

@@ -120,33 +120,6 @@ public async Task<IEnumerable<T>> RetrieveWebPageChildrenByPath(
         return pages;
     }
 
-    public async Task<IEnumerable<T>> RetrieveWebPageChildrenByPath(
-        string parentPageContentTypeName,
-        string parentPagePath,
-        Action<ContentTypeQueryParameters> contentTypeQueryParameters,
-        int depth = 1)
-    {
-        var builder = new ContentItemQueryBuilder()
-                            .ForContentType(
-                                parentPageContentTypeName,
-                                config => contentTypeQueryParameters(
-                                    config
-                                        .ForWebsite(webSiteChannelContext.WebsiteChannelName, [PathMatch.Children(parentPagePath)])
-                                        .WithLinkedItems(depth)
-                                    )
-                                )
-                            .InLanguage(preferredLanguageRetriever.Get());
-
-        var queryExecutorOptions = new ContentQueryExecutionOptions
-        {
-            ForPreview = webSiteChannelContext.IsPreview
-        };
-
-        var pages = await contentQueryExecutor.GetMappedWebPageResult<T>(builder, queryExecutorOptions);
-
-        return pages;
-    }
-
 
 
     /// <summary>
@@ -222,18 +195,6 @@ private async Task<IEnumerable<IContentItemFieldsSource>> RetrieveContentItems(A
         return await contentQueryExecutor.GetMappedResult<IContentItemFieldsSource>(builder);
     }
 
-    /// <summary>
-    /// Retrieeves reusable content items based on the provided reusable field schema name, further filtring by the provided content query parameters.
-    /// </summary>
-    /// <param name="schemaName">The name of the reusable field schema</param>
-    /// <param name="contentQueryParameters">Content query filter</param>
-    /// <returns>Enumerable list of content items</returns>
-    public async Task<IEnumerable<IContentItemFieldsSource>> RetrieveContentItemsBySchema(string schemaName, Action<ContentQueryParameters> contentQueryParameters) =>
-        await RetrieveContentItems(contentQueryParameters, contentTypesQueryParameters =>
-                {
-                    contentTypesQueryParameters.OfReusableSchema(schemaName);
-                });
-
     private async Task<IEnumerable<IWebPageFieldsSource>> RetrieveWebPages(Action<ContentQueryParameters> parameters)
     {
         var builder = new ContentItemQueryBuilder();
@@ -262,4 +223,20 @@ private async Task<IEnumerable<IWebPageFieldsSource>> RetrieveWebPages(Action<Co
 
         return pages.FirstOrDefault();
     }
+
+        /// <summary>
+    /// Retrieves the IWebPageFieldsSource of a web page item by Guid.
+    /// </summary>
+    /// <param name="webPageItemGuid">the Guid of the web page item</param>
+    /// <returns><see cref="IWebPageFieldsSource"/> object containing generic <see cref="WebPageFields"/> for the item</returns>
+    public async Task<IWebPageFieldsSource?> RetrieveWebPageByGuid(
+        Guid webPageItemGuid)
+    {
+        var pages = await RetrieveWebPages(parameters =>
+            {
+                parameters.Where(where => where.WhereEquals(nameof(WebPageFields.WebPageItemGUID), webPageItemGuid));
+            });
+
+        return pages.FirstOrDefault();
+    }
 }

src/TrainingGuides.Web/Features/Shared/Services/IContentItemRetrieverService.cs

@@ -20,12 +20,6 @@ public Task<IEnumerable<T>> RetrieveWebPageChildrenByPath(
         string path,
         int depth = 1);
 
-    public Task<IEnumerable<T>> RetrieveWebPageChildrenByPath(
-        string parentPageContentTypeName,
-        string path,
-        Action<ContentTypeQueryParameters> contentTypeQueryParameters,
-        int depth = 1);
-
     public Task<T?> RetrieveContentItemByGuid(
         Guid contentItemGuid,
         string contentTypeName,
@@ -42,5 +36,4 @@ public interface IContentItemRetrieverService
 
     public Task<IWebPageFieldsSource?> RetrieveWebPageByGuid(Guid webPageItemGuid);
 
-    public Task<IEnumerable<IContentItemFieldsSource>> RetrieveContentItemsBySchema(string schemaName, Action<ContentQueryParameters> contentQueryParameters);
 }