Add disabled parameter to "Delete" tag and evaluate values before parsing (#358)

* Evaluate values before parsing tests and add "enabled" parameter to Delete tag

Author: vakssonya

ClosedXML.Report/Options/DeleteTag.cs

@@ -8,12 +8,15 @@ OPTION          OBJECTS
 
 using ClosedXML.Excel;
 using ClosedXML.Report.Excel;
+using ClosedXML.Report.Utils;
 using System.Linq;
 
 namespace ClosedXML.Report.Options
 {
     public class DeleteTag : OptionTag
     {
+        public const string DisabledParameter = "disabled";
+
         public override void Execute(ProcessingContext context)
         {
             var deleteTags = List.GetAll<DeleteTag>()
@@ -23,6 +26,12 @@ public override void Execute(ProcessingContext context)
 
             foreach (var tag in deleteTags)
             {
+                if (IsDisabled(tag))
+                {
+                    tag.Enabled = false;
+                    continue;
+                }
+
                 var xlCell = tag.Cell.GetXlCell(context.Range);
                 var cellAddr = xlCell.Address.ToStringRelative(false);
                 var ws = Range.Worksheet;
@@ -52,5 +61,10 @@ public override void Execute(ProcessingContext context)
                 tag.Enabled = false;
             }
         }
+
+        private bool IsDisabled(DeleteTag tag)
+        {
+            return tag.Parameters.ContainsKey(DisabledParameter) && tag.Parameters[DisabledParameter].AsBool();
+        }
     }
 }

ClosedXML.Report/RangeInterpreter.cs

@@ -32,8 +32,8 @@ public RangeInterpreter(string alias, TemplateErrors errors)
         public void Evaluate(IXLRange range)
         {
             var rangeName = range.RangeAddress.ToStringRelative(true);
-            ParseTags(range, rangeName);
             EvaluateValues(range);
+            ParseTags(range, rangeName);
             TagsPostprocessing(rangeName, new ProcessingContext(range, null, _evaluator));
         }
 

ClosedXML.Report/Utils/ConvertExtensions.cs

@@ -59,6 +59,7 @@ public static bool AsBool(this string value)
                 case "нет":
                 case "no":
                 case "not":
+                case "null":
                     return false;
                 default:
                     return true;

tests/ClosedXML.Report.Tests/GroupTagTests.cs

@@ -21,7 +21,6 @@ public GroupTagTests(ITestOutputHelper output) : base(output)
          InlineData("tLists1_cell_setting.xlsx"),
          InlineData("tLists2_sum.xlsx"),
          InlineData("tLists3_options.xlsx"),
-         InlineData("delete_options.xlsx"),
          InlineData("issue#111_autofilter_with_delete.xlsx"),
          InlineData("tLists4_complexRange.xlsx"),
          InlineData("tLists5_GlobalVars.xlsx"),

tests/ClosedXML.Report.Tests/ReportOptionsTests.cs

@@ -1,15 +1,15 @@
 using System;
-using System.Globalization;
 using System.Linq;
-using System.Threading;
 using ClosedXML.Excel;
 using ClosedXML.Report.Tests.TestModels;
 using FluentAssertions;
+using LinqToDB;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace ClosedXML.Report.Tests
 {
+    [Collection("Database")]
     public class ReportOptionsTests : XlsxTemplateTestsBase
     {
         [Fact]
@@ -72,6 +72,26 @@ public void Sort_option_should_sort_range()
                 });
         }
 
+        [Fact]
+        public void DeleteOptionsWithParameter()
+        {
+            XlTemplateTest("delete_options.xlsx",
+                tpl =>
+                {
+                    using (var db = new DbDemos())
+                    {
+                        var cust = db.customers.LoadWith(x => x.Orders.First().Items).OrderBy(c => c.CustNo).First(x => x.CustNo == 1356);
+                        tpl.AddVariable(cust);
+                    }
+                    tpl.AddVariable("disableCColumnDeletion", "true");
+                    tpl.AddVariable("disableEColumnDeletion", "false");
+                },
+                wb =>
+                {
+                    CompareWithGauge(wb, "delete_options.xlsx");
+                });
+        }
+
         public ReportOptionsTests(ITestOutputHelper output) : base(output)
         {
         }