Allow dropdown text for unlisted choice to be configurable

kubespawner/spawner.py

@@ -1543,6 +1543,7 @@ def _validate_image_pull_secrets(self, proposal):
             selected "Other" as a choice:
             - `enabled`: Boolean, whether the free form input should be enabled
             - `display_name`: String, label for input field
+            - `other_text`: Optional, text to show in Select Dropdown for Other option
             - `validation_regex`: Optional, regex that the free form input should match - eg. ^pangeo/.*$
             - `validation_message`: Optional, validation message for the regex. Should describe the required
                input format in a human-readable way.
@@ -1605,6 +1606,7 @@ def _validate_image_pull_secrets(self, proposal):
                             'unlisted_choice': {
                                 'enabled': True,
                                 'display_name': 'Other image',
+                                'display_name_in_choices': 'Enter image manually',
                                 'validation_regex': '^jupyter/.+:.+$',
                                 'validation_message': 'Must be an image matching ^jupyter/<name>:<tag>$',
                                 'kubespawner_override': {'image': '{value}'},
@@ -3242,7 +3244,13 @@ def _get_initialized_profile_list(self, profile_list: list):
                     # pre-defined choices were provided without a default choice
                     default_choice = list(option_config['choices'].keys())[0]
                     option_config['choices'][default_choice]["default"] = True
-
+                if option_config.get('unlisted_choice'):
+                    if not 'display_name_in_choices' in option_config.get(
+                        'unlisted_choice'
+                    ):
+                        option_config['unlisted_choice'][
+                            'display_name_in_choices'
+                        ] = "Other..."
         # ensure there is one default profile
         if not any(p.get("default") for p in profile_list):
             profile_list[0]["default"] = True

kubespawner/templates/form.html

@@ -27,7 +27,7 @@ <h3>{{ profile.display_name }}</h3>
                       <option value="{{ k }}" {% if choice.default %}selected{% endif %}>{{ choice.display_name }}</option>
                     {%- endfor %}
                     {%- if option['unlisted_choice'] and option['unlisted_choice']['enabled'] %}
-                      <option value="unlisted-choice">Other...</option>
+                      <option value="unlisted-choice">{{ option['unlisted_choice']['display_name_in_choices'] }}</option>
                     {%- endif %}
                   </select>
                 </div>

tests/test_profile.py

@@ -105,7 +105,10 @@
                         },
                         'only-unlisted': {
                             'display_name': 'Some option without any choices set',
-                            'unlisted_choice': {'enabled': True},
+                            'unlisted_choice': {
+                                'enabled': True,
+                                'display_name_in_choices': 'Other...',
+                            },
                         },
                         'explicit-defaults': {
                             'display_name': 'Some choice with a default set',