getlocalci · kienstra · Apr 22, 2022 · Mar 16, 2022 · Mar 17, 2022 · Mar 17, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,18 +2,16 @@ version: 2.1
 
 orbs:
   node: circleci/node@5.0.0
-  browser-tools: circleci/browser-tools@1.1.0
 
 jobs:
   test:
     docker:
       - image: cimg/node:16.8.0-browsers
     steps:
       - checkout
-      - browser-tools/install-browser-tools
       - node/install-packages
       - run: npm test
-  build:
+  package:
     docker:
       - image: cimg/node:16.8.0-browsers
     steps:
@@ -28,4 +26,4 @@ workflows:
   test-lint:
     jobs:
       - test
-      - build
+      - package
diff --git a/node/binary.js b/node/binary.js
@@ -15,12 +15,12 @@ const supportedPlatforms = [
   {
     type: "Linux",
     architecture: "x64",
-    url: "https://github.com/CircleCI-Public/circleci-cli/releases/download/v0.1.16947/circleci-cli_0.1.16947_linux_amd64.tar.gz",
+    url: "https://github.com/CircleCI-Public/circleci-cli/releases/download/v0.1.17087/circleci-cli_0.1.17087_linux_amd64.tar.gz",
   },
   {
     type: "Darwin",
     architecture: "x64",
-    url: "https://github.com/CircleCI-Public/circleci-cli/releases/download/v0.1.16947/circleci-cli_0.1.16947_darwin_amd64.tar.gz",
+    url: "https://github.com/CircleCI-Public/circleci-cli/releases/download/v0.1.17087/circleci-cli_0.1.17087_darwin_amd64.tar.gz",
   },
 ];
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/classes/Job.ts b/src/classes/Job.ts
@@ -70,4 +70,8 @@ export default class Job extends vscode.TreeItem {
   setIsFailure(): void {
     this.description = '❌';
   }
+
+  setExpanded(): void {
+    this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
+  }
 }
diff --git a/src/classes/JobProvider.ts b/src/classes/JobProvider.ts
@@ -1,12 +1,15 @@
 import * as fs from 'fs';
+import * as path from 'path';
 import * as vscode from 'vscode';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import Command from './Command';
 import Job from './Job';
+import Log from './Log';
 import Warning from './Warning';
 import getAllConfigFilePaths from '../utils/getAllConfigFilePaths';
 import getAllJobs from '../utils/getAllJobs';
 import getConfigFilePath from '../utils/getConfigFilePath';
+import getLogFilesDirectory from '../utils/getLogFilesDirectory';
 import getTrialLength from '../utils/getTrialLength';
 import isDockerRunning from '../utils/isDockerRunning';
 import isLicenseValid from '../utils/isLicenseValid';
@@ -23,11 +26,11 @@ import {
 } from '../constants';
 
 enum JobError {
-  dockerNotRunning,
-  licenseKey,
-  noConfigFilePathInWorkspace,
-  noConfigFilePathSelected,
-  processFile,
+  DockerNotRunning,
+  LicenseKey,
+  NoConfigFilePathInWorkspace,
+  NoConfigFilePathSelected,
+  ProcessFile,
 }
 
 export default class JobProvider
@@ -42,25 +45,29 @@ export default class JobProvider
   private jobErrorMessage: string | undefined;
   private runningJob: string | undefined;
   private jobDependencies: Map<string, string[] | null> | undefined;
+  private logs: Record<string, string[]> = {};
 
   constructor(
     private readonly context: vscode.ExtensionContext,
     private readonly reporter: TelemetryReporter
   ) {}
 
-  /**
-   * Refreshes the TreeView, without processing the config file.
-   */
+  async init() {
+    await this.loadJobs();
+    await this.loadLogs();
+  }
+
+  /** Refreshes the TreeView, without processing the config file. */
   async refresh(job?: Job, skipMessage?: boolean): Promise<void> {
     await this.loadJobs(true, skipMessage);
+    await this.loadLogs();
     this._onDidChangeTreeData.fire(job);
   }
 
