Feedback updates

acoumb · acoumb · commit 6842f507e445 · 2022-08-04T16:28:48.000+03:00
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsForm.cshtml b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsForm.cshtml
@@ -6,9 +6,9 @@
     var id = Guid.NewGuid();
 }
 
-@if (Model.IFrameEmbedded)
+@if (Model.IframeEmbedded)
 {
-    <iframe frameBorder="0" style="width:100%" id=@id></iframe>
+    <iframe frameBorder="0" style="width:100%;height:100%;" id=@id></iframe>
     <script>
         var sandboxSrc = "https://@(Model.Hostname)/t/formsandbox/@(Model.WebsiteId)/@(Model.FormBlockId)?ad="
             + encodeURIComponent(document.location.toString()); document.getElementById('@id').setAttribute('src', sandboxSrc);
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV8.cshtml b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV8.cshtml
@@ -6,9 +6,9 @@
     var id = Guid.NewGuid();
 }
 
-@if (Model.IFrameEmbedded)
+@if (Model.IframeEmbedded)
 {
-    <iframe frameBorder="0" style="width:100%" id=@id></iframe>
+    <iframe frameBorder="0" style="width:100%;height:100%;" id=@id></iframe>
     <script>
         var sandboxSrc = "https://@(Model.Hostname)/t/formsandbox/@(Model.WebsiteId)/@(Model.FormBlockId)?ad="
             + encodeURIComponent(document.location.toString()); document.getElementById('@id').setAttribute('src', sandboxSrc);
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/css/styles.css b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/css/styles.css
@@ -31,4 +31,8 @@
 
 .dynSettings {
     padding-top: 4px;
+}
+
+.dynFormSelected {
+    background: #fee4e1;
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/configuration.controller.js b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/configuration.controller.js
@@ -25,7 +25,11 @@
 
         umbracoCmsIntegrationsCrmDynamicsResource.revokeAccessToken().then(function () {
             vm.oauthConfig.isConnected = false;
-            notificationsService.success("Dynamics Configuration", "OAuth connection revoked.");
+
+            // if directive runs from property editor, the notifications should be hidden, because they will not be displayed properly behind the overlay window.
+            // if directive runs from data type, the notifications are displayed
+            if (typeof $scope.connected === "undefined")
+                notificationsService.success("Dynamics Configuration", "OAuth connection revoked.");
 
             if (typeof $scope.revoked === "function")
                 $scope.revoked();
@@ -38,11 +42,18 @@
 
             umbracoCmsIntegrationsCrmDynamicsResource.getAccessToken(event.data.code).then(function (response) {
                 if (response.startsWith("Error:")) {
-                    notificationsService.error("Dynamics Configuration", response);
+
+                    // if directive runs from property editor, the notifications should be hidden, because they will not be displayed properly behind the overlay window.
+                    // if directive runs from data type, the notifications are displayed
+                    if (typeof $scope.connected === "undefined")
+                        notificationsService.error("Dynamics Configuration", response);
                 } else {
                     vm.oauthConfig.isConnected = true;
-                    
-                    notificationsService.success("Dynamics Configuration", "OAuth connected.");
+
+                    // if directive runs from property editor, the notifications should be hidden, because they will not be displayed properly behind the overlay window.
+                    // if directive runs from data type, the notifications are displayed
+                    if (typeof $scope.connected === "undefined")
+                        notificationsService.success("Dynamics Configuration", "OAuth connected.");
 
                     umbracoCmsIntegrationsCrmDynamicsResource.getSystemUserFullName().then(function(response) {
                         vm.oauthConfig.fullName = response;
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/formpicker.controller.js b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/formpicker.controller.js
@@ -4,8 +4,12 @@
 
     vm.loading = false;
     vm.dynamicsFormsList = [];
+
     vm.searchTerm = "";
-    vm.iFrameEmbedded = false;
+
+    vm.selectedForm = {};
+    vm.iframeEmbedded = false;
+
     vm.isConnected = false;
 
     umbracoCmsIntegrationsCrmDynamicsResource.checkOAuthConfiguration().then(function (response) {
@@ -33,7 +37,7 @@
     }
 
     vm.toggleRenderMode = function () {
-        vm.iFrameEmbedded = !vm.iFrameEmbedded;
+        vm.iframeEmbedded = !vm.iframeEmbedded;
     }
 
     vm.openDynamicsFormPickerOverlay = function () {
@@ -43,9 +47,9 @@
             subtitle: "Select a form",
             view: "/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/formpickereditor.html",
             size: "medium",
-            selectForm: function (form, iFrameEmbedded) {
+            selectForm: function (form, iframeEmbedded) {
 
-                form.iFrameEmbedded = iFrameEmbedded;
+                form.iframeEmbedded = iframeEmbedded;
 
                 vm.saveForm(form);
 
@@ -68,7 +72,7 @@
                         id: item.msdyncrm_marketingformid,
                         name: item.msdyncrm_name,
                         embedCode: "",
-                        iFrameEmbedded: vm.iFrameEmbedded
+                        iframeEmbedded: vm.iframeEmbedded
                     });
                 });
             }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/formpickereditor.html b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/formpickereditor.html
@@ -4,9 +4,6 @@
             <umb-box>
                 <umb-box-header title="{{ model.title }}" description="{{ model.subtitle }}"></umb-box-header>
                 <umb-box-content>
-                    <div class="dynOverlayGroup">
-                        <oauth-configuration on-connected="connected()" on-revoked="revoked()"></oauth-configuration>
-                    </div>
                     <div class="dynOverlayGroup" ng-if="vm.isConnected">
                         <div class="form-search">
                             <i class="icon-search"></i>
@@ -15,8 +12,8 @@
                     </div>
                     <div class="dynOverlayGroup" ng-if="vm.isConnected">
                         <ul class="dynFormsList">
-                            <li ng-repeat="form in vm.dynamicsFormsList | orderBy:'name' | filter:vm.searchTerm" ng-click="model.selectForm(form, vm.iFrameEmbedded)"
-                                class="ng-scope" role="button" tabindex="0">
+                            <li ng-repeat="form in vm.dynamicsFormsList | orderBy:'name' | filter:vm.searchTerm" ng-click="vm.selectedForm = form"
+                                ng-class="{ 'dynFormSelected': vm.selectedForm == form }" role="button" tabindex="0">
                                 <a href="" ng-attr-title="form.name">
                                     <i class="icon-umb-contour"></i>
                                     <span class="formLine">{{form.name}}</span>
@@ -25,7 +22,7 @@
                         </ul>
                     </div>
                     <div class="dynOverlayGroup" ng-if="vm.isConnected">
-                        <umb-toggle checked="vm.iFrameEmbedded"
+                        <umb-toggle checked="vm.iframeEmbedded"
                                     on-click="vm.toggleRenderMode()"
                                     show-labels="true"
                                     label-on="Render with iFrame"
@@ -36,10 +33,24 @@
                     </div>
                 </umb-box-content>
             </umb-box>
+            <umb-box>
+                <umb-box-header title="Dynamics - OAuth Status" description="Please connect with your Microsoft account."></umb-box-header>
+                <umb-box-content>
+                    <div class="dynOverlayGroup">
+                        <oauth-configuration on-connected="connected()" on-revoked="revoked()"></oauth-configuration>
+                    </div>
+                </umb-box-content>
+            </umb-box>
         </umb-editor-container>
 
         <umb-editor-footer>
             <umb-editor-footer-content-right>
+                <umb-button type="button"
+                            button-style="success"
+                            label-key="general_submit"
+                            shortcut="ctrl+s"
+                            action="model.selectForm(vm.selectedForm, vm.iframeEmbedded)">
+                </umb-button>
                 <umb-button type="button"
                             button-style="link"
                             label-key="general_close"
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Configuration/DynamicsSettings.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Configuration/DynamicsSettings.cs
@@ -8,13 +8,13 @@ public DynamicsSettings() { }
 
         public DynamicsSettings(NameValueCollection appSettings)
         {
-            InstanceUrl = appSettings[Constants.UmbracoCmsIntegrationsCrmDynamicsInstanceUrlKey];
+            HostUrl = appSettings[Constants.UmbracoCmsIntegrationsCrmDynamicsHostUrlKey];
 
-            InstanceWebApiUrl = appSettings[Constants.UmbracoCmsIntegrationsCrmDynamicsInstanceWebApiUrlKey];
+            ApiPath = appSettings[Constants.UmbracoCmsIntegrationsCrmDynamicsApiPathKey];
         }
 
-        public string InstanceUrl { get; set; }
+        public string HostUrl { get; set; }
 
-        public string InstanceWebApiUrl { get; set; }
+        public string ApiPath { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Constants.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Constants.cs
@@ -9,9 +9,9 @@ public class Constants
 
         public const string TargetStateName = "dynamicsOAuthConfiguration-db";
 
-        public const string UmbracoCmsIntegrationsCrmDynamicsInstanceUrlKey = "Umbraco.Cms.Integrations.Crm.Dynamics.InstanceUrl";
+        public const string UmbracoCmsIntegrationsCrmDynamicsHostUrlKey = "Umbraco.Cms.Integrations.Crm.Dynamics.HostUrl";
 
-        public const string UmbracoCmsIntegrationsCrmDynamicsInstanceWebApiUrlKey = "Umbraco.Cms.Integrations.Crm.Dynamics.InstanceWebApiUrl";
+        public const string UmbracoCmsIntegrationsCrmDynamicsApiPathKey = "Umbraco.Cms.Integrations.Crm.Dynamics.ApiPath";
 
         public const string AppPluginFolderPath = "~/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics";
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Controllers/FormsController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Controllers/FormsController.cs
@@ -138,7 +138,7 @@ public async Task<ResponseDto<FormDto>> GetForms()
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
-                RequestUri = new Uri($"{_settings.InstanceWebApiUrl}msdyncrm_marketingforms")
+                RequestUri = new Uri($"{_settings.HostUrl}{_settings.ApiPath}msdyncrm_marketingforms")
             };
             requestMessage.Headers.Authorization =
                 new AuthenticationHeaderValue("Bearer", oauthConfiguration.AccessToken);
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs
@@ -31,16 +31,16 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
             var jObject = JObject.Parse(source.ToString());
 
             var embedCode = jObject["embedCode"].ToString();
-            var iFrameEmbedd = (bool)jObject["iFrameEmbedded"];
+            var iframeEmbedd = (bool)jObject["iframeEmbedded"];
 
             var vm = new FormViewModel
             {
-                IFrameEmbedded = iFrameEmbedd,
-                FormBlockId = embedCode.ParseAttributeValue(Constants.EmbedAttribute.DataFormBlockId),
-                ContainerId = embedCode.ParseAttributeValue(Constants.EmbedAttribute.ContainerId),
-                ContainerClass = embedCode.ParseAttributeValue(Constants.EmbedAttribute.ContainerClass),
-                WebsiteId = embedCode.ParseAttributeValue(Constants.EmbedAttribute.DataWebsiteId),
-                Hostname = embedCode.ParseAttributeValue(Constants.EmbedAttribute.DataHostname)
+                IframeEmbedded = iframeEmbedd,
+                FormBlockId = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.DataFormBlockId),
+                ContainerId = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.ContainerId),
+                ContainerClass = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.ContainerClass),
+                WebsiteId = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.DataWebsiteId),
+                Hostname = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.DataHostname)
             };
 
             return vm;
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Helpers/StringExtensions.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Helpers/StringExtensions.cs
@@ -2,15 +2,15 @@
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Helpers
 {
-    public static class EmbedCodeExtensions
+    public static class StringExtensions
     {
         /// <summary>
         /// Read <div></div> tags attributes like id, class, data- from input HTML using Regular Expressions.
         /// </summary>
         /// <param name="html"></param>
         /// <param name="attributeKey"></param>
         /// <returns></returns>
-        public static string ParseAttributeValue(this string html, string attributeKey)
+        public static string ParseDynamicsEmbedCodeAttributeValue(this string html, string attributeKey)
         {
             string divPattern = @"<\s*{0}[^>]*>(.*?)<\s*/{0}\s*>";
             string attributePattern = @"{0}=""([^""]*)""";
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/DynamicsMigration.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/DynamicsMigration.cs
@@ -62,7 +62,7 @@ public class DynamicsOAuthConfigurationTable
         public int Id { get; set; }
 
         [Column("AccessToken")]
-        [SpecialDbType(SpecialDbTypes.NTEXT)]
+        [Length(2048)]
         public string AccessToken { get; set; }
 
         [Column("UserId")]
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/ViewModels/FormViewModel.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/ViewModels/FormViewModel.cs
@@ -4,8 +4,8 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels
 {
     public class FormViewModel
     {
-        [JsonProperty("iFrameEmbedded")]
-        public bool IFrameEmbedded { get; set; }
+        [JsonProperty("iframeEmbedded")]
+        public bool IframeEmbedded { get; set; }
 
         [JsonProperty("formBlockId")]
         public string FormBlockId { get; set; }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs
@@ -41,7 +41,7 @@ public AuthorizationService()
 
         public string GetAuthorizationUrl()
         {
-            var scopes = string.Format(OAuthScopes, _settings.InstanceUrl);
+            var scopes = string.Format(OAuthScopes, _settings.HostUrl);
             return string.Format(DynamicsAuthorizationUrl, ClientId, OAuthProxyBaseUrl, scopes);
         }
             
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs
@@ -5,8 +5,10 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
 
@@ -52,7 +54,7 @@ public async Task<IdentityDto> GetIdentity(string accessToken)
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
-                RequestUri = new Uri($"{_settings.InstanceWebApiUrl}systemusers")
+                RequestUri = new Uri($"{_settings.HostUrl}{_settings.ApiPath}systemusers")
             };
             requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
 
@@ -74,7 +76,7 @@ public async Task<string> GetEmbedCode(string formId)
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
-                RequestUri = new Uri($"{_settings.InstanceWebApiUrl}msdyncrm_formpages?$select=msdyncrm_javascriptcode,_msdyncrm_marketingformid_value" +
+                RequestUri = new Uri($"{_settings.HostUrl}{_settings.ApiPath}msdyncrm_formpages?$select=msdyncrm_javascriptcode,_msdyncrm_marketingformid_value" +
                     $"&$filter=_msdyncrm_marketingformid_value eq {formId}")
             };
             requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", oauthConfiguration.AccessToken);
@@ -95,7 +97,7 @@ private async Task<string> GetUserId(string accessToken)
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Get,
-                RequestUri = new Uri($"{_settings.InstanceWebApiUrl}WhoAmI")
+                RequestUri = new Uri($"{_settings.HostUrl}{_settings.ApiPath}WhoAmI")
             };
             requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
 

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`	`var id = Guid.NewGuid();`
`7`	`7`	`}`
`8`	`8`
`9`		`-@if (Model.IFrameEmbedded)`
	`9`	`+@if (Model.IframeEmbedded)`
`10`	`10`	`{`
`11`		`- <iframe frameBorder="0" style="width:100%" id=@id></iframe>`
	`11`	`+ <iframe frameBorder="0" style="width:100%;height:100%;" id=@id></iframe>`
`12`	`12`	`<script>`
`13`	`13`	`var sandboxSrc = "https://@(Model.Hostname)/t/formsandbox/@(Model.WebsiteId)/@(Model.FormBlockId)?ad="`
`14`	`14`	`+ encodeURIComponent(document.location.toString()); document.getElementById('@id').setAttribute('src', sandboxSrc);`
Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,8 @@`
`31`	`31`
`32`	`32`	`.dynSettings {`
`33`	`33`	`padding-top: 4px;`
	`34`	`+}`
	`35`	`+`
	`36`	`+.dynFormSelected {`
	`37`	`+ background: #fee4e1;`
`34`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,13 @@ public DynamicsSettings() { }`
`8`	`8`
`9`	`9`	`public DynamicsSettings(NameValueCollection appSettings)`
`10`	`10`	`{`
`11`		`- InstanceUrl = appSettings[Constants.UmbracoCmsIntegrationsCrmDynamicsInstanceUrlKey];`
	`11`	`+ HostUrl = appSettings[Constants.UmbracoCmsIntegrationsCrmDynamicsHostUrlKey];`
`12`	`12`
`13`		`- InstanceWebApiUrl = appSettings[Constants.UmbracoCmsIntegrationsCrmDynamicsInstanceWebApiUrlKey];`
	`13`	`+ ApiPath = appSettings[Constants.UmbracoCmsIntegrationsCrmDynamicsApiPathKey];`
`14`	`14`	`}`
`15`	`15`
`16`		`- public string InstanceUrl { get; set; }`
	`16`	`+ public string HostUrl { get; set; }`
`17`	`17`
`18`		`- public string InstanceWebApiUrl { get; set; }`
	`18`	`+ public string ApiPath { get; set; }`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public async Task<ResponseDto<FormDto>> GetForms()`
`138`	`138`	`var requestMessage = new HttpRequestMessage`
`139`	`139`	`{`
`140`	`140`	`Method = HttpMethod.Get,`
`141`		`- RequestUri = new Uri($"{_settings.InstanceWebApiUrl}msdyncrm_marketingforms")`
	`141`	`+ RequestUri = new Uri($"{_settings.HostUrl}{_settings.ApiPath}msdyncrm_marketingforms")`
`142`	`142`	`};`
`143`	`143`	`requestMessage.Headers.Authorization =`
`144`	`144`	`new AuthenticationHeaderValue("Bearer", oauthConfiguration.AccessToken);`