fix: only migrate old data

StatCan · Jun 9, 2021 · adde04d · adde04d
1 parent 500b420
commit adde04d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/src/Modules/StatCan.OrchardCore.VueForms/Migrations.cs b/src/Modules/StatCan.OrchardCore.VueForms/Migrations.cs
@@ -364,29 +364,37 @@ public async Task<int> UpdateFrom6Async()
                 // form.Content.VueFormScripts.OnValidation = null;
 
                 var flow = form.As<FlowPart>();
-                var templateBuilder = new StringBuilder();
-                foreach (var widget in flow.Widgets)
+                if (flow != null)
                 {
-                    if (widget.ContentType == "VueComponent")
+                    var templateBuilder = new StringBuilder();
+                    foreach (var widget in flow.Widgets)
                     {
-                        templateBuilder.Append((string)widget.Content.VueComponent.Template.Text);
-                        templateBuilder.AppendLine();
+                        if (widget.ContentType == "VueComponent")
+                        {
+                            templateBuilder.Append((string)widget.Content.VueComponent.Template.Text);
+                            templateBuilder.AppendLine();
+                        }
                     }
+                    form.Remove("FlowPart");
+                    form.Alter<VueForm>(v =>
+                    {
+                        v.Template = new TextField() { Text = templateBuilder.ToString() };
+                    });
                 }
-                form.Remove("FlowPart");
-
-                var isDisabled = false;
-                if (form.Content?.VueForm?.Enabled?.Value != null)
+                if(form.Content?.VueForm?.Disabled == null)
                 {
-                    isDisabled = !(bool)form.Content.VueForm.Enabled.Value;
-                }
-                form.Content.VueForm.Enabled = null;
+                    var isDisabled = false;
+                    if (form.Content?.VueForm?.Enabled?.Value != null)
+                    {
+                        isDisabled = !(bool)form.Content.VueForm.Enabled.Value;
+                    }
+                    form.Content.VueForm.Enabled = null;
 
-                form.Alter<VueForm>(v =>
-                {
-                    v.Disabled = new BooleanField() { Value = isDisabled };
-                    v.Template = new TextField() { Text = templateBuilder.ToString() };
-                });
+                    form.Alter<VueForm>(v =>
+                    {
+                        v.Disabled = new BooleanField() { Value = isDisabled };
+                    });
+                }
                 _session.Save(form);
             }
 

diff --git a/src/Themes/DigitalAdmin/Views/TextField-Monaco.Edit.cshtml b/src/Themes/DigitalAdmin/Views/TextField-Monaco.Edit.cshtml
@@ -66,8 +66,8 @@ $(document).ready(function () {
             const defaultSettings = {
                 "scrollBeyondLastLine": false,
                 "scrollbar": {
-                    // allow the page to scroll when bottom of editor is  scrolling
-                    //"alwaysConsumeMouseWheel": false,
+                  // allow the page to scroll when bottom of editor is  scrolling
+                  "alwaysConsumeMouseWheel": false,
                 }
             }