-  /**
-   * Processes the config file(s) in addition to refreshing.
-   */
+  /** Processes the config file(s) in addition to refreshing. */
   async hardRefresh(job?: Job, suppressMessage?: boolean): Promise<void> {
     await this.loadJobs(false, suppressMessage);
+    await this.loadLogs();
     this._onDidChangeTreeData.fire(job);
   }
 
@@ -73,25 +80,25 @@ export default class JobProvider
     this.jobErrorMessage = undefined;
     this.runningJob = undefined;
 
-    let processedConfig;
-    let processError;
-
     const configFilePath = await getConfigFilePath(this.context);
     if (!configFilePath || !fs.existsSync(configFilePath)) {
       this.reporter.sendTelemetryEvent('configFilePath');
 
       const doExistConfigPaths = !!(await getAllConfigFilePaths(this.context))
         .length;
       if (doExistConfigPaths) {
-        this.jobErrorType = JobError.noConfigFilePathSelected;
+        this.jobErrorType = JobError.NoConfigFilePathSelected;
       } else {
         this.reporter.sendTelemetryErrorEvent('noConfigFile');
-        this.jobErrorType = JobError.noConfigFilePathInWorkspace;
+        this.jobErrorType = JobError.NoConfigFilePathInWorkspace;
       }
 
       return;
     }
 
+    let processedConfig;
+    let processError;
+
     if (!skipConfigProcessing) {
       const configResult = prepareConfig(
         configFilePath,
@@ -111,19 +118,19 @@ export default class JobProvider
       );
 
     if (!shouldEnableExtension) {
-      this.jobErrorType = JobError.licenseKey;
+      this.jobErrorType = JobError.LicenseKey;
       return;
     }
 
     if (!isDockerRunning()) {
       this.reporter.sendTelemetryErrorEvent('dockerNotRunning');
-      this.jobErrorType = JobError.dockerNotRunning;
+      this.jobErrorType = JobError.DockerNotRunning;
       this.jobErrorMessage = getDockerError();
       return;
     }
 
     if (processError) {
-      this.jobErrorType = JobError.processFile;
+      this.jobErrorType = JobError.ProcessFile;
       this.jobErrorMessage = processError;
       return;
     }
@@ -138,11 +145,24 @@ export default class JobProvider
     }
   }
 
+  async loadLogs() {
+    const configFilePath = await getConfigFilePath(this.context);
+
+    for (const jobName of this.jobDependencies?.keys() ?? []) {
+      const logDirectory = getLogFilesDirectory(configFilePath, jobName);
+      if (fs.existsSync(logDirectory)) {
+        this.logs[jobName] = fs.readdirSync(logDirectory).map((logFile) => {
+          return path.join(logDirectory, logFile);
+        });
+      }
+    }
+  }
+
   getTreeItem(treeItem: vscode.TreeItem): vscode.TreeItem {
     return treeItem;
   }
 
