From f6e06f8a065a4e4c0d694b1fa8771e4d8eb66581 Mon Sep 17 00:00:00 2001
From: Aaron Plave <aaron.plave@jpl.nasa.gov>
Date: Thu, 1 Feb 2024 12:57:23 -0800
Subject: [PATCH] Consistent display of model and version in model dropdowns
 (#1111)

Ensure model dropdowns always show model + version instead of just model or model + model ID
---
 src/components/constraints/ConstraintForm.svelte               | 3 ++-
 src/components/expansion/ExpansionRuleForm.svelte              | 1 +
 src/components/expansion/ExpansionSetForm.svelte               | 1 +
 .../scheduling/conditions/SchedulingConditionForm.svelte       | 3 ++-
 src/components/scheduling/goals/SchedulingGoalForm.svelte      | 3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/constraints/ConstraintForm.svelte b/src/components/constraints/ConstraintForm.svelte
index f37a66db9c..11a1651a98 100644
--- a/src/components/constraints/ConstraintForm.svelte
+++ b/src/components/constraints/ConstraintForm.svelte
@@ -279,7 +279,8 @@
           <option value={null} />
           {#each models as model}
             <option value={model.id} disabled={!hasModelPermission(model.id, mode, user)}>
-              {model.name} ({model.id})
+              {model.name}
+              (Version: {model.version})
             </option>
           {/each}
         </select>
diff --git a/src/components/expansion/ExpansionRuleForm.svelte b/src/components/expansion/ExpansionRuleForm.svelte
index d4a3063e78..1c270b863d 100644
--- a/src/components/expansion/ExpansionRuleForm.svelte
+++ b/src/components/expansion/ExpansionRuleForm.svelte
@@ -291,6 +291,7 @@
           {#each $models as model}
             <option value={model.id}>
               {model.name}
+              (Version: {model.version})
             </option>
           {/each}
         </select>
diff --git a/src/components/expansion/ExpansionSetForm.svelte b/src/components/expansion/ExpansionSetForm.svelte
index d832aafc8e..a745303903 100644
--- a/src/components/expansion/ExpansionSetForm.svelte
+++ b/src/components/expansion/ExpansionSetForm.svelte
@@ -196,6 +196,7 @@
           {#each $models as model}
             <option value={model.id} disabled={!hasModelPermission(model.id, user)}>
               {model.name}
+              (Version: {model.version})
             </option>
           {/each}
         </select>
diff --git a/src/components/scheduling/conditions/SchedulingConditionForm.svelte b/src/components/scheduling/conditions/SchedulingConditionForm.svelte
index e2c7d05bf0..5ca0dbde63 100644
--- a/src/components/scheduling/conditions/SchedulingConditionForm.svelte
+++ b/src/components/scheduling/conditions/SchedulingConditionForm.svelte
@@ -245,7 +245,8 @@
           <option value={null} />
           {#each models as model}
             <option value={model.id} disabled={!hasModelPermission(model.id, mode, user)}>
-              {model.name} ({model.id})
+              {model.name}
+              (Version: {model.version})
             </option>
           {/each}
         </select>
diff --git a/src/components/scheduling/goals/SchedulingGoalForm.svelte b/src/components/scheduling/goals/SchedulingGoalForm.svelte
index 13b3915db8..791178ce77 100644
--- a/src/components/scheduling/goals/SchedulingGoalForm.svelte
+++ b/src/components/scheduling/goals/SchedulingGoalForm.svelte
@@ -315,7 +315,8 @@
           <option value={null} />
           {#each models as model}
             <option value={model.id} disabled={!hasModelPermission(model.id, mode, user)}>
-              {model.name} ({model.id})
+              {model.name}
+              (Version: {model.version})
             </option>
           {/each}
         </select>