Merge pull request #43 from Kentico/feat/remove-obsolete-api-references

Feat/remove obsolete api references

Directory.Packages.props

@@ -6,10 +6,10 @@
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Kentico.Xperience.Admin" Version="29.0.0" />
-    <PackageVersion Include="Kentico.Xperience.WebApp" Version="29.0.0" />
-    <PackageVersion Include="kentico.xperience.azurestorage" Version="29.0.0" />
-    <PackageVersion Include="kentico.xperience.imageprocessing" Version="29.0.0" />
+    <PackageVersion Include="Kentico.Xperience.Admin" Version="29.5.3" />
+    <PackageVersion Include="Kentico.Xperience.WebApp" Version="29.5.3" />
+    <PackageVersion Include="kentico.xperience.azurestorage" Version="29.5.3" />
+    <PackageVersion Include="kentico.xperience.imageprocessing" Version="29.5.3" />
     <PackageVersion Include="Kentico.Xperience.TagManager" Version="" Condition="'$(LOCAL_NUGET)' == 'true'" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />

examples/DancingGoat/.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "kentico.xperience.dbmanager": {
-      "version": "28.1.0",
+      "version": "29.5.3",
       "commands": [
         "kentico-xperience-dbmanager"
       ]

examples/DancingGoat/AdminComponents/Apps/SampleDataGenerator/SampleDataGeneratorApplication.cs

@@ -43,7 +43,7 @@ public class SampleDataGeneratorApplication : OverviewPageBase
         private readonly IInfoProvider<ConsentInfo> consentInfoProvider;
         private readonly IInfoProvider<BizFormInfo> bizFormInfoProvider;
         private readonly IInfoProvider<ContactGroupInfo> contactGroupInfoProvider;
-        private readonly ISettingsKeyInfoProvider settingsKeyInfoProvider;
+        private readonly IInfoProvider<SettingsKeyInfo> settingsKeyInfoProvider;
         private readonly IInfoProvider<WebsiteChannelInfo> websiteChannelInfoProvider;
 
 
@@ -63,7 +63,7 @@ public SampleDataGeneratorApplication(
             IInfoProvider<ConsentInfo> consentInfoProvider,
             IInfoProvider<BizFormInfo> bizFormInfoProvider,
             IInfoProvider<ContactGroupInfo> contactGroupInfoProvider,
-            ISettingsKeyInfoProvider settingsKeyInfoProvider,
+            IInfoProvider<SettingsKeyInfo> settingsKeyInfoProvider,
             IInfoProvider<WebsiteChannelInfo> websiteChannelInfoProvider)
         {
             this.formBuilderConfigurationSerializer = formBuilderConfigurationSerializer;

examples/DancingGoat/Components/ComponentIdentifiers.cs

@@ -21,4 +21,4 @@ public static class ComponentIdentifiers
         public const string ARTICLE_TEMPLATE = "DancingGoat.Article";
         public const string ARTICLE_WITH_SIDEBAR_TEMPLATE = "DancingGoat.ArticleWithSidebar";
     }
-}
+}

examples/DancingGoat/Components/FormBuilderComponentRegister.cs

@@ -2,4 +2,4 @@
 
 using Kentico.Forms.Web.Mvc;
 
-[assembly: RegisterFormSection("DancingGoat.TitledSection", "Section with title", "~/Components/FormSections/TitledSection/_TitledSection.cshtml", Description = "Single-column section with one zone and an editable title", IconClass = "icon-rectangle-a", PropertiesType = typeof(TitledSectionProperties))]
+[assembly: RegisterFormSection("DancingGoat.TitledSection", "Section with title", "~/Components/FormSections/TitledSection/_TitledSection.cshtml", Description = "Single-column section with one zone and an editable title", IconClass = "icon-rectangle-a", PropertiesType = typeof(TitledSectionProperties))]

examples/DancingGoat/Components/InlineEditors/ColorPickerEditor/ColorPickerEditorViewModel.cs