-  getChildren(parentElement: vscode.TreeItem): vscode.TreeItem[] {
+  getChildren(parentElement: Job | Log): vscode.TreeItem[] {
     if (!parentElement) {
       return this.jobs.length
         ? this.getJobTreeItems(
@@ -154,15 +174,18 @@ export default class JobProvider
     }
 
     const jobNames = this.jobDependencies?.keys();
-    if (!jobNames) {
+    if (
+      !jobNames ||
+      ('getJobName' in parentElement && !parentElement.getJobName())
+    ) {
       return [];
     }
 
     const children = [];
     for (const jobName of jobNames) {
       const jobDependencies = this?.jobDependencies?.get(jobName) ?? [];
       const dependencyLength = jobDependencies?.length;
-      // This element's children should be the jobs that list it as their last dependency in the requires array.
+      // This element's children include the jobs that list it as their last dependency in the requires array.
       if (
         dependencyLength &&
         parentElement.label === jobDependencies[dependencyLength - 1]
@@ -171,43 +194,56 @@ export default class JobProvider
       }
     }
 
-    return this.getJobTreeItems(children);
+    return [
+      ...this.getLogTreeItems(
+        'getJobName' in parentElement ? parentElement.getJobName() : ''
+      ),
+      ...this.getJobTreeItems(children),
+    ];
+  }
+
+  getLogTreeItems(jobName: string): Log[] {
+    return (
+      this.logs[jobName]?.map(
+        (logFile) => new Log(path.basename(logFile), logFile)
+      ) ?? []
+    );
   }
 
   getJobTreeItems(jobs: string[]): Job[] {
     return jobs.map(
       (jobName) =>
-        new Job(jobName, jobName === this.runningJob, this.hasChildJob(jobName))
+        new Job(jobName, jobName === this.runningJob, this.hasChild(jobName))
     );
   }
 
   getErrorTreeItems(): vscode.TreeItem[] {
     const errorMessage = this.getJobErrorMessage();
 
     switch (this.jobErrorType) {
-      case JobError.dockerNotRunning:
+      case JobError.DockerNotRunning:
         return [
           new Warning('Error: is Docker running?'),
           new vscode.TreeItem(errorMessage),
           new Command('Try Again', `${JOB_TREE_VIEW_ID}.refresh`),
         ];
-      case JobError.licenseKey:
+      case JobError.LicenseKey:
         return [
           new Warning('Please enter a Local CI license key.'),
           new Command('Get License', GET_LICENSE_COMMAND),
           new Command('Enter License', ENTER_LICENSE_COMMAND),
         ];
-      case JobError.noConfigFilePathInWorkspace:
+      case JobError.NoConfigFilePathInWorkspace:
         return [
           new Warning('Error: No .circleci/config.yml found'),
           new Command('Create a config for me', CREATE_CONFIG_FILE_COMMAND),
         ];
-      case JobError.noConfigFilePathSelected:
+      case JobError.NoConfigFilePathSelected:
         return [
           new Warning('Error: No jobs found'),
           new Command('Select repo', 'localCiJobs.selectRepo'),
         ];
-      case JobError.processFile:
+      case JobError.ProcessFile:
         return [
           new Warning('Error processing the CircleCI config:'),
           new vscode.TreeItem(
@@ -233,9 +269,16 @@ export default class JobProvider
   }
 
   /**
-   * A job has a child job if any other job has it as the last value in its requires array.
+   * A job has a child if either:
+   *
+   * 1. It has a log
+   * 2. It's a dependency of another job (another job has it as the last value in its requires array)
    */
-  hasChildJob(jobName: string): boolean {
+  hasChild(jobName: string): boolean {
+    if (this.logs[jobName]) {
+      return true;
+    }
+
     for (const [, dependecies] of this?.jobDependencies ?? []) {
       if (
         dependecies?.length &&

diff --git a/src/classes/Log.ts b/src/classes/Log.ts
@@ -0,0 +1,18 @@
+import * as vscode from 'vscode';
+
+export default class Log extends vscode.TreeItem {
+  constructor(public readonly label: string, public readonly filePath: string) {
+    super(label);
+    const tooltip = 'Log for CircleCI® job';
+    this.collapsibleState = vscode.TreeItemCollapsibleState.None;
+    this.command = {
+      title: label,
+      command: 'vscode.open',
+      tooltip,
+      arguments: [filePath],
+    };
+
+    this.iconPath = new vscode.ThemeIcon('output');
+    this.tooltip = tooltip;
+  }
+}
diff --git a/src/constants/index.ts b/src/constants/index.ts
@@ -54,8 +54,6 @@ export const DYNAMIC_CONFIG_PATH_IN_CONTAINER = path.join(
   DYNAMIC_CONFIG_FILE_NAME
 );
 export const HOST_TMP_DIRECTORY = '/tmp/local-ci'; // Also hard-coded in node/uninstall.js, change that if this changes. Be careful changing this, as there's an rm -rf for it.
-export const PROCESS_FILE_DIRECTORY = path.join(HOST_TMP_DIRECTORY, 'process');
-export const LOCAL_VOLUME_DIRECTORY = path.join(HOST_TMP_DIRECTORY, 'volume');
 export const RUN_JOB_COMMAND = 'local-ci.job.run';
 export const CREATE_CONFIG_FILE_COMMAND = 'local-ci.create.config';
 export const CONTINUE_PIPELINE_STEP_NAME = 'Continue the pipeline';