Merge pull request #346 from sensu/dan/fix-dropdowns

Update the Deprecate modal for the latest Select2 version
sensu · Mar 15, 2022 · 91a15fa · 91a15fa
2 parents d68519d + 0cd61ba
commit 91a15fa
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 24 deletions.
diff --git a/app/assets/javascripts/extensionDeprecate.js b/app/assets/javascripts/extensionDeprecate.js
@@ -1,35 +1,24 @@
-$(document).on('opened', '[data-reveal]', function () {
+$(document).ready(function() {
   var settings =  {
-    placeholder: 'Search for an asset',
+    placeholder: 'Search for replacement asset',
     minimumInputLength: 3,
     width: '100%',
     ajax: {
-      url: function () {
-        return $(this).data('url');
-      },
+      url: $('.extension-deprecate').data('url'),
       dataType: 'json',
-      quietMillis: 200,
-      data: function (term, page) {
-        return { q: term };
-      },
-      results: function (data, page) {
-        return { results: data.items };
-      },
-    },
-    id: function(object) {
-      return [object.extension_owner, object.extension_name];
-    },
-    formatSelection: function(object, container) {
-      return [object.extension_owner, object.extension_name].join('/');
-    },
-    formatResult: function(object, container) {
-      return [object.extension_owner, object.extension_name].join('/');
+      processResults: function (data, page) {
+        let results = data.items.map(o => {
+          let id_vals = [o.extension_owner, o.extension_name];
+          return {id: id_vals.join(','), text: id_vals.join('/')}
+        })
+        return { results: results };
+      }
     }
   }
 
   $('.extension-deprecate').select2(settings);
 
-  $('.extension-deprecate').on("select2-selecting", function(e) {
+  $('.extension-deprecate').on("select2:select", function(e) {
     $('.submit-deprecation').prop('disabled', false);
   });
 });
diff --git a/app/views/extensions/_manage_extension.html.erb b/app/views/extensions/_manage_extension.html.erb
@@ -78,14 +78,19 @@
     <div id="deprecate" class="reveal-modal small" data-reveal>
       <h1>Deprecate <%= t('nouns.extension').titleize %></h1>
 
-      <p>You can deprecate your <%= t('nouns.extension') %> if you are no longer maintaining it. You must select a replacement <%= t('nouns.extension') %> in order to deprecate your <%= t('nouns.extension') %>.</p>
+      <p>
+        You can deprecate this <%= t('nouns.extension') %>
+        if you are no longer maintaining it.
+        You must select a replacement <%= t('nouns.extension') %>
+        in order to deprecate this <%= t('nouns.extension') %>.
+      </p>
 
       <a class="close-reveal-modal">&#215;</a>
 
       <%= form_for extension, url: deprecate_extension_path(extension, username: extension.owner_name), method: :put do |f| %>
         <div class="row collapse">
           <div class="small-9 columns">
-            <%= f.hidden_field :replacement, class: 'extension-deprecate', 'data-url' => deprecate_search_extension_path(extension, username: extension.owner_name) %>
+            <%= f.select :replacement, [], {}, class: 'extension-deprecate', 'data-url' => deprecate_search_extension_path(extension, username: extension.owner_name) %>
           </div>
           <div class="small-3 columns">
             <%= f.submit 'Deprecate', class: 'button radius postfix submit-deprecation', disabled: true %>