@@ -10,4 +10,4 @@ public sealed class ColorPickerEditorViewModel : InlineEditorViewModel
         /// </summary>
         public string ColorCssClass { get; set; }
     }
-}
+}

examples/DancingGoat/Components/InlineEditors/InlineEditorViewModel.cs

@@ -10,4 +10,4 @@ public abstract class InlineEditorViewModel
         /// </summary>
         public string PropertyName { get; set; }
     }
-}
+}

examples/DancingGoat/Components/InlineEditors/TextEditor/TextEditorViewModel.cs

@@ -16,4 +16,4 @@ public sealed class TextEditorViewModel : InlineEditorViewModel
         /// </summary>
         public string PlaceholderText { get; set; } = "Type your text";
     }
-}
+}

examples/DancingGoat/Components/PageBuilderComponentRegister.cs

@@ -1,4 +1,4 @@
-using DancingGoat;
+using DancingGoat;
 using DancingGoat.Models;
 using DancingGoat.PageTemplates;
 using DancingGoat.Sections;

examples/DancingGoat/Components/Personalization/ConditionTypes/IsInContactGroupConditionType.cs

@@ -46,4 +46,4 @@ public override bool Evaluate()
             return contact.IsInAnyContactGroup(SelectedContactGroups.Select(c => c.ObjectCodeName).ToArray());
         }
     }
-}
+}

examples/DancingGoat/Components/Sections/ThemeSectionProperties.cs

@@ -14,4 +14,4 @@ public class ThemeSectionProperties : ISectionProperties
         [DropDownComponent(Label = "Color scheme", Order = 1, Options = ";None\nsection-white;Flat white\nsection-cappuccino;Cappuccino")]
         public string Theme { get; set; }
     }
-}
+}

examples/DancingGoat/Components/Sections/ThreeColumnSection/ThreeColumnSectionProperties.cs

@@ -13,4 +13,4 @@ public class ThreeColumnSectionProperties : ThemeSectionProperties
         [TextInputComponent(Label = "Title", Order = 1)]
         public string Title { get; set; }
     }
-}
+}

examples/DancingGoat/Components/Sections/ZoneRestrictions.cs

@@ -58,4 +58,4 @@ private static IEnumerable<string> GetWidgetsIdentifiers()
                    .Select(definition => definition.Identifier);
         }
     }
-}
+}

examples/DancingGoat/Components/ViewComponents/Articles/ArticlesViewComponent.cs

@@ -43,10 +43,10 @@ public async Task<ViewViewComponentResult> InvokeAsync(WebPageRelatedItem articl
         {
             var languageName = currentLanguageRetriever.Get();
 
-            var articlesSection = await articlesSectionRepository.GetArticlesSection(articlesSectionItem.WebPageGuid, languageName);
+            var articlesSection = await articlesSectionRepository.GetArticlesSection(articlesSectionItem.WebPageGuid, languageName, HttpContext.RequestAborted);
             if (articlesSection == null)
             {
-                return View("~/Components/ViewComponents/Articles/Default.cshtml", ArticlesSectionViewModel.GetViewModel(Enumerable.Empty<ArticleViewModel>(), string.Empty));
+                return View("~/Components/ViewComponents/Articles/Default.cshtml", ArticlesSectionViewModel.GetViewModel(null, Enumerable.Empty<ArticleViewModel>(), string.Empty));
             }
 
             var articlePages = await articlePageRepository.GetArticles(articlesSection.SystemFields.WebPageItemTreePath,
@@ -55,15 +55,15 @@ public async Task<ViewViewComponentResult> InvokeAsync(WebPageRelatedItem articl
             var models = new List<ArticleViewModel>();
             foreach (var article in articlePages)
             {
-                var model = await ArticleViewModel.GetViewModel(article, urlRetriever, languageName);
+                var model = await ArticleViewModel.GetViewModel(article, urlRetriever, languageName, HttpContext.RequestAborted);
                 models.Add(model);
             }
 
-            var url = (await urlRetriever.Retrieve(articlesSection, languageName)).RelativePath;
+            var url = (await urlRetriever.Retrieve(articlesSection, languageName, HttpContext.RequestAborted)).RelativePath;
 
-            var viewModel = ArticlesSectionViewModel.GetViewModel(models, url);
+            var viewModel = ArticlesSectionViewModel.GetViewModel(articlesSection, models, url);
 
             return View("~/Components/ViewComponents/Articles/Default.cshtml", viewModel);
         }
     }
-}
+}

