From 5755c35e50e26ce8db50476fad0bb5ce9e1a425f Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Thu, 30 May 2024 12:02:17 +0000 Subject: [PATCH 1/3] Reasonably happy with this style --- cmd/tea_submitplan.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/tea_submitplan.go b/cmd/tea_submitplan.go index 03c0798e..c442b621 100644 --- a/cmd/tea_submitplan.go +++ b/cmd/tea_submitplan.go @@ -727,15 +727,15 @@ func (m submitPlanModel) FinalReport() string { severity := "" switch r.GetSeverity() { case sdp.Risk_SEVERITY_HIGH: - severity = lipgloss.NewStyle().Background(ColorPalette.BgDanger).Render(" High 🔥 ") + severity = lipgloss.NewStyle().Foreground(ColorPalette.BgDanger).Render("High ‼") case sdp.Risk_SEVERITY_MEDIUM: - severity = lipgloss.NewStyle().Background(ColorPalette.BgWarning).Render(" Medium ❗ ") + severity = lipgloss.NewStyle().Foreground(ColorPalette.BgWarning).Render("Medium !") case sdp.Risk_SEVERITY_LOW: - severity = lipgloss.NewStyle().Background(ColorPalette.LabelTitle).Render(" Low ℹ️ ") + severity = lipgloss.NewStyle().Render("Low ⓘ") case sdp.Risk_SEVERITY_UNSPECIFIED: // do nothing } - bits = append(bits, (fmt.Sprintf("%v %v\n\n%v\n\n", + bits = append(bits, (fmt.Sprintf("%v%v\n\n%v\n\n", severity, styleH2().Render(r.GetTitle()), wordwrap.String(r.GetDescription(), min(160, m.width-4))))) From 6fea3776a8194b0a2c3304a0ad230fe83ff9f4ac Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Thu, 30 May 2024 12:21:53 +0000 Subject: [PATCH 2/3] Moves severity to the end to match the GUI --- cmd/tea_submitplan.go | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/cmd/tea_submitplan.go b/cmd/tea_submitplan.go index c442b621..d5294468 100644 --- a/cmd/tea_submitplan.go +++ b/cmd/tea_submitplan.go @@ -715,29 +715,41 @@ func (m submitPlanModel) submitPlanCmd() tea.Msg { func (m submitPlanModel) FinalReport() string { bits := []string{} if m.blastRadiusItems > 0 { - bits = append(bits, "") bits = append(bits, styleH1().Render("Blast Radius")) bits = append(bits, fmt.Sprintf("\nItems: %v\nEdges: %v\n", m.blastRadiusItems, m.blastRadiusEdges)) } if m.changeUrl != "" && len(m.risks) > 0 { - bits = append(bits, "") bits = append(bits, styleH1().Render("Potential Risks")) bits = append(bits, "") for _, r := range m.risks { severity := "" switch r.GetSeverity() { case sdp.Risk_SEVERITY_HIGH: - severity = lipgloss.NewStyle().Foreground(ColorPalette.BgDanger).Render("High ‼") + severity = lipgloss.NewStyle(). + Foreground(ColorPalette.BgDanger). + Bold(true). + PaddingLeft(2). + Render("High ‼") case sdp.Risk_SEVERITY_MEDIUM: - severity = lipgloss.NewStyle().Foreground(ColorPalette.BgWarning).Render("Medium !") + severity = lipgloss.NewStyle(). + Foreground(ColorPalette.BgWarning). + PaddingLeft(2). + Render("Medium !") case sdp.Risk_SEVERITY_LOW: - severity = lipgloss.NewStyle().Render("Low ⓘ") + severity = lipgloss.NewStyle(). + PaddingLeft(2). + Render("Low ⓘ ") case sdp.Risk_SEVERITY_UNSPECIFIED: // do nothing } + title := lipgloss.NewStyle(). + Foreground(ColorPalette.BgMain). + Bold(true). + Render(r.GetTitle()) + bits = append(bits, (fmt.Sprintf("%v%v\n\n%v\n\n", + title, severity, - styleH2().Render(r.GetTitle()), wordwrap.String(r.GetDescription(), min(160, m.width-4))))) } bits = append(bits, fmt.Sprintf("\nCheck the blast radius graph and risks at:\n%v\n\n", m.changeUrl)) From 88308dd90e06164ed7abae0c86c96bfcdca17406 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Fri, 31 May 2024 17:39:22 +0200 Subject: [PATCH 3/3] Implement PR feedback --- cmd/tea_submitplan.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/tea_submitplan.go b/cmd/tea_submitplan.go index d5294468..fb2b6eac 100644 --- a/cmd/tea_submitplan.go +++ b/cmd/tea_submitplan.go @@ -726,24 +726,26 @@ func (m submitPlanModel) FinalReport() string { switch r.GetSeverity() { case sdp.Risk_SEVERITY_HIGH: severity = lipgloss.NewStyle(). - Foreground(ColorPalette.BgDanger). + Background(ColorPalette.BgDanger). + Padding(0, 1). Bold(true). - PaddingLeft(2). Render("High ‼") case sdp.Risk_SEVERITY_MEDIUM: severity = lipgloss.NewStyle(). - Foreground(ColorPalette.BgWarning). - PaddingLeft(2). + Background(ColorPalette.BgWarning). + Padding(0, 1). Render("Medium !") case sdp.Risk_SEVERITY_LOW: severity = lipgloss.NewStyle(). - PaddingLeft(2). + Background(ColorPalette.LabelBase). + Padding(0, 1). Render("Low ⓘ ") case sdp.Risk_SEVERITY_UNSPECIFIED: // do nothing } title := lipgloss.NewStyle(). Foreground(ColorPalette.BgMain). + PaddingRight(1). Bold(true). Render(r.GetTitle())