Guard shared OT browse and probe lifecycle entry points
This commit is contained in:
+5
-2
@@ -79,19 +79,22 @@
|
||||
|
||||
private async Task OnClickAsync()
|
||||
{
|
||||
if (_disposed || _busy) return;
|
||||
_busy = true;
|
||||
_result = null;
|
||||
StateHasChanged();
|
||||
try
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
if (_disposed) return;
|
||||
var budget = TestConnectBudget.Resolve(json, TimeoutSeconds, DriverType);
|
||||
_lastBudgetSeconds = budget;
|
||||
_result = await Probe.TestAsync(DriverType, json, budget, driverInstanceId: DriverInstanceId);
|
||||
var result = await Probe.TestAsync(DriverType, json, budget, driverInstanceId: DriverInstanceId);
|
||||
if (!_disposed) _result = result;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_result = new TestDriverConnectResult(false, ex.Message, null, Guid.Empty);
|
||||
if (!_disposed) _result = new TestDriverConnectResult(false, ex.Message, null, Guid.Empty);
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
||||
+5
-1
@@ -102,7 +102,9 @@
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
var auth = await AuthState.GetAuthenticationStateAsync();
|
||||
if (_disposed) return;
|
||||
var authResult = await AuthorizationService.AuthorizeAsync(auth.User, null, AdminUiPolicies.DriverOperator);
|
||||
if (_disposed) return;
|
||||
// CanBrowse constructs a throwaway driver — evaluate once, not per render.
|
||||
_canBrowse = authResult.Succeeded && BrowserService.CanBrowse(DriverType, GetConfigJson() ?? "{}");
|
||||
_built = Build();
|
||||
@@ -111,17 +113,19 @@
|
||||
|
||||
private async Task OpenBrowseAsync()
|
||||
{
|
||||
if (_disposed || _opening) return;
|
||||
_opening = true; _openError = null; StateHasChanged();
|
||||
try
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
if (_disposed) return;
|
||||
var result = await BrowserService.OpenAsync(DriverType, json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) _token = result.Token;
|
||||
else _openError = result.Message;
|
||||
}
|
||||
finally { _opening = false; StateHasChanged(); }
|
||||
finally { _opening = false; if (!_disposed) StateHasChanged(); }
|
||||
}
|
||||
|
||||
private async Task RefreshBrowseAsync()
|
||||
|
||||
+5
-1
@@ -176,7 +176,9 @@
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
var auth = await AuthState.GetAuthenticationStateAsync();
|
||||
if (_disposed) return;
|
||||
var authResult = await AuthorizationService.AuthorizeAsync(auth.User, null, AdminUiPolicies.DriverOperator);
|
||||
if (_disposed) return;
|
||||
// CanBrowse constructs a throwaway driver — evaluate once, not per render.
|
||||
_canBrowse = authResult.Succeeded && BrowserService.CanBrowse(DriverType, GetConfigJson() ?? "{}");
|
||||
_built = Compose();
|
||||
@@ -185,17 +187,19 @@
|
||||
|
||||
private async Task OpenBrowseAsync()
|
||||
{
|
||||
if (_disposed || _opening) return;
|
||||
_opening = true; _openError = null; StateHasChanged();
|
||||
try
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
if (_disposed) return;
|
||||
var result = await BrowserService.OpenAsync(DriverType, json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) _token = result.Token;
|
||||
else _openError = result.Message;
|
||||
}
|
||||
finally { _opening = false; StateHasChanged(); }
|
||||
finally { _opening = false; if (!_disposed) StateHasChanged(); }
|
||||
}
|
||||
|
||||
private async Task RefreshBrowseAsync()
|
||||
|
||||
+5
-1
@@ -127,7 +127,9 @@
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
var auth = await AuthState.GetAuthenticationStateAsync();
|
||||
if (_disposed) return;
|
||||
var authResult = await AuthorizationService.AuthorizeAsync(auth.User, null, AdminUiPolicies.DriverOperator);
|
||||
if (_disposed) return;
|
||||
_canOperate = authResult.Succeeded;
|
||||
_built = Build();
|
||||
await CurrentAddressChanged.InvokeAsync(_built);
|
||||
@@ -135,17 +137,19 @@
|
||||
|
||||
private async Task OpenBrowseAsync()
|
||||
{
|
||||
if (_disposed || _opening) return;
|
||||
_opening = true; _openError = null; StateHasChanged();
|
||||
try
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
if (_disposed) return;
|
||||
var result = await BrowserService.OpenAsync("GalaxyMxGateway", json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) _token = result.Token;
|
||||
else _openError = result.Message;
|
||||
}
|
||||
finally { _opening = false; StateHasChanged(); }
|
||||
finally { _opening = false; if (!_disposed) StateHasChanged(); }
|
||||
}
|
||||
|
||||
private async Task CloseBrowseAsync()
|
||||
|
||||
+5
-1
@@ -78,7 +78,9 @@
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
var auth = await AuthState.GetAuthenticationStateAsync();
|
||||
if (_disposed) return;
|
||||
var authResult = await AuthorizationService.AuthorizeAsync(auth.User, null, AdminUiPolicies.DriverOperator);
|
||||
if (_disposed) return;
|
||||
_canOperate = authResult.Succeeded;
|
||||
_built = _nodeId;
|
||||
await CurrentAddressChanged.InvokeAsync(_built);
|
||||
@@ -86,17 +88,19 @@
|
||||
|
||||
private async Task OpenBrowseAsync()
|
||||
{
|
||||
if (_disposed || _opening) return;
|
||||
_opening = true; _openError = null; StateHasChanged();
|
||||
try
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
if (_disposed) return;
|
||||
var result = await BrowserService.OpenAsync("OpcUaClient", json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) _token = result.Token;
|
||||
else _openError = result.Message;
|
||||
}
|
||||
finally { _opening = false; StateHasChanged(); }
|
||||
finally { _opening = false; if (!_disposed) StateHasChanged(); }
|
||||
}
|
||||
|
||||
private async Task CloseBrowseAsync()
|
||||
|
||||
+5
-1
@@ -256,7 +256,9 @@ else
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
var auth = await AuthState.GetAuthenticationStateAsync();
|
||||
if (_disposed) return;
|
||||
var authResult = await AuthorizationService.AuthorizeAsync(auth.User, null, AdminUiPolicies.DriverOperator);
|
||||
if (_disposed) return;
|
||||
_canOperate = authResult.Succeeded;
|
||||
_built = Build();
|
||||
await CurrentAddressChanged.InvokeAsync(_built);
|
||||
@@ -264,6 +266,7 @@ else
|
||||
|
||||
private async Task OpenBrowseAsync()
|
||||
{
|
||||
if (_disposed || _opening) return;
|
||||
_opening = true;
|
||||
_openError = null;
|
||||
StateHasChanged();
|
||||
@@ -273,13 +276,14 @@ else
|
||||
// never written to the composed TagConfig blob nor back to the driver config — this is the
|
||||
// sole place it is read, and it dies with the local variable.
|
||||
var json = BuildBrowseConfig();
|
||||
if (_disposed) return;
|
||||
var result = await BrowserService.OpenAsync(DriverTypeNames.Sql, json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) { _token = result.Token; }
|
||||
else { _openError = result.Message; }
|
||||
}
|
||||
finally { _opening = false; StateHasChanged(); }
|
||||
finally { _opening = false; if (!_disposed) StateHasChanged(); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
+5
-1
@@ -89,7 +89,9 @@
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
var auth = await AuthState.GetAuthenticationStateAsync();
|
||||
if (_disposed) return;
|
||||
var authResult = await AuthorizationService.AuthorizeAsync(auth.User, null, AdminUiPolicies.DriverOperator);
|
||||
if (_disposed) return;
|
||||
// CanBrowse constructs a throwaway driver — evaluate once, not per render.
|
||||
_canBrowse = authResult.Succeeded && BrowserService.CanBrowse(DriverType, GetConfigJson() ?? "{}");
|
||||
_built = _varName;
|
||||
@@ -98,17 +100,19 @@
|
||||
|
||||
private async Task OpenBrowseAsync()
|
||||
{
|
||||
if (_disposed || _opening) return;
|
||||
_opening = true; _openError = null; StateHasChanged();
|
||||
try
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
if (_disposed) return;
|
||||
var result = await BrowserService.OpenAsync(DriverType, json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) _token = result.Token;
|
||||
else _openError = result.Message;
|
||||
}
|
||||
finally { _opening = false; StateHasChanged(); }
|
||||
finally { _opening = false; if (!_disposed) StateHasChanged(); }
|
||||
}
|
||||
|
||||
private async Task RefreshBrowseAsync()
|
||||
|
||||
Reference in New Issue
Block a user