examples/DancingGoat/Components/ViewComponents/Banner/BannerViewComponent.cs

@@ -15,4 +15,4 @@ public ViewViewComponentResult Invoke(BannerViewModel banner)
             return View("~/Components/ViewComponents/Banner/Default.cshtml", banner);
         }
     }
-}
+}

examples/DancingGoat/Components/ViewComponents/Cafe/CafeViewComponent.cs

@@ -15,4 +15,4 @@ public ViewViewComponentResult Invoke(CafeViewModel cafe)
             return View("~/Components/ViewComponents/Cafe/Default.cshtml", cafe);
         }
     }
-}
+}

examples/DancingGoat/Components/ViewComponents/Cafe/Default.cshtml

@@ -8,13 +8,11 @@
     }
     else
     {
-        <a href="#" class="ourcoffee-tile-link">
-            <h2 class="ourcoffee-tile-text center-text">@Model.Name</h2>
-            <span class="cafe-overlay"> </span>
-            @if (!string.IsNullOrEmpty(Model.PhotoPath))
-            {
-                <img src="@Url.Content(Model.PhotoPath)" alt="@Model.PhotoShortDescription" title="@Model.Name" class="ourcoffee-tile-image" loading="lazy" />
-            }
-        </a>
+        <h2 class="ourcoffee-tile-text center-text">@Model.Name</h2>
+        <span class="cafe-overlay"> </span>
+        @if (!string.IsNullOrEmpty(Model.PhotoPath))
+        {
+            <img src="@Url.Content(Model.PhotoPath)" alt="@Model.PhotoShortDescription" title="@Model.Name" class="ourcoffee-tile-image" loading="lazy" />
+        }
     }
 </div>

examples/DancingGoat/Components/ViewComponents/CafeCardSection/CafeCardSectionViewComponent.cs

@@ -1,8 +1,13 @@
 using System.Collections.Generic;
-using System.Linq;
+using System.Threading.Tasks;
+using System.Threading;
+
+using CMS.Websites;
 
 using DancingGoat.Models;
 
+using Kentico.Content.Web.Mvc.Routing;
+
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewComponents;
 
@@ -11,11 +16,39 @@ namespace DancingGoat.ViewComponents
     /// <summary>
     /// Cafe card section view component.
     /// </summary>
-    public class CafeCardSectionViewComponent: ViewComponent
+    public class CafeCardSectionViewComponent : ViewComponent
     {
-        public ViewViewComponentResult Invoke(IEnumerable<CafeViewModel> cafes)
+        private readonly ContactsPageRepository contactsPageRepository;
+        private readonly IWebPageUrlRetriever webPageUrlRetriever;
+        private readonly IPreferredLanguageRetriever currentLanguageRetriever;
+
+
+        public CafeCardSectionViewComponent(IPreferredLanguageRetriever currentLanguageRetriever, ContactsPageRepository contactsPageRepository, IWebPageUrlRetriever webPageUrlRetriever)
+        {
+            this.currentLanguageRetriever = currentLanguageRetriever;
+            this.contactsPageRepository = contactsPageRepository;
+            this.webPageUrlRetriever = webPageUrlRetriever;
+        }
+
+
+        public async Task<ViewViewComponentResult> InvokeAsync(IEnumerable<CafeViewModel> cafes)
         {
-            return View("~/Components/ViewComponents/CafeCardSection/Default.cshtml", cafes.Take(3));
+            string languageName = currentLanguageRetriever.Get();
+            string contactsPagePath = await GetContactsPagePath(languageName, HttpContext.RequestAborted);
+            var model = new CafeCardSectionViewModel(cafes, contactsPagePath);
+
+            return View("~/Components/ViewComponents/CafeCardSection/Default.cshtml", model);
+        }
+
+
+        private async Task<string> GetContactsPagePath(string languageName, CancellationToken cancellationToken)
+        {
+            const string CONTACTS_PAGE_TREE_PATH = "/Contacts";
+
+            var contactsPage = await contactsPageRepository.GetContactsPage(CONTACTS_PAGE_TREE_PATH, languageName, cancellationToken);
+            var url = await webPageUrlRetriever.Retrieve(contactsPage, cancellationToken);
+
+            return url.RelativePath;
         }
     }
 }

