From 4f7bfed0080daf5fa889d9b1edea56d7200ad5c6 Mon Sep 17 00:00:00 2001
From: Tarashish Mishra <sunu@sunu.in>
Date: Sat, 16 May 2026 21:30:40 +0530
Subject: [PATCH 1/2] pre-select saved user options on the spawn form

---
 kubespawner/spawner.py          |  4 +++-
 kubespawner/templates/form.html | 21 ++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/kubespawner/spawner.py b/kubespawner/spawner.py
index 8e0bb0d9f..98163f132 100644
--- a/kubespawner/spawner.py
+++ b/kubespawner/spawner.py
@@ -3487,7 +3487,9 @@ def _render_options_form(self, profile_list):
             profile_form_template = env.from_string(self.profile_form_template)
         else:
             profile_form_template = env.get_template("form.html")
-        return profile_form_template.render(profile_list=profile_list)
+        return profile_form_template.render(
+            profile_list=profile_list, user_options=self.user_options or {}
+        )
 
     async def _render_options_form_dynamically(self, current_spawner):
         """
diff --git a/kubespawner/templates/form.html b/kubespawner/templates/form.html
index 180e8752e..583c26aa2 100644
--- a/kubespawner/templates/form.html
+++ b/kubespawner/templates/form.html
@@ -9,7 +9,9 @@
                name="profile"
                id="profile-item-{{ profile.slug }}"
                value="{{ profile.slug }}"
-               {% if profile.default %}checked{% endif %} />
+               {% if user_options.profile == profile.slug %}checked
+               {% elif not user_options.profile and profile.default %}checked
+               {% endif %} />
       </div>
       <div>
         <h3>{{ profile.display_name }}</h3>
@@ -53,6 +55,7 @@ <h3>{{ profile.display_name }}</h3>
   {%- endfor %}
 </div>
 <script>
+  const userOptions = {{ user_options|tojson }};
   $('.js-profile-option-select, .js-profile-option-label').click(function() {
     // we need this bit of JS to select the profile when a <select> inside is clicked.
     $(this).parents('.js-profile-label')
@@ -89,6 +92,22 @@ <h3>{{ profile.display_name }}</h3>
   // wrapping in a document.ready to make clear this is executed once
   // on page load
   $(document).ready(() => {
+    // Pre-select options from previously saved user_options
+    const savedProfile = userOptions && userOptions.profile;
+    if (savedProfile) {
+      $(`label[for="profile-item-${savedProfile}"] .js-profile-option-select`).each(function() {
+        // name format: profile-option-{slug}--{optionKey}
+        const optionKey = $(this).attr('name').split('--').pop();
+        const unlistedValue = userOptions[optionKey + '--unlisted-choice'];
+        const savedValue = userOptions[optionKey];
+        if (unlistedValue) {
+          $(this).val('unlisted-choice');
+          $(this).parents('.js-options-container').find('.js-other-input').val(unlistedValue);
+        } else if (savedValue) {
+          $(this).val(savedValue);
+        }
+      });
+    }
     // trigger the `change` event on the select inputs,
     // so that if "Other" is selected on page load, the corresponding
     // free-text input shows

From 0312c34a981030e9f26f58b492fc8f6191dd3f7d Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 16 May 2026 16:12:04 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 kubespawner/templates/form.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kubespawner/templates/form.html b/kubespawner/templates/form.html
index 583c26aa2..e2b141782 100644
--- a/kubespawner/templates/form.html
+++ b/kubespawner/templates/form.html
@@ -9,9 +9,7 @@
                name="profile"
                id="profile-item-{{ profile.slug }}"
                value="{{ profile.slug }}"
-               {% if user_options.profile == profile.slug %}checked
-               {% elif not user_options.profile and profile.default %}checked
-               {% endif %} />
+               {% if user_options.profile == profile.slug %}checked {% elif not user_options.profile and profile.default %}checked {% endif %} />
       </div>
       <div>
         <h3>{{ profile.display_name }}</h3>