fix: fix showing rig options when form error (#679)

RIGS/templates/event_form.html

@@ -36,7 +36,7 @@
                 // If there were errors, apply the previous Rig/not-Rig selection
                 {% if form.errors %}
                     all('.form-hws').forEach(function (el) { slideDown(el, 0); });
-                    if (document.getElementById('{{form.is_rig.auto_id}}').getAttribute('checked') !== 'checked') {
+                    if (document.getElementById('{{form.is_rig.auto_id}}').checked === false) {
                         all('.form-is_rig').forEach(function (el) { el.style.display = 'none'; });
                     }
                 {% else %}

pipeline/source_assets/js/autocompleter.js

@@ -50,7 +50,8 @@ function initPicker(select) {
     var noClear = 'noclear' in select.dataset;
     var multiple = select.multiple;
     var url = select.dataset.sourceurl;
-    var plugins = [];
+    // input_autogrow keeps the search box on the same line as the selected value (otherwise it wraps and doubles the height)
+    var plugins = ['input_autogrow'];
     if (multiple) {
         plugins.push('remove_button');
     } else if (!noClear) {
@@ -70,18 +71,28 @@ function initPicker(select) {
     };
 
     if (url) {
+        // The server does the searching. Tom Select keeps every option it has ever loaded, so remember which
+        // ones the server returned for each query and only show those (otherwise results for "a" and "al"
+        // linger in the dropdown when searching for "ali hassan").
+        var results = {};
+        var normalise = function (query) { return query.trim().toLowerCase(); };
+
         Object.assign(settings, {
-            // Results come from the server so don't filter them locally
-            score: function () { return function () { return 1; }; },
+            score: function (query) {
+                var ids = results[normalise(query)];
+                return function (option) { return ids && ids.has(String(option.value)) ? 1 : 0; };
+            },
             shouldLoad: function (query) { return query.length > 0; },
             load: function (query, callback) {
                 var separator = url.indexOf('?') === -1 ? '?' : '&';
                 fetch(url + separator + 'q=' + encodeURIComponent(query), {credentials: 'same-origin'})
                     .then(function (response) { return response.json(); })
                     .then(function (data) {
-                        callback(data.map(function (item) {
+                        var options = data.map(function (item) {
                             return {value: item.pk, text: item.text, update_url: item.update};
-                        }));
+                        });
+                        results[normalise(query)] = new Set(options.map(function (option) { return String(option.value); }));
+                        callback(options);
                     })
                     .catch(function () { callback(); });
             }
@@ -94,6 +105,14 @@ function initPicker(select) {
     });
 
     var ts = new TomSelect(select, settings);
+    if (url) {
+        // Emptying the search box shouldn't list everything loaded so far (selected options are kept)
+        ts.on('type', function (query) {
+            if (query === '') {
+                ts.clearOptions();
+            }
+        });
+    }
     Object.keys(update_urls).forEach(function (value) {
         if (ts.options[value]) {
             ts.options[value].update_url = update_urls[value];