Fix rendering component for Umbraco 9; pass region parameter to rendering component using the view model.

acoumb · acoumb · commit 759d7d315f1f · 2022-03-08T17:05:56.000+02:00
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/Render/HubspotForm.cshtml b/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/Render/HubspotForm.cshtml
@@ -1,31 +1,14 @@
-﻿@using System.Configuration
-@inherits Umbraco.Web.Mvc.UmbracoViewPage<Umbraco.Cms.Integrations.Crm.Hubspot.Models.ViewModels.HubspotFormViewModel>
+﻿@inherits Umbraco.Web.Mvc.UmbracoViewPage<Umbraco.Cms.Integrations.Crm.Hubspot.Models.ViewModels.HubspotFormViewModel>
 
 @{
-    var region = ConfigurationManager.AppSettings["Umbraco.Cms.Integrations.Crm.Hubspot.Region"];
-
-    var hbsptScriptPath = string.IsNullOrEmpty(region) ? "//js.hsforms.net/forms/shell.js" : "//js-eu1.hsforms.net/forms/shell.js";
+    var hbsptScriptPath = string.IsNullOrEmpty(Model.Region) ? "//js.hsforms.net/forms/shell.js" : "//js-eu1.hsforms.net/forms/shell.js";
 }
 
 <script charset="utf-8" type="text/javascript" src="@hbsptScriptPath"></script>
-@if (string.IsNullOrEmpty(region))
-{
-    <script>
-        hbspt.forms.create({
-            portalId: "@Model.PortalId",
-            formId: "@Model.Id"
-        });
-    </script>
-
-}
-else
-{
-    <script>
-        hbspt.forms.create({
-            region: "@region",
-            portalId: "@Model.PortalId",
-            formId: "@Model.Id"
-        });
-    </script>
-
-}
+<script>
+    hbspt.forms.create({
+        region: "@Model.Region",
+        portalId: "@Model.PortalId",
+        formId: "@Model.Id"
+    });
+</script>
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/Render/HubspotFormV9.cshtml b/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/Render/HubspotFormV9.cshtml
@@ -0,0 +1,14 @@
+﻿@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Integrations.Crm.Hubspot.Models.ViewModels.HubspotFormViewModel>
+
+@{
+    var hbsptScriptPath = string.IsNullOrEmpty(Model.Region) ? "//js.hsforms.net/forms/shell.js" : "//js-eu1.hsforms.net/forms/shell.js";
+}
+
+<script charset="utf-8" type="text/javascript" src="@hbsptScriptPath"></script>
+<script>
+    hbspt.forms.create({
+        region: "@Model.Region",
+        portalId: "@Model.PortalId",
+        formId: "@Model.Id"
+    });
+</script>
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/views/formpickereditor.html b/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/views/formpickereditor.html
@@ -12,7 +12,7 @@
                     </div>
                     <div class="hsOverlayGroup">
                         <ul class="hsFormsList">
-                            <li ng-repeat="form in vm.hubspotFormsList | orderBy:'name' | filter:vm.searchTerm" ng-click="model.pickForm(form, vm.euRegion)" class="ng-scope" role="button" tabindex="0">
+                            <li ng-repeat="form in vm.hubspotFormsList | orderBy:'name' | filter:vm.searchTerm" ng-click="model.pickForm(form)" class="ng-scope" role="button" tabindex="0">
                                 <a href="" ng-attr-title="form.name">
                                     <i class="icon-umb-contour"></i>
                                     <span class="formLine">{{form.name}}</span>
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Controllers/FormsController.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Controllers/FormsController.cs
@@ -126,8 +126,10 @@ public async Task<ResponseDto> GetAll()
                         Name = hubspotForm.Name,
                         PortalId = hubspotForm.PortalId.ToString(),
                         Id = hubspotForm.Guid,
+                        Region = Options.Region,
                         Fields = string.Join(", ", hubspotForm.FormFieldGroups.SelectMany(x => x.Fields).Select(y => y.Label))
                     };
+
                     responseDto.Forms.Add(hubspotFormDto);
                 }
 
@@ -190,6 +192,7 @@ public async Task<ResponseDto> GetAllOAuth()
                         Name = hubspotForm.Name,
                         PortalId = hubspotForm.PortalId.ToString(),
                         Id = hubspotForm.Guid,
+                        Region = Options.Region,
                         Fields = string.Join(", ", hubspotForm.FormFieldGroups.SelectMany(x => x.Fields).Select(y => y.Label))
                     };
                     responseDto.Forms.Add(hubspotFormDto);
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Editors/FormPickerValueConverter.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Editors/FormPickerValueConverter.cs
@@ -32,13 +32,15 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
             var jObject = JObject.Parse(source.ToString());
             var jformId = jObject["id"];
             var jportalId = jObject["portalId"];
+            var jRegion = jObject["region"];
 
             if (jformId != null && jportalId != null)
             {
                 var hubspotFormViewModel = new HubspotFormViewModel
                 {
                     Id = jformId.Value<string>(),
-                    PortalId = jportalId.Value<string>()
+                    PortalId = jportalId.Value<string>(),
+                    Region = jRegion.Value<string>()
                 };
                 return hubspotFormViewModel;
             }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Helpers/HtmlHelper.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Helpers/HtmlHelper.cs
