administrate-field-lazy_belongs_to 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 914aa06eaeeaa696731e20ca3e5a4229a9c3e1f0c0ad599f45f4006f51e0a93e
-  data.tar.gz: 4709458195e1871abee62ed08cb1b9407a258c4f8590f919cdf1739cb4134436
+  metadata.gz: 697cb0a185adc3a2c73fa841b27d3098731e88458e547b2cb97e9c0c25269687
+  data.tar.gz: f5002c9dddc93db61943c89f87b0c268cf70faf96f14d2a9719f6a63c5df2cef
 SHA512:
-  metadata.gz: 157dc3eb4ca811309110cd4ff17a20f1558fd86246b9e3a42bab40c2e0d9811471b25ce14bcb25bf2c667f37517d8176fb14f969042cc56110d3cfc128e6d912
-  data.tar.gz: 825faf8f1adddfa6083274a8c7304b78b0936d6788cb624e05f781bd853240c7703d7afcd52db631e7c826124e376c984732cd6ff5306e5978c96eaeb01e28dd
+  metadata.gz: cd2bd5a9b03e47ba74983ef4f5d21c88b4bd3ee2781472b32f9c5e6532438c856594af556c8ba6f431cda2a57bbf95aec3a6aebace26e8c48aff37c152a25b83
+  data.tar.gz: 5ee96484f520e9de3090490040c74da16c6cbccbb81917c07b3ffe42dd260a9d7aed67c945dacd75bebf43b52a4e0da6f622a923cfbe4e67d17bb90de883e7d2

data/.idea/administrate-field-lazy_belongs_to.iml

@@ -47,7 +47,7 @@
     <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.10.1, ruby-2.5.3-p105) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rack (v2.0.6, ruby-2.5.3-p105) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rack-test (v1.1.0, ruby-2.5.3-p105) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails (v5.2.2.1, ruby-2.5.3-p105) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rails (v5.2.3, ruby-2.5.3-p105) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, ruby-2.5.3-p105) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.0.4, ruby-2.5.3-p105) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="railties (v5.2.2.1, ruby-2.5.3-p105) [gem]" level="application" />

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.2.0
+
+- Allow selecting the only option
+- Allow selecting the currently selected option
+- Change class names for styling (remove clashing `.search`)
+
 ## 0.1.4
 
 - Fix an issue when `Turbolinks` is not defined

data/README.md

@@ -27,7 +27,10 @@ Or install it yourself as:
 ## Usage
 
 This field needs a bit of setup, unless you're using [XPBytes/administrate-base_controller](https://github.com/XPBytes/administrate-base_controller),
-in order to lazily collect the values you're looking for:
+in order to lazily collect the values you're looking for. If you _are_ using the `BaseController`, you only need to 
+set-up the [fields](#fields).
+
+### Controller
 
 You need to have a route that yields an array of objects with at least the value and label you want to show. The best
 way is to re-use everything administrate offers you, which is the default behaviour of `Administrate::BaseController`:
@@ -54,6 +57,15 @@ end
 This way, your already existing route also is available in JSON. You may optimize this by only use the id and value
 field: `resources.to_json(fields: %i[id name])`.
 
+You could also use the dashboard display:
+```ruby
+render json: resources.map do |resource| 
+  { id: resource.id, name: dashboard.display_resource(resource) }
+end
+```
+
+### Fields
+
 The rest of the setup is as easy as any other field, except that you need to tell the field where to query the results,
 which key it should use for the value (defaults to `id`) and the label (defaults to `name`).
 

data/app/assets/javascripts/administrate-field-lazy_belongs_to/components/lazy_belongs_to.js

@@ -63,6 +63,11 @@ function bindLazyBelongsTos() {
             })
 
             select.setAttribute('size', "" + Math.max(2, Math.min(Number(select.getAttribute('data-max-size')), rs.length)))
+
+            // Deselect if there was nothing selected
+            if (!currentValue) {
+              select.selectedIndex = -1
+            }
           })
           .catch(error => {
             if (error.name === 'AbortError') {
@@ -91,14 +96,33 @@ function bindLazyBelongsTos() {
       }
     })
 
+    function pickValue(value, label) {
+      target.value = value
+      button.textContent = label
+      hidePopout()
+    }
+
+    select.addEventListener('click', (e) => {
+      if (e.target.value && e.target.value === e.currentTarget.value) {
+        pickValue(
+          e.target.value,
+          e.target.textContent
+        )
+
+        e.stopImmediatePropagation()
+        return
+      }
+    })
+
     select.addEventListener('change', (e) => {
       if (!e.currentTarget.value) {
         return
       }
 
-      target.value = e.currentTarget.value
-      button.textContent = e.currentTarget.selectedOptions[0].textContent
-      hidePopout()
+      pickValue(
+        e.currentTarget.value,
+        e.currentTarget.selectedOptions[0].textContent
+      )
     })
 
     button.removeAttribute('disabled')

data/app/assets/stylesheets/administrate-field-lazy_belongs_to/components/lazy_belongs_to.css

@@ -1,18 +1,18 @@
-.field-unit--lazy-belongs-to .popout {
+.field-unit--lazy-belongs-to .lazy_belongs_to__popout {
     display: none;
     background-color: white;
-    box-shadow: rgba(13, 22, 38, 0.1) 0px 0px 0px 1px, rgba(13, 22, 38, 0.1) 0px 4px 11px;
+    box-shadow: rgba(13, 22, 38, 0.1) 0 0 0 1px, rgba(13, 22, 38, 0.1) 0 4px 11px;
     margin-top: 8px;
     position: absolute;
     z-index: 2;
     border-radius: 4px;
 }
 
-.field-unit--lazy-belongs-to .popout.active {
+.field-unit--lazy-belongs-to .lazy_belongs_to__popout.active {
     display: block;
 }
 
-.field-unit--lazy-belongs-to .search {
+.field-unit--lazy-belongs-to .lazy_belongs_to__popout_search {
     height: 100%;
     width: auto;
     line-height: 38px;

data/app/views/fields/lazy_belongs_to/_form.html.erb

@@ -31,17 +31,17 @@ Instead of the default, this only loads the results lazily
 >
   <%= f.hidden_field(field.permitted_attribute) %>
 
-  <button type="button" disabled="disabled" class="button"><%= field.current_value %></button>
+  <button type="button" disabled="disabled" class="button lazy_belongs_to__button"><%= field.current_value %></button>
 
-  <div class="popout" data-target="popout">
-    <input type="search" class="search" placeholder="Search...">
+  <div class="popout lazy_belongs_to__popout" data-target="popout">
+    <input type="search" class="lazy_belongs_to__popout_search" placeholder="Search..." aria-label="Search input">
     <i class="icon">
       <svg width="18" height="18" viewBox="0 0 24 24" focusable="false" role="presentation">
         <path d="M16.436 15.085l3.94 4.01a1 1 0 0 1-1.425 1.402l-3.938-4.006a7.5 7.5 0 1 1 1.423-1.406zM10.5 16a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11z" fill="currentColor" fill-rule="evenodd"></path>
       </svg>
     </i>
     <output class="results" data-target="output">
-      <select data-max-size="<%= field.size %>">
+      <select data-max-size="<%= field.size %>" aria-label="Select a result">
         <option></option>
       </select>
     </output>

data/lib/administrate/field/lazy_belongs_to/version.rb

@@ -1,7 +1,7 @@
 module Administrate
   module Field
     module LazyBelongsToVersion
-      VERSION = '0.1.4'.freeze
+      VERSION = '0.2.0'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-lazy_belongs_to
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -140,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A belongs to-like field that lazily loads candidates from a custom endpoint.