headmin 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0d9ff0c21ed70d23b6f58a61c4853028cc2580cdd23e7df89cdfce51d6c547e
-  data.tar.gz: 2e0c0aeb8efc4294c2a01bd04c46949e97a9a9c7056e5d0caf99f75339ff02d7
+  metadata.gz: 4ec99ac85337bc096a16478a65e5434f37209281e861043a59f8cd4692197851
+  data.tar.gz: e3c9bf55658ce12c6d96ca0791ffa7e2dae14df3df9798e4ee21dc4b07b2f994
 SHA512:
-  metadata.gz: f0712678aa575c3e982ec2359b9f1bb949b968ca8785ea482db63319b3fa843413a0e5744b31c8c7e917aafbd7db676fe2270d4e2e0b6ce419e90e2c82d06d5b
-  data.tar.gz: a6965e77198490afc58e7825da2db8711a540159e6a0366c660f9c15c2f303fa19cfbef006540677efa6f8eb8bf9aee61bfde0d5a04c774d1393c5ac5cfda859
+  metadata.gz: c0eaf4ed9453bbc2cf383c82d050c708f7f8e7ba930c58fb9a0c2432ada5f4e928644b2d2e26ba331bd793bd4d58e5cca261f8e61ee091e987c90b62d6d096da
+  data.tar.gz: 249378b6c61d2d02b4349af48080fc9c53d8bba28fe41da0d7492c725502f2932384e3b9dfde718be1eca5f1cbc17c4d0ef884ec6dd21be804f0592be10bef7f

data/.gitignore

@@ -25,3 +25,9 @@
 # Ingore editors
 /.idea
 /headmin.iml
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+Gemfile.lock
+# .ruby-version
+# .ruby-gemset

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    headmin (0.5.9)
+    headmin (0.6.1)
       closure_tree (~> 7.4)
       inline_svg (~> 1.7)
       redcarpet (~> 3.5)
