Fix logic for current selection when some are locked

src/pages/10_Set_Your_Lineup.py

@@ -139,28 +139,31 @@ def position_cell(
     pos_label = f"{week}-{pos_str}-{pos_idx}"
     selected_id = existing_selection_map.get(pos_label)
     options_list = options_map[pos_str][int(week)]
+    non_locked_options = [x for x in options_list if not x.is_locked()]
     disabled = False
-    if isinstance(selected_id, str):
-        try:
-            selected_option_idx, selected_player = next(
-                (i, v) for i, v in enumerate(options_list) if str(selected_id) == str(v.gsis_id)
-            )
-        except StopIteration:
-            selected_player = PlayerOption.empty_player()
-            selected_option_idx = 0
-    else:
+    # get selected player by id from options
+    try:
+        selected_player = next(v for v in options_list if str(selected_id) == str(v.gsis_id))
+    except Exception:
         selected_player = PlayerOption.empty_player()
-        selected_option_idx = 0
+
     if int(week) > CURRENT_PLAYOFF_WEEK:
+        # future week, no options
         options = []
         selected_option_idx = 0
         disabled = True
     elif int(week) < CURRENT_PLAYOFF_WEEK or selected_player.is_locked():
+        # past week, can't change
         options = [selected_player]
         selected_option_idx = 0
         disabled = True
     else:
-        options = [x for x in options_list if not x.is_locked()]
+        options = non_locked_options
+        # set to index of current select.  This should exist, but try-except for safety
+        try:
+            selected_option_idx = non_locked_options.index(selected_player)
+        except ValueError:
+            selected_option_idx = 0
 
     selected_player_from_box = st.selectbox(
         pos_str,