From f9519ae87112eef512caa9c35ed3338bacf0234a Mon Sep 17 00:00:00 2001 From: Sudhir Verma Date: Fri, 19 Mar 2021 16:02:19 +0530 Subject: [PATCH] Fix bug for listing pipelineRun from command palette (#529) --- src/tekton/pipelinerun.ts | 10 +++++----- src/tekton/tektonitem.ts | 2 +- test/tekton/pipelinerun.test.ts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/tekton/pipelinerun.ts b/src/tekton/pipelinerun.ts index c5a1e93a..8b1bc74d 100644 --- a/src/tekton/pipelinerun.ts +++ b/src/tekton/pipelinerun.ts @@ -34,12 +34,12 @@ export class PipelineRun extends TektonItem { PipelineRun.tkn.executeInTerminal(Command.describePipelineRuns(pipelineRun.getName())); } - static async list(pipelineRun: TektonNode): Promise { - if (!pipelineRun) { - pipelineRun = await window.showQuickPick(await PipelineRun.getPipelineRunNames(), { placeHolder: 'Select Pipeline Run to list', ignoreFocusOut: true }); + static async list(pipeline: TektonNode): Promise { + if (!pipeline) { + pipeline = await window.showQuickPick(await PipelineRun.getPipelineNames(), { placeHolder: 'Select Pipeline Run to list', ignoreFocusOut: true }); } - if (!pipelineRun) return null; - PipelineRun.tkn.executeInTerminal(Command.listPipelineRunsInTerminal(pipelineRun.getName())); + if (!pipeline) return null; + PipelineRun.tkn.executeInTerminal(Command.listPipelineRunsInTerminal(pipeline.getName())); } static async logs(pipelineRun: TektonNode): Promise { diff --git a/src/tekton/tektonitem.ts b/src/tekton/tektonitem.ts index a0eca583..afa1ea72 100644 --- a/src/tekton/tektonitem.ts +++ b/src/tekton/tektonitem.ts @@ -10,7 +10,7 @@ import { tektonFSUri } from '../util/tekton-vfs'; import { TknResourceItem } from './webviewstartpipeline'; import { telemetryLogCommand, telemetryLogError } from '../telemetry'; -const errorMessage = { +export const errorMessage = { Pipeline: 'You need at least one Pipeline available. Please create new Tekton Pipeline and try again.', PipelineRun: 'You need at least one PipelineRun available. Please create new Tekton PipelineRun and try again.', PipelineResource: 'You need at least one PipelineResource available. Please create new Tekton PipelineResource and try again.', diff --git a/test/tekton/pipelinerun.test.ts b/test/tekton/pipelinerun.test.ts index 743672e8..2020faf8 100644 --- a/test/tekton/pipelinerun.test.ts +++ b/test/tekton/pipelinerun.test.ts @@ -12,7 +12,7 @@ import * as sinon from 'sinon'; import { TknImpl, Command, ContextType } from '../../src/tkn'; import { PipelineRun } from '../../src/tekton/pipelinerun'; import { TestItem } from './testTektonitem'; -import { TektonItem } from '../../src/tekton/tektonitem'; +import { errorMessage, TektonItem } from '../../src/tekton/tektonitem'; import * as logInEditor from '../../src/util/log-in-editor'; const expect = chai.expect; @@ -66,7 +66,7 @@ suite('Tekton/PipelineRun', () => { try { await PipelineRun.list(null); } catch (err) { - expect(err.message).equals('You need at least one PipelineRun available. Please create new Tekton PipelineRun and try again.'); + expect(err.message).equals(errorMessage.Pipeline); return; } });