cm-admin 4.1.0 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19fd7ec610f3f8b02370549dfac1e314ece5c44f57466727666058c83f4f5905
-  data.tar.gz: fe9a9c73585456a365364b1e44305e229a242a19bf832da849117bc1fb3f47a6
+  metadata.gz: '08cb28438df1f6c84b31f95bf13779e18a2900e4973fcd7591744284ba791b93'
+  data.tar.gz: 68ecf1bb6702de4a04486dd65213dd997828be32506cf9479322baf853c79fa0
 SHA512:
-  metadata.gz: 8fef781ecc5b1bfc28f04fdc4bbdea3c6463cddb39aa4cddddfcb84d359af8528ce77c8f33eb98a505e95214c468883c89185f61cb7b320b614c91813f1bef10
-  data.tar.gz: '068f711e3e85d6019af1d40256c1bff7a11fd69016e11be5285e48598d13dd652d1ae7447cae179279063f2f7edd1f85398f4a140a83bf41bc494c4332d1318c'
+  metadata.gz: a5fbf72b4cbef166f981864eba01a34477f72b53171b6745efdf360dacf8b5f3f5e19a4b0d57b31f5eb27d9c821bbcbc5dc750a47468528b293792d8ea435e43
+  data.tar.gz: cc020e41b2cd42e924bb4d2fb9410d30aab5fbcb95baf4366c48ae0ab0e64781584a901e1b83d578a4f726a8e03b7681763be8ebd5d26815d903f9d5782fe8a0

data/.github/workflows/test.yml

@@ -0,0 +1,46 @@
+name: Tests
+
+on: [push]
+
+jobs:
+  test:
+    if: "!contains(github.event.head_commit.message, '[skip-tests]')"
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:17
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3
+          bundler-cache: true
+
+      - name: Install dependencies
+        working-directory: feature-app
+        run: bundle install
+
+      - name: Set up database
+        working-directory: feature-app
+        run: |
+          cp config/database.yml.ci config/database.yml
+          RAILS_ENV=test bundle exec rails db:create
+          RAILS_ENV=test bundle exec rails db:migrate
+
+      - name: Precompile assets
+        working-directory: feature-app
+        run: RAILS_ENV=test bundle exec rails assets:precompile
+
+      - name: Run RSpec tests
+        working-directory: feature-app
+        run: bundle exec rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (4.1.0)
+    cm-admin (4.1.2)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)

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

@@ -58,4 +58,9 @@ $(document).on("click", '[data-behaviour="discard_form"]', function (e) {
   const form = $(this).closest("form");
   form[0].reset();
   window.history.back();
+});
+
+$(document).on("turbo:submit-end", function(e){
+  $('[data-behaviour="form_submit_spinner"]').addClass("visually-hidden");
+  return $('[data-behaviour="form_submit"]').removeClass("visually-hidden");
 });

data/app/assets/stylesheets/cm_admin/base/table.scss

@@ -4,6 +4,9 @@
 
   &.associated-index {
     background-color: transparent;
+    .table-wrapper {
+      height: calc(100vh - 290px);
+    }
   }
 
   .sticky-container {
@@ -38,7 +41,7 @@
   .table-wrapper {
     min-width: 720px;
     max-width: fit-content;
-    max-height: calc(100vh - 240px);
+    height: calc(100vh - 215px);
     overflow: auto;
     .index-table {
       @extend .table, .table-hover;
@@ -301,11 +304,11 @@
     max-width: 48px;
   }
   [data-action-title-pad="2"] {
-   padding-left: 53px !important;
+    padding-left: 53px !important;
   }
   [data-action-title-pad="3"] {
     padding-left: 101px !important;
-   }
+  }
   th,
   td {
     min-width: 120px;

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

@@ -57,8 +57,6 @@
 
           - if @associated_model
             == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @associated_model, ar_object: ar_object }
-
   .pagination-bar
-    p.count-text.m-0 Showing #{@associated_ar_object.pagy.from} to #{@associated_ar_object.pagy.to} out of #{@associated_ar_object.pagy.count}
+    p.count-text.m-0 Showing #{number_with_delimiter(@associated_ar_object.pagy.from.to_i)} to #{number_with_delimiter(@associated_ar_object.pagy.to.to_i)} out of #{number_with_delimiter(@associated_ar_object.pagy.count.to_i)}
     == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @associated_ar_object.pagy }
