Skip to content
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

Jump to bottom

Don't reload columns after second render #232

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Don't reload columns after second render #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56485b7
Don't reload columns after second render
Jul 10, 2023
8610666
reverted layout change
Jul 10, 2023
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
16 changes: 9 additions & 7 deletions src/Pages/ChannelRequests.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
<DisplayTemplate>
<Row Style="white-space: nowrap;">
@context.Status.Humanize(LetterCasing.Sentence)
<ChannelStatusLogsTooltip ChannelStatusLogs="@context.StatusLogs"/>
<ChannelStatusLogsTooltip ChannelStatusLogs="@context.StatusLogs"/>
</Row>
</DisplayTemplate>
</DataGridColumn>
Expand Down Expand Up @@ -415,10 +415,6 @@
private MempoolRecommendedFeesTypes FeesSelection;
private long FeeAmount = 1;
private MempoolRecommendedFees? _recommendedFees;
private ColumnLayout<PendingChannelsColumnName> PendingRequestsColumnLayout;
private ColumnLayout<AllChannelsColumnName> AllRequestsColumnLayout;
private Dictionary<string, bool> PendingRequestsColumns = new();
private Dictionary<string, bool> AllRequestsColumns = new();

// New Request integration
private List<Wallet> _allWallets = new List<Wallet>();
Expand Down Expand Up @@ -452,6 +448,12 @@
[CascadingParameter]
private ClaimsPrincipal? ClaimsPrincipal { get; set; }

private ColumnLayout<PendingChannelsColumnName> PendingRequestsColumnLayout;
private ColumnLayout<AllChannelsColumnName> AllRequestsColumnLayout;
private Dictionary<string, bool> PendingRequestsColumns = new();
private Dictionary<string, bool> AllRequestsColumns = new();
private bool columnsLoaded;

public abstract class PendingChannelsColumnName
{
public static readonly ColumnDefault SourceNode = new("Source Node");
Expand Down Expand Up @@ -497,17 +499,17 @@

protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
if (!firstRender && !columnsLoaded)
{
await LoadColumnLayout();

}
}

private async Task LoadColumnLayout()
{
AllRequestsColumns = await LocalStorageService.LoadStorage(nameof(AllChannelsColumnName), ColumnHelpers.GetColumnsDictionary<AllChannelsColumnName>());
PendingRequestsColumns = await LocalStorageService.LoadStorage(nameof(PendingChannelsColumnName), ColumnHelpers.GetColumnsDictionary<PendingChannelsColumnName>());
columnsLoaded = true;
StateHasChanged();
}

Expand Down
4 changes: 3 additions & 1 deletion src/Pages/Channels.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@

private ColumnLayout<ChannelsColumnName> ChannelsColumnLayout;
private Dictionary<string, bool> ChannelsColumns = new();
private bool columnsLoaded;

public abstract class ChannelsColumnName
{
Expand Down Expand Up @@ -386,7 +387,7 @@

protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
if (!firstRender && !columnsLoaded)
{
await LoadColumnLayout();

Expand All @@ -396,6 +397,7 @@
private async Task LoadColumnLayout()
{
ChannelsColumns = await LocalStorageService.LoadStorage(nameof(ChannelsColumnName), ColumnHelpers.GetColumnsDictionary<ChannelsColumnName>());
columnsLoaded = true;
StateHasChanged();
}

Expand Down
4 changes: 3 additions & 1 deletion src/Pages/Nodes.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@

private ColumnLayout<NodesColumnName> NodesColumnLayout;
private Dictionary<string, bool> NodesColumns = new();
private bool columnsLoaded;

public abstract class NodesColumnName
{
Expand Down Expand Up @@ -212,7 +213,7 @@

protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
if (!firstRender && !columnsLoaded)
{
await LoadColumnLayout();

Expand All @@ -222,6 +223,7 @@
private async Task LoadColumnLayout()
{
NodesColumns = await LocalStorageService.LoadStorage(nameof(NodesColumnName), ColumnHelpers.GetColumnsDictionary<NodesColumnName>());
columnsLoaded = true;
StateHasChanged();
}

Expand Down
4 changes: 3 additions & 1 deletion src/Pages/Users.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@

private ColumnLayout<UsersColumnName> UsersColumnLayout;
private Dictionary<string, bool> UsersColumns = new();
private bool columnsLoaded;

public abstract class UsersColumnName
{
Expand Down Expand Up @@ -164,7 +165,7 @@

protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
if (!firstRender && !columnsLoaded)
{
await LoadColumnLayout();

Expand All @@ -174,6 +175,7 @@
private async Task LoadColumnLayout()
{
UsersColumns = await LocalStorageService.LoadStorage(nameof(UsersColumnName), ColumnHelpers.GetColumnsDictionary<UsersColumnName>());
columnsLoaded = true;
StateHasChanged();
}

Expand Down
4 changes: 3 additions & 1 deletion src/Pages/Wallets.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@

private ColumnLayout<WalletsColumnName> WalletsColumnLayout;
private Dictionary<string, bool> WalletsColumns = new();
private bool columnsLoaded;

public abstract class WalletsColumnName
{
Expand Down Expand Up @@ -455,7 +456,7 @@

protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
if (!firstRender && !columnsLoaded)
{
await LoadColumnLayout();

Expand All @@ -465,6 +466,7 @@
private async Task LoadColumnLayout()
{
WalletsColumns = await LocalStorageService.LoadStorage(nameof(WalletsColumnName), ColumnHelpers.GetColumnsDictionary<WalletsColumnName>());
columnsLoaded = true;
StateHasChanged();
}

Expand Down
6 changes: 4 additions & 2 deletions src/Pages/Withdrawals.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@
private ColumnLayout<AllWithdrawalsColumnName> AllRequestsColumnLayout;
private Dictionary<string, bool> PendingRequestsColumns = new();
private Dictionary<string, bool> AllRequestsColumns = new();
private bool columnsLoaded;

public abstract class PendingWithdrawalsColumnName
{
Expand Down Expand Up @@ -476,21 +477,22 @@

_isFinanceManager = ClaimsPrincipal != null && ClaimsPrincipal.IsInRole(ApplicationUserRole.FinanceManager.ToString());
await GetData();
await LoadColumnLayout();
RodriFS marked this conversation as resolved.
Show resolved Hide resolved
}

protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
if (!firstRender && !columnsLoaded)
{
await LoadColumnLayout();

}
}

private async Task LoadColumnLayout()
{
AllRequestsColumns = await LocalStorageService.LoadStorage(nameof(AllWithdrawalsColumnName), ColumnHelpers.GetColumnsDictionary<AllWithdrawalsColumnName>());
PendingRequestsColumns = await LocalStorageService.LoadStorage(nameof(PendingWithdrawalsColumnName), ColumnHelpers.GetColumnsDictionary<PendingWithdrawalsColumnName>());
columnsLoaded = true;
StateHasChanged();
}

Expand Down
Loading