Merge pull request #232 from Elenpay/hotfix-reject-modal

Don't reload columns after second render
Elenpay · Jul 10, 2023 · 8ba6e84 · 8ba6e84
2 parents ad88512 + 8610666
commit 8ba6e84
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/src/Pages/ChannelRequests.razor b/src/Pages/ChannelRequests.razor
@@ -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>
@@ -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>();
@@ -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");
@@ -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();
     }
 

diff --git a/src/Pages/Channels.razor b/src/Pages/Channels.razor
@@ -343,6 +343,7 @@
 
     private ColumnLayout<ChannelsColumnName> ChannelsColumnLayout;
     private Dictionary<string, bool> ChannelsColumns = new();
+    private bool columnsLoaded;
 
     public abstract class ChannelsColumnName
     {
@@ -386,7 +387,7 @@
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (!firstRender)
+        if (!firstRender && !columnsLoaded)
         {
             await LoadColumnLayout();
 
@@ -396,6 +397,7 @@
     private async Task LoadColumnLayout()
     {
         ChannelsColumns = await LocalStorageService.LoadStorage(nameof(ChannelsColumnName), ColumnHelpers.GetColumnsDictionary<ChannelsColumnName>());
+        columnsLoaded = true;
         StateHasChanged();
     }
 

diff --git a/src/Pages/Nodes.razor b/src/Pages/Nodes.razor
@@ -173,6 +173,7 @@
 
     private ColumnLayout<NodesColumnName> NodesColumnLayout;
     private Dictionary<string, bool> NodesColumns = new();
+    private bool columnsLoaded;
 
     public abstract class NodesColumnName
     {
@@ -212,7 +213,7 @@
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (!firstRender)
+        if (!firstRender && !columnsLoaded)
         {
             await LoadColumnLayout();
 
@@ -222,6 +223,7 @@
     private async Task LoadColumnLayout()
     {
         NodesColumns = await LocalStorageService.LoadStorage(nameof(NodesColumnName), ColumnHelpers.GetColumnsDictionary<NodesColumnName>());
+        columnsLoaded = true;
         StateHasChanged();
     }
 

diff --git a/src/Pages/Users.razor b/src/Pages/Users.razor
@@ -137,6 +137,7 @@
 
     private ColumnLayout<UsersColumnName> UsersColumnLayout;
     private Dictionary<string, bool> UsersColumns = new();
+    private bool columnsLoaded;
 
     public abstract class UsersColumnName
     {
@@ -164,7 +165,7 @@
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (!firstRender)
+        if (!firstRender && !columnsLoaded)
         {
             await LoadColumnLayout();
 
@@ -174,6 +175,7 @@
     private async Task LoadColumnLayout()
     {
         UsersColumns = await LocalStorageService.LoadStorage(nameof(UsersColumnName), ColumnHelpers.GetColumnsDictionary<UsersColumnName>());
+        columnsLoaded = true;
         StateHasChanged();
     }
 

diff --git a/src/Pages/Wallets.razor b/src/Pages/Wallets.razor
@@ -424,6 +424,7 @@
 
     private ColumnLayout<WalletsColumnName> WalletsColumnLayout;
     private Dictionary<string, bool> WalletsColumns = new();
+    private bool columnsLoaded;
 
     public abstract class WalletsColumnName
     {
@@ -455,7 +456,7 @@
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (!firstRender)
+        if (!firstRender && !columnsLoaded)
         {
             await LoadColumnLayout();
 
@@ -465,6 +466,7 @@
     private async Task LoadColumnLayout()
     {
         WalletsColumns = await LocalStorageService.LoadStorage(nameof(WalletsColumnName), ColumnHelpers.GetColumnsDictionary<WalletsColumnName>());
+        columnsLoaded = true;
         StateHasChanged();
     }
 

diff --git a/src/Pages/Withdrawals.razor b/src/Pages/Withdrawals.razor
@@ -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
     {
@@ -476,21 +477,22 @@
 
         _isFinanceManager = ClaimsPrincipal != null && ClaimsPrincipal.IsInRole(ApplicationUserRole.FinanceManager.ToString());
         await GetData();
+        await LoadColumnLayout();
     }
 
     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();
     }