Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CCUI.DAPPI/src/app/state/content/content.effects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export class ContentEffects {
offset: ((action.page - 1) * action.limit).toString(),
limit: action.limit.toString(),
SearchTerm: action.searchText || '',
include: '*',
},
})
.pipe(
Expand Down
63 changes: 63 additions & 0 deletions Dappi.SourceGenerator/CrudGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,21 @@ private dynamic GetDbSetForType(string typeName)

private IQueryable<{item.ClassName}> ApplyDynamicIncludes(IQueryable<{item.ClassName}> query)
{{
if (!HttpContext.Request.Query.ContainsKey(""include""))
{{
return query;
}}

var shouldApplyFullIncludes = HttpContext.Request.Query[""include""]
.SelectMany(includeValue => (includeValue ?? string.Empty)
.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
.Any(includePath => includePath == ""*"");

if (shouldApplyFullIncludes)
{{
return ApplyFullIncludes(query);
}}

var includeTree = HttpContext.Items[IncludeQueryFilter.IncludeParamsKey] as IDictionary<string, IncludeNode>;
if (includeTree is null || includeTree.Count == 0)
{{
Expand All @@ -165,6 +180,54 @@ private dynamic GetDbSetForType(string typeName)
return query;
}}

private IQueryable<{item.ClassName}> ApplyFullIncludes(IQueryable<{item.ClassName}> query)
{{
var rootEntityType = dbContext.Model.FindEntityType(typeof({item.ClassName}));
if (rootEntityType is null)
{{
return query;
}}

var includePaths = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
var visitedTypes = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
visitedTypes.Add(rootEntityType.Name);
var prefix = string.Empty;

CollectIncludePaths(rootEntityType, prefix, includePaths, visitedTypes);

foreach (var includePath in includePaths)
{{
query = query.Include(includePath);
}}

return query;
}}

private static void CollectIncludePaths(
Microsoft.EntityFrameworkCore.Metadata.IEntityType entityType,
string prefix,
HashSet<string> includePaths,
HashSet<string> visitedTypes)
{{
var relations = entityType.GetNavigations();
foreach (var relation in relations)
{{
var entityTypeName = relation.TargetEntityType.Name;
if (visitedTypes.Contains(entityTypeName))
{{
continue;
}}

var navigationPath = string.IsNullOrEmpty(prefix) ? relation.Name : string.Concat(prefix, ""."", relation.Name);

includePaths.Add(navigationPath);
visitedTypes.Add(entityTypeName);

CollectIncludePaths(relation.TargetEntityType, navigationPath, includePaths, visitedTypes);
visitedTypes.Remove(entityTypeName);
}}
}}

private static IQueryable<{item.ClassName}> ApplyIncludeRecursively(IQueryable<{item.ClassName}> query, string path, IncludeNode node)
{{
query = query.Include(path);
Expand Down

This file was deleted.

Loading