Fix RealTime forms rendering mode.

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsForm.cshtml

@@ -6,7 +6,7 @@
     var id = Guid.NewGuid();
 }
 
-@if (string.IsNullOrEmpty(Model.RawHtml))
+@if (Model.Module == Umbraco.Cms.Integrations.Crm.Dynamics.Models.DynamicsModule.Outbound)
 {
     @if (Model.IframeEmbedded)
     {
@@ -28,5 +28,12 @@
 }
 else
 {
-    @Html.Raw(Model.RawHtml)
+    @if (Model.IframeEmbedded)
+    {
+        <iframe frameBorder="0" style="width:100%;height:100%;" id=@id src="@Model.StandaloneUrl"></iframe>
+    }
+    else
+    {
+        @Html.Raw(Model.Html)
+    }
 }

src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV8.cshtml

@@ -6,7 +6,7 @@
     var id = Guid.NewGuid();
 }
 
-@if (!string.IsNullOrEmpty(Model.RawHtml))
+@if (Model.Module == Umbraco.Cms.Integrations.Crm.Dynamics.Models.DynamicsModule.Outbound)
 {
     @if (Model.IframeEmbedded)
     {
@@ -26,8 +26,14 @@
              data-website-id="@Model.WebsiteId" data-hostname="@Model.Hostname"></div>
     }
 }
-
 else
 {
-    @Html.Raw(Model.RawHtml)
+    @if (Model.IframeEmbedded)
+    {
+        <iframe frameBorder="0" style="width:100%;height:100%;" id=@id src="@Model.StandaloneUrl"></iframe>
+    }
+    else
+    {
+        @Html.Raw(Model.Html)
+    }
 }

src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/formpickereditor.html

@@ -27,7 +27,7 @@
                             </li>
                         </ul>
                     </div>
-                    <div class="dynOverlayGroup" ng-if="vm.isConnected && vm.selectedForm.module == 'Outbound'">
+                    <div class="dynOverlayGroup" ng-if="vm.isConnected">
                         <umb-toggle checked="vm.iframeEmbedded"
                                     on-click="vm.toggleRenderMode()"
                                     show-labels="true"

src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/views/module-configuration.html

@@ -12,9 +12,9 @@
             </li>
             <li>
                 <umb-radiobutton name="moduleConfiguration"
-                                 value="Real-Time"
+                                 value="RealTime"
                                  model="model.value"
-                                 text="Real-Time"
+                                 text="RealTime"
                                  required="true">
                 </umb-radiobutton>
             </li>

src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs

@@ -41,29 +41,33 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
 
             var jObject = JObject.Parse(source.ToString());
 
-            var vm = new FormViewModel();
+            var vm = new FormViewModel
+            {
+                IframeEmbedded = (bool)jObject["iframeEmbedded"]
+            };
 
             var module = (DynamicsModule)Enum.Parse(typeof(DynamicsModule), jObject["module"].ToString());
+
+            vm.Module = module;
+
             if (module == DynamicsModule.Outbound)
             {
 
                 var embedCode = jObject["embedCode"].ToString();
-                var iframeEmbedd = (bool)jObject["iframeEmbedded"];
 
-                vm = new FormViewModel
-                {
-                    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)
-                };
+                vm.FormBlockId = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.DataFormBlockId);
+                vm.ContainerId = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.ContainerId);
+                vm.ContainerClass = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.ContainerClass);
+                vm.WebsiteId = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.DataWebsiteId);
+                vm.Hostname = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.DataHostname);
             }
             else
             {
                 var form = _dynamicsService.GetRealTimeForm(jObject["id"].ToString()).ConfigureAwait(false).GetAwaiter().GetResult();
-                vm.RawHtml = form.RawHtml;
+                if (form != null)
+                {
+                    vm.Html = form.StandaloneHtml;
+                }
             }
 
             return vm;

src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/FormDto.cs

@@ -13,6 +13,9 @@ public class FormDto
         [JsonProperty("rawHtml")]
         public string RawHtml { get; set; }
 
+        [JsonProperty("standaloneHtml")]
+        public string StandaloneHtml { get; set; }
+
         [JsonProperty("module")]
         public DynamicsModule Module { get; set; }
     }

src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/RealTimeFormDto.cs

@@ -12,5 +12,8 @@ public class RealTimeFormDto
 
         [JsonProperty("msdynmkt_formhtml")]
         public string FormHtml { get; set; }
+
+        [JsonProperty("msdynmkt_standalonehtml")]
+        public string StandaloneHtml { get; set; }
     }
 }

src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/ViewModels/FormViewModel.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using System.Linq;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels
 {
@@ -22,6 +23,27 @@ public class FormViewModel
         [JsonProperty("hostname")]
         public string Hostname { get; set; }
 
-        public string RawHtml { get; set; }
+        public DynamicsModule Module { get; set; }
+
+        public string Html { get; set; }
+
+        public string StandaloneUrl
+        {
+            get
+            {
+                const string dataCachedFormUrlKey = "data-cached-form-url=";
+
+                var dataCachedFromUrl = Html.Split(' ').FirstOrDefault(p => p.Contains("data-cached-form-url"));
+                if (string.IsNullOrEmpty(dataCachedFromUrl))
+                {
+                    return string.Empty;
+                }
+
+                return dataCachedFromUrl
+                    .Replace("'", "")
+                    .Substring(dataCachedFromUrl.IndexOf(dataCachedFormUrlKey) + dataCachedFormUrlKey.Length)
+                    .Replace("forms", "standaloneforms");
+            }
+        }
     }
 }

src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs

@@ -161,12 +161,13 @@ public async Task<FormDto> GetRealTimeForm(string id)
 
             var forms = await Get<RealTimeFormDto>(oauthConfiguration.AccessToken, Constants.Modules.RealTimePath);
 
-            if (!forms.Value.Any(p => p.Id == id)) return null;
+            if (forms == null || !forms.Value.Any(p => p.Id == id)) return null;
 
             var form = forms.Value.First(p => p.Id == id);
             return new FormDto
             {
-                RawHtml = form.FormHtml
+                RawHtml = form.FormHtml,
+                StandaloneHtml = form.StandaloneHtml
             };
         }