jupyter/spawner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First cluster is always selected when present

Browse source
This commit is contained in:
Benoît Seignovert 2024-02-20 15:36:40 +01:00
parent 11d878cecf
commit e3fda2c317
Signed by: Benoît Seignovert
GPG key ID: F5D8895227D18A0B
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/glicid_spawner/templates/views/slurm.jinja
View file

@ -17,7 +17,8 @@
<div class="col-sm-9 flex-container"> <div class="col-sm-9 flex-container">
{%- for cluster in sinfo.values() -%} {%- for cluster in sinfo.values() -%}
<div class="flex-item-2 slurm-cluster" data-cluster="{{cluster}}"> <div class="flex-item-2 slurm-cluster" data-cluster="{{cluster}}">
<input type="radio" name="cluster" id="cluster_{{cluster}}" value="{{cluster}}"> <input type="radio" name="cluster" id="cluster_{{cluster}}" value="{{cluster}}"
{% if loop.first %}checked{% endif %}>
<label for="cluster_{{cluster}}" class="btn btn-default btn-block"> <label for="cluster_{{cluster}}" class="btn btn-default btn-block">
{{ cluster | capitalize }} {{ cluster | capitalize }}
</label> </label>
@ -27,7 +28,7 @@
</div> </div>
{% endif %} {% endif %}
<div class="form-group partitions{% if 'N/A' not in sinfo %} hidden{% endif %}"> <div class="form-group partitions">
<label for="partition" class="col-sm-3 control-label">Partition:</label> <label for="partition" class="col-sm-3 control-label">Partition:</label>
<div class="col-sm-9 flex-container"> <div class="col-sm-9 flex-container">
{%- for cluster in sinfo.values() -%} {%- for cluster in sinfo.values() -%}
@ -125,9 +126,6 @@ not_enough_resources = function (err) {
toggle_config = function() { toggle_config = function() {
var config = get_config(); var config = get_config();
if (config['cluster'] !== undefined) {
$('.partitions').removeClass('hidden');
}
if (config['partition'] !== undefined) { if (config['partition'] !== undefined) {
$('.nodes').removeClass('hidden'); $('.nodes').removeClass('hidden');
} }
@ -140,6 +138,9 @@ toggle_config = function() {
_toggle(el, config['cpu'], config['mem'], config['gpu'], config['cluster'], config['partition']); _toggle(el, config['cpu'], config['mem'], config['gpu'], config['cluster'], config['partition']);
}) })
// Reload config
config = get_config();
if ($partitions.not('.hidden').length == 0) { if ($partitions.not('.hidden').length == 0) {
$('.partitions').addClass('hidden'); $('.partitions').addClass('hidden');
} else { } else {

11
tests/test_form.py
View file

@ -153,13 +153,18 @@ def test_options_form_slurm(mock_cluster):
assert '<div class="flex-item-2 slurm-cluster" data-cluster="nautilus">' in html assert '<div class="flex-item-2 slurm-cluster" data-cluster="nautilus">' in html
assert '<div class="flex-item-2 slurm-cluster" data-cluster="waves">' in html assert '<div class="flex-item-2 slurm-cluster" data-cluster="waves">' in html
assert '<input type="radio" name="cluster" id="cluster_nautilus" value="nautilus">' in html # The 1st cluster is always selected when present…
assert (
'<input type="radio" name="cluster" id="cluster_nautilus" value="nautilus" checked>' in html
)
assert ( assert (
'<label for="cluster_nautilus" class="btn btn-default btn-block"> Nautilus </label>' in html '<label for="cluster_nautilus" class="btn btn-default btn-block"> Nautilus </label>' in html
) )
# Partitions (hidden by default for multi-cluster) # … not the second one
assert '<div class="form-group partitions hidden">' in html assert '<input type="radio" name="cluster" id="cluster_waves" value="waves" >' in html
# Partitions
assert '<label for="partition" class="col-sm-3 control-label">Partition:</label>' in html assert '<label for="partition" class="col-sm-3 control-label">Partition:</label>' in html
assert ( assert (