btcpayserver/app
btcpayserver/app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Improve state display on dashboard

Browse Source
This commit is contained in:
Dennis Reimann 2024-06-24 21:03:28 +02:00
parent 06f7c1deff
commit 2cb294fd2a
No known key found for this signature in database
GPG Key ID: 5009E1797F03F8D0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayApp.UI/Components/SetupStatus.razor
View File

@ -46,13 +46,13 @@
public SetupState SetupStateOnchain() {
if (SetupStateConnection() != SetupState.Completed ||
State.Value.OnchainWalletState is OnChainWalletState.Init or OnChainWalletState.Loading) return SetupState.Undetermined;
State.Value.OnchainWalletState is OnChainWalletState.Loading) return SetupState.Undetermined;
return State.Value.OnchainWalletState == OnChainWalletState.Loaded ? SetupState.Completed : SetupState.Pending;
}
public SetupState SetupStateLightning() {
if (SetupStateConnection() != SetupState.Completed ||
State.Value.LightningNodeState is LightningNodeState.Init or LightningNodeState.Loading) return SetupState.Undetermined;
State.Value.LightningNodeState is LightningNodeState.Loading) return SetupState.Undetermined;
if (State.Value.LightningNodeState is LightningNodeState.Error or LightningNodeState.Stopped) return SetupState.Failed;
return State.Value.LightningNodeState == LightningNodeState.Loaded ? SetupState.Completed : SetupState.Pending;
}

12
BTCPayApp.UI/Pages/DashboardPage.razor
View File

@ -86,7 +86,7 @@
</NavLink>
</li>
<AuthorizeView Policy="@Policies.CanModifyStoreSettings" Resource="StoreState.Value.StoreInfo?.Id">
<li class="list-group-item @(SetupStateOnchain == SetupState.Undetermined ? "disabled" : null)" aria-disabled="@(SetupStateOnchain == SetupState.Undetermined ? "true" : null)" data-state="@SetupStateOnchain.ToString().ToLowerInvariant()">
<li class="list-group-item @(SetupStateOnchain == SetupState.Undetermined ? "disabled" : null)" aria-disabled="@(SetupStateOnchain == SetupState.Undetermined ? "true" : null)" data-state="@SetupStateOnchain.ToString().ToLowerInvariant()" data-onchain-state="@State.Value.OnchainWalletState.GetValueOrDefault()">
<NavLink class="nav-link" href="@(SetupStateOnchain == SetupState.Completed ? Routes.Wallet : Routes.WalletSetup)" Match="NavLinkMatch.All">
<span>Set up wallet</span>
@switch (SetupStateOnchain)
@ -103,7 +103,7 @@
}
</NavLink>
</li>
<li class="list-group-item @(SetupStateLightning == SetupState.Undetermined ? "disabled" : null)" aria-disabled="@(SetupStateLightning == SetupState.Undetermined ? "true" : null)" data-state="@SetupStateLightning.ToString().ToLowerInvariant()">
<li class="list-group-item @(SetupStateLightning == SetupState.Undetermined ? "disabled" : null)" aria-disabled="@(SetupStateLightning == SetupState.Undetermined ? "true" : null)" data-state="@SetupStateLightning.ToString().ToLowerInvariant()" data-lightning-state="@State.Value.LightningNodeState.GetValueOrDefault()">
<NavLink class="nav-link" href="@(SetupStateLightning == SetupState.Completed ? Routes.Lightning : Routes.LightningSetup)" Match="NavLinkMatch.All">
<span>Configure node</span>
@switch (SetupStateLightning)
@ -225,10 +225,10 @@
}
}
private SetupState? SetupStateConnection => _setupStatus?.SetupStateConnection() ?? SetupState.Undetermined;
private SetupState? SetupStateAccount => _setupStatus?.SetupStateAccount() ?? SetupState.Undetermined;
private SetupState? SetupStateOnchain => _setupStatus?.SetupStateOnchain() ?? SetupState.Undetermined;
private SetupState? SetupStateLightning => _setupStatus?.SetupStateLightning() ?? SetupState.Undetermined;
private SetupState SetupStateConnection => _setupStatus?.SetupStateConnection() ?? SetupState.Undetermined;
private SetupState SetupStateAccount => _setupStatus?.SetupStateAccount() ?? SetupState.Undetermined;
private SetupState SetupStateOnchain => _setupStatus?.SetupStateOnchain() ?? SetupState.Undetermined;
private SetupState SetupStateLightning => _setupStatus?.SetupStateLightning() ?? SetupState.Undetermined;
private IEnumerable<InvoiceData>? Invoices => StoreState.Value.Invoices?.Data?.Take(5);
private bool InvoicesLoading => StoreState.Value.Invoices?.Loading is true;