Add iframeEmbedded property

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Dynamics/Client/generated/types.gen.ts

@@ -218,6 +218,7 @@ export type FormDtoModel = {
     rawHtml: string;
     standaloneHtml: string;
     module: DynamicsModuleModel;
+    iframeEmbedded: boolean;
 };
 
 export enum GenericParameterAttributes {

src/Umbraco.Cms.Integrations.Crm.Dynamics/Client/src/modal/dynamics-form-modal.element.ts

@@ -30,7 +30,8 @@ export default class DynamicsFormModalElement extends UmbModalBaseElement<Dynami
         module: DynamicsModuleModel.BOTH,
         name: "",
         rawHtml: "",
-        standaloneHtml: ""
+        standaloneHtml: "",
+        iframeEmbedded: false
     };
     @state()
     private renderWithIFrame: boolean = false;
@@ -85,7 +86,9 @@ export default class DynamicsFormModalElement extends UmbModalBaseElement<Dynami
             }
         }
 
-        this.value = { selectedForm: this._selectedForm, iframeEmbedded: this.renderWithIFrame };
+        this._selectedForm.iframeEmbedded = this.renderWithIFrame
+
+        this.value = { selectedForm: this._selectedForm };
         this._submitModal();
     }
 
@@ -145,19 +148,19 @@ export default class DynamicsFormModalElement extends UmbModalBaseElement<Dynami
                             ${this._renderFilter()}
                             ${this._filteredForms.length > 0 ?
                                 html`
-                                            ${repeat(this._filteredForms, (form) => html`
-                                                <uui-ref-node-form
-                                                    selectable
-                                                    ?selected=${this._selectedForm.id == form.id}
-                                                    name=${form.name ?? ""}
-                                                    @selected=${() => this._onSelect(form)}>
-                                                </uui-ref-node-form>
-                                            `)}
-                                            <uui-toggle
-                                                ?checked=${this.renderWithIFrame}
-                                                .label=${this.toggleLabel}
-                                                @change=${this.onMessageOnSubmitIsHtmlChange}></uui-toggle>
-                                        ` :
+                                    ${repeat(this._filteredForms, (form) => html`
+                                        <uui-ref-node-form
+                                            selectable
+                                            ?selected=${this._selectedForm.id == form.id}
+                                            name=${form.name ?? ""}
+                                            @selected=${() => this._onSelect(form)}>
+                                        </uui-ref-node-form>
+                                    `)}
+                                    <uui-toggle
+                                        ?checked=${this.renderWithIFrame}
+                                        .label=${this.toggleLabel}
+                                        @change=${this.onMessageOnSubmitIsHtmlChange}></uui-toggle>
+                                ` :
                                 html``}
                         </uui-box>
 

src/Umbraco.Cms.Integrations.Crm.Dynamics/Client/src/modal/dynamics.modal-token.ts

@@ -9,7 +9,6 @@ export type DynamicsFormPickerModalData = {
 
 export type DynamicsFormPickerModalValue = {
     selectedForm: FormDtoModel;
-    iframeEmbedded: boolean;
 }
 
 export const DYNAMICS_MODAL_TOKEN = new UmbModalToken<DynamicsFormPickerModalData, DynamicsFormPickerModalValue>("Dynamics.Modal", {

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

@@ -17,5 +17,8 @@ public class FormDto
 
         [JsonPropertyName("module")]
         public DynamicsModule Module { get; set; }
+
+        [JsonPropertyName("iframeEmbedded")]
+        public bool IFrameEmbedded { get; set; }
     }
 }

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

@@ -31,6 +31,11 @@ public string StandaloneUrl
             {
                 const string dataCachedFormUrlKey = "data-cached-form-url=";
 
+                if (string.IsNullOrEmpty(Html))
+                {
+                    return string.Empty;
+                }
+
                 var dataCachedFromUrl = Html.Split(' ').FirstOrDefault(p => p.Contains("data-cached-form-url"));
                 if (string.IsNullOrEmpty(dataCachedFromUrl))
                 {