cm-admin 4.4.6 → 4.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b4a98af23560b5a7dcd5e05df922d4ea1dcf3d3eaf1a4d9dda5186f7c75458
-  data.tar.gz: 22cec496c00f00ddaab1f4ba8bf42d0a30d7d11c892e81d2b5eb1e97103d1e4c
+  metadata.gz: 2f200f0b81773d02d7dd472b90c0dcdc124cd3797e7a09b06cef05b42b597132
+  data.tar.gz: 31ebaa25c7016f262697e52f76bc695db07595286d8ac088175390d09eea1ffe
 SHA512:
-  metadata.gz: 0a06402c208970fdcb9b4a5477cc42f8dca00904e006bd06f8a7fcb283e61fbd90a30f64c48cde6445bb983d03445ff401a97c7bd4b60fe8f3213be6c417fe74
-  data.tar.gz: d8dab6bffd90f7f22d86669c1f3f1bbfc12516b6c9008e5fad7dc93bc6d6a0b4326edc27a7159575b2f3144a64a2f6a32e8dde5c42524254abbe9e906f24baa8
+  metadata.gz: a655ebbf63906cd67dd83f3e2a68eaff22c1d215a4e6b0eb1ea7e05b471ccb24907a65552236ca893161fa64979cb03c825d4b922637de73124fb601174df8d3
+  data.tar.gz: 9ebfab98bc9321b20141765412dbb229e6c994195a3f82de0c1420c423bea0fe6790aaaaf57147a92a9c850713e051f471e49f35e9d64f5e1d31a470fab6268a

data/.github/workflows/test.yml

@@ -7,6 +7,10 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[skip-tests]')"
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        rails-version: ["7.1", "7.2", "8.0"]
+
     services:
       postgres:
         image: postgres:17
@@ -28,10 +32,16 @@ jobs:
 
       - name: Install dependencies
         working-directory: feature-app
-        run: bundle install
+        env:
+          RAILS_TEST_VERSION: ${{ matrix.rails-version }}
+        run: |
+          bundle install
+          bundle exec appraisal install
 
       - name: Set up database
         working-directory: feature-app
+        env:
+          RAILS_TEST_VERSION: ${{ matrix.rails-version }}
         run: |
           cp config/database.yml.ci config/database.yml
           RAILS_ENV=test bundle exec rails db:create
@@ -39,8 +49,12 @@ jobs:
 
       - name: Precompile assets
         working-directory: feature-app
+        env:
+          RAILS_TEST_VERSION: ${{ matrix.rails-version }}
         run: RAILS_ENV=test bundle exec rails assets:precompile
 
       - name: Run RSpec tests
         working-directory: feature-app
-        run: bundle exec rspec
+        env:
+          RAILS_TEST_VERSION: ${{ matrix.rails-version }}
+        run: bundle exec appraisal rails-${{ matrix.rails-version }} rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (4.4.6)
+    cm-admin (4.4.8)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv (>= 3.3.0)

data/app/assets/javascripts/cm_admin/application.js

@@ -1,6 +1,7 @@
 import "./scaffolds.js";
 import "./shared_scaffolds.js";
 
+import "./kanban.js";
 import "./bulk_actions.js";
 import "./cocoon.js";
 import "./exports.js";
@@ -8,5 +9,4 @@ import "./filters.js";
 import "./form_validation.js";
 import "./quick_search.js";
 import "./custom.js";
-import "./kanban.js";
 import "./custom_action";

data/app/assets/javascripts/cm_admin/kanban.js

@@ -1,30 +1,32 @@
-$(document).on('click', '.kanban-show-more', function(e) {
-  e.preventDefault();
-  var page = $(this).data('page') + 1
-  var query_string = window.location.search
-  $.ajax('/admin/batch_order_items' + query_string, {
-    type: "GET",
-    data: {
-      page: page,
-      per_page: $(this).data('per-page'),
-      view_type: 'kanban'
-    },
-    success: function (data) {
-      apply_response_to_board(data.table.data);
-      $('.kanban-show-more').data('page', page)
-      if (data.table.paging.next_page == false) {
-        $('.kanban-show-more').addClass('disabled')
-      }
-      $('.kanban-show-more').data('page', page)
-    },
-    error: function (jqxhr, textStatus, errorThrown) {
-      alert("Something went wrong. Please try again later.\n" + errorThrown);
-    },
-  });
-})
+$(document).on("turbo:load", function() {
+  $(document).on('click', "[data-action='kanban-show-more']", function(e) {
+    e.preventDefault();
+    var page = $(this).data('page') + 1
+    var query_string = window.location.search
+    $.ajax('/admin/batch_order_items' + query_string, {
+      type: "GET",
+      data: {
+        page: page,
+        per_page: $(this).data('per-page'),
+        view_type: 'kanban'
+      },
+      success: function (data) {
+        apply_response_to_board(data.table.data);
+        $("[data-action='kanban-show-more']").data('page', page)
+        if (data.table.paging.next_page == false) {
+          $("[data-action='kanban-show-more']").addClass('disabled')
+        }
+        $("[data-action='kanban-show-more']").data('page', page)
+      },
+      error: function (jqxhr, textStatus, errorThrown) {
+        alert("Something went wrong. Please try again later.\n" + errorThrown);
+      },
+    });
+  })
 
-function apply_response_to_board(json_data) {
-  $.each(json_data, function(key, value) {
-    $('.' + key + ' .cards').append(value)
-  });
-}
+  function apply_response_to_board(json_data) {
+    $.each(json_data, function(key, value) {
+      $('.' + key + " [data-section='kanban-cards']").append(value)
+    });
+  }
+});

data/app/assets/javascripts/cm_admin/shared_scaffolds.js

@@ -72,6 +72,11 @@ $(document).on("click", '[data-behaviour="offcanvas"]', function (e) {
   });
 });
 
+// Select2 focus on open
+$(document).on("select2:open", () => {
+  document.querySelector(".select2-search__field").focus();
+});
+
 $(document).on("click", '[data-bs-dismiss="offcanvas"]', function (e) {
   $(document).off("submit", "[data-is-drawer-form='true']");
 });

data/app/controllers/cm_admin/resource_controller.rb

@@ -386,7 +386,7 @@ module CmAdmin
       group_record_count = final_data.group(params[:kanban_column_name] || @current_action.kanban_attr[:column_name]).count
       per_page = params[:per_page] || 20
       page = params[:page] || 1
-      max_page = (group_record_count.values.max.to_i / per_page.to_f).ceil
+      max_page = (group_record_count.reject { |k, _v| k.nil? }.values.max.to_i / per_page.to_f).ceil
       filtered_result.paging['next_page'] = (page.to_i < max_page)
       filtered_result.column_count = group_record_count.reject { |key, _value| key.blank? }
 

data/app/views/cm_admin/main/_kanban.html.slim

@@ -6,11 +6,11 @@
       .kanban-list__header
           p = column_name.to_s.titleize
           p.counter = @ar_object.column_count[column_name].to_i
-      .cards 
+      .cards data-section='kanban-cards'
         = @ar_object.data[column_name]
                 
 .pagination-bar.kanban-pagination
-  .btn.btn-primary.kanban-show-more data-page=1 Show more
+  .btn.btn-primary.kanban-show-more data-action='kanban-show-more' data-page=1 Show more
 / = render partial: 'cm_admin/main/show_as_drawer'
 
 = export_modal(@model)

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '4.4.6'
+  VERSION = '4.4.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 4.4.6
+  version: 4.4.8
 platform: ruby
 authors:
 - Michael
@@ -13,7 +13,7 @@ authors:
 - Austin
 bindir: exe
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails