fix: fixed the web ui filter rules by value (content) (#121)

carlosgoias · web-flow · commit b2b2256af1d4 · 2023-02-14T15:37:07.000Z
* fix: fixed the web ui filter rules by value (content)
diff --git a/samples/Rules.Framework.WebUI.Sample/Engine/RulesEngineProvider.cs b/samples/Rules.Framework.WebUI.Sample/Engine/RulesEngineProvider.cs
@@ -19,7 +19,7 @@ public RulesEngineProvider(RulesBuilder rulesBuilder)
                     .WithContentType<ContentTypes>()
                     .WithConditionType<ConditionTypes>()
                     .SetInMemoryDataSource()
-                    .Configure(c => c.PriotityCriteria = PriorityCriterias.BottommostRuleWins)
+                    .Configure(c => c.PriotityCriteria = PriorityCriterias.TopmostRuleWins)
                     .Build();
 
                 await rulesBuilder.BuildAsync(rulesEngine).ConfigureAwait(false);
diff --git a/samples/Rules.Framework.WebUI.Sample/Rules/RulesRandomFactory.cs b/samples/Rules.Framework.WebUI.Sample/Rules/RulesRandomFactory.cs
@@ -43,7 +43,7 @@ private static RuleBuilderResult<ContentTypes, ConditionTypes> CreateMultipleRul
                                      RuleBuilder
                              .NewRule<ContentTypes, ConditionTypes>()
                              .WithName($"Multi rule for test {contentTypes} {value}")
-                             .WithContent(contentTypes, $"Value {contentTypes} {value}")
+                             .WithContent(contentTypes, new { Value = value })
                              .WithDatesInterval(dateBegin, dateEnd)
                              .WithCondition(cnb => cnb.AsComposed()
                                     .WithLogicalOperator(LogicalOperators.Or)
@@ -52,6 +52,11 @@ private static RuleBuilderResult<ContentTypes, ConditionTypes> CreateMultipleRul
                                             .WithComparisonOperator(Operators.Equal)
                                             .SetOperand(7)
                                             .Build())
+                                        .AddCondition(condition => condition
+                                            .AsValued(ConditionTypes.SumAll).OfDataType<int>()
+                                            .WithComparisonOperator(Operators.Equal)
+                                            .SetOperand(9)
+                                            .Build())
                                         .AddCondition(condition => condition.AsComposed()
                                             .WithLogicalOperator(LogicalOperators.And)
                                             .AddCondition(sub => sub
@@ -73,8 +78,8 @@ private static RuleBuilderResult<ContentTypes, ConditionTypes> CreateMultipleRul
                                                     .Build())
                                                 .AddCondition(sub => sub
                                                     .AsValued(ConditionTypes.SumAll).OfDataType<string>()
-                                                    .WithComparisonOperator(Operators.EndsWith)
-                                                    .SetOperand("150")
+                                                    .WithComparisonOperator(Operators.NotEqual)
+                                                    .SetOperand(string.Empty)
                                                     .Build())
                                             .Build())
                                         .Build())
diff --git a/src/Rules.Framework.WebUI/Dto/ContentTypeDto.cs b/src/Rules.Framework.WebUI/Dto/ContentTypeDto.cs
@@ -2,6 +2,7 @@ namespace Rules.Framework.WebUI.Dto
 {
     internal sealed class ContentTypeDto
     {
+        public int Index { get; internal set; }
         public int ActiveRulesCount { get; internal set; }
         public string Name { get; internal set; }
         public int RulesCount { get; internal set; }
diff --git a/src/Rules.Framework.WebUI/Handlers/GetContentTypeHandler.cs b/src/Rules.Framework.WebUI/Handlers/GetContentTypeHandler.cs
@@ -33,7 +33,7 @@ protected override async Task HandleRequestAsync(HttpRequest httpRequest, HttpRe
                 var contents = this.genericRulesEngineAdapter.GetContentTypes();
 
                 var contentTypes = new List<ContentTypeDto>();
-
+                var index = 0;
                 foreach (var identifier in contents.Select(c => c.Identifier))
                 {
                     var genericContentType = new GenericContentType { Identifier = identifier };
@@ -46,10 +46,12 @@ protected override async Task HandleRequestAsync(HttpRequest httpRequest, HttpRe
 
                     contentTypes.Add(new ContentTypeDto
                     {
+                        Index = index,
                         Name = identifier,
                         ActiveRulesCount = genericRules.Count(IsActive),
                         RulesCount = genericRules.Count()
                     });
+                    index++;
                 }
 
                 await this.WriteResponseAsync(httpResponse, contentTypes, (int)HttpStatusCode.OK).ConfigureAwait(false);
diff --git a/src/Rules.Framework.WebUI/index.html b/src/Rules.Framework.WebUI/index.html

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ namespace Rules.Framework.WebUI.Dto`
`2`	`2`	`{`
`3`	`3`	`internal sealed class ContentTypeDto`
`4`	`4`	`{`
	`5`	`+ public int Index { get; internal set; }`
`5`	`6`	`public int ActiveRulesCount { get; internal set; }`
`6`	`7`	`public string Name { get; internal set; }`
`7`	`8`	`public int RulesCount { get; internal set; }`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected override async Task HandleRequestAsync(HttpRequest httpRequest, HttpRe`
`33`	`33`	`var contents = this.genericRulesEngineAdapter.GetContentTypes();`
`34`	`34`
`35`	`35`	`var contentTypes = new List<ContentTypeDto>();`
`36`		`-`
	`36`	`+ var index = 0;`
`37`	`37`	`foreach (var identifier in contents.Select(c => c.Identifier))`
`38`	`38`	`{`
`39`	`39`	`var genericContentType = new GenericContentType { Identifier = identifier };`
`@@ -46,10 +46,12 @@ protected override async Task HandleRequestAsync(HttpRequest httpRequest, HttpRe`
`46`	`46`
`47`	`47`	`contentTypes.Add(new ContentTypeDto`
`48`	`48`	`{`
	`49`	`+ Index = index,`
`49`	`50`	`Name = identifier,`
`50`	`51`	`ActiveRulesCount = genericRules.Count(IsActive),`
`51`	`52`	`RulesCount = genericRules.Count()`
`52`	`53`	`});`
	`54`	`+ index++;`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`await this.WriteResponseAsync(httpResponse, contentTypes, (int)HttpStatusCode.OK).ConfigureAwait(false);`