Do not group by repository node if only one repository open in workspace

cschleiden · cschleiden · commit 03785778087f · 2022-04-22T14:57:19.000-07:00
diff --git a/src/treeViews/settings.ts b/src/treeViews/settings.ts
@@ -1,13 +1,15 @@
 import * as vscode from "vscode";
-import { getGitHubContext } from "../git/repository";
+
+import { SettingsRepoNode, getSettingNodes } from "./settings/settingsRepoNode";
+
 import { EnvironmentNode } from "./settings/environmentNode";
 import { EnvironmentsNode } from "./settings/environmentsNode";
 import { OrgSecretsNode } from "./settings/orgSecretsNode";
 import { RepoSecretsNode } from "./settings/repoSecretsNode";
 import { SecretsNode } from "./settings/secretsNode";
 import { SelfHostedRunnersNode } from "./settings/selfHostedRunnersNode";
-import { SettingsRepoNode } from "./settings/settingsRepoNode";
 import { SettingsExplorerNode } from "./settings/types";
+import { getGitHubContext } from "../git/repository";
 
 export class SettingsTreeProvider
   implements vscode.TreeDataProvider<SettingsExplorerNode>
@@ -36,6 +38,10 @@ export class SettingsTreeProvider
 
     if (!element) {
       if (gitHubContext.repos.length > 0) {
+        if (gitHubContext.repos.length == 1) {
+          return getSettingNodes(gitHubContext.repos[0]);
+        }
+
         return gitHubContext.repos.map((r) => new SettingsRepoNode(r));
       }
     }
diff --git a/src/treeViews/settings/settingsRepoNode.ts b/src/treeViews/settings/settingsRepoNode.ts
@@ -1,6 +1,7 @@
 import * as vscode from "vscode";
-import { GitHubRepoContext } from "../../git/repository";
+
 import { EnvironmentsNode } from "./environmentsNode";
+import { GitHubRepoContext } from "../../git/repository";
 import { SecretsNode } from "./secretsNode";
 import { SelfHostedRunnersNode } from "./selfHostedRunnersNode";
 import { SettingsExplorerNode } from "./types";
@@ -13,10 +14,18 @@ export class SettingsRepoNode extends vscode.TreeItem {
   }
 
   async getSettings(): Promise<SettingsExplorerNode[]> {
-    return [
-      new SelfHostedRunnersNode(this.gitHubRepoContext),
-      new SecretsNode(this.gitHubRepoContext),
-      new EnvironmentsNode(this.gitHubRepoContext),
-    ];
+    return getSettingNodes(this.gitHubRepoContext);
   }
 }
+
+export function getSettingNodes(
+  gitHubContext: GitHubRepoContext
+): SettingsExplorerNode[] {
+  const nodes: SettingsExplorerNode[] = [];
+
+  nodes.push(new EnvironmentsNode(gitHubContext));
+  nodes.push(new SecretsNode(gitHubContext));
+  nodes.push(new SelfHostedRunnersNode(gitHubContext));
+
+  return nodes;
+}
diff --git a/src/treeViews/workflows.ts b/src/treeViews/workflows.ts
@@ -1,5 +1,9 @@
 import * as vscode from "vscode";
 
+import {
+  WorkflowsRepoNode,
+  getWorkflowNodes,
+} from "./workflows/workflowsRepoNode";
 import { log, logDebug, logError } from "../log";
 
 import { AuthenticationNode } from "./shared/authenticationNode";
@@ -9,7 +13,6 @@ import { WorkflowJobNode } from "./workflows/workflowJobNode";
 import { WorkflowNode } from "./workflows/workflowNode";
 import { WorkflowRunNode } from "./workflows/workflowRunNode";
 import { WorkflowStepNode } from "./workflows/workflowStepNode";
-import { WorkflowsRepoNode } from "./workflows/workflowsRepoNode";
 import { getGitHubContext } from "../git/repository";
 
 type WorkflowsTreeNode =
@@ -51,6 +54,10 @@ export class WorkflowsTreeProvider
         }
 
         if (gitHubContext.repos.length > 0) {
+          if (gitHubContext.repos.length == 1) {
+            return getWorkflowNodes(gitHubContext.repos[0]);
+          }
+
           return gitHubContext.repos.map((r) => new WorkflowsRepoNode(r));
         }
 
diff --git a/src/treeViews/workflows/workflowsRepoNode.ts b/src/treeViews/workflows/workflowsRepoNode.ts
@@ -17,31 +17,31 @@ export class WorkflowsRepoNode extends vscode.TreeItem {
   async getWorkflows(): Promise<WorkflowNode[]> {
     logDebug("Getting workflows");
 
-    const result =
-      await this.gitHubRepoContext.client.actions.listRepoWorkflows({
-        owner: this.gitHubRepoContext.owner,
-        repo: this.gitHubRepoContext.name,
-      });
-
-    const resp = result.data;
-    const workflows = resp.workflows;
-
-    workflows.sort((a, b) => a.name.localeCompare(b.name));
-
-    return await Promise.all(
-      workflows.map(async (wf) => {
-        let parsedWorkflow: ParsedWorkflow | undefined;
-
-        const workflowUri = getWorkflowUri(this.gitHubRepoContext, wf.path);
-        if (workflowUri) {
-          parsedWorkflow = await parseWorkflow(
-            workflowUri,
-            this.gitHubRepoContext
-          );
-        }
-
-        return new WorkflowNode(this.gitHubRepoContext, wf, parsedWorkflow);
-      })
-    );
+    return getWorkflowNodes(this.gitHubRepoContext);
   }
 }
+
+export async function getWorkflowNodes(gitHubRepoContext: GitHubRepoContext) {
+  const result = await gitHubRepoContext.client.actions.listRepoWorkflows({
+    owner: gitHubRepoContext.owner,
+    repo: gitHubRepoContext.name,
+  });
+
+  const resp = result.data;
+  const workflows = resp.workflows;
+
+  workflows.sort((a, b) => a.name.localeCompare(b.name));
+
+  return await Promise.all(
+    workflows.map(async (wf) => {
+      let parsedWorkflow: ParsedWorkflow | undefined;
+
+      const workflowUri = getWorkflowUri(gitHubRepoContext, wf.path);
+      if (workflowUri) {
+        parsedWorkflow = await parseWorkflow(workflowUri, gitHubRepoContext);
+      }
+
+      return new WorkflowNode(gitHubRepoContext, wf, parsedWorkflow);
+    })
+  );
+}
