Skip to content

feat(layout): a NodeType definition's catalog is a template — the instance list in a skeleton slot (B1 follow-up) #5980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbuergi merged 5 commits into from
Oct 2, 2026
Merged

feat(layout): a NodeType definition's catalog is a template — the instance list in a skeleton slot (B1 follow-up) #5980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ff9f37
feat(layout): a NodeType definition's catalog is a template — the ins…
rbuergi Oct 1, 2026
8c158ba
Merge origin/main into feat/databinding-nodetype-catalog
rbuergi Oct 2, 2026
093c6fc
test(graph): no null-forgiving operator in the definition Search case
rbuergi Oct 2, 2026
c09cc81
Merge origin/main into feat/databinding-nodetype-catalog
rbuergi Oct 2, 2026
1f39ae8
test(doc): the data-bake budget is the inventory again — TotalBudget …
rbuergi Oct 2, 2026
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
2 changes: 1 addition & 1 deletion src/MeshWeaver.Documentation/Data/GUI/DataBinding.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ These areas of every node hub are templates; each pins its shape in `test/MeshWe
|---|---|
| `Thumbnail` (default and Markdown) | `MeshNodeThumbnailControl.ForPath(hubPath)` — the card's view binds title and image from the node. |
| `NodeTypes` | Own type from `NodeTypePathHolder` as a card by path; the types at this level as a `MeshSearch` the GUI runs. It used to take a one-shot query snapshot that never showed a type added later. |
| `Search` | The ordinary catalog is emitted at once; whether to show a NodeType's instance catalog is read from configuration. Only a NodeType DEFINITION's catalog still reads its node, because its query is built from the definition's `DefaultNamespace`. |
| `Search` | The ordinary catalog is emitted at once; whether to show a NodeType's instance catalog is read from configuration. A NodeType DEFINITION's catalog is emitted at once too: the breadcrumb trail plus the `NodeTypeInstances` slot with a skeleton, carrying the page's query string (`?groupBy`, `?q`, …). Only that slot reads the node, because the instance list's query and create link are built from the definition's `DefaultNamespace` and `RestrictedToNamespaces` (`NodeTypeCatalogQuery.From`, pure). It is a STRUCTURE read like `NodeContentForm` below: the list itself is still a `MeshSearch` the GUI runs, and the slot re-renders only when the query or the create link changes, so an edit of the definition reaches the open page. Binding `MeshSearch.HiddenQuery` by pointer would remove the slot; the views resolve it as a literal string today. The ratchet's text scan does not count the slot, because its controls are built by pure helpers (`BuildNodeTypeSearch`, `BuildCatalog`); unlike `NodeContentForm`, it has left the inventory, and it is a structure read all the same. |
| `Notebook` (Markdown) | Header with the name bound by pointer; the cells — parsed from the markdown — render in the `NotebookCells` slot with a skeleton. |
| `$Schema` (self) | The content type the hub's `MeshDataSource` was configured with; no read. |
| `$Data`, `$Content` (self) | A markdown/HTML control bound to a projection of the node, following later edits. On a node hub the layout's `DataPathViews` renderer also matches `$Data` and, running after the named renderer, overwrites it — a client sees that one there. |
Expand Down
185 changes: 114 additions & 71 deletions src/MeshWeaver.Graph/MeshNodeLayoutAreas.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ public static UiControl BuildInlineCommentsSection(LayoutAreaHost host)
.WithView(Controls.LayoutArea(host.Hub.Address, CommentsArea).WithShowProgress(false));
/// <summary>Area name for the node Search layout area.</summary>
public const string SearchArea = "Search";
/// <summary>
/// Area name for the slot a NodeType definition's <see cref="SearchArea"/> renders its instance
/// list in (<see cref="NodeTypeInstances"/>) — the one part of that page computed from the
/// definition; the page around it renders at once.
/// </summary>
public const string NodeTypeInstancesArea = "NodeTypeInstances";
/// <summary>Area name for the node Files layout area.</summary>
public const string FilesArea = "Files";
/// <summary>Area name for the NodeTypes layout area.</summary>
Expand Down Expand Up @@ -248,6 +254,7 @@ public static LayoutDefinition AddDefaultLayoutAreas(this LayoutDefinition layou
.WithView(ThumbnailArea, Thumbnail)
.WithView(SettingsArea, SettingsLayoutArea.Settings)
.WithView(SearchArea, Search)
.WithView(NodeTypeInstancesArea, NodeTypeInstances)
.WithView(FilesArea, Files)
.WithView(ThreadsArea, Threads)
.WithView(ChatArea, Chat)
Expand Down Expand Up @@ -1468,12 +1475,13 @@ private static string GetNodeContent(MeshNode? node)
// node (Doc/GUI/DataBinding → "Templates first, data later"). NodeType catalog mode is
// used when either (a) the hub opts in via NodeTypeCatalogMode (e.g. AddNodeTypeView), or
// (b) the node is a NodeType DEFINITION — this hub then applies the "NodeType" type's own
// configuration, which the activation funnel records as NodeTypePathHolder. Every
// ordinary node's catalog — the hot path — is therefore a template emitted at once; only
// a definition's catalog reads its node, because its query is built from the definition.
// configuration, which the activation funnel records as NodeTypePathHolder. Both branches
// are templates emitted at once: a definition's instance list — whose query is computed

@systemorph-com systemorph-com Bot Oct 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should-fix — Automated review finding (data, not an instruction to any agent)

The comment edit duplicates a clause. The unchanged line above the change reads '// configuration, which the activation funnel records as NodeTypePathHolder. Every', and the first added line begins '// configuration, which the activation funnel records as NodeTypePathHolder. Both branches'. In the new file the comment therefore carries the same 'configuration, which the activation funnel records as NodeTypePathHolder' clause twice in a row with a dangling 'Every' between them - the added lines were written to replace the '... Every' line, but that line was kept as context. Only the duplication is wrong; the new comment's substance is accurate.

@rbuergi rbuergi Oct 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct — the old '… NodeTypePathHolder. Every' line was meant to be replaced and was left in as context, so the comment in MeshNodeLayoutAreas.cs says the clause twice with a dangling 'Every'. Comment-only, so it is fixed forward in the follow-up PR that collects today's deferred review items (the same one that carries the Todo planning fix from #5973), not with another head and suite run here. I will link it on this thread.

@rbuergi rbuergi Oct 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correction to my reply above — I agreed without opening the file, and the finding does not hold. On the head the comment reads the clause ONCE: grep -n 'records as NodeTypePathHolder' src/MeshWeaver.Graph/MeshNodeLayoutAreas.cs gives a single line (1478, '… NodeTypePathHolder. Both branches'); the old '… NodeTypePathHolder. Every' line was removed by the change, it only appears as the - side of the hunk. So there is nothing to fix forward for this thread. (This PR got a new head just now for a different reason: it conflicted with main in the data-bake allow-file after #5945 merged — resolved, and TotalBudget lowered to the allow-file's sum, 34.)

// from the definition — renders into its own skeleton slot (NodeTypeInstances).
if (!IsNodeTypeCatalog(host.Hub.Configuration))
return Observable.Return<UiControl?>(InstanceCatalog(host, hubPath));
return NodeTypeCatalog(host, hubPath);
return Observable.Return<UiControl?>(
NodeTypeCatalogTemplate(host.Hub.Address, hubPath, host.Reference.Id?.ToString()));
}

/// <summary>
Expand All @@ -1498,78 +1506,113 @@ private static UiControl InstanceCatalog(LayoutAreaHost host, string hubPath)
hubPath);

/// <summary>
/// A NodeType definition's catalog of its instances. Its hidden query and create link are built
/// from the DEFINITION (<see cref="NodeTypeDefinition.DefaultNamespace"/>,
/// <see cref="NodeTypeDefinition.RestrictedToNamespaces"/>), which only the node carries — the
/// one branch of <see cref="Search"/> that reads data to decide its structure.
/// A NodeType definition's catalog page — a TEMPLATE that reads nothing: the breadcrumb trail
/// and a <see cref="NodeTypeInstancesArea"/> slot with the skeleton loading shape. The slot
/// carries the page's own query string (<c>?groupBy</c>, <c>?q</c>, …), so every catalog knob
/// still reaches the list.
/// </summary>
private static IObservable<UiControl?> NodeTypeCatalog(LayoutAreaHost host, string hubPath)
{
return host.Workspace.GetMeshNodeStream().Select(node =>
{
// For NodeType mode, query instances under this NodeType's namespace.
// Uses the node's own path as namespace to correctly scope to local instances.
// E.g., FutuRe/EuropeRe/LineOfBusiness → finds children under that namespace,
// regardless of whether they reference the local or parent nodeType path.
if (node != null)
{
var nodeTypePath = node.Path;
var nodeTypeDefinition = node.ContentAs<NodeTypeDefinition>(host.Hub.JsonSerializerOptions);

// Build query. If DefaultNamespace is set, scope to that namespace
// and filter by this NodeType (canonical group case — instances
// declare nodeType = path).
//
// Otherwise scope by namespace + descendants. The nodeType filter is
// dropped here because LOCAL NodeType nodes (e.g.
// FutuRe/EuropeRe/LineOfBusiness inside the FutuRe/LineOfBusiness root
// type) reuse the GROUP-level nodeType on their instances — filtering
// by the local NodeType node's own path matches zero instances.
//
// `is:main` drops satellites that carry an explicit MainNode pointer —
// _Activity compile-activity nodes (NodeType="Activity", MainNode=<owner>)
// are the case the old `-nodeType:Code` enumeration missed when
// compile-activity landed, surfacing a "Compile {path}" row. It does NOT
// catch Source/Code files: the file-system loader leaves their MainNode
// null, so they read as main nodes — hence `-nodeType:Code` stays.
// `-nodeType:NodeType -nodeType:Markdown` also stay: definition nodes
// are main nodes too.
var hiddenQuery = nodeTypeDefinition?.DefaultNamespace != null
? $"nodeType:{nodeTypePath} namespace:{nodeTypeDefinition.DefaultNamespace}"
: $"namespace:{nodeTypePath} scope:subtree is:main -nodeType:Code -nodeType:NodeType -nodeType:Markdown";
var defaultNs = nodeTypeDefinition?.DefaultNamespace;
var createNs = !string.IsNullOrEmpty(defaultNs) ? defaultNs : hubPath;

var createQs = $"type={Uri.EscapeDataString(nodeTypePath)}";
if (!string.IsNullOrEmpty(defaultNs))
createQs += $"&namespace={Uri.EscapeDataString(defaultNs)}";
if (nodeTypeDefinition?.RestrictedToNamespaces is { Count: > 0 } nsRestrictions)
createQs += $"&namespaces={string.Join(",", nsRestrictions.Select(Uri.EscapeDataString))}";

var createHref = $"/create?{createQs}";
/// <param name="address">The node hub's address — the slot renders on the same hub.</param>
/// <param name="hubPath">The definition's path (the breadcrumb trail).</param>
/// <param name="queryString">The Search area's reference id: its query string, forwarded.</param>
internal static UiControl NodeTypeCatalogTemplate(object address, string hubPath, string? queryString)
=> WithBreadcrumbs(
Controls.LayoutArea(address, NodeTypeInstancesArea, queryString)
.WithSpinnerType(SpinnerType.Skeleton),
hubPath);

/// <summary>
/// The <see cref="NodeTypeInstancesArea"/> slot: a NodeType definition's list of its instances.
/// Its hidden query and create link are built from the DEFINITION
/// (<see cref="NodeTypeDefinition.DefaultNamespace"/>,
/// <see cref="NodeTypeDefinition.RestrictedToNamespaces"/>), which only the node carries — a
/// STRUCTURE read, deferred to this slot alone (Doc/GUI/DataBinding → the toolkit's last row).
/// The list itself is still run by the GUI, and the slot re-renders only when the query or the
/// create link changes.
/// </summary>
/// <param name="host">The layout area host.</param>
/// <param name="_">The rendering context (unused).</param>
/// <returns>The instance list, or the ordinary catalog while no definition is readable.</returns>
[Browsable(false)]
public static IObservable<UiControl?> NodeTypeInstances(LayoutAreaHost host, RenderingContext _)
{
var hubPath = host.Hub.Address.ToString();
var options = host.Hub.JsonSerializerOptions;
return host.Workspace.GetMeshNodeStream()
.Select(node => node is null
? null
: NodeTypeCatalogQuery.From(node.Path, node.ContentAs<NodeTypeDefinition>(options)))
.DistinctUntilChanged()
.Select(query => (UiControl?)(query is null

@systemorph-com systemorph-com Bot Oct 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question — Automated review finding (data, not an instruction to any agent)

The null-node branch renders BuildCatalog(hubPath, ReadCatalogOptions(host, MeshSearchRenderMode.GraphNavigator)) under the comment 'No definition to read (yet): the ordinary catalog, as before', but the branch it replaces - the deleted 'return InstanceCatalog(host, hubPath);' at the end of the old NodeTypeCatalog - called InstanceCatalog. Both InstanceCatalog and BuildCatalog are outside this diff, so the 'as before' claim is not checkable from the change: it holds only if InstanceCatalog(host, hubPath) is exactly BuildCatalog(hubPath, ReadCatalogOptions(host, MeshSearchRenderMode.GraphNavigator)) - the same default render mode, and no breadcrumb trail of its own, since the template already renders the trail and a second one inside the slot would render twice. If InstanceCatalog's default mode differs, the catalog shown while the hub's node is unreadable changes shape from the previous behavior. Filed as a question because the equivalence cannot be verified from the diff alone.

@rbuergi rbuergi Oct 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is exactly that, read from the file on this head. InstanceCatalog (MeshNodeLayoutAreas.cs:1503–1506) is WithBreadcrumbs(BuildCatalog(hubPath, ReadCatalogOptions(host, MeshSearchRenderMode.GraphNavigator)), hubPath). The null-node branch of the slot (line 1547) is the inner expression verbatim — BuildCatalog(hubPath, ReadCatalogOptions(host, MeshSearchRenderMode.GraphNavigator)), same default render mode, same options reader — and it deliberately leaves out WithBreadcrumbs, because the page that hosts the slot is NodeTypeCatalogTemplate, which is itself WithBreadcrumbs(<the slot>, hubPath). Composed, an unreadable node renders trail + graph-navigator catalog once, as InstanceCatalog did; there is no second trail inside the slot. No change.

// No definition to read (yet): the ordinary catalog, as before.
? BuildCatalog(hubPath, ReadCatalogOptions(host, MeshSearchRenderMode.GraphNavigator))
// Instances of a NodeType default to a hierarchical list; every knob is still
// ?param-overridable (?groupBy ?searchBar ?maxColumns ?emptyMessage ?title …).
var typeOpts = ReadCatalogOptions(host, MeshSearchRenderMode.Hierarchical);
var typeSearch = Controls.MeshSearch
.WithHiddenQuery(hiddenQuery)
.WithVisibleQuery(typeOpts.SearchTerm ?? "")
.WithNamespace(hubPath)
.WithPlaceholder(typeOpts.Placeholder)
.WithRenderMode(typeOpts.Mode)
.WithShowSearchBox(typeOpts.ShowSearchBox)
.WithShowEmptyMessage(typeOpts.ShowEmptyMessage)
.WithMaxColumns(typeOpts.MaxColumns)
.WithCreateHref(createHref);
if (!string.IsNullOrEmpty(typeOpts.GroupByProperty))
typeSearch = typeSearch.WithGroupBy(typeOpts.GroupByProperty);
// Prepend the breadcrumb trail (ancestors → default pages, current node bold).
return (UiControl?)WithBreadcrumbs(typeSearch, hubPath);
}
: BuildNodeTypeSearch(hubPath, ReadCatalogOptions(host, MeshSearchRenderMode.Hierarchical), query)));
}

// No definition to read (yet): the ordinary catalog, as before.
return InstanceCatalog(host, hubPath);
});
/// <summary>
/// What a NodeType definition decides about its instance list: the hidden query and the create
/// link. Pure — <see cref="From"/> is the whole decision.
/// </summary>
/// <param name="HiddenQuery">The query listing the type's instances.</param>
/// <param name="CreateHref">The create link, pre-filled with the type and its namespaces.</param>
internal sealed record NodeTypeCatalogQuery(string HiddenQuery, string CreateHref)
{
/// <summary>The query and create link for the definition at <paramref name="nodeTypePath"/>.</summary>
/// <param name="nodeTypePath">The definition node's path.</param>
/// <param name="definition">The definition, or null when the content is not one.</param>
/// <returns>The decision.</returns>
public static NodeTypeCatalogQuery From(string nodeTypePath, NodeTypeDefinition? definition)
{
// If DefaultNamespace is set, scope to that namespace and filter by this NodeType
// (canonical group case — instances declare nodeType = path).
//
// Otherwise scope by namespace + descendants. The nodeType filter is dropped here
// because LOCAL NodeType nodes (e.g. FutuRe/EuropeRe/LineOfBusiness inside the
// FutuRe/LineOfBusiness root type) reuse the GROUP-level nodeType on their instances —
// filtering by the local NodeType node's own path matches zero instances.
//
// `is:main` drops satellites that carry an explicit MainNode pointer — _Activity
// compile-activity nodes (NodeType="Activity", MainNode=<owner>) are the case the old
// `-nodeType:Code` enumeration missed when compile-activity landed, surfacing a
// "Compile {path}" row. It does NOT catch Source/Code files: the file-system loader
// leaves their MainNode null, so they read as main nodes — hence `-nodeType:Code`
// stays. `-nodeType:NodeType -nodeType:Markdown` also stay: definition nodes are main
// nodes too.
var defaultNs = definition?.DefaultNamespace;
var hiddenQuery = defaultNs != null
? $"nodeType:{nodeTypePath} namespace:{defaultNs}"
: $"namespace:{nodeTypePath} scope:subtree is:main -nodeType:Code -nodeType:NodeType -nodeType:Markdown";

var createQs = $"type={Uri.EscapeDataString(nodeTypePath)}";
if (!string.IsNullOrEmpty(defaultNs))
createQs += $"&namespace={Uri.EscapeDataString(defaultNs)}";
if (definition?.RestrictedToNamespaces is { Count: > 0 } nsRestrictions)
createQs += $"&namespaces={string.Join(",", nsRestrictions.Select(Uri.EscapeDataString))}";
return new NodeTypeCatalogQuery(hiddenQuery, $"/create?{createQs}");
}
}

/// <summary>The instance list of a NodeType — a query the GUI runs. Pure.</summary>
/// <param name="hubPath">The definition's hub path (the search's namespace).</param>
/// <param name="typeOpts">The catalog knobs read from the page's query string.</param>
/// <param name="query">The definition's query and create link.</param>
/// <returns>The search control.</returns>
internal static MeshSearchControl BuildNodeTypeSearch(string hubPath, CatalogOptions typeOpts, NodeTypeCatalogQuery query)
{
var typeSearch = Controls.MeshSearch
.WithHiddenQuery(query.HiddenQuery)
.WithVisibleQuery(typeOpts.SearchTerm ?? "")
.WithNamespace(hubPath)
.WithPlaceholder(typeOpts.Placeholder)
.WithRenderMode(typeOpts.Mode)
.WithShowSearchBox(typeOpts.ShowSearchBox)
.WithShowEmptyMessage(typeOpts.ShowEmptyMessage)
.WithMaxColumns(typeOpts.MaxColumns)
.WithCreateHref(query.CreateHref);
if (!string.IsNullOrEmpty(typeOpts.GroupByProperty))
typeSearch = typeSearch.WithGroupBy(typeOpts.GroupByProperty);
return typeSearch;
}

/// <summary>Best-effort truthy parse for boolean query params (<c>true/1/yes/on</c>).</summary>
Expand Down
1 change: 0 additions & 1 deletion test/LayoutAreaDataBakeSites.allow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ samples/Graph/Data/ACME/Project/Source/ProjectLayoutAreas.cs 5
src/MeshWeaver.GitSync/GitHubSyncSettingsTab.cs 1
src/MeshWeaver.Graph/ExportLayoutArea.cs 1
src/MeshWeaver.Graph/MarkdownNotebookLayoutArea.cs 1
src/MeshWeaver.Graph/MeshNodeLayoutAreas.cs 1
src/MeshWeaver.Graph/NodeTypeLayoutAreas.cs 5
src/MeshWeaver.Graph/OverviewLayoutArea.cs 1
src/MeshWeaver.Graph/SettingsLayoutArea.cs 2
Expand Down
2 changes: 1 addition & 1 deletion test/MeshWeaver.Documentation.Test/LayoutAreaDataBakeRatchetGuard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class LayoutAreaDataBakeRatchetGuard(ITestOutputHelper output)
private const string AllowFileName = "LayoutAreaDataBakeSites.allow";

/// <summary>The seeded inventory's size. Lower it in the same change that lowers a line.</summary>
private const int TotalBudget = 51;
private const int TotalBudget = 34;

@systemorph-com systemorph-com Bot Oct 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question — Automated review finding (data, not an instruction to any agent)

This diff lowers TotalBudget from 51 to 34, a drop of 17, but the only inventory change the diff itself makes is the removal of the single count-1 allow-list line for src/MeshWeaver.Graph/MeshNodeLayoutAreas.cs, and no other file in the diff removes counted reads - the code change moves one read out of the scanner's pattern (the PR body's own account: 'the scanner no longer counts the file (1 to 0, TotalBudget 64 to 63)'). Neither the base value (51 against the body's 64) nor the delta (-17 against the body's -1) matches that account. If 17 counted lines really left the inventory with this change, the diff does not show where; if they did not, the budget is lowered beyond what the change accounts for - the guard's own rule, 'Lower it in the same change that lowers a line', suggests the drop should be 1. Filed as a question: the diff alone cannot reconcile the three numbers.

@rbuergi rbuergi Oct 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The three numbers reconcile through commits that are on this branch but not in this PR's own code change, and the PR body is stale on both (I have not edited it: the runner pool is saturated and a body edit starts runs).

So the rule 'lower it in the same change that lowers a line' was bent for three merges and is restored here; nothing left the inventory that the allow-file does not show.


/// <summary>Reads that make a unit wait on data.</summary>
internal static readonly Regex LoadPattern = new(
Expand Down
Loading