getlocalci · kienstra · Oct 15, 2022 · Oct 15, 2022 · Oct 15, 2022 · Oct 15, 2022
diff --git a/src/common/BaseIoc.ts b/src/common/BaseIoc.ts
@@ -43,6 +43,7 @@ import SelectRepo from 'command/SelectRepo';
 import Spawn from 'common/Spawn';
 import TryProcessAgain from 'command/TryProcessAgain';
 import UncommittedFile from 'containerization/UncommittedFile';
+import WarningCommandFactory from 'job/WarningCommandFactory';
 import WarningFactory from 'job/WarningFactory';
 import Workspace from 'common/Workspace';
 
@@ -106,6 +107,7 @@ export default class BaseIoc {
     this.container.bind(Spawn).toSelf();
     this.container.bind(TryProcessAgain).toSelf();
     this.container.bind(UncommittedFile).toSelf();
+    this.container.bind(WarningCommandFactory).toSelf();
     this.container.bind(WarningFactory).toSelf();
     this.container.bind(Workspace).toSelf();
 

diff --git a/src/config/ConfigFile.ts b/src/config/ConfigFile.ts
@@ -3,7 +3,11 @@ import type vscode from 'vscode';
 import Types from 'common/Types';
 import AllConfigFiles from './AllConfigFiles';
 import EditorGateway from 'gateway/EditorGateway';
-import { CREATE_CONFIG_FILE_COMMAND, SELECTED_CONFIG_PATH } from 'constant';
+import {
+  CREATE_CONFIG_FILE_COMMAND,
+  SELECTED_CONFIG_PATH,
+  SELECT_REPO_COMMAND,
+} from 'constant';
 
 @injectable()
 export default class ConfigFile {
@@ -56,17 +60,17 @@ export default class ConfigFile {
       return allConfigFilePaths[0].fsPath;
     }
 
-    const chooseRepoText = 'Choose repo';
+    const selectRepoText = 'Select repo';
     this.editorGateway.editor.window
       .showInformationMessage(
         'Please select the repo to run Local CI on',
         { detail: 'There is no repo selected to run Local CI on' },
-        chooseRepoText
+        selectRepoText
       )
       .then((clicked) => {
-        if (clicked === chooseRepoText) {
+        if (clicked === selectRepoText) {
           this.editorGateway.editor.commands.executeCommand(
-            'localCiJobs.selectRepo'
+            SELECT_REPO_COMMAND
           );
         }
       });

diff --git a/src/constant/index.ts b/src/constant/index.ts
@@ -41,6 +41,7 @@ export const DYNAMIC_CONFIG_PATH_IN_CONTAINER = path.join(
 export const HOST_TMP_DIRECTORY = '/tmp/local-ci';
 export const RUN_JOB_COMMAND = 'local-ci.job.run';
 export const CREATE_CONFIG_FILE_COMMAND = 'local-ci.create.config';
+export const SELECT_REPO_COMMAND = 'localCiJobs.selectRepo';
 export const SHOW_LOG_FILE_COMMAND = 'local-ci.show.log-file';
 export const LOG_FILE_SCHEME = 'local-ci-log';
 export const CONTINUE_PIPELINE_STEP_NAME = 'Continue the pipeline';

diff --git a/src/job/Children.ts b/src/job/Children.ts
@@ -8,6 +8,7 @@ import CommandFactory from './ComandFactory';
 import JobFactory from './JobFactory';
 import JobTreeItem from './JobTreeItem';
 import WarningFactory from './WarningFactory';
+import WarningCommandFactory from './WarningCommandFactory';
 import type EditorGateway from 'gateway/EditorGateway';
 import {
   COMPLAIN_COMMAND,
@@ -16,6 +17,7 @@ import {
   GET_LICENSE_COMMAND,
   JOB_TREE_VIEW_ID,
   PROCESS_TRY_AGAIN_COMMAND,
+  SELECT_REPO_COMMAND,
 } from 'constant';
 
 type Logs = Record<string, string[]>;
@@ -35,6 +37,9 @@ export default class Children {
   @inject(LogFactory)
   logFactory!: LogFactory;
 
+  @inject(WarningCommandFactory)
+  warningCommandFactory!: WarningCommandFactory;
+
   @inject(WarningFactory)
   warningFactory!: WarningFactory;
 
@@ -149,8 +154,11 @@ export default class Children {
         ];
       case JobError.NoConfigFilePathSelected:
         return [
-          this.warningFactory.create('Please select repo'),
-          this.commandFactory.create('Select repo', 'localCiJobs.selectRepo'),
+          this.warningCommandFactory.create(
+            'Please select repo',
+            SELECT_REPO_COMMAND
+          ),
+          this.commandFactory.create('Select repo', SELECT_REPO_COMMAND),
           this.commandFactory.create('Complain to me', COMPLAIN_COMMAND),
         ];
       case JobError.ProcessFile:

diff --git a/src/job/WarningCommandFactory.ts b/src/job/WarningCommandFactory.ts
@@ -0,0 +1,20 @@
+import { inject, injectable } from 'inversify';
+import type vscode from 'vscode';
+import WarningFactory from './WarningFactory';
+
+@injectable()
+export default class WarningCommandFactory {
+  @inject(WarningFactory)
+  warningFactory!: WarningFactory;
+
+  create(label: string, command: string): vscode.TreeItem {
+    return {
+      ...this.warningFactory.create(label),
+      command: {
+        command,
+        title: label,
+        tooltip: label,
+      },
+    };
+  }
+}