examples/DancingGoat/Components/ViewComponents/CafeCardSection/CafeCardSectionViewModel.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+using DancingGoat.Models;
+
+namespace DancingGoat.ViewComponents
+{
+    public record CafeCardSectionViewModel(IEnumerable<CafeViewModel> Cafes, string ContactsPagePath)
+    {
+    }
+}

examples/DancingGoat/Components/ViewComponents/CafeCardSection/Default.cshtml

@@ -1,15 +1,17 @@
-@using DancingGoat.Models
-@model IEnumerable<CafeViewModel>
+@using DancingGoat.ViewComponents
+@model CafeCardSectionViewModel
 
 <div class="row cafe-cards">
     <div class="title-wrapper">
         <h1 class="title-tab">@HtmlLocalizer["Taste our coffee"]</h1>
     </div>
     <div class="row row--with-cols-padding">
-        @foreach (var cafe in Model)
+        @foreach (var cafe in Model.Cafes)
         {
             <div class="col-md-4">
-                <vc:cafe cafe="@cafe" />
+                <a href="@Model.ContactsPagePath" class="ourcoffee-tile-link">
+                    <vc:cafe cafe="@cafe" />
+                </a>
             </div>
         }
     </div>

examples/DancingGoat/Components/ViewComponents/NavigationMenu/NavigationMenuViewComponent.cs

@@ -27,4 +27,4 @@ public async Task<IViewComponentResult> InvokeAsync()
             return View($"~/Components/ViewComponents/NavigationMenu/Default.cshtml", navigationViewModels);
         }
     }
-}
+}

examples/DancingGoat/Components/ViewComponents/TrackingConsent/TrackingConsentViewComponent.cs

@@ -54,15 +54,15 @@ public async Task<IViewComponentResult> InvokeAsync()
                 {
                     ConsentShortText = (await consent.GetConsentTextAsync(currentLanguage)).ShortText,
                     ReturnPageUrl = webPageDataContextRetriever.TryRetrieve(out var currentWebPageContext)
-                        ? (await urlRetriever.Retrieve(currentWebPageContext.WebPage.WebPageItemID, currentLanguage)).RelativePath
+                        ? (await urlRetriever.Retrieve(currentWebPageContext.WebPage.WebPageItemID, currentLanguage, cancellationToken: HttpContext.RequestAborted)).RelativePath
                         : (HttpContext.Request.PathBase + HttpContext.Request.Path).Value
                 };
 
                 var contact = ContactManagementContext.CurrentContact;
                 if ((contact != null) && consentAgreementService.IsAgreed(contact, consent))
                 {
                     consentModel.IsConsentAgreed = true;
-                    consentModel.PrivacyPageUrl = Url.Content((await urlRetriever.Retrieve(PrivacyPageConstants.PRIVACY_PAGE_TREE_PATH, websiteChannelContext.WebsiteChannelName, currentLanguage)).RelativePath);
+                    consentModel.PrivacyPageUrl = Url.Content((await urlRetriever.Retrieve(PrivacyPageConstants.PRIVACY_PAGE_TREE_PATH, websiteChannelContext.WebsiteChannelName, currentLanguage, cancellationToken: HttpContext.RequestAborted)).RelativePath);
                 }
 
                 return View("~/Components/ViewComponents/TrackingConsent/Default.cshtml", consentModel);