@@ -16,9 +16,9 @@ namespace Umbraco.Cms.Integrations.Crm.Hubspot.Helpers
     public static class HubspotHtmlExtensions
     {
 #if NETCOREAPP
-        public static IHtmlContent RenderHubspotForm(this HtmlHelper htmlHelper, HubspotFormViewModel hubspotFormViewModel)
+        public static IHtmlContent RenderHubspotForm(this IHtmlHelper<dynamic> htmlHelper, HubspotFormViewModel hubspotFormViewModel)
         {
-            return htmlHelper.Partial("~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/Render/HubspotForm.cshtml", hubspotFormViewModel ?? new HubspotFormViewModel());
+            return htmlHelper.Partial("~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/Render/HubspotFormV9.cshtml", hubspotFormViewModel ?? new HubspotFormViewModel());
         }
 #else
         public static IHtmlString RenderHubspotForm(this HtmlHelper htmlHelper, HubspotFormViewModel hubspotFormViewModel)
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Models/Dtos/HubspotFormDto.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Models/Dtos/HubspotFormDto.cs
@@ -16,7 +16,7 @@ public class HubspotFormDto
         [JsonProperty("fields")]
         public string Fields { get; set; }
 
-        [JsonProperty("euRegion")]
-        public bool EuRegion { get; set; }
+        [JsonProperty("region")]
+        public string Region { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Models/ViewModels/HubspotFormViewModel.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Models/ViewModels/HubspotFormViewModel.cs
@@ -5,5 +5,7 @@ public class HubspotFormViewModel
         public string PortalId { get; set; }
 
         public string Id { get; set; }
+
+        public string Region { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Umbraco.Cms.Integrations.Crm.Hubspot.csproj b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Umbraco.Cms.Integrations.Crm.Hubspot.csproj
@@ -22,6 +22,7 @@
 	<ItemGroup Condition="'$(TargetFramework)' == 'net50'">
 		<PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.1" />
 		<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.1" />
+		<PackageReference Include="Umbraco.Cms.Web.Common" version="9.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -42,6 +43,10 @@
 		</Content>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Remove="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\Render\HubspotFormV9.cshtml" />
+	</ItemGroup>
+
 	<Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">
 		<ItemGroup>
 			<Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Lucene.Net.CodeAnalysis.CSharp'" />

Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,15 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub`
`32`	`32`	`var jObject = JObject.Parse(source.ToString());`
`33`	`33`	`var jformId = jObject["id"];`
`34`	`34`	`var jportalId = jObject["portalId"];`
	`35`	`+ var jRegion = jObject["region"];`
`35`	`36`
`36`	`37`	`if (jformId != null && jportalId != null)`
`37`	`38`	`{`
`38`	`39`	`var hubspotFormViewModel = new HubspotFormViewModel`
`39`	`40`	`{`
`40`	`41`	`Id = jformId.Value<string>(),`
`41`		`- PortalId = jportalId.Value<string>()`
	`42`	`+ PortalId = jportalId.Value<string>(),`
	`43`	`+ Region = jRegion.Value<string>()`
`42`	`44`	`};`
`43`	`45`	`return hubspotFormViewModel;`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ namespace Umbraco.Cms.Integrations.Crm.Hubspot.Helpers`
`16`	`16`	`public static class HubspotHtmlExtensions`
`17`	`17`	`{`
`18`	`18`	`#if NETCOREAPP`
`19`		`- public static IHtmlContent RenderHubspotForm(this HtmlHelper htmlHelper, HubspotFormViewModel hubspotFormViewModel)`
	`19`	`+ public static IHtmlContent RenderHubspotForm(this IHtmlHelper<dynamic> htmlHelper, HubspotFormViewModel hubspotFormViewModel)`
`20`	`20`	`{`
`21`		`- return htmlHelper.Partial("~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/Render/HubspotForm.cshtml", hubspotFormViewModel ?? new HubspotFormViewModel());`
	`21`	`+ return htmlHelper.Partial("~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/Render/HubspotFormV9.cshtml", hubspotFormViewModel ?? new HubspotFormViewModel());`
`22`	`22`	`}`
`23`	`23`	`#else`
`24`	`24`	`public static IHtmlString RenderHubspotForm(this HtmlHelper htmlHelper, HubspotFormViewModel hubspotFormViewModel)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class HubspotFormDto`
`16`	`16`	`[JsonProperty("fields")]`
`17`	`17`	`public string Fields { get; set; }`
`18`	`18`
`19`		`- [JsonProperty("euRegion")]`
`20`		`- public bool EuRegion { get; set; }`
	`19`	`+ [JsonProperty("region")]`
	`20`	`+ public string Region { get; set; }`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@ public class HubspotFormViewModel`
`5`	`5`	`public string PortalId { get; set; }`
`6`	`6`
`7`	`7`	`public string Id { get; set; }`
	`8`	`+`
	`9`	`+ public string Region { get; set; }`
`8`	`10`	`}`
`9`	`11`	`}`