From b46c4808ad48f54eec978e13154215feb5d43738 Mon Sep 17 00:00:00 2001
From: jmeridth <jmeridth@gmail.com>
Date: Thu, 28 Dec 2023 17:50:53 -0600
Subject: [PATCH 1/3] fix: custom columns not supporting annotations

- [x] search annotations for matching key from user's custom column type
  - docs state we can use labels and annotations [here](https://github.com/argoproj/argo-workflows/blob/954884d64c7b2d24a2e5fa0641a66692d182fefd/pkg/apis/workflow/v1alpha1/info.go#L21) and [here](https://github.com/argoproj/argo-workflows/blob/954884d64c7b2d24a2e5fa0641a66692d182fefd/docs/workflow-controller-configmap.yaml#L90)

Signed-off-by: jmeridth <jmeridth@gmail.com>
Co-authored-by: Steven Johnson <52087249+stevenbjohnson@users.noreply.github.com>
---
 ui/src/app/workflows/components/workflows-row/workflows-row.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx
index 06437e967d54..21f11cefa95c 100644
--- a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx
+++ b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx
@@ -87,7 +87,7 @@ export function WorkflowsRow(props: WorkflowsRowProps) {
                     <div className='columns small-1'>{isArchivedWorkflow(wf) ? 'true' : 'false'}</div>
                     {(props.columns || []).map(column => {
                         // best not to make any assumptions and wait until this data is filled
-                        const value = wf?.metadata?.labels?.[column.key] ?? 'unknown';
+                        const value = wf?.metadata?.annotations?.[column.key] ?? wf?.metadata?.labels?.[column.key] ?? 'unknown';
                         return (
                             <div key={column.name} className='columns small-1'>
                                 {value}

From ca3205c2dada16b3f742601068ebbc0f82e5af77 Mon Sep 17 00:00:00 2001
From: Jason Meridth <jmeridth@gmail.com>
Date: Thu, 28 Dec 2023 22:35:06 -0600
Subject: [PATCH 2/3] Update
 ui/src/app/workflows/components/workflows-row/workflows-row.tsx

Co-authored-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com>
Signed-off-by: Jason Meridth <jmeridth@gmail.com>
---
 ui/src/app/workflows/components/workflows-row/workflows-row.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx
index 21f11cefa95c..05e99b6791e0 100644
--- a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx
+++ b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx
@@ -87,7 +87,7 @@ export function WorkflowsRow(props: WorkflowsRowProps) {
                     <div className='columns small-1'>{isArchivedWorkflow(wf) ? 'true' : 'false'}</div>
                     {(props.columns || []).map(column => {
                         // best not to make any assumptions and wait until this data is filled
-                        const value = wf?.metadata?.annotations?.[column.key] ?? wf?.metadata?.labels?.[column.key] ?? 'unknown';
+                        const value = (column.type === "label" ? wf?.metadata?.labels?.[column.key] : wf?.metadata?.annotations?.[column.key]) ?? 'unknown';
                         return (
                             <div key={column.name} className='columns small-1'>
                                 {value}

From 42af0f0eda80b583a820c817ef223c6209f26cf1 Mon Sep 17 00:00:00 2001
From: jmeridth <jmeridth@gmail.com>
Date: Thu, 28 Dec 2023 22:40:52 -0600
Subject: [PATCH 3/3] fix: single quotes instead of double quotes on string
 comparison

Signed-off-by: jmeridth <jmeridth@gmail.com>
---
 ui/src/app/workflows/components/workflows-row/workflows-row.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx
index 05e99b6791e0..7aae39bb9cad 100644
--- a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx
+++ b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx
@@ -87,7 +87,7 @@ export function WorkflowsRow(props: WorkflowsRowProps) {
                     <div className='columns small-1'>{isArchivedWorkflow(wf) ? 'true' : 'false'}</div>
                     {(props.columns || []).map(column => {
                         // best not to make any assumptions and wait until this data is filled
-                        const value = (column.type === "label" ? wf?.metadata?.labels?.[column.key] : wf?.metadata?.annotations?.[column.key]) ?? 'unknown';
+                        const value = (column.type === 'label' ? wf?.metadata?.labels?.[column.key] : wf?.metadata?.annotations?.[column.key]) ?? 'unknown';
                         return (
                             <div key={column.name} className='columns small-1'>
                                 {value}