-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
d16aa89
commit 94401cd
Showing
12 changed files
with
357 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
225 changes: 225 additions & 0 deletions
225
Signum.Entities/DynamicQuery/Tokens/CollectionToArrayToken.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,225 @@ | ||
| using Signum.Entities.Reflection; | ||
| using Signum.Utilities.Reflection; | ||
| using System.ComponentModel; | ||
|
|
||
| namespace Signum.Entities.DynamicQuery; | ||
|
|
||
| public class CollectionToArrayToken : QueryToken | ||
| { | ||
| public CollectionToArrayType ToArrayType { get; private set; } | ||
|
|
||
| QueryToken parent; | ||
| public override QueryToken? Parent => parent; | ||
|
|
||
| readonly Type elementType; | ||
| internal CollectionToArrayToken(QueryToken parent, CollectionToArrayType toArrayType) | ||
| { | ||
| elementType = parent.Type.ElementType()!; | ||
| if (elementType == null) | ||
| throw new InvalidOperationException("not a collection"); | ||
|
|
||
| this.ToArrayType = toArrayType; | ||
|
|
||
| this.parent = parent ?? throw new ArgumentNullException(nameof(parent)); | ||
| } | ||
|
|
||
| public override Type Type | ||
| { | ||
| get { return elementType.BuildLiteNullifyUnwrapPrimaryKey(new[] { this.GetPropertyRoute()! }); } | ||
| } | ||
|
|
||
| public override string ToString() | ||
| { | ||
| return ToArrayType.NiceToString(); | ||
| } | ||
|
|
||
| public override string Key | ||
| { | ||
| get { return ToArrayType.ToString(); } | ||
| } | ||
|
|
||
| protected override List<QueryToken> SubTokensOverride(SubTokensOptions options) | ||
| { | ||
| var st = SubTokensBase(Type, options, GetImplementations()); | ||
|
|
||
| var ept = MListElementPropertyToken.AsMListEntityProperty(this.parent); | ||
| if (ept != null) | ||
| { | ||
| var mleType = MListElementPropertyToken.MListElementType(ept); | ||
|
|
||
| st.Add(new MListElementPropertyToken(this, mleType.GetProperty("RowId")!, ept.PropertyRoute, "RowId", () => QueryTokenMessage.RowId.NiceToString()) { Priority = -5 }); | ||
|
|
||
| if (MListElementPropertyToken.HasAttribute(ept.PropertyRoute, typeof(PreserveOrderAttribute))) | ||
| st.Add(new MListElementPropertyToken(this, mleType.GetProperty("RowOrder")!, ept.PropertyRoute, "RowOrder", () => QueryTokenMessage.RowOrder.NiceToString()) { Priority = -5 }); | ||
| } | ||
|
|
||
| return st; | ||
| } | ||
|
|
||
| public override Implementations? GetImplementations() | ||
| { | ||
| return parent.GetElementImplementations(); | ||
| } | ||
|
|
||
| public override string? Format | ||
| { | ||
| get | ||
| { | ||
|
|
||
| if (Parent is ExtensionToken et && et.IsProjection) | ||
| return et.ElementFormat; | ||
|
|
||
| return parent.Format; | ||
| } | ||
| } | ||
|
|
||
| public override string? Unit | ||
| { | ||
| get | ||
| { | ||
|
|
||
| if (Parent is ExtensionToken et && et.IsProjection) | ||
| return et.ElementUnit; | ||
|
|
||
| return parent.Unit; | ||
| } | ||
| } | ||
|
|
||
| public override string? IsAllowed() | ||
| { | ||
| return parent.IsAllowed(); | ||
| } | ||
|
|
||
|
|
||
| public override CollectionToArrayToken? HasToArray() => this; | ||
|
|
||
| public override PropertyRoute? GetPropertyRoute() | ||
| { | ||
| if (parent is ExtensionToken et && et.IsProjection) | ||
| return et.GetElementPropertyRoute(); | ||
|
|
||
| PropertyRoute? pr = this.parent!.GetPropertyRoute(); | ||
| if (pr != null && pr.Type.ElementType() != null) | ||
| return pr.Add("Item"); | ||
|
|
||
| return pr; | ||
| } | ||
|
|
||
| public override string NiceName() | ||
| { | ||
| return this.parent.NiceName(); | ||
| } | ||
|
|
||
| public override QueryToken Clone() | ||
| { | ||
| return new CollectionToArrayToken(parent.Clone(), ToArrayType); | ||
| } | ||
|
|
||
| protected override Expression BuildExpressionInternal(BuildExpressionContext context) | ||
| { | ||
| throw new InvalidOperationException("ToArrayToken should have a replacement at this stage"); | ||
| } | ||
|
|
||
|
|
||
| public override string TypeColor | ||
| { | ||
| get { return "#0000FF"; } | ||
| } | ||
|
|
||
| public static int MaxToArrayValues = 100; | ||
|
|
||
| static MethodInfo miToArray = ReflectionTools.GetMethodInfo(() => Enumerable.ToArray<int>(null!)).GetGenericMethodDefinition(); | ||
| static MethodInfo miToDistict = ReflectionTools.GetMethodInfo(() => Enumerable.Distinct<int>(null!)).GetGenericMethodDefinition(); | ||
| static MethodInfo miSelect = ReflectionTools.GetMethodInfo(() => Enumerable.Select<int, long>(null!, a => a)).GetGenericMethodDefinition(); | ||
| static MethodInfo miTake = ReflectionTools.GetMethodInfo(() => Enumerable.Take<int>(null!, 0)).GetGenericMethodDefinition(); | ||
| static MethodInfo miSelectMany = ReflectionTools.GetMethodInfo(() => Enumerable.SelectMany<string, char>(null!, a => a)).GetGenericMethodDefinition(); | ||
|
|
||
| internal static Expression BuildToArrayExpression(QueryToken token, CollectionToArrayToken cta, BuildExpressionContext context) | ||
| { | ||
| var ept = MListElementPropertyToken.AsMListEntityProperty(cta.Parent!); | ||
|
|
||
| BuildExpressionContext subCtx; | ||
| Expression query; | ||
| if(ept != null) | ||
| { | ||
| var collection = MListElementPropertyToken.BuildMListElements(ept, context); | ||
| query = collection; | ||
| Type mleType = collection.Type.ElementType()!; | ||
| var param = Expression.Parameter(mleType, mleType.Name.Substring(0, 1).ToLower()); | ||
| subCtx = new BuildExpressionContext(mleType, param, new Dictionary<QueryToken, ExpressionBox> | ||
| { | ||
| { cta, new ExpressionBox(param, mlistElementRoute: cta.GetPropertyRoute()) } | ||
| }); | ||
| } | ||
| else | ||
| { | ||
| var collection = cta.Parent!.BuildExpression(context); | ||
| query = collection; | ||
| Type elemeType = collection.Type.ElementType()!; | ||
| var param = Expression.Parameter(elemeType, elemeType.Name.Substring(0, 1).ToLower()); | ||
| subCtx = new BuildExpressionContext(elemeType, param, new Dictionary<QueryToken, ExpressionBox>() | ||
| { | ||
| { cta, new ExpressionBox(param.BuildLiteNullifyUnwrapPrimaryKey(new[] { cta.GetPropertyRoute()! }))} | ||
| }); | ||
| } | ||
|
|
||
| Expression body; | ||
| if (token is CollectionToArrayToken) | ||
| { | ||
| body = subCtx.Parameter.BuildLite(); | ||
| } | ||
| else | ||
| { | ||
| var cets = token.Follow(a => a.Parent).TakeWhile(a => a != cta).OfType<CollectionElementToken>().Reverse().ToList(); | ||
| foreach (var ce in cets) | ||
| { | ||
| var ept2 = MListElementPropertyToken.AsMListEntityProperty(ce.Parent!); | ||
| if (ept2 != null) | ||
| { | ||
| var collection = MListElementPropertyToken.BuildMListElements(ept2, subCtx); | ||
| Type mleType = collection.Type.ElementType()!; | ||
| query = Expression.Call(miSelectMany.MakeGenericMethod(query.Type.ElementType()!, mleType), query, Expression.Lambda(collection, subCtx.Parameter)); | ||
| var param = Expression.Parameter(mleType, mleType.Name.Substring(0, 1).ToLower()); | ||
| subCtx = new BuildExpressionContext(mleType, param, new Dictionary<QueryToken, ExpressionBox>() | ||
| { | ||
| { ce, new ExpressionBox(param, mlistElementRoute: ce.GetPropertyRoute())} | ||
| }); | ||
| } | ||
| else | ||
| { | ||
| var collection = ce.Parent!.BuildExpression(subCtx); | ||
| Type elementType = collection.Type.ElementType()!; | ||
| query = Expression.Call(miSelectMany.MakeGenericMethod(query.Type.ElementType()!, elementType), query, Expression.Lambda(collection, subCtx.Parameter)); | ||
|
|
||
| var param = Expression.Parameter(elementType, elementType.Name.Substring(0, 1).ToLower()); | ||
| subCtx = new BuildExpressionContext(elementType, param, new Dictionary<QueryToken, ExpressionBox>() | ||
| { | ||
| { ce, new ExpressionBox(param.BuildLiteNullifyUnwrapPrimaryKey(new[] { ce.GetPropertyRoute()! }))} | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| body = token.BuildExpression(subCtx); | ||
| } | ||
|
|
||
| if (body != subCtx.Parameter) | ||
| query = Expression.Call(miSelect.MakeGenericMethod(query.Type.ElementType()!, body.Type), query, Expression.Lambda(body, subCtx.Parameter)); | ||
|
|
||
| if (cta.ToArrayType == CollectionToArrayType.SeparatedByCommaDistict || | ||
| cta.ToArrayType == CollectionToArrayType.SeparatedByNewLineDistict) | ||
| query = Expression.Call(miToDistict.MakeGenericMethod(token.Type), query); | ||
|
|
||
| query = Expression.Call(miTake.MakeGenericMethod(token.Type), query, Expression.Constant(MaxToArrayValues)); | ||
|
|
||
| return Expression.Call(miToArray.MakeGenericMethod(token.Type), query); | ||
| } | ||
| } | ||
|
|
||
| [DescriptionOptions(DescriptionOptions.Members)] | ||
| public enum CollectionToArrayType | ||
| { | ||
| SeparatedByComma, | ||
| SeparatedByCommaDistict, | ||
| SeparatedByNewLine, | ||
| SeparatedByNewLineDistict, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
94401cdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Presenting SeparatedByNewLine / SeparatedByComma
This commit finishes a very welcome feature to the SearchControl: The ability to add lists of values separated by comma or by new line directly in a result cell for any collection.
The way it works is that any collection has now four new sub-tokens available.
The elements can be anything, strings, lites, dates, values... the propper formatter will be used.
What about Distict?
The feature was originally intended for small lists, (like telephone numbers of a company) but thanks to the distict and the ability to continue the expression is also usefull for relationships with more entities potentially associated (operation logs, or products in an order).
For example:
With this sequence of query tokens que can see what distict categories of producst are associated with each order.
What about Top?
There is an implicit limitation to show up to 100 elements on each cell. This calue can be globally configured if needed.
Enjoy!
94401cdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.