Improve the behavior when indexers are all offline (or user is offline)

- Related to #148
block-core · Jun 7, 2022 · ba68591 · ba68591
1 parent b753896
commit ba68591
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 21 deletions.
diff --git a/angular/src/app/settings/network/network.component.html b/angular/src/app/settings/network/network.component.html
@@ -12,22 +12,9 @@ <h1>{{ 'Settings.NetworkStatus' | translate }}</h1>
         <strong class="network-type">{{status.type}}</strong><br>
         <span *ngIf="status.networks?.length == 0">No servers online for this network.<br></span>
         <div mat-line *ngFor="let network of status.networks">
-
-            <!-- <div class="network-status-widget"> -->
             <app-network-status [value]="network.availability"></app-network-status>
-            <!-- </div> -->
-
             {{network.domain}}<br><span class="dimmed">{{network.status}}</span><br><br>
         </div>
     </div>
 
-    <!-- <mat-nav-list>
-        <div mat-subheader>Networks for accounts in your wallets:</div>
-        <a mat-list-item *ngFor="let status of networkStatus.getActive(); let i = index">
-            <mat-icon mat-list-icon>travel_explore</mat-icon>
-            <div mat-line>{{status.type}}</div>
-            <div mat-line *ngIf="status.networks.length == 0">No servers online for this network.</div>
-            <div mat-line *ngFor="let network of status.networks">{{network.domain}}<br><span class="dimmed">{{network.status}}</span><br><br></div>
-        </a>
-    </mat-nav-list> -->
 </div>
diff --git a/angular/src/app/settings/network/network.component.ts b/angular/src/app/settings/network/network.component.ts
@@ -1,7 +1,6 @@
 import { Location } from '@angular/common';
 import { Component, OnDestroy, ViewEncapsulation } from '@angular/core';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { UIState, CommunicationService, FeatureService, NetworkStatusService } from '../../services';
+import { UIState, FeatureService, NetworkStatusService } from '../../services';
 
 @Component({
     selector: 'app-network',
@@ -13,8 +12,6 @@ export class NetworkComponent implements OnDestroy {
     constructor(
         public uiState: UIState,
         public location: Location,
-        private snackBar: MatSnackBar,
-        private communication: CommunicationService,
         public networkStatus: NetworkStatusService,
         public feature: FeatureService,
     ) {

diff --git a/angular/src/app/shared/network-status/network-status.component.ts b/angular/src/app/shared/network-status/network-status.component.ts
@@ -21,7 +21,12 @@ export class NetworkStatusComponent {
             if (!this.status || this.status.length === 0) {
                 return `network-status-offline`;
             } else {
-                return `network-status-online`;
+                const availableCount = this.status.filter(s => s.availability == 1).length;
+                if (availableCount == 0) {
+                    return `network-status-offline`;
+                } else {
+                    return `network-status-online`;
+                }
             }
         }
 

diff --git a/angular/src/shared/background-manager.ts b/angular/src/shared/background-manager.ts
@@ -74,7 +74,7 @@ export class BackgroundManager {
             await this.updateAll(accounts, networkLoader, settingStore);
         }
         catch (err) {
-
+            console.error('Failure during update all network status:', err);
         }
     }
 
@@ -233,8 +233,6 @@ export class BackgroundManager {
         }
     }
 
-
-
     async runWatcher(runState: RunState) {
         this.watcherState = runState;
 

diff --git a/angular/src/shared/indexer.ts b/angular/src/shared/indexer.ts
@@ -259,6 +259,27 @@ export class IndexerBackgroundService {
         }
 
         // console.debug('Looping wallets', wallets);
+        // Check if there is any indexers online for any of the accounts in all of the wallets.
+        // If there are no indexers online, we'll simply return "completed: true" to avoid
+        // the loop.
+        const allAccountTypes = wallets.flatMap(w => w.accounts).flatMap(a => a.networkType);
+        const uniqueAccountTypes = Array.from([...new Set(allAccountTypes)]);;
+        let anyIndexerOnline = false;
+
+        for (let i = 0; i < uniqueAccountTypes.length; i++) {
+            const indexerUrl = this.addressManager.networkLoader.getServer(uniqueAccountTypes[i], settings.server, settings.indexer);
+
+            if (indexerUrl == null || indexerUrl == '') {
+                continue;
+            }
+
+            anyIndexerOnline = true;
+        }
+
+        if (!anyIndexerOnline) {
+            console.warn('There are no indexers for the current accounts that are online.');
+            return { cancelled: true, completed: true };
+        }
 
         for (let i = 0; i < wallets.length; i++) {
             if (this.runState.cancel) {