Merge pull request #23 from umbraco/v9/bugfix/partial-view-missing

V9/bugfix/partial view missing

Author: acoumb

azure-pipelines - Commerce.Shopify.yml

@@ -1,5 +1,5 @@
 trigger:
-- main
+- v9/bugfix/partial-view-missing
 
 pool:
   vmImage: 'windows-latest'

src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/Render/Products.cshtml

@@ -0,0 +1,12 @@
+@inherits Umbraco.Web.Mvc.UmbracoViewPage<List<Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels.ProductViewModel>>
+
+<dl class="products-list">
+    @foreach (var product in Model)
+    {
+        <dt class="product-title">@product.Title</dt>
+        <dd class="product-body">@Html.Raw(product.Body)</dd>
+        <img class="product-image" src="@product.Image" alt="@product.Title" />
+    }
+</dl>
+
+

src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/Render/ProductsV9.cshtml

@@ -0,0 +1,13 @@
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<List<Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels.ProductViewModel>>
+
+<dl class="products-list">
+    @foreach (var product in Model)
+    {
+        <dt class="product-title">@product.Title</dt>
+        <dd class="product-body">@Html.Raw(product.Body)</dd>
+        <img class="product-image" src="@product.Image" alt="@product.Title" /> 
+    }
+</dl>
+
+
+

src/Umbraco.Cms.Integrations.Commerce.Shopify/Constants.cs

@@ -14,6 +14,13 @@ public static class Constants
 
         public const string AppPluginFolderPath = "~/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify";
 
+        public static class RenderingComponent
+        {
+            public const string DefaultV8ViewPath = AppPluginFolderPath + "/Render/Products.cshtml";
+
+            public const string DefaultV9ViewPath = AppPluginFolderPath + "/Render/ProductsV9.cshtml";
+        }
+
         public static class Configuration
         {
             public const string Settings = "Umbraco:Cms:Integrations:Commerce:Shopify:Settings";

src/Umbraco.Cms.Integrations.Commerce.Shopify/Helpers/HtmlHelper.cs

@@ -17,14 +17,14 @@ namespace Umbraco.Cms.Integrations.Commerce.Shopify.Helpers
     public static class ShopifyHtmlExtensions
     {
 #if NETCOREAPP
-        public static IHtmlContent RenderShopifyProductsList(this HtmlHelper htmlHelper, List<ProductViewModel> vm)
+        public static IHtmlContent RenderShopifyProductsList(this IHtmlHelper<dynamic> htmlHelper, List<ProductViewModel> vm, string renderingViewPath = "")
         {
-            return htmlHelper.Partial($"{Constants.AppPluginFolderPath}/Render/Products.cshtml", vm);
+            return htmlHelper.Partial(string.IsNullOrEmpty(renderingViewPath) ? Constants.RenderingComponent.DefaultV9ViewPath : renderingViewPath, vm);
         }
 #else
-        public static IHtmlString RenderShopifyProductsList(this HtmlHelper htmlHelper, List<ProductViewModel> vm)
+        public static IHtmlString RenderShopifyProductsList(this HtmlHelper htmlHelper, List<ProductViewModel> vm, string renderingViewPath = "")
         {
-            return htmlHelper.Partial($"{Constants.AppPluginFolderPath}/Render/Products.cshtml", vm);
+            return htmlHelper.Partial(string.IsNullOrEmpty(renderingViewPath) ? Constants.RenderingComponent.DefaultV8ViewPath : renderingViewPath, vm);
         }
 #endif
     }

src/Umbraco.Cms.Integrations.Commerce.Shopify/Umbraco.Cms.Integrations.Commerce.Shopify.csproj

@@ -10,7 +10,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 	</PropertyGroup>

src/Umbraco.Cms.Integrations.Commerce.Shopify/package.xml

@@ -3,7 +3,7 @@
   <info>
     <package>
       <name>Umbraco.Cms.Integrations.Commerce.Shopify</name>
-      <version>1.0.0</version>
+      <version>1.0.1</version>
       <iconUrl></iconUrl>
       <licence url="https://opensource.org/licenses/MIT">MIT</licence>
       <url>https://github.com/umbraco/Umbraco.Cms.Integrations</url>