Fix issue where refreshing clears the view with no internet

Author: thyeggman

src/git/repository.ts

@@ -6,6 +6,7 @@ import {getRemoteName} from "../configuration/configuration";
 import {Protocol} from "../external/protocol";
 import {logDebug, logError} from "../log";
 import {API, GitExtension, RefType, RepositoryState} from "../typings/git";
+import {hasInternetConnectivity} from "../util"
 
 interface GitHubUrls {
   workspaceUri: vscode.Uri;
@@ -142,17 +143,8 @@ export async function getGitHubContext(): Promise<GitHubContext | undefined> {
     return gitHubContext;
   }
 
-  // Check internet connectivity
-  try {
-    const octokit = new Octokit()
-    await octokit.request('GET /', {
-      headers: {
-        'X-GitHub-Api-Version': '2022-11-28'
-      }
-    })
-  }
-  catch {
-    logError(new Error("Cannot fetch github context, unable to connect to the internet"));
+  if (!(await hasInternetConnectivity())) {
+    logError(new Error("Cannot fetch github context"));
     return undefined;
   }
 

src/treeViews/currentBranch.ts

@@ -12,6 +12,7 @@ import {WorkflowRunNode} from "./shared/workflowRunNode";
 import {WorkflowRunTreeDataProvider} from "./workflowRunTreeDataProvider";
 import {NoInternetConnectivityNode} from "./shared/noInternetConnectivityNode";
 import {CurrentBranchTreeNode} from "./settings/types";
+import {hasInternetConnectivity} from "../util"
 
 export class CurrentBranchTreeProvider
   extends WorkflowRunTreeDataProvider
@@ -28,8 +29,14 @@ export class CurrentBranchTreeProvider
     this._onDidChangeTreeData.fire(node);
   }
 
-  refresh(): void {
-    this._onDidChangeTreeData.fire(null);
+  async refresh(): Promise<void> {
+    // Don't delete all the nodes if we don't have internet connectivity
+    if (await hasInternetConnectivity()) {
+      this._onDidChangeTreeData.fire(null);
+    }
+    else {
+      await vscode.window.showWarningMessage("Unable to refresh, you are not connected to the internet")
+    }
   }
 
   getTreeItem(element: CurrentBranchTreeNode): vscode.TreeItem | Thenable<vscode.TreeItem> {

src/treeViews/settings.ts

@@ -15,13 +15,20 @@ import {EnvironmentVariablesNode} from "./settings/environmentVariablesNode";
 import {OrgVariablesNode} from "./settings/orgVariablesNode";
 import {OrgSecretsNode} from "./settings/orgSecretsNode";
 import {NoInternetConnectivityNode} from "./shared/noInternetConnectivityNode";
+import {hasInternetConnectivity} from "../util"
 
 export class SettingsTreeProvider implements vscode.TreeDataProvider<SettingsExplorerNode> {
   private _onDidChangeTreeData = new vscode.EventEmitter<SettingsExplorerNode | null>();
   readonly onDidChangeTreeData = this._onDidChangeTreeData.event;
 
-  refresh(): void {
-    this._onDidChangeTreeData.fire(null);
+  async refresh(): Promise<void> {
+    // Don't delete all the nodes if we don't have internet connectivity
+    if (await hasInternetConnectivity()) {
+      this._onDidChangeTreeData.fire(null);
+    }
+    else {
+      await vscode.window.showWarningMessage("Unable to refresh, you are not connected to the internet")
+    }
   }
 
   getTreeItem(element: SettingsExplorerNode): vscode.TreeItem | Thenable<vscode.TreeItem> {

src/treeViews/treeViews.ts

@@ -21,15 +21,15 @@ export async function initTreeViews(context: vscode.ExtensionContext, store: Run
 
   context.subscriptions.push(
     vscode.commands.registerCommand("github-actions.explorer.refresh", async () => {
-      workflowTreeProvider.refresh();
-      settingsTreeProvider.refresh();
+      await workflowTreeProvider.refresh();
+      await settingsTreeProvider.refresh();
       await executeCacheClearCommand();
     })
   );
 
   context.subscriptions.push(
-    vscode.commands.registerCommand("github-actions.explorer.current-branch.refresh", () => {
-      currentBranchTreeProvider.refresh();
+    vscode.commands.registerCommand("github-actions.explorer.current-branch.refresh", async () => {
+      await currentBranchTreeProvider.refresh();
     })
   );
 
@@ -46,7 +46,7 @@ export async function initTreeViews(context: vscode.ExtensionContext, store: Run
 
     let currentAhead = repo.repositoryState.HEAD?.ahead;
     let currentHeadName = repo.repositoryState.HEAD?.name;
-    repo.repositoryState.onDidChange(() => {
+    repo.repositoryState.onDidChange(async () => {
       // When the current head/branch changes, or the number of commits ahead changes (which indicates
       // a push), refresh the current-branch view
       if (
@@ -55,7 +55,7 @@ export async function initTreeViews(context: vscode.ExtensionContext, store: Run
       ) {
         currentHeadName = repo.repositoryState?.HEAD?.name;
         currentAhead = repo.repositoryState?.HEAD?.ahead;
-        currentBranchTreeProvider.refresh();
+        await currentBranchTreeProvider.refresh();
       }
     });
   }

src/treeViews/workflows.ts

@@ -14,6 +14,7 @@ import {WorkflowNode} from "./workflows/workflowNode";
 import {getWorkflowNodes, WorkflowsRepoNode} from "./workflows/workflowsRepoNode";
 import {WorkflowsTreeNode} from "./settings/types";
 import {NoInternetConnectivityNode} from "./shared/noInternetConnectivityNode";
+import {hasInternetConnectivity} from "../util"
 
 export class WorkflowsTreeProvider
   extends WorkflowRunTreeDataProvider
@@ -30,9 +31,14 @@ export class WorkflowsTreeProvider
     this._onDidChangeTreeData.fire(node);
   }
 
-  refresh(): void {
-    logDebug("Refreshing workflow tree");
-    this._onDidChangeTreeData.fire(null);
+  async refresh(): Promise<void> {
+    // Don't delete all the nodes if we don't have internet connectivity
+    if (await hasInternetConnectivity()) {
+      this._onDidChangeTreeData.fire(null);
+    }
+    else {
+      await vscode.window.showWarningMessage("Unable to refresh, you are not connected to the internet")
+    }
   }
 
   getTreeItem(element: WorkflowsTreeNode): vscode.TreeItem | Thenable<vscode.TreeItem> {

src/util.ts

@@ -0,0 +1,19 @@
+import {Octokit} from "@octokit/rest";
+
+import {logError} from "./log";
+
+export async function hasInternetConnectivity() {
+  try {
+    const octokit = new Octokit()
+    await octokit.request('GET /', {
+      headers: {
+        'X-GitHub-Api-Version': '2022-11-28'
+      }
+    })
+  }
+  catch {
+    logError(new Error("Unable to connect to the internet"));
+    return false;
+  }
+  return true;
+}