Move region to config settings. Notifications updates.

acoumb · acoumb · commit b9e1b72c974e · 2022-02-11T12:23:07.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,27 +1,17 @@
-﻿@inherits Umbraco.Web.Mvc.UmbracoViewPage<Umbraco.Cms.Integrations.Crm.Hubspot.Models.ViewModels.HubspotFormViewModel>
+﻿@using System.Configuration
+@inherits Umbraco.Web.Mvc.UmbracoViewPage<Umbraco.Cms.Integrations.Crm.Hubspot.Models.ViewModels.HubspotFormViewModel>
 
 @{
-    var hbsptScriptPath = Model.EuRegion ? "//js-eu1.hsforms.net/forms/shell.js" : "//js.hsforms.net/forms/shell.js";
+    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";
 }
 
 <script charset="utf-8" type="text/javascript" src="@hbsptScriptPath"></script>
-@if (Model.EuRegion)
-{
-    <script>
-        hbspt.forms.create({
-            region: "eu1",
-            portalId: "@Model.PortalId",
-            formId: "@Model.Id"
-        });
-    </script>
-}
-else
-{
-    <script>
+<script>
         hbspt.forms.create({
+            region: "@region",
             portalId: "@Model.PortalId",
             formId: "@Model.Id"
         });
-    </script>
-}
-
+</script>
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/formpicker.controller.js b/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/formpicker.controller.js
@@ -1,6 +1,6 @@
 ﻿angular.module("umbraco")
     .controller("Umbraco.Cms.Integrations.Crm.Hubspot.FormPickerController",
-        function ($scope, editorService, notificationsService, umbracoCmsIntegrationsCrmHubspotResource) {
+        function ($scope, editorService, notificationsService, umbracoCmsIntegrationsCrmHubspotService, umbracoCmsIntegrationsCrmHubspotResource) {
 
             const oauthName = "OAuth";
 
@@ -10,24 +10,10 @@
             vm.searchTerm = "";
             vm.error = "";
             vm.isValid = true;
-            vm.euRegion = false;
-
-            const configDescription = {
-                API: "An API key is configured and will be used to connect to your HubSpot account.",
-                OAuth:
-                    "No API key is configured. To connect to your HubSpot account using OAuth click 'Connect', select your account and agree to the permissions.",
-                None: "No API or OAuth configuration could be found. Please review your settings before continuing.",
-                OAuthConnected:
-                    "OAuth is configured and an access token is available to connect to your HubSpot account. To revoke, click 'Revoke'"
-            };
 
             // check configuration
             checkConfiguration(loadForms);
 
-            vm.toggleRegion = function() {
-                vm.euRegion = !vm.euRegion;
-            }
-
             vm.remove = function () {
                 $scope.model.value = null;
             };
@@ -38,14 +24,11 @@
 
             vm.openHubspotFormPickerOverlay = function () {
                 var options = {
-                    title: "Hubspot forms",
+                    title: "HubSpot forms",
                     subtitle: "Select a form",
                     view: "/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/views/formpickereditor.html",
                     size: "medium",
-                    pickForm: function (form, euRegion) {
-
-                        form.euRegion = euRegion;
-
+                    pickForm: function (form) {
                         vm.saveForm(form);
 
                         editorService.close();
@@ -64,14 +47,14 @@
                     vm.status = {
                         isValid: response.isValid === true,
                         type: response.type,
-                        description: configDescription[response.type.value],
+                        description: umbracoCmsIntegrationsCrmHubspotService.configDescription[response.type.value],
                         useOAuth: response.isValid === true && response.type.value === oauthName
                     };
 
                     if (response.isValid === false) {
                         vm.loading = false;
-                        vm.error = configDescription.None;
-                        notificationsService.warning("Hubspot API", configDescription.None);
+                        vm.error = umbracoCmsIntegrationsCrmHubspotService.configDescription.None;
+                        notificationsService.warning("HubSpot API", umbracoCmsIntegrationsCrmHubspotService.configDescription.None);
                     } else {
                         callback();
                     }
@@ -84,7 +67,7 @@
                     umbracoCmsIntegrationsCrmHubspotResource.validateAccessToken().then(function (response) {
                         if (response.isExpired === true || response.isValid === false) {
                             vm.loading = false;
-                            notificationsService.warning("Hubspot API", "Invalid access token. Please review OAuth settings of the editor.");
+                            notificationsService.warning("HubSpot API", "Invalid access token. Please review OAuth settings of the editor.");
                             return;
                         }
 
@@ -93,7 +76,7 @@
                             vm.hubspotFormsList = data.forms;
 
                             if (data.isValid === false || data.isExpired === true) {
-                                notificationsService.error("Hubspot API", "Invalid access token. Please review OAuth settings of the editor.");
+                                notificationsService.error("HubSpot API", "Invalid access token. Please review OAuth settings of the editor.");
                             }
                         });
                     });
@@ -105,7 +88,7 @@
                         vm.hubspotFormsList = data.forms;
 
                         if (data.isValid === false || data.isExpired === true) {
-                            notificationsService.error("Hubspot API", "Invalid API key");
+                            notificationsService.error("HubSpot API", "Invalid API key");
                         }
                     });
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/settings.controller.js b/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/settings.controller.js
@@ -1,20 +1,11 @@
-﻿function settingsController($scope, notificationsService, umbracoCmsIntegrationsCrmHubspotResource) {
+﻿function settingsController($scope, notificationsService, umbracoCmsIntegrationsCrmHubspotService, umbracoCmsIntegrationsCrmHubspotResource) {
 
     var vm = this;
 
     const oauthName = "OAuth";
-    const configDescription = {
-        API: "An API key is configured and will be used to connect to your HubSpot account.",
-        OAuth:
-            "No API key is configured. To connect to your HubSpot account using OAuth click 'Connect', select your account and agree to the permissions.",
-        None: "No API or OAuth configuration could be found. Please review your settings before continuing.",
-        OAuthConnected:
-            "OAuth is configured and an access token is available to connect to your HubSpot account. To revoke, click 'Revoke'"
-    };
 
     vm.oauthSetup = {};
     vm.status = {};
-    
 
     $scope.$on('formSubmitting', function () {
 
@@ -29,18 +20,16 @@
             vm.status = {
                 isValid: response.isValid === true,
                 type: response.type,
-                description: configDescription[response.type.value],
+                description: umbracoCmsIntegrationsCrmHubspotService.configDescription[response.type.value],
                 useOAuth: response.isValid === true && response.type.value === oauthName
             };
 
             if (vm.status.useOAuth) {
                 validateOAuthSetup();
             }
 
-            if (response.isValid === true) {
-                notificationsService.success("Configuration", `${response.type.value} setup is configured.`);
-            } else {
-                notificationsService.warning("Configuration",
+            if (response.isValid !== true) {
+                notificationsService.warning("HubSpot Configuration",
                     "Invalid setup. Please review the API/OAuth settings.");
             }
         });
@@ -66,6 +55,8 @@
 
             umbracoCmsIntegrationsCrmHubspotResource.getAccessToken(event.data.code).then(function (response) {
                 vm.oauthSetup.isConnected = true;
+                vm.status.description = umbracoCmsIntegrationsCrmHubspotService.configDescription.OAuthConnected;
+                notificationsService.success("HubSpot Configuration", "OAuth connected.");
             });
 
         }
@@ -81,8 +72,12 @@
                 isAccessTokenValid: response.isValid
             }
 
+            if (vm.oauthSetup.isConnected === true && vm.oauthSetup.isAccessTokenValid === true) {
+                vm.status.description = umbracoCmsIntegrationsCrmHubspotService.configDescription.OAuthConnected;
+            }
+
             // refresh access token
-            if (vm.oauthSetup.isExpired === true) {
+            if (vm.oauthSetup.isAccessTokenExpired === true) {
                 umbracoCmsIntegrationsCrmHubspotResource.refreshAccessToken().then(function (response) {
                 });
             }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/package.manifest b/src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/package.manifest
@@ -2,7 +2,8 @@
   "javascript": [
     "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/formpicker.controller.js",
     "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/settings.controller.js",
-    "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/hubspot.resource.js"
+    "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/hubspot.resource.js",
+    "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/hubspot.service.js"
   ],
   "css": [
     "~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/css/styles.css"
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
@@ -11,8 +11,6 @@
                         </div>
                     </div>
                     <div class="hsOverlayGroup">
-                        <umb-toggle checked="vm.euRegion" show-labels="true" label-on="EU Region" label-off="US Region" on-click="vm.toggleRegion()">
-                        </umb-toggle>
                         <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">
                                 <a href="" ng-attr-title="form.name">
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Configuration/AppSettingsConstants.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Configuration/AppSettingsConstants.cs
@@ -4,5 +4,7 @@ namespace Umbraco.Cms.Integrations.Crm.Hubspot.Configuration
     public static class AppSettingsConstants
     {
         public static string UmbracoCmsIntegrationsCrmHubspotApiKey = "Umbraco.Cms.Integrations.Crm.Hubspot.ApiKey";
+
+        public static string UmbracoCmsIntegrationsCrmHubspotRegion = "Umbraco.Cms.Integrations.Crm.Hubspot.Region";
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Controllers/FormsController.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Controllers/FormsController.cs
@@ -160,6 +160,9 @@ public async Task<ResponseDto> GetAllOAuth()
         [HttpGet]
         public HubspotFormPickerSettings CheckConfiguration()
         {
+            if (string.IsNullOrEmpty(_appSettings[AppSettingsConstants.UmbracoCmsIntegrationsCrmHubspotRegion]))
+                return new HubspotFormPickerSettings();
+
             return
                 !string.IsNullOrEmpty(_appSettings[AppSettingsConstants.UmbracoCmsIntegrationsCrmHubspotApiKey])
                     ? new HubspotFormPickerSettings { IsValid = true, Type = ConfigurationType.Api}
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Editors/FormPickerValueConverter.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Editors/FormPickerValueConverter.cs
@@ -24,15 +24,13 @@ 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>(),
-                    EuRegion = jeuRegion.Value<bool>()
+                    PortalId = jportalId.Value<string>()
                 };
                 return hubspotFormViewModel;
             }
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,7 +5,5 @@ public class HubspotFormViewModel
         public string PortalId { get; set; }
 
         public string Id { get; set; }
-
-        public bool EuRegion { 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
@@ -27,6 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\js\hubspot.service.js" />
     <None Remove="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\js\settings.controller.js" />
     <None Remove="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\Render\HubspotForm.cshtml" />
     <None Remove="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\views\formpickereditor.html" />
diff --git a/src/Umbraco.Cms.Integrations.Testsite.V8/Web.config b/src/Umbraco.Cms.Integrations.Testsite.V8/Web.config
@@ -51,6 +51,7 @@
 
 		<!-- Hubspot Configuration -->
 		<add key="Umbraco.Cms.Integrations.Crm.Hubspot.ApiKey" value=""/>
+		<add key="Umbraco.Cms.Integrations.Crm.Hubspot.Region" value="eu1" />
 	</appSettings>
 	<!--
         Important: if you're upgrading Umbraco, do not clear the connectionString/providerName during your Web.config merge.

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,7 @@ namespace Umbraco.Cms.Integrations.Crm.Hubspot.Configuration`
`4`	`4`	`public static class AppSettingsConstants`
`5`	`5`	`{`
`6`	`6`	`public static string UmbracoCmsIntegrationsCrmHubspotApiKey = "Umbraco.Cms.Integrations.Crm.Hubspot.ApiKey";`
	`7`	`+`
	`8`	`+ public static string UmbracoCmsIntegrationsCrmHubspotRegion = "Umbraco.Cms.Integrations.Crm.Hubspot.Region";`
`7`	`9`	`}`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,15 +24,13 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub`
`24`	`24`	`var jObject = JObject.Parse(source.ToString());`
`25`	`25`	`var jformId = jObject["id"];`
`26`	`26`	`var jportalId = jObject["portalId"];`
`27`		`- var jeuRegion = jObject["euRegion"];`
`28`	`27`
`29`	`28`	`if (jformId != null && jportalId != null)`
`30`	`29`	`{`
`31`	`30`	`var hubspotFormViewModel = new HubspotFormViewModel`
`32`	`31`	`{`
`33`	`32`	`Id = jformId.Value<string>(),`
`34`		`- PortalId = jportalId.Value<string>(),`
`35`		`- EuRegion = jeuRegion.Value<bool>()`
	`33`	`+ PortalId = jportalId.Value<string>()`
`36`	`34`	`};`
`37`	`35`	`return hubspotFormViewModel;`
`38`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,5 @@ public class HubspotFormViewModel`
`5`	`5`	`public string PortalId { get; set; }`
`6`	`6`
`7`	`7`	`public string Id { get; set; }`
`8`		`-`
`9`		`- public bool EuRegion { get; set; }`
`10`	`8`	`}`
`11`	`9`	`}`