From 874a01ec7ec01c74deb527eb2b320be2fa6fd3c2 Mon Sep 17 00:00:00 2001
From: catsby <clint@ctshryock.com>
Date: Thu, 3 Aug 2023 20:39:11 +0000
Subject: [PATCH] backport of commit 9c5adab90fffc682a3bfef7da2b90e542643cac1

---
 internal/cli/job_get_stream.go |  1 -
 internal/cli/job_inspect.go    | 18 +++++++++++++++---
 internal/cli/job_list.go       | 12 +++++++++---
 internal/cli/task_inspect.go   | 20 ++++++++++++++++----
 4 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/internal/cli/job_get_stream.go b/internal/cli/job_get_stream.go
index 6363026db4a..8c89dcec8a8 100644
--- a/internal/cli/job_get_stream.go
+++ b/internal/cli/job_get_stream.go
@@ -54,7 +54,6 @@ func (c *JobGetStreamCommand) Run(args []string) int {
 
 func (c *JobGetStreamCommand) Flags() *flag.Sets {
 	return c.flagSet(flagSetOperation, func(set *flag.Sets) {
-		//f := set.NewSet("Command Options")
 	})
 }
 
diff --git a/internal/cli/job_inspect.go b/internal/cli/job_inspect.go
index 2d0f565db6b..42e2ec637d5 100644
--- a/internal/cli/job_inspect.go
+++ b/internal/cli/job_inspect.go
@@ -166,6 +166,18 @@ func (c *JobInspectCommand) Run(args []string) int {
 	}
 
 	c.ui.Output("Job Configuration", terminal.WithHeaderStyle())
+	appProjectName := resp.GetApplication().GetProject()
+	if appProjectName == "" {
+		appProjectName = "deleted"
+	}
+	appName := resp.GetApplication().GetApplication()
+	if appName == "" {
+		appName = "deleted"
+	}
+	workspaceName := resp.GetWorkspace().GetWorkspace()
+	if workspaceName == "" {
+		workspaceName = "deleted"
+	}
 	c.ui.NamedValues([]terminal.NamedValue{
 		{
 			Name: "ID", Value: resp.Id,
@@ -180,13 +192,13 @@ func (c *JobInspectCommand) Run(args []string) int {
 			Name: "Target Runner", Value: targetRunner,
 		},
 		{
-			Name: "Workspace", Value: resp.Workspace.Workspace,
+			Name: "Workspace", Value: workspaceName,
 		},
 		{
-			Name: "Project", Value: resp.Application.Project,
+			Name: "Project", Value: appProjectName,
 		},
 		{
-			Name: "Application", Value: resp.Application.Application,
+			Name: "Application", Value: appName,
 		},
 	}, terminal.WithInfoStyle())
 
diff --git a/internal/cli/job_list.go b/internal/cli/job_list.go
index f5a45ad2d0e..40cace05203 100644
--- a/internal/cli/job_list.go
+++ b/internal/cli/job_list.go
@@ -308,6 +308,12 @@ func (c *JobListCommand) Run(args []string) int {
 			pipeline = "name: " + j.Pipeline.PipelineName + ", run: " + strconv.FormatUint(j.Pipeline.RunSequence, 10) + ", step: " + j.Pipeline.Step
 		}
 
+		appProject := j.GetApplication().GetProject()
+		if appProject == "" {
+			appProject = "deleted"
+		}
+		appWorkspace := j.GetWorkspace().GetWorkspace()
+
 		tblColumn := []string{
 			j.Id,
 			op,
@@ -315,13 +321,13 @@ func (c *JobListCommand) Run(args []string) int {
 			queueTime,
 			completeTime,
 			targetRunner,
-			j.Application.Project,
-			j.Workspace.Workspace,
+			appProject,
+			appWorkspace,
 		}
 
 		if c.flagVerbose {
 			tblColumn = append(tblColumn, []string{
-				j.Application.Application,
+				appProject,
 				pipeline,
 			}...)
 		}
diff --git a/internal/cli/task_inspect.go b/internal/cli/task_inspect.go
index 3664e401bf6..68f8409c326 100644
--- a/internal/cli/task_inspect.go
+++ b/internal/cli/task_inspect.go
@@ -101,7 +101,9 @@ func (c *TaskInspectCommand) Run(args []string) int {
 		return 1
 	}
 
-	var workspace, project, application string
+	var workspace string
+	project := "deleted"
+	application := "deleted"
 	if taskResp.TaskJob.Workspace != nil {
 		workspace = taskResp.TaskJob.Workspace.Workspace
 	}
@@ -257,6 +259,16 @@ func (c *TaskInspectCommand) FormatJob(job *pb.Job) error {
 		errMsg = job.Error.Message
 	}
 
+	var workspace string
+	project := "deleted"
+	application := "deleted"
+	if job.Workspace != nil {
+		workspace = job.Workspace.Workspace
+	}
+	if job.Application != nil {
+		project = job.Application.Project
+		application = job.Application.Application
+	}
 	c.ui.Output("Job Configuration:", terminal.WithInfoStyle())
 	c.ui.NamedValues([]terminal.NamedValue{
 		{
@@ -272,13 +284,13 @@ func (c *TaskInspectCommand) FormatJob(job *pb.Job) error {
 			Name: "Target Runner", Value: targetRunner,
 		},
 		{
-			Name: "Workspace", Value: job.Workspace.Workspace,
+			Name: "Workspace", Value: workspace,
 		},
 		{
-			Name: "Project", Value: job.Application.Project,
+			Name: "Project", Value: project,
 		},
 		{
-			Name: "Application", Value: job.Application.Application,
+			Name: "Application", Value: application,
 		},
 	}, terminal.WithInfoStyle())