-/ = render partial: 'cm_admin/main/member_custom_action_modal', locals: { cm_model: @associated_model, ar_collection: @associated_ar_object }

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

@@ -9,10 +9,10 @@ nav.pagination-actions role="navigation" aria-label="pager"
 
   - pagy.series.each do |item|        # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
     - if item.is_a?(Integer)          # page link
-      span ==> link.call(item, item, 'class="btn-ghost"')
+      span ==> link.call(item, number_with_delimiter(item.to_i), 'class="btn-ghost"')
 
     - elsif item.is_a?(String)        # current page
-      span ==> link.call(item, item, 'class="btn-ghost active"')
+      span ==> link.call(item, number_with_delimiter(item.to_i), 'class="btn-ghost active"')
 
     - elsif item == :gap              # page gap
       span.page.gap ==> pagy_t('pagy.nav.gap')

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

@@ -50,7 +50,7 @@
           - if @model
             == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @model, ar_object: ar_object }
   .pagination-bar
-    p.count-text.m-0 Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}
+    p.count-text.m-0 Showing #{number_with_delimiter(@ar_object.pagy.from.to_i)} to #{number_with_delimiter(@ar_object.pagy.to.to_i)} out of #{number_with_delimiter(@ar_object.pagy.count.to_i)}
     == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @ar_object.pagy }
 
 = column_pop_up(@model)

data/app/views/cm_admin/roles/permissions.html.slim

@@ -35,5 +35,8 @@
                                 .cm-select-tag class="#{permission.present? ? '' : 'hidden'}"
                                   = select_tag(:policy_scope_name, options_for_select(model.policy_scopes.map{|policy_hash| [policy_hash[:display_name], policy_hash[:scope_name]]}, permission&.scope_name), {name: "role_permission[#{model.name}][#{action.name}][scope_name]", class: 'select-2', id: "policy-scope-#{model.name}-#{action.name}"})
           .form-submit-button-container
-            = f.submit 'Save Changes', class: "btn-cta"
-            = link_to 'Discard', cm_admin.send('cm_index_cm_role_path'), class: "btn-secondary ml-10"
+            = f.submit 'Save Changes', class: 'btn-cta', data: { behaviour: 'form_submit', form_class: "new_cm_permission", turbo_submits_with: 'Submitting...' }
+            = button_tag(type: 'button', class: 'btn-loading visually-hidden', data: { behaviour: 'form_submit_spinner' }) do
+              = content_tag(:span, '', class: 'spinner-border spinner-border-sm', role: 'status')
+              |  Submitting...
+            = link_to 'Discard', cm_admin.send('cm_index_cm_role_path'), class: "btn-secondary ml-10"

data/cm_admin.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|feature-app)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '4.1.0'
+  VERSION = '4.1.2'
 end

data/lib/cm_admin/view_helpers.rb

@@ -13,6 +13,7 @@ module CmAdmin
     # Included Rails view helper
     include ActionView::Helpers::FormTagHelper
     include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::NumberHelper
 
     def exportable(_klass, html_class: [])
       tag.a 'Export as excel', class: html_class.append('filter-btn modal-btn me-2'), data: { toggle: 'modal', target: '#exportmodal' } do
@@ -80,7 +81,7 @@ module CmAdmin
 
     def humanized_ar_collection_count(count, model_name)
       table_name = count == 1 ? model_name.singularize : model_name.pluralize
-      "#{count} #{table_name.humanize.downcase} found"
+      "#{number_with_delimiter(count.to_i)} #{table_name.humanize.downcase} found"
     end
 
     def toast_message(message, toast_type)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.2
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2024-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -165,6 +165,7 @@ files:
 - ".github/workflows/deploy-yard-docs.yml"
 - ".github/workflows/linters.yml"
 - ".github/workflows/release-gem.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop-https---raw-githubusercontent-com-commutatus-cm-linters-main-rubocop-yml"