examples/DancingGoat/Components/Widgets/CTAButton/CTAButtonWidgetViewModel.cs

@@ -22,4 +22,4 @@ public class CTAButtonWidgetViewModel
         /// </summary>
         public bool OpenInNewTab { get; set; }
     }
-}
+}

examples/DancingGoat/Components/Widgets/CardWidget/CardWidgetProperties.cs

@@ -23,4 +23,4 @@ public class CardWidgetProperties : IWidgetProperties
         /// </summary>
         public string Text { get; set; }
     }
-}
+}

examples/DancingGoat/Components/Widgets/CardWidget/CardWidgetViewComponent.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 
 using DancingGoat.Models;
@@ -66,4 +66,4 @@ private async Task<Image> GetImage(CardWidgetProperties properties, string langu
             return await imageRepository.GetImage(image.Identifier, languageName);
         }
     }
-}
+}

examples/DancingGoat/Components/Widgets/CardWidget/CardWidgetViewModel.cs

@@ -16,4 +16,4 @@ public class CardWidgetViewModel
         /// </summary>
         public string Text { get; set; }
     }
-}
+}

examples/DancingGoat/Components/Widgets/HeroImageWidget/HeroImageWidgetProperties.cs

@@ -46,4 +46,4 @@ public class HeroImageWidgetProperties : IWidgetProperties
         [DropDownComponent(Label = "Color scheme", Order = 3, Options = "light;Light\ndark;Dark")]
         public string Theme { get; set; } = "dark";
     }
-}
+}

examples/DancingGoat/Components/Widgets/HeroImageWidget/HeroImageWidgetViewComponent.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 
 using DancingGoat.Models;
@@ -68,4 +68,4 @@ private async Task<Image> GetImage(HeroImageWidgetProperties properties, string
             return await imageRepository.GetImage(image.Identifier, languageName);
         }
     }
-}
+}

examples/DancingGoat/Components/Widgets/HeroImageWidget/HeroImageWidgetViewModel.cs

@@ -34,4 +34,4 @@ public class HeroImageWidgetViewModel
         /// </summary>
         public string Theme { get; set; }
     }
-}
+}

examples/DancingGoat/Components/Widgets/ProductCardWidget/ProductCardListViewModel.cs

@@ -21,10 +21,10 @@ public class ProductCardListViewModel
         /// </summary>
         /// <param name="products">Collection of products.</param>
         /// <returns>Hydrated ViewModel.</returns>
-        public static ProductCardListViewModel GetViewModel(IEnumerable<Coffee> products)
+        public static ProductCardListViewModel GetViewModel(IEnumerable<IProductFields> products)
         {
             var productModels = new List<ProductCardViewModel>();
-            
+
             foreach (var product in products.Where(product => product != null))
             {
                 var productModel = ProductCardViewModel.GetViewModel(product);
@@ -37,4 +37,4 @@ public static ProductCardListViewModel GetViewModel(IEnumerable<Coffee> products
             };
         }
     }
-}
+}

examples/DancingGoat/Components/Widgets/ProductCardWidget/ProductCardProperties.cs

@@ -2,8 +2,6 @@
 
 using CMS.ContentEngine;
 
-using DancingGoat.Models;
-
 using Kentico.PageBuilder.Web.Mvc;
 using Kentico.Xperience.Admin.Base.FormAnnotations;
 
@@ -17,7 +15,7 @@ public class ProductCardProperties : IWidgetProperties
         /// <summary>
         /// Selected products.
         /// </summary>
-        [ContentItemSelectorComponent(Coffee.CONTENT_TYPE_NAME, Label = "Selected products", Order = 1)]
+        [ContentItemSelectorComponent(typeof(ProductCardSchemaFilter), Label = "Selected products", Order = 1)]
         public IEnumerable<ContentItemReference> SelectedProducts { get; set; } = new List<ContentItemReference>();
     }
-}
+}