@@ -10,67 +10,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    actioncable (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailbox (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.4)
-      actionpack (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailer (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      actionview (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionpack (7.0.4.1)
+      actionview (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4)
-      actionpack (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actiontext (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+    actionview (7.0.4.1)
+      activesupport (= 7.0.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4)
-      activesupport (= 7.0.4)
+    activejob (7.0.4.1)
+      activesupport (= 7.0.4.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activestorage (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activesupport (= 7.0.4)
+    activemodel (7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activerecord (7.0.4.1)
+      activemodel (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activestorage (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.4)
+    activesupport (7.0.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -96,9 +96,10 @@ GEM
     closure_tree (7.4.0)
       activerecord (>= 4.2.10)
       with_advisory_lock (>= 4.0.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     crass (1.0.6)
-    debug (1.7.0)
+    date (3.3.3)
+    debug (1.7.1)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
     devise (4.8.1)
@@ -109,9 +110,9 @@ GEM
       warden (~> 1.2.3)
     enumerize (2.5.0)
       activesupport (>= 3.2)
-    erubi (1.11.0)
+    erubi (1.12.0)
     ffi (1.15.5)
-    globalid (1.0.0)
+    globalid (1.0.1)
       activesupport (>= 5.0)
     hotwire-rails (0.1.3)
       rails (>= 6.0.0)
@@ -128,8 +129,8 @@ GEM
     inline_svg (1.8.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-console (0.5.11)
-    irb (1.5.1)
+    io-console (0.6.0)
+    irb (1.6.2)
       reline (>= 0.3.0)
     json (2.6.3)
     kaminari (1.2.2)
@@ -145,10 +146,10 @@ GEM
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     language_server-protocol (3.17.0.2)
-    loofah (2.19.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.0)
+    mail (2.8.0.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -156,60 +157,61 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
-    minitest (5.16.3)
+    minitest (5.17.0)
     minitest-spec-rails (6.2.0)
       minitest (>= 5.0)
       railties (>= 4.1)
-    net-imap (0.3.1)
+    net-imap (0.3.4)
+      date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.0)
+    net-protocol (0.2.1)
       timeout
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.9-arm64-darwin)
+    nokogiri (1.14.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-darwin)
+    nokogiri (1.14.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-linux)
+    nokogiri (1.14.0-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    public_suffix (5.0.0)
+    public_suffix (5.0.1)
     puma (5.6.5)
       nio4r (~> 2.0)
-    racc (1.6.1)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.6.2)
     rack-test (2.0.2)
       rack (>= 1.3)
-    rails (7.0.4)
-      actioncable (= 7.0.4)
-      actionmailbox (= 7.0.4)
-      actionmailer (= 7.0.4)
-      actionpack (= 7.0.4)
-      actiontext (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activemodel (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails (7.0.4.1)
+      actioncable (= 7.0.4.1)
+      actionmailbox (= 7.0.4.1)
+      actionmailer (= 7.0.4.1)
+      actionpack (= 7.0.4.1)
+      actiontext (= 7.0.4.1)
+      actionview (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activemodel (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.4)
+      railties (= 7.0.4.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    railties (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -217,8 +219,8 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     redcarpet (3.5.1)
-    regexp_parser (2.6.1)
-    reline (0.3.1)
+    regexp_parser (2.6.2)
+    reline (0.3.2)
       io-console (~> 0.5)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -229,19 +231,19 @@ GEM
       actionpack (>= 5.2, < 7.1)
       activesupport (>= 5.2, < 7.1)
       addressable (~> 2.7)
-    rubocop (1.39.0)
+    rubocop (1.42.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.1)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
@@ -255,20 +257,20 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sprockets (4.1.1)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.5.4-arm64-darwin)
-    sqlite3 (1.5.4-x86_64-darwin)
-    sqlite3 (1.5.4-x86_64-linux)
-    standard (1.19.1)
+    sqlite3 (1.6.0-arm64-darwin)
+    sqlite3 (1.6.0-x86_64-darwin)
+    sqlite3 (1.6.0-x86_64-linux)
+    standard (1.22.1)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (= 1.39.0)
-      rubocop-performance (= 1.15.1)
+      rubocop (= 1.42.0)
+      rubocop-performance (= 1.15.2)
     stimulus-rails (1.2.1)
       railties (>= 6.0.0)
     thor (1.2.1)
@@ -280,7 +282,7 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     warden (1.2.9)
       rack (>= 2.0.9)
     websocket-driver (0.7.5)

data/README.md

@@ -128,8 +128,8 @@ $ bundle
 # Update the version number, push commits and tag the release
 $ gem bump -v {patch,minor,major,...} --push --tag
 
-# Release to Rubygems
-$ gem release
+# Release to Rubygems and create a Github release tag
+$ gem release --github
 ```
 
 Update the node package

data/app/assets/javascripts/headmin/controllers/filter_controller.js

@@ -15,8 +15,6 @@ export default class extends Controller {
   // This allows calling controller methods from the element in other controllers
   connect () {
     this.element.controller = this
-
-    this.updateHiddenValue()
   }
 
   toggle (event) {
@@ -89,7 +87,21 @@ export default class extends Controller {
     for (const row of this.rowTargets) {
       const conditional = row.previousElementSibling ? row.previousElementSibling.querySelector('[data-filter-target="conditional"]').value : null
       const operator = row.querySelector('[data-filter-target="operator"]').value
-      const value = row.querySelector('[data-filter-target="value"]').value
+      let values = Array.from(row.querySelectorAll('[data-filter-target="value"]'))
+
+      // Only the visible elements are of interest
+      values = values.filter((element) => {
+        return element.style.display;
+      })
+
+      // Grab the value of each visible element
+      values = values.map((element) => {
+        return element.value
+      })
+
+      // Concatenate array to a string
+      const value = values.join(",")
+
       string += `${conditional || ''}${operator}:${value}`
     }
 

data/app/assets/javascripts/headmin/controllers/filter_row_controller.js

@@ -1,50 +1,78 @@
-import { Controller } from '@hotwired/stimulus'
+import {Controller} from '@hotwired/stimulus'
 
 export default class extends Controller {
-  static get targets () {
-    return ['original', 'operator', 'null']
-  }
-
-  connect () {
-    this.operatorTarget.addEventListener('change', () => this.handleOperatorChange())
-    this.handleOperatorChange()
-  }
-
-  handleOperatorChange () {
-    if (this.operatorTarget.value === 'is_null' || this.operatorTarget.value === 'is_not_null') {
-      this.toggleNullInput()
-    } else {
-      this.toggleOriginalInput()
-    }
-  }
-
-  toggleNullInput () {
-    this.hideOriginal()
-    this.showNull()
-  }
-
-  toggleOriginalInput () {
-    this.showOriginal()
-    this.hideNull()
-  }
-
-  hideOriginal () {
-    this.originalTarget.style.display = 'none'
-    this.originalTarget.setAttribute('data-filter-target', 'value_original')
-  }
-
-  showOriginal () {
-    this.originalTarget.style.display = 'block'
-    this.originalTarget.setAttribute('data-filter-target', 'value')
-  }
-
-  hideNull () {
-    this.nullTarget.style.display = 'none'
-    this.nullTarget.setAttribute('data-filter-target', 'value_null')
-  }
-
-  showNull () {
-    this.nullTarget.style.display = 'block'
-    this.nullTarget.setAttribute('data-filter-target', 'value')
-  }
+    static get targets() {
+        return ['original', 'operator', 'null']
+    }
+
+    connect() {
+        this.operatorTarget.addEventListener('change', () => this.handleOperatorChange())
+        this.handleOperatorChange()
+    }
+
+    handleOperatorChange() {
+        if (this.operatorTarget.value === 'is_null' || this.operatorTarget.value === 'is_not_null') {
+            this.toggleNullInput()
+        } else if (this.operatorTarget.value === 'between' || this.operatorTarget.value === 'not_between') {
+            this.toggleSecondaryInput()
+        } else {
+            this.toggleOriginalInput()
+        }
+    }
+
+    toggleNullInput() {
+        this.hideOriginal()
+        this.hideSecondary()
+        this.showNull()
+    }
+
+    toggleOriginalInput() {
+        this.showOriginal()
+        this.hideSecondary()
+        this.hideNull()
+    }
+
+    toggleSecondaryInput() {
+        this.showSecondary()
+        this.hideOriginal()
+        this.hideNull()
+    }
+
+    hideOriginal() {
+        this.originalTarget.style.display = 'none'
+        this.originalTarget.setAttribute('data-filter-target', 'value_original')
+    }
+
+    showOriginal() {
+        this.originalTarget.style.display = 'block'
+        this.originalTarget.setAttribute('data-filter-target', 'value')
+    }
+
+    hideSecondary() {
+        for (const [index, value] of this.originalTargets.entries()) {
+            if (index != 0) {
+                value.style.display = 'none'
+                value.setAttribute('data-filter-target', 'value_original')
+            }
+        }
+    }
+
+    showSecondary() {
+        for (const [index, value] of this.originalTargets.entries()) {
+            if (index != 0) {
+                value.style.display = 'block'
+                value.setAttribute('data-filter-target', 'value')
+            }
+        }
+    }
+
+    hideNull() {
+        this.nullTarget.style.display = 'none'
+        this.nullTarget.setAttribute('data-filter-target', 'value_null')
+    }
+
+    showNull() {
+        this.nullTarget.style.display = 'block'
+        this.nullTarget.setAttribute('data-filter-target', 'value')
+    }
 }

data/app/assets/javascripts/headmin/controllers/infinite_scroller_controller.js

@@ -0,0 +1,30 @@
+/* global fetch, Event */
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  connect() {
+    this.clickWhenInViewport()
+
+    document.querySelector(".modal-body").addEventListener("scroll", () => {
+      this.clickWhenInViewport()
+    })
+  }
+
+  clickWhenInViewport() {
+    if (!this.isLoading() && this.isInViewport()) {
+      this.element.setAttribute("clicked", 1)
+      this.element.click()
+    }
+  }
+
+  isLoading() {
+    return this.element.hasAttribute("clicked")
+  }
+
+  isInViewport() {
+    const rect = this.element.getBoundingClientRect()
+
+    return rect.top >= 0 && rect.left >= 0 && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && rect.right <= (window.innerWidth || document.documentElement.clientWidth);
+  }
+
+}

data/app/assets/javascripts/headmin/controllers/media_controller.js

@@ -66,10 +66,10 @@ export default class extends Controller {
 
   selectItems (items) {
     // Destroy all deselected items
-    this.removeAllItems()
+    this.removeAllDeselectedItems(items)
 
-    // Add all selected items
-    this.addItems(items)
+    // Add all new selected items
+    this.addNewItems(items)
 
     this.postProcess()
   }
@@ -129,8 +129,16 @@ export default class extends Controller {
     })
   }
 
-  addItems (items) {
-    items.forEach((item) => this.addItem(item))
+  addNewItems (items) {
+    const itemTargetIds = this.itemTargets.map((i) => { return parseInt(i.querySelectorAll("input")[1].value)})
+    items.forEach((item) => {
+      if (itemTargetIds.includes(item.blobId)) {
+        // Do not add this item (as it is already present)
+        return
+      }
+
+      this.addItem(item)
+    })
   }
 
   addItem (item) {
@@ -192,12 +200,20 @@ export default class extends Controller {
     return template.innerHTML.replace(regex, randomNumber)
   }
 
-  removeAllItems () {
-    this.removeItems(this.itemTargets)
+  removeAllDeselectedItems (items) {
+    this.removeDeselectedItems(items, this.itemTargets)
   }
 
-  removeItems (items) {
+  removeDeselectedItems (elements, items) {
+    const returnedBlobIds = elements.map((e) => { return e.blobId})
+
     items.forEach((item) => {
+      const blobId = parseInt(item.querySelectorAll("input")[1].value)
+      if (returnedBlobIds.includes(blobId)) {
+        // Do not delete this one
+        return;
+      }
+
       this.removeItem(item)
     })
   }