From 822f238524abd2ed3cde941402a5413ff27fff6a Mon Sep 17 00:00:00 2001
From: Matt Seddon <37993418+mattseddon@users.noreply.github.com>
Date: Thu, 20 Jul 2023 10:05:43 +1000
Subject: [PATCH] Standardise column like quick pick (#4307)

---
 .../src/experiments/columns/quickPick.test.ts |  6 ++---
 .../src/experiments/columns/quickPick.ts      | 24 +++++++++++++------
 extension/src/plots/model/quickPick.test.ts   | 12 ++++------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/extension/src/experiments/columns/quickPick.test.ts b/extension/src/experiments/columns/quickPick.test.ts
index 6472840a9e..b908e4b7ae 100644
--- a/extension/src/experiments/columns/quickPick.test.ts
+++ b/extension/src/experiments/columns/quickPick.test.ts
@@ -49,13 +49,11 @@ describe('pickFromColumnLikes', () => {
     expect(mockedQuickPickValue).toHaveBeenCalledWith(
       [
         {
-          description: epochsParamPath,
-          label: 'epochs',
+          label: epochsParamPath,
           value: epochsParam
         },
         {
-          description: paramsYamlPath,
-          label: paramsYaml,
+          label: paramsYamlPath,
           value: paramsYamlParam
         }
       ],
diff --git a/extension/src/experiments/columns/quickPick.ts b/extension/src/experiments/columns/quickPick.ts
index f0e9c748ea..98dd05b534 100644
--- a/extension/src/experiments/columns/quickPick.ts
+++ b/extension/src/experiments/columns/quickPick.ts
@@ -13,12 +13,22 @@ export const pickFromColumnLikes = (
   if (!definedAndNonEmpty(columnLikes)) {
     return Toast.showError('There are no columns to select from.')
   }
-  return quickPickValue<ColumnLike>(
-    columnLikes.map(columnLike => ({
-      description: columnLike.path,
-      label: columnLike.label,
+
+  const items = []
+  for (const columnLike of columnLikes) {
+    if (columnLike.path === 'starred') {
+      items.push({
+        description: columnLike.path,
+        label: columnLike.label,
+        value: columnLike
+      })
+      continue
+    }
+    items.push({
+      label: columnLike.path,
       value: columnLike
-    })),
-    quickPickOptions
-  )
+    })
+  }
+
+  return quickPickValue<ColumnLike>(items, quickPickOptions)
 }
diff --git a/extension/src/plots/model/quickPick.test.ts b/extension/src/plots/model/quickPick.test.ts
index bce56cb46a..fd597a7c6b 100644
--- a/extension/src/plots/model/quickPick.test.ts
+++ b/extension/src/plots/model/quickPick.test.ts
@@ -231,18 +231,15 @@ describe('pickMetricAndParam', () => {
       1,
       [
         {
-          description: 'metrics:summary.json:loss',
-          label: 'loss',
+          label: 'metrics:summary.json:loss',
           value: { label: 'loss', path: 'metrics:summary.json:loss' }
         },
         {
-          description: 'metrics:summary.json:accuracy',
-          label: 'accuracy',
+          label: 'metrics:summary.json:accuracy',
           value: { label: 'accuracy', path: 'metrics:summary.json:accuracy' }
         },
         {
-          description: 'metrics:summary.json:val_loss',
-          label: 'val_loss',
+          label: 'metrics:summary.json:val_loss',
           value: { label: 'val_loss', path: 'metrics:summary.json:val_loss' }
         }
       ],
@@ -254,8 +251,7 @@ describe('pickMetricAndParam', () => {
       2,
       [
         {
-          description: 'params:params.yaml:epochs',
-          label: 'epochs',
+          label: 'params:params.yaml:epochs',
           value: { label: 'epochs', path: 'params:params.yaml:epochs' }
         }
       ],