fix(admin-ui): bind Raw callers and lazy reads to their presentations
This commit is contained in:
@@ -37,36 +37,42 @@
|
||||
</Virtualize>
|
||||
</div>
|
||||
|
||||
@* --- Real modals + dialogs (one instance each for the whole recursive tree) --- *@
|
||||
<DriverConfigModal @bind-Visible="_driverCfgVisible" DriverInstanceId="@_driverCfgId" OnSaved="DriverCfgSaved" />
|
||||
|
||||
<DeviceModal @bind-Visible="_deviceVisible" DeviceId="@_deviceEditId"
|
||||
DriverInstanceId="@_deviceCreateDriverId" DriverType="@_deviceDriverType" OnSaved="DeviceSaved" />
|
||||
|
||||
<RawTagModal @bind-Visible="_tagVisible" TagId="@_tagId" DriverType="@_tagDriverType" OnSaved="TagSaved" />
|
||||
|
||||
<RawManualTagEntryModal @bind-Visible="_manualVisible" DeviceId="@_manualDeviceId"
|
||||
TagGroupId="@_manualTagGroupId" DriverType="@_manualDriverType" OnSaved="ManualSaved" />
|
||||
|
||||
<RawCsvImportModal @bind-Visible="_csvImportVisible" DeviceId="@_csvImportDeviceId"
|
||||
TagGroupId="@_csvImportTagGroupId" DriverType="@_csvImportDriverType" OnSaved="CsvImportSaved" />
|
||||
|
||||
<RawCsvExportModal @bind-Visible="_csvExportVisible" DeviceId="@_csvExportDeviceId"
|
||||
TagGroupId="@_csvExportTagGroupId" DriverType="@_csvExportDriverType" />
|
||||
|
||||
<RawBrowseModal @bind-Visible="_browseVisible" DeviceId="@_browseDeviceId"
|
||||
TagGroupId="@_browseTagGroupId" DriverType="@_browseDriverType" OnSaved="BrowseSaved" />
|
||||
|
||||
<RawNameDialog @bind-Visible="_nameVisible" Title="@_nameTitle" Value="@_nameInitial" OnSubmit="NameSubmitted" />
|
||||
|
||||
<RawConfirmDialog @bind-Visible="_confirmVisible" Title="@_confirmTitle" Message="@_confirmMessage"
|
||||
OnConfirm="Confirmed" />
|
||||
|
||||
<RawDriverTypeDialog @bind-Visible="_driverTypeVisible" OnSubmit="DriverTypeSubmitted" />
|
||||
|
||||
@* Shared message surface (repurposed RawStubModal) — delete blockers, rename warnings, Browse note. *@
|
||||
<RawStubModal Visible="_msgVisible" Title="@_msgTitle" Message="@_msgMessage"
|
||||
NodeName="@_msgNodeName" OnClose="CloseMessage" />
|
||||
@* Render-local identities keep retained handlers attached to their original target. *@
|
||||
@{
|
||||
var presentation = _presentationGeneration;
|
||||
var nameSubmit = _nameSubmit;
|
||||
var confirmAction = _confirmAction;
|
||||
var driverTypeSubmit = _driverTypeSubmit;
|
||||
var cfgNode = _driverCfgNode;
|
||||
var deviceNode = _deviceNode;
|
||||
var deviceCreate = _deviceIsCreate;
|
||||
var tagNode = _tagNode;
|
||||
var manualNode = _manualNode;
|
||||
var csvNode = _csvImportNode;
|
||||
var browseNode = _browseNode;
|
||||
}
|
||||
<DriverConfigModal Visible="_driverCfgVisible" Target="@presentation" VisibleChanged="value => ChangeVisibility(presentation, value, v => _driverCfgVisible = v)"
|
||||
DriverInstanceId="@_driverCfgId" OnSaved="() => Saved(presentation, cfgNode, false)" />
|
||||
<DeviceModal Visible="_deviceVisible" Target="@presentation" VisibleChanged="value => ChangeVisibility(presentation, value, v => _deviceVisible = v)"
|
||||
DeviceId="@_deviceEditId" DriverInstanceId="@_deviceCreateDriverId" DriverType="@_deviceDriverType" OnSaved="() => Saved(presentation, deviceNode, deviceCreate)" />
|
||||
<RawTagModal Visible="_tagVisible" Target="@presentation" VisibleChanged="value => ChangeVisibility(presentation, value, v => _tagVisible = v)"
|
||||
TagId="@_tagId" DriverType="@_tagDriverType" OnSaved="() => Saved(presentation, tagNode, false)" />
|
||||
<RawManualTagEntryModal Visible="_manualVisible" Target="@presentation" VisibleChanged="value => ChangeVisibility(presentation, value, v => _manualVisible = v)"
|
||||
DeviceId="@_manualDeviceId" TagGroupId="@_manualTagGroupId" DriverType="@_manualDriverType" OnSaved="() => Saved(presentation, manualNode, true)" />
|
||||
<RawCsvImportModal Visible="_csvImportVisible" Target="@presentation" VisibleChanged="value => ChangeVisibility(presentation, value, v => _csvImportVisible = v)"
|
||||
DeviceId="@_csvImportDeviceId" TagGroupId="@_csvImportTagGroupId" DriverType="@_csvImportDriverType" OnSaved="() => Saved(presentation, csvNode, true)" />
|
||||
<RawCsvExportModal Visible="_csvExportVisible" Target="@presentation" VisibleChanged="value => ChangeVisibility(presentation, value, v => _csvExportVisible = v)"
|
||||
DeviceId="@_csvExportDeviceId" TagGroupId="@_csvExportTagGroupId" DriverType="@_csvExportDriverType" />
|
||||
<RawBrowseModal Visible="_browseVisible" Target="@presentation" VisibleChanged="value => ChangeVisibility(presentation, value, v => _browseVisible = v)"
|
||||
DeviceId="@_browseDeviceId" TagGroupId="@_browseTagGroupId" DriverType="@_browseDriverType" OnSaved="() => Saved(presentation, browseNode, true)" />
|
||||
<RawNameDialog Visible="_nameVisible" Target="@presentation" VisibleChanged="value => ChangeVisibility(presentation, value, v => _nameVisible = v)"
|
||||
Title="@_nameTitle" Value="@_nameInitial" OnSubmit="name => NameSubmitted(presentation, nameSubmit, name)" />
|
||||
<RawConfirmDialog Visible="_confirmVisible" Target="@presentation" VisibleChanged="value => ChangeVisibility(presentation, value, v => _confirmVisible = v)"
|
||||
Title="@_confirmTitle" Message="@_confirmMessage" OnConfirm="() => Confirmed(presentation, confirmAction)" />
|
||||
<RawDriverTypeDialog Visible="_driverTypeVisible" Target="@presentation" VisibleChanged="value => ChangeVisibility(presentation, value, v => _driverTypeVisible = v)"
|
||||
OnSubmit="choice => DriverTypeSubmitted(presentation, driverTypeSubmit, choice)" />
|
||||
<RawStubModal Visible="_msgVisible" Target="@presentation" Title="@_msgTitle" Message="@_msgMessage"
|
||||
NodeName="@_msgNodeName" OnClose="() => CloseMessage(presentation)" />
|
||||
|
||||
@code {
|
||||
private readonly string _densityId = "raw-density-" + Guid.NewGuid().ToString("N");
|
||||
@@ -80,6 +86,16 @@
|
||||
|
||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||
{
|
||||
if (_releaseMessage && !InputDialogVisible && _queuedMessage is { } queued)
|
||||
{
|
||||
_releaseMessage = false;
|
||||
_queuedMessage = null;
|
||||
if (Current(queued.Generation))
|
||||
{
|
||||
PresentMessage(queued.Title, queued.Message, queued.NodeName);
|
||||
StateHasChanged(); // The originating dialog was removed in the preceding DOM batch.
|
||||
}
|
||||
}
|
||||
if (!firstRender) return;
|
||||
await _densityGate.WaitAsync();
|
||||
try
|
||||
@@ -219,17 +235,17 @@
|
||||
private bool _nameVisible;
|
||||
private string _nameTitle = "";
|
||||
private string _nameInitial = "";
|
||||
private Func<string, Task>? _nameSubmit;
|
||||
private Func<string, long, Task>? _nameSubmit;
|
||||
|
||||
// --- Confirm dialog (deletes) ---
|
||||
private bool _confirmVisible;
|
||||
private string _confirmTitle = "";
|
||||
private string _confirmMessage = "";
|
||||
private Func<Task>? _confirmAction;
|
||||
private Func<long, Task>? _confirmAction;
|
||||
|
||||
// --- Driver-type dialog (New driver) ---
|
||||
private bool _driverTypeVisible;
|
||||
private Func<(string DriverType, string Name), Task>? _driverTypeSubmit;
|
||||
private Func<(string DriverType, string Name), long, Task>? _driverTypeSubmit;
|
||||
|
||||
// --- Shared message surface (repurposed RawStubModal): delete blockers, rename warnings, Browse note ---
|
||||
private bool _msgVisible;
|
||||
@@ -346,18 +362,21 @@
|
||||
/// </summary>
|
||||
private async Task ToggleAsync(RawNode node)
|
||||
{
|
||||
if (node.Loading) { return; }
|
||||
if (_densityDisposed || node.Loading) { return; }
|
||||
|
||||
node.Expanded = !node.Expanded;
|
||||
|
||||
if (node.Expanded && node.HasLazyChildren && !node.Loaded)
|
||||
{
|
||||
var owner = _reloadOwners.GetValue(node, _ => new ReloadOwner());
|
||||
var revision = ++owner.Revision;
|
||||
node.Loading = true;
|
||||
node.Error = null;
|
||||
StateHasChanged();
|
||||
try
|
||||
{
|
||||
var children = await Svc.LoadChildrenAsync(node);
|
||||
if (_densityDisposed || owner.Revision != revision) return;
|
||||
node.Children.Clear();
|
||||
node.Children.AddRange(children);
|
||||
node.ChildCount = node.Children.Count;
|
||||
@@ -365,13 +384,13 @@
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
node.Error = ex.Message;
|
||||
if (!_densityDisposed && owner.Revision == revision) node.Error = ex.Message;
|
||||
}
|
||||
finally
|
||||
{
|
||||
node.Loading = false;
|
||||
if (owner.Revision == revision) node.Loading = false;
|
||||
}
|
||||
StateHasChanged();
|
||||
if (!_densityDisposed && owner.Revision == revision) StateHasChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -515,11 +534,11 @@
|
||||
{
|
||||
var clusterId = node.Kind == RawNodeKind.Cluster ? (node.ClusterId ?? node.EntityId) : node.ClusterId;
|
||||
var parentFolderId = node.Kind == RawNodeKind.Folder ? node.EntityId : null;
|
||||
ShowNameDialog("New folder", "", async name =>
|
||||
ShowNameDialog("New folder", "", async (name, generation) =>
|
||||
{
|
||||
var res = await Svc.CreateFolderAsync(clusterId ?? "", parentFolderId, name);
|
||||
if (!res.Ok) { ShowMessage("New folder failed", res.Error ?? "Create failed.", node.DisplayName); return; }
|
||||
await ReloadNodeAsync(node);
|
||||
if (!res.Ok) { ShowMessage(generation, "New folder failed", res.Error ?? "Create failed.", node.DisplayName); return; }
|
||||
await ReloadNodeAsync(node, generation);
|
||||
});
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
@@ -529,26 +548,26 @@
|
||||
{
|
||||
var clusterId = node.Kind == RawNodeKind.Cluster ? (node.ClusterId ?? node.EntityId) : node.ClusterId;
|
||||
var folderId = node.Kind == RawNodeKind.Folder ? node.EntityId : null;
|
||||
ShowDriverTypeDialog(async choice =>
|
||||
ShowDriverTypeDialog(async (choice, generation) =>
|
||||
{
|
||||
var res = await Svc.CreateDriverAsync(clusterId ?? "", folderId, choice.Name, choice.DriverType, "{}");
|
||||
if (!res.Ok) { ShowMessage("New driver failed", res.Error ?? "Create failed.", node.DisplayName); return; }
|
||||
await ReloadNodeAsync(node);
|
||||
if (!res.Ok) { ShowMessage(generation, "New driver failed", res.Error ?? "Create failed.", node.DisplayName); return; }
|
||||
await ReloadNodeAsync(node, generation);
|
||||
});
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnRenameFolder(RawNode node)
|
||||
{
|
||||
ShowNameDialog("Rename folder", node.DisplayName, async name =>
|
||||
await AfterRename(await Svc.RenameFolderAsync(node.EntityId!, name, node.RowVersion), node));
|
||||
ShowNameDialog("Rename folder", node.DisplayName, async (name, generation) =>
|
||||
await AfterRename(await Svc.RenameFolderAsync(node.EntityId!, name, node.RowVersion), node, generation));
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnDeleteFolder(RawNode node)
|
||||
{
|
||||
ShowConfirm("Delete folder", $"Delete folder “{node.DisplayName}”?", async () =>
|
||||
await AfterDelete(await Svc.DeleteFolderAsync(node.EntityId!, node.RowVersion), node));
|
||||
ShowConfirm("Delete folder", $"Delete folder “{node.DisplayName}”?", async generation =>
|
||||
await AfterDelete(await Svc.DeleteFolderAsync(node.EntityId!, node.RowVersion), node, generation));
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -556,6 +575,7 @@
|
||||
|
||||
private Task OnConfigureDriver(RawNode node)
|
||||
{
|
||||
BeginPresentation();
|
||||
_driverCfgId = node.EntityId;
|
||||
_driverCfgNode = node;
|
||||
_driverCfgVisible = true;
|
||||
@@ -565,6 +585,7 @@
|
||||
|
||||
private Task OnNewDevice(RawNode node)
|
||||
{
|
||||
BeginPresentation();
|
||||
_deviceIsCreate = true;
|
||||
_deviceEditId = null;
|
||||
_deviceCreateDriverId = node.EntityId;
|
||||
@@ -577,22 +598,27 @@
|
||||
|
||||
private async Task OnToggleDriverEnabled(RawNode node)
|
||||
{
|
||||
var res = await Svc.SetDriverEnabledAsync(node.EntityId!, !node.Enabled, node.RowVersion);
|
||||
if (!res.Ok) { ShowMessage("Update failed", res.Error ?? "Could not change enabled state.", node.DisplayName); return; }
|
||||
await ReloadParentAsync(node);
|
||||
var generation = BeginPresentation();
|
||||
try
|
||||
{
|
||||
var res = await Svc.SetDriverEnabledAsync(node.EntityId!, !node.Enabled, node.RowVersion);
|
||||
if (!res.Ok) { ShowMessage(generation, "Update failed", res.Error ?? "Could not change enabled state.", node.DisplayName, requireInput: false); return; }
|
||||
await ReloadParentAsync(node, generation);
|
||||
}
|
||||
catch (Exception) when (!Current(generation)) { /* A retired result must not fault its replacement. */ }
|
||||
}
|
||||
|
||||
private Task OnRenameDriver(RawNode node)
|
||||
{
|
||||
ShowNameDialog("Rename driver", node.DisplayName, async name =>
|
||||
await AfterRename(await Svc.RenameDriverAsync(node.EntityId!, name, node.RowVersion), node));
|
||||
ShowNameDialog("Rename driver", node.DisplayName, async (name, generation) =>
|
||||
await AfterRename(await Svc.RenameDriverAsync(node.EntityId!, name, node.RowVersion), node, generation));
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnDeleteDriver(RawNode node)
|
||||
{
|
||||
ShowConfirm("Delete driver", $"Delete driver “{node.DisplayName}” and its empty devices?", async () =>
|
||||
await AfterDelete(await Svc.DeleteDriverAsync(node.EntityId!, node.RowVersion), node));
|
||||
ShowConfirm("Delete driver", $"Delete driver “{node.DisplayName}” and its empty devices?", async generation =>
|
||||
await AfterDelete(await Svc.DeleteDriverAsync(node.EntityId!, node.RowVersion), node, generation));
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -600,6 +626,7 @@
|
||||
|
||||
private Task OnConfigureDevice(RawNode node)
|
||||
{
|
||||
BeginPresentation();
|
||||
_deviceIsCreate = false;
|
||||
_deviceEditId = node.EntityId;
|
||||
_deviceCreateDriverId = null;
|
||||
@@ -613,19 +640,19 @@
|
||||
private Task OnNewTagGroup(RawNode node)
|
||||
{
|
||||
// node is a Device — its root tag-groups.
|
||||
ShowNameDialog("New tag-group", "", async name =>
|
||||
ShowNameDialog("New tag-group", "", async (name, generation) =>
|
||||
{
|
||||
var res = await Svc.CreateTagGroupAsync(node.EntityId!, null, name);
|
||||
if (!res.Ok) { ShowMessage("New tag-group failed", res.Error ?? "Create failed.", node.DisplayName); return; }
|
||||
await ReloadNodeAsync(node);
|
||||
if (!res.Ok) { ShowMessage(generation, "New tag-group failed", res.Error ?? "Create failed.", node.DisplayName); return; }
|
||||
await ReloadNodeAsync(node, generation);
|
||||
});
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnDeleteDevice(RawNode node)
|
||||
{
|
||||
ShowConfirm("Delete device", $"Delete device “{node.DisplayName}”?", async () =>
|
||||
await AfterDelete(await Svc.DeleteDeviceAsync(node.EntityId!, node.RowVersion), node));
|
||||
ShowConfirm("Delete device", $"Delete device “{node.DisplayName}”?", async generation =>
|
||||
await AfterDelete(await Svc.DeleteDeviceAsync(node.EntityId!, node.RowVersion), node, generation));
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -633,6 +660,7 @@
|
||||
|
||||
private Task OnAddManualTags(RawNode node)
|
||||
{
|
||||
BeginPresentation();
|
||||
// Manual entry needs the device id: for a Device node it's node itself; for a TagGroup walk up.
|
||||
_manualDeviceId = FindAncestorDevice(node)?.EntityId ?? "";
|
||||
_manualTagGroupId = node.Kind == RawNodeKind.TagGroup ? node.EntityId : null;
|
||||
@@ -645,6 +673,7 @@
|
||||
|
||||
private Task OnImportCsv(RawNode node)
|
||||
{
|
||||
BeginPresentation();
|
||||
// Device node → DeviceId; TagGroup node → TagGroupId (the modal self-resolves its device).
|
||||
if (node.Kind == RawNodeKind.Device)
|
||||
{
|
||||
@@ -665,6 +694,7 @@
|
||||
|
||||
private Task OnExportCsv(RawNode node)
|
||||
{
|
||||
BeginPresentation();
|
||||
if (node.Kind == RawNodeKind.Device)
|
||||
{
|
||||
_csvExportDeviceId = node.EntityId ?? "";
|
||||
@@ -685,6 +715,7 @@
|
||||
// at the device root; on a TagGroup node the group's device-relative path is prepended to every tag.
|
||||
private Task OnBrowseDevice(RawNode node)
|
||||
{
|
||||
BeginPresentation();
|
||||
_browseDeviceId = FindAncestorDevice(node)?.EntityId ?? "";
|
||||
_browseTagGroupId = node.Kind == RawNodeKind.TagGroup ? node.EntityId : null;
|
||||
_browseDriverType = node.DriverType ?? "";
|
||||
@@ -700,26 +731,26 @@
|
||||
{
|
||||
// node is a TagGroup — create a sub-group under it (needs its owning device id).
|
||||
var deviceId = FindAncestorDevice(node)?.EntityId ?? "";
|
||||
ShowNameDialog("New group", "", async name =>
|
||||
ShowNameDialog("New group", "", async (name, generation) =>
|
||||
{
|
||||
var res = await Svc.CreateTagGroupAsync(deviceId, node.EntityId, name);
|
||||
if (!res.Ok) { ShowMessage("New group failed", res.Error ?? "Create failed.", node.DisplayName); return; }
|
||||
await ReloadNodeAsync(node);
|
||||
if (!res.Ok) { ShowMessage(generation, "New group failed", res.Error ?? "Create failed.", node.DisplayName); return; }
|
||||
await ReloadNodeAsync(node, generation);
|
||||
});
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnRenameTagGroup(RawNode node)
|
||||
{
|
||||
ShowNameDialog("Rename tag-group", node.DisplayName, async name =>
|
||||
await AfterRename(await Svc.RenameTagGroupAsync(node.EntityId!, name, node.RowVersion), node));
|
||||
ShowNameDialog("Rename tag-group", node.DisplayName, async (name, generation) =>
|
||||
await AfterRename(await Svc.RenameTagGroupAsync(node.EntityId!, name, node.RowVersion), node, generation));
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnDeleteTagGroup(RawNode node)
|
||||
{
|
||||
ShowConfirm("Delete tag-group", $"Delete tag-group “{node.DisplayName}”?", async () =>
|
||||
await AfterDelete(await Svc.DeleteTagGroupAsync(node.EntityId!, node.RowVersion), node));
|
||||
ShowConfirm("Delete tag-group", $"Delete tag-group “{node.DisplayName}”?", async generation =>
|
||||
await AfterDelete(await Svc.DeleteTagGroupAsync(node.EntityId!, node.RowVersion), node, generation));
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -727,6 +758,7 @@
|
||||
|
||||
private Task OnEditTag(RawNode node)
|
||||
{
|
||||
BeginPresentation();
|
||||
_tagId = node.EntityId;
|
||||
_tagDriverType = node.DriverType;
|
||||
_tagNode = node;
|
||||
@@ -737,8 +769,8 @@
|
||||
|
||||
private Task OnDeleteTag(RawNode node)
|
||||
{
|
||||
ShowConfirm("Delete tag", $"Delete tag “{node.DisplayName}”?", async () =>
|
||||
await AfterDelete(await Svc.DeleteTagAsync(node.EntityId!, node.RowVersion), node));
|
||||
ShowConfirm("Delete tag", $"Delete tag “{node.DisplayName}”?", async generation =>
|
||||
await AfterDelete(await Svc.DeleteTagAsync(node.EntityId!, node.RowVersion), node, generation));
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -746,70 +778,75 @@
|
||||
// Modal OnSaved callbacks — refresh the affected subtree.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
private async Task DriverCfgSaved()
|
||||
private async Task Saved(long generation, RawNode? node, bool reloadChildren)
|
||||
{
|
||||
if (_driverCfgNode is not null) { await ReloadParentAsync(_driverCfgNode); }
|
||||
}
|
||||
|
||||
private async Task DeviceSaved()
|
||||
{
|
||||
if (_deviceNode is null) { return; }
|
||||
// Create → reload the driver container; edit → reload the device's parent driver.
|
||||
if (_deviceIsCreate) { await ReloadNodeAsync(_deviceNode); }
|
||||
else { await ReloadParentAsync(_deviceNode); }
|
||||
}
|
||||
|
||||
private async Task TagSaved()
|
||||
{
|
||||
if (_tagNode is not null) { await ReloadParentAsync(_tagNode); }
|
||||
}
|
||||
|
||||
private async Task ManualSaved()
|
||||
{
|
||||
if (_manualNode is not null) { await ReloadNodeAsync(_manualNode); }
|
||||
}
|
||||
|
||||
private async Task CsvImportSaved()
|
||||
{
|
||||
if (_csvImportNode is not null) { await ReloadNodeAsync(_csvImportNode); }
|
||||
}
|
||||
|
||||
private async Task BrowseSaved()
|
||||
{
|
||||
// New tags (and any mirrored groups) land under the browsed node — reload its children.
|
||||
if (_browseNode is not null) { await ReloadNodeAsync(_browseNode); }
|
||||
if (!Current(generation) || node is null) return;
|
||||
if (reloadChildren) await ReloadNodeAsync(node, generation);
|
||||
else await ReloadParentAsync(node, generation);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Rename / delete outcome surfacing.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
private async Task AfterRename(RawRenameResult res, RawNode node)
|
||||
private async Task AfterRename(RawRenameResult res, RawNode node, long generation)
|
||||
{
|
||||
if (res.Ok) { await ReloadParentAsync(node); }
|
||||
if (!Current(generation)) return;
|
||||
if (res.Ok) { await ReloadParentAsync(node, generation); }
|
||||
if (!Current(generation)) return;
|
||||
|
||||
if (!res.Ok)
|
||||
{
|
||||
ShowMessage("Rename failed", res.Error ?? "Rename failed.", node.DisplayName);
|
||||
ShowMessage(generation, "Rename failed", res.Error ?? "Rename failed.", node.DisplayName);
|
||||
}
|
||||
else if (res.Warnings.Count > 0)
|
||||
{
|
||||
ShowMessage("Renamed — with warnings", string.Join(" • ", res.Warnings), node.DisplayName);
|
||||
ShowMessage(generation, "Renamed — with warnings", string.Join(" • ", res.Warnings), node.DisplayName);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task AfterDelete(UnsMutationResult res, RawNode node)
|
||||
private async Task AfterDelete(UnsMutationResult res, RawNode node, long generation)
|
||||
{
|
||||
if (!res.Ok) { ShowMessage("Delete blocked", res.Error ?? "Delete failed.", node.DisplayName); return; }
|
||||
await ReloadParentAsync(node);
|
||||
if (!Current(generation)) return;
|
||||
if (!res.Ok) { ShowMessage(generation, "Delete blocked", res.Error ?? "Delete failed.", node.DisplayName); return; }
|
||||
await ReloadParentAsync(node, generation);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Dialog show-helpers (one instance each; a pending delegate carries the op).
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
private void ShowNameDialog(string title, string initial, Func<string, Task> submit)
|
||||
private sealed class ReloadOwner { public long Revision; }
|
||||
private readonly System.Runtime.CompilerServices.ConditionalWeakTable<RawNode, ReloadOwner> _reloadOwners = new();
|
||||
private long _presentationGeneration;
|
||||
private bool Current(long generation) => !_densityDisposed && generation == _presentationGeneration;
|
||||
private bool InputDialogVisible => _driverCfgVisible || _deviceVisible || _tagVisible || _manualVisible
|
||||
|| _csvImportVisible || _csvExportVisible || _browseVisible || _nameVisible || _confirmVisible || _driverTypeVisible;
|
||||
private sealed record QueuedMessage(long Generation, string Title, string Message, string? NodeName);
|
||||
private QueuedMessage? _queuedMessage;
|
||||
private bool _releaseMessage;
|
||||
|
||||
private long BeginPresentation()
|
||||
{
|
||||
++_presentationGeneration;
|
||||
_driverCfgVisible = _deviceVisible = _tagVisible = _manualVisible = false;
|
||||
_csvImportVisible = _csvExportVisible = _browseVisible = false;
|
||||
_nameVisible = _confirmVisible = _driverTypeVisible = _msgVisible = false;
|
||||
_queuedMessage = null;
|
||||
_releaseMessage = false;
|
||||
return _presentationGeneration;
|
||||
}
|
||||
|
||||
private void ChangeVisibility(long generation, bool visible, Action<bool> setVisible)
|
||||
{
|
||||
if (!Current(generation)) return;
|
||||
setVisible(visible);
|
||||
if (!visible && _queuedMessage is not null) _releaseMessage = true;
|
||||
}
|
||||
|
||||
private void ShowNameDialog(string title, string initial, Func<string, long, Task> submit)
|
||||
{
|
||||
BeginPresentation();
|
||||
_nameTitle = title;
|
||||
_nameInitial = initial;
|
||||
_nameSubmit = submit;
|
||||
@@ -817,14 +854,16 @@
|
||||
StateHasChanged();
|
||||
}
|
||||
|
||||
private async Task NameSubmitted(string name)
|
||||
private async Task NameSubmitted(long generation, Func<string, long, Task>? submit, string name)
|
||||
{
|
||||
var submit = _nameSubmit;
|
||||
if (submit is not null) { await submit(name); }
|
||||
if (!Current(generation) || !_nameVisible || submit is null) return;
|
||||
try { await submit(name, generation); }
|
||||
catch (Exception) when (!Current(generation) || !_nameVisible) { }
|
||||
}
|
||||
|
||||
private void ShowConfirm(string title, string message, Func<Task> action)
|
||||
private void ShowConfirm(string title, string message, Func<long, Task> action)
|
||||
{
|
||||
BeginPresentation();
|
||||
_confirmTitle = title;
|
||||
_confirmMessage = message;
|
||||
_confirmAction = action;
|
||||
@@ -832,40 +871,47 @@
|
||||
StateHasChanged();
|
||||
}
|
||||
|
||||
private async Task Confirmed()
|
||||
private async Task Confirmed(long generation, Func<long, Task>? action)
|
||||
{
|
||||
var action = _confirmAction;
|
||||
if (action is not null) { await action(); }
|
||||
if (!Current(generation) || !_confirmVisible || action is null) return;
|
||||
try { await action(generation); }
|
||||
catch (Exception) when (!Current(generation) || !_confirmVisible) { }
|
||||
}
|
||||
|
||||
private void ShowDriverTypeDialog(Func<(string DriverType, string Name), Task> submit)
|
||||
private void ShowDriverTypeDialog(Func<(string DriverType, string Name), long, Task> submit)
|
||||
{
|
||||
BeginPresentation();
|
||||
_driverTypeSubmit = submit;
|
||||
_driverTypeVisible = true;
|
||||
StateHasChanged();
|
||||
}
|
||||
|
||||
private async Task DriverTypeSubmitted((string DriverType, string Name) choice)
|
||||
private async Task DriverTypeSubmitted(long generation, Func<(string DriverType, string Name), long, Task>? submit, (string DriverType, string Name) choice)
|
||||
{
|
||||
var submit = _driverTypeSubmit;
|
||||
if (submit is not null) { await submit(choice); }
|
||||
if (!Current(generation) || !_driverTypeVisible || submit is null) return;
|
||||
try { await submit(choice, generation); }
|
||||
catch (Exception) when (!Current(generation) || !_driverTypeVisible) { }
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Shared message surface (repurposed RawStubModal).
|
||||
// ---------------------------------------------------------------------------
|
||||
// Follow-up messages wait for the input dialog's close callback and a completed DOM batch.
|
||||
private void ShowMessage(long generation, string title, string message, string? nodeName, bool requireInput = true)
|
||||
{
|
||||
if (!Current(generation) || (requireInput && !InputDialogVisible)) return;
|
||||
if (InputDialogVisible) _queuedMessage = new(generation, title, message, nodeName);
|
||||
else { PresentMessage(title, message, nodeName); StateHasChanged(); }
|
||||
}
|
||||
|
||||
private void ShowMessage(string title, string message, string? nodeName)
|
||||
private void PresentMessage(string title, string message, string? nodeName)
|
||||
{
|
||||
_msgTitle = title;
|
||||
_msgMessage = message;
|
||||
_msgNodeName = nodeName;
|
||||
_msgVisible = true;
|
||||
StateHasChanged();
|
||||
}
|
||||
|
||||
private void CloseMessage()
|
||||
private void CloseMessage(long generation)
|
||||
{
|
||||
if (!Current(generation)) return;
|
||||
_msgVisible = false;
|
||||
_msgTitle = "";
|
||||
_msgMessage = "";
|
||||
@@ -880,13 +926,15 @@
|
||||
/// Reloads a container node's children in place (create-under refresh): clears its loaded level and
|
||||
/// re-runs the lazy load, keeping it expanded. A refresh failure is captured on the node, never thrown.
|
||||
/// </summary>
|
||||
private async Task ReloadNodeAsync(RawNode container)
|
||||
private async Task ReloadNodeAsync(RawNode container, long generation)
|
||||
{
|
||||
if (!Current(generation)) return;
|
||||
var owner = _reloadOwners.GetValue(container, _ => new ReloadOwner());
|
||||
var revision = ++owner.Revision;
|
||||
try
|
||||
{
|
||||
container.Expanded = true;
|
||||
container.Loaded = false;
|
||||
container.Children.Clear();
|
||||
container.Error = null;
|
||||
|
||||
if (container.HasLazyChildren)
|
||||
@@ -894,6 +942,7 @@
|
||||
container.Loading = true;
|
||||
StateHasChanged();
|
||||
var children = await Svc.LoadChildrenAsync(container);
|
||||
if (!Current(generation) || owner.Revision != revision) return;
|
||||
container.Children.Clear();
|
||||
container.Children.AddRange(children);
|
||||
container.ChildCount = container.Children.Count;
|
||||
@@ -902,13 +951,13 @@
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
container.Error = ex.Message;
|
||||
if (Current(generation) && owner.Revision == revision) container.Error = ex.Message;
|
||||
}
|
||||
finally
|
||||
{
|
||||
container.Loading = false;
|
||||
if (owner.Revision == revision) container.Loading = false;
|
||||
}
|
||||
StateHasChanged();
|
||||
if (Current(generation) && owner.Revision == revision) StateHasChanged();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -917,10 +966,11 @@
|
||||
/// menu-bearing node's parent is in the loaded tree; the OnRootsChanged fallback is a belt-and-braces
|
||||
/// path for a would-be cluster-less top-level node.
|
||||
/// </summary>
|
||||
private async Task ReloadParentAsync(RawNode node)
|
||||
private async Task ReloadParentAsync(RawNode node, long generation)
|
||||
{
|
||||
if (!Current(generation)) return;
|
||||
var parent = FindParent(node);
|
||||
if (parent is not null) { await ReloadNodeAsync(parent); }
|
||||
if (parent is not null) { await ReloadNodeAsync(parent, generation); }
|
||||
else { await OnRootsChanged.InvokeAsync(); }
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user