EU region value serialization. Updated notifications.

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/Render/HubspotForm.cshtml

@@ -5,11 +5,23 @@
 }
 
 <script charset="utf-8" type="text/javascript" src="@hbsptScriptPath"></script>
-<script>
-    hbspt.forms.create({
-        region: "@Model.EuRegion ? 'eu1' : 'na1'",
-        portalId: "@Model.PortalId",
-        formId: "@Model.Id"
-    });
-</script>
+@if (Model.EuRegion)
+{
+    <script>
+        hbspt.forms.create({
+            region: "eu1",
+            portalId: "@Model.PortalId",
+            formId: "@Model.Id"
+        });
+    </script>
+}
+else
+{
+    <script>
+        hbspt.forms.create({
+            portalId: "@Model.PortalId",
+            formId: "@Model.Id"
+        });
+    </script>
+}
 

src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/formpicker.controller.js

@@ -83,7 +83,8 @@
                     // use OAuth
                     umbracoCmsIntegrationsCrmHubspotResource.validateAccessToken().then(function (response) {
                         if (response.isExpired === true || response.isValid === false) {
-                            notificationsService.warning("Hubspot API", "Invalid Access Token");
+                            vm.loading = false;
+                            notificationsService.warning("Hubspot API", "Invalid access token. Please review OAuth settings of the editor.");
                             return;
                         }
 
@@ -92,7 +93,7 @@
                             vm.hubspotFormsList = data.forms;
 
                             if (data.isValid === false || data.isExpired === true) {
-                                notificationsService.error("Hubspot API", "Invalid Access Token");
+                                notificationsService.error("Hubspot API", "Invalid access token. Please review OAuth settings of the editor.");
                             }
                         });
                     });
@@ -103,7 +104,7 @@
 
                         vm.hubspotFormsList = data.forms;
 
-                        if (data.isValid === false || data.isExpired == true) {
+                        if (data.isValid === false || data.isExpired === true) {
                             notificationsService.error("Hubspot API", "Invalid API key");
                         }
                     });

src/Umbraco.Cms.Integrations.Crm.Hubspot/Editors/FormPickerValueConverter.cs

@@ -24,13 +24,15 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
             var jObject = JObject.Parse(source.ToString());
             var jformId = jObject["id"];
             var jportalId = jObject["portalId"];
+            var jeuRegion = jObject["euRegion"];
 
             if (jformId != null && jportalId != null)
             {
                 var hubspotFormViewModel = new HubspotFormViewModel
                 {
                     Id = jformId.Value<string>(),
-                    PortalId = jportalId.Value<string>()
+                    PortalId = jportalId.Value<string>(),
+                    EuRegion = jeuRegion.Value<bool>()
                 };
                 return hubspotFormViewModel;
             }