activeadmin-rails 1.7.2 → 1.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (99) hide show
  1. checksums.yaml +4 -4
  2. data/.babelrc +5 -0
  3. data/.github/workflows/ci.yaml +3 -18
  4. data/.github/workflows/daily.yaml +6 -18
  5. data/.github/workflows/pages.yml +1 -1
  6. data/.gitignore +2 -0
  7. data/CHANGELOG.md +25 -3
  8. data/CONTRIBUTING.md +1 -1
  9. data/Gemfile +2 -1
  10. data/Rakefile +1 -0
  11. data/activeadmin-rails.gemspec +2 -5
  12. data/app/assets/javascripts/active_admin/base.js +507 -0
  13. data/app/assets/stylesheets/active_admin/_base.scss +4 -1
  14. data/app/assets/stylesheets/active_admin/_forms.scss +11 -10
  15. data/app/assets/stylesheets/active_admin/_header.scss +22 -19
  16. data/app/assets/stylesheets/active_admin/_index.scss +7 -0
  17. data/app/assets/stylesheets/active_admin/components/_batch_actions.scss +2 -4
  18. data/app/assets/stylesheets/active_admin/components/_blank_slates.scss +1 -1
  19. data/app/assets/stylesheets/active_admin/components/_comments.scss +8 -6
  20. data/app/assets/stylesheets/active_admin/components/_date_picker.scss +4 -4
  21. data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss +20 -15
  22. data/app/assets/stylesheets/active_admin/components/_flash_messages.scss +3 -3
  23. data/app/assets/stylesheets/active_admin/components/_pagination.scss +21 -14
  24. data/app/assets/stylesheets/active_admin/components/_status_tags.scss +3 -1
  25. data/app/assets/stylesheets/active_admin/components/_table_tools.scss +13 -13
  26. data/app/assets/stylesheets/active_admin/components/_tables.scss +8 -7
  27. data/app/assets/stylesheets/active_admin/components/_tabs.scss +10 -7
  28. data/app/assets/stylesheets/active_admin/mixins/_all.scss +0 -4
  29. data/app/assets/stylesheets/active_admin/mixins/_buttons.scss +22 -15
  30. data/app/assets/stylesheets/active_admin/mixins/_gradients.scss +7 -5
  31. data/app/assets/stylesheets/active_admin/mixins/_sections.scss +4 -4
  32. data/app/assets/stylesheets/active_admin/mixins/_variables.scss +14 -3
  33. data/app/assets/stylesheets/active_admin/pages/_logged_out.scss +10 -6
  34. data/app/assets/stylesheets/active_admin/structure/_footer.scss +8 -1
  35. data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +19 -8
  36. data/app/javascript/active_admin/base.js +28 -0
  37. data/app/{assets/javascripts/active_admin/lib/batch_actions.es6 → javascript/active_admin/initializers/batch-actions.js} +5 -3
  38. data/app/javascript/active_admin/initializers/checkbox-toggler.js +3 -0
  39. data/app/javascript/active_admin/initializers/dropdown-menu.js +9 -0
  40. data/app/javascript/active_admin/initializers/filters.js +10 -0
  41. data/app/{assets/javascripts/active_admin/lib/has_many.es6 → javascript/active_admin/initializers/has-many.js} +7 -1
  42. data/app/javascript/active_admin/initializers/per-page.js +13 -0
  43. data/app/javascript/active_admin/initializers/table-checkbox-toggler.js +3 -0
  44. data/app/{assets/javascripts/active_admin/lib/checkbox-toggler.es6 → javascript/active_admin/lib/checkbox-toggler.js} +2 -2
  45. data/app/{assets/javascripts/active_admin/lib/dropdown-menu.es6 → javascript/active_admin/lib/dropdown-menu.js} +2 -9
  46. data/app/javascript/active_admin/lib/filters.js +39 -0
  47. data/app/{assets/javascripts/active_admin/lib/modal_dialog.es6 → javascript/active_admin/lib/modal-dialog.js} +5 -3
  48. data/app/javascript/active_admin/lib/per-page.js +38 -0
  49. data/app/{assets/javascripts/active_admin/lib/table-checkbox-toggler.es6 → javascript/active_admin/lib/table-checkbox-toggler.js} +4 -2
  50. data/app/javascript/active_admin/lib/utils.js +40 -0
  51. data/cucumber.yml +2 -2
  52. data/docs/9-batch-actions.md +2 -2
  53. data/features/index/format_as_csv.feature +7 -7
  54. data/features/index/index_as_table.feature +6 -6
  55. data/gemfiles/rails_71.gemfile +2 -1
  56. data/gemfiles/rails_72.gemfile +2 -1
  57. data/gemfiles/rails_80.gemfile +2 -1
  58. data/gemfiles/rails_81.gemfile +18 -0
  59. data/lib/active_admin/application.rb +9 -1
  60. data/lib/active_admin/engine.rb +8 -5
  61. data/lib/active_admin/filters/active_filter.rb +1 -2
  62. data/lib/active_admin/namespace.rb +1 -1
  63. data/lib/active_admin/namespace_settings.rb +2 -1
  64. data/lib/active_admin/resource/attributes.rb +1 -1
  65. data/lib/active_admin/router.rb +4 -4
  66. data/lib/active_admin/version.rb +1 -1
  67. data/lib/active_admin.rb +2 -4
  68. data/lib/generators/active_admin/assets/assets_generator.rb +7 -1
  69. data/lib/generators/active_admin/assets/templates/active_admin.js.erb +6 -0
  70. data/lib/generators/active_admin/assets/templates/active_admin.scss +2 -2
  71. data/package.json +42 -0
  72. data/rollup.config.js +38 -0
  73. data/spec/requests/pages/layout_spec.rb +8 -2
  74. data/spec/requests/stylesheets_spec.rb +10 -3
  75. data/spec/support/active_admin_integration_spec_helper.rb +0 -3
  76. data/spec/support/rails_template.rb +29 -13
  77. data/spec/support/templates/dartsass.rb +4 -0
  78. data/spec/unit/namespace_spec.rb +0 -13
  79. data/spec/unit/resource/attributes_spec.rb +1 -1
  80. data/vendor/assets/stylesheets/active_admin/_normalize.scss +70 -354
  81. metadata +39 -77
  82. data/app/assets/javascripts/active_admin/base.es6 +0 -23
  83. data/app/assets/javascripts/active_admin/initializers/filters.es6 +0 -45
  84. data/app/assets/javascripts/active_admin/lib/active_admin.es6 +0 -41
  85. data/app/assets/javascripts/active_admin/lib/per_page.es6 +0 -47
  86. data/app/assets/stylesheets/active_admin/mixins/_rounded.scss +0 -22
  87. data/app/assets/stylesheets/active_admin/mixins/_shadows.scss +0 -15
  88. data/app/assets/stylesheets/active_admin/mixins/_typography.scss +0 -3
  89. data/app/assets/stylesheets/active_admin/mixins/_utilities.scss +0 -17
  90. data/gemfiles/rails_60.gemfile +0 -16
  91. data/gemfiles/rails_61.gemfile +0 -16
  92. data/gemfiles/rails_61_turbolinks.gemfile +0 -16
  93. data/gemfiles/rails_70.gemfile +0 -16
  94. data/gemfiles/rails_70_hotwire.gemfile +0 -16
  95. data/lib/generators/active_admin/assets/templates/active_admin.js +0 -1
  96. /data/app/{assets/javascripts/active_admin/ext/jquery-ui.es6 → javascript/active_admin/ext/jquery-ui.js} +0 -0
  97. /data/app/{assets/javascripts/active_admin/ext/jquery.es6 → javascript/active_admin/ext/jquery.js} +0 -0
  98. /data/app/{assets/javascripts/active_admin/initializers/datepicker.es6 → javascript/active_admin/initializers/datepicker.js} +0 -0
  99. /data/app/{assets/javascripts/active_admin/initializers/tabs.es6 → javascript/active_admin/initializers/tabs.js} +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8ad955d098046e0a908d6f53f22a2270935149a031c22e4f17110aae675fec2e
4
- data.tar.gz: cfe0421fe309a57bc56570e752b0c932f08a837e70d9d047477f3e26b178c9dc
3
+ metadata.gz: db35daadd78e228b2d6a52d48ca15b3daaf143d079a96e697bca22a781535c31
4
+ data.tar.gz: 740c4e6b623fa8b9fcb49784a171ff569510d3858aa38bc8ed1477f5a840a757
5
5
  SHA512:
6
- metadata.gz: 796317e632daaff7738a1fd4f63a2deeb9782709720d1c75ee9fe3bd57f67948e737eb89933a3e713229434f4b2f598e48726c54685634a9bbdf38676236ee45
7
- data.tar.gz: 3bbe2316011379e3b5cede0121b0fb91af778145631d38faa6dad9282b1ebfc752b6e188a849c937bc19c6bf45aaeab5c2344ea231c9da0b289a9318612d8b99
6
+ metadata.gz: f000b569105c403974d50ccb9c0c982fa6423b5a0024ce1fc955e2225408b623d5490afa159faac2d8febe796b99d4dab2b6ef59e1e6bfeebb98082ae29da1bd
7
+ data.tar.gz: d50e024eed6afe0988459d18d24653b1fda634a2ba01888ef2d408d857387b99a5493796a75598ebcd743db0c3cfb0a26dd69c12cb2bbf2ca8242723dc1e8c76
data/.babelrc ADDED
@@ -0,0 +1,5 @@
1
+ {
2
+ "presets": [
3
+ ["@babel/env", { "modules": false, "loose": true } ]
4
+ ]
5
+ }
@@ -14,6 +14,9 @@ jobs:
14
14
  strategy:
15
15
  matrix:
16
16
  include:
17
+ - ruby: { name: 3.4, value: 3.4.8 }
18
+ deps: rails_81
19
+ os: ubuntu-24.04
17
20
  - ruby: { name: 3.3, value: 3.3.6 }
18
21
  deps: rails_80
19
22
  os: ubuntu-24.04
@@ -26,24 +29,6 @@ jobs:
26
29
  - ruby: { name: 3.2, value: 3.2.2 }
27
30
  deps: rails_71
28
31
  os: ubuntu-22.04
29
- - ruby: { name: 3.2, value: 3.2.2 }
30
- deps: rails_70
31
- os: ubuntu-22.04
32
- - ruby: { name: 3.2, value: 3.2.2 }
33
- deps: rails_70_hotwire
34
- os: ubuntu-22.04
35
- - ruby: { name: 3.1, value: 3.1.6 }
36
- deps: rails_70
37
- os: ubuntu-22.04
38
- - ruby: { name: 3.1, value: 3.1.6 }
39
- deps: rails_70_hotwire
40
- os: ubuntu-22.04
41
- - ruby: { name: 3.1, value: 3.1.2 }
42
- deps: rails_61
43
- os: ubuntu-22.04
44
- - ruby: { name: 3.1, value: 3.1.2 }
45
- deps: rails_61_turbolinks
46
- os: ubuntu-22.04
47
32
  fail-fast: false
48
33
 
49
34
  env:
@@ -14,6 +14,12 @@ jobs:
14
14
  strategy:
15
15
  matrix:
16
16
  include:
17
+ - ruby: { name: 3.4, value: 3.4.8 }
18
+ deps: rails_81
19
+ os: ubuntu-24.04
20
+ - ruby: { name: 3.3, value: 3.3.6 }
21
+ deps: rails_80
22
+ os: ubuntu-24.04
17
23
  - ruby: { name: 3.3, value: 3.3.6 }
18
24
  deps: rails_72
19
25
  os: ubuntu-24.04
@@ -23,24 +29,6 @@ jobs:
23
29
  - ruby: { name: 3.2, value: 3.2.2 }
24
30
  deps: rails_71
25
31
  os: ubuntu-22.04
26
- - ruby: { name: 3.2, value: 3.2.2 }
27
- deps: rails_70
28
- os: ubuntu-22.04
29
- - ruby: { name: 3.2, value: 3.2.2 }
30
- deps: rails_70_hotwire
31
- os: ubuntu-22.04
32
- - ruby: { name: 3.1, value: 3.1.6 }
33
- deps: rails_70
34
- os: ubuntu-22.04
35
- - ruby: { name: 3.1, value: 3.1.6 }
36
- deps: rails_70_hotwire
37
- os: ubuntu-22.04
38
- - ruby: { name: 3.1, value: 3.1.2 }
39
- deps: rails_61
40
- os: ubuntu-22.04
41
- - ruby: { name: 3.1, value: 3.1.2 }
42
- deps: rails_61_turbolinks
43
- os: ubuntu-22.04
44
32
  fail-fast: false
45
33
 
46
34
  env:
@@ -55,7 +55,7 @@ jobs:
55
55
  JEKYLL_ENV: production
56
56
  - name: Upload artifact
57
57
  # Automatically uploads an artifact from the './_site' directory by default
58
- uses: actions/upload-pages-artifact@v1
58
+ uses: actions/upload-pages-artifact@v3
59
59
  with:
60
60
  path: "docs/_site/"
61
61
 
data/.gitignore CHANGED
@@ -14,6 +14,8 @@ docs/_site
14
14
  spec/rails
15
15
  Gemfile.lock
16
16
  gemfiles/rails_*.gemfile.lock
17
+ node_modules
18
+ yarn.lock
17
19
  .test-rails-apps
18
20
  public
19
21
  .rspec
data/CHANGELOG.md CHANGED
@@ -1,14 +1,27 @@
1
1
  # Changelog
2
2
 
3
+ ## 1.8.0 [☰](https://github.com/varyonic/activeadmin-rails/compare/v1.7.2...v1.8.0)
4
+
5
+ This release supports both Sprockets and Propshaft. CSS has been modernized and updated to Dart Sass.
6
+
7
+ ### Enhancements
8
+
9
+ * Rails 8.1 support. [#64] by [@varyonic]
10
+ * Support applications using either Propshaft or Sprockets. [#62] by [@varyonic]
11
+ * Replace jquery-rails and jquery-ui-rails gems with CDN assets. [#60] by [@varyonic]
12
+ * Configure Rollup to bundle JavaScript outside of Sprockets. [#58] by [@varyonic] (from [#5868], [#5888] and [@5956] by [@sgara])
13
+ * Modernize CSS. [#57] by [@varyonic]
14
+ * Replace SassC (EOL) with Dart Sass. [#55] by [@varyonic]
15
+
3
16
  ## 1.7.2 [☰](https://github.com/varyonic/activeadmin-rails/compare/v1.7.1...v1.7.2)
4
17
 
5
- #### Minor
18
+ ### Enhancements
6
19
 
7
20
  * Rails 8.0 support. [#54] by [@varyonic]
8
21
 
9
22
  ## 1.7.1 [☰](https://github.com/varyonic/activeadmin-rails/compare/v1.7.0...v1.7.1)
10
23
 
11
- #### Minor
24
+ ### Enhancements
12
25
 
13
26
  * Rails 7.2 support. [#53] by [@varyonic]
14
27
  * Verify Ruby 3.3 support. [#50] by [@varyonic]
@@ -432,10 +445,13 @@ Please check [0-6-stable] for previous changes.
432
445
  [#5501]: https://github.com/activeadmin/activeadmin/pull/5501
433
446
  [#5516]: https://github.com/activeadmin/activeadmin/pull/5516
434
447
  [#5583]: https://github.com/activeadmin/activeadmin/pull/5583
435
- [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
436
448
  [#5650]: https://github.com/activeadmin/activeadmin/pull/5650
437
449
  [#5702]: https://github.com/activeadmin/activeadmin/pull/5702
438
450
  [#5800]: https://github.com/activeadmin/activeadmin/pull/5800
451
+ [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
452
+ [#5842]: https://github.com/activeadmin/activeadmin/pull/5868
453
+ [#5842]: https://github.com/activeadmin/activeadmin/pull/5888
454
+ [#5842]: https://github.com/activeadmin/activeadmin/pull/5956
439
455
  [#6000]: https://github.com/activeadmin/activeadmin/pull/6000
440
456
  [#6237]: https://github.com/activeadmin/activeadmin/pull/6237
441
457
  [#7235]: https://github.com/activeadmin/activeadmin/pull/7235
@@ -473,6 +489,12 @@ Please check [0-6-stable] for previous changes.
473
489
  [#52]: https://github.com/varyonic/activeadmin-rails/pull/52
474
490
  [#53]: https://github.com/varyonic/activeadmin-rails/pull/53
475
491
  [#54]: https://github.com/varyonic/activeadmin-rails/pull/54
492
+ [#54]: https://github.com/varyonic/activeadmin-rails/pull/55
493
+ [#54]: https://github.com/varyonic/activeadmin-rails/pull/57
494
+ [#54]: https://github.com/varyonic/activeadmin-rails/pull/58
495
+ [#54]: https://github.com/varyonic/activeadmin-rails/pull/60
496
+ [#54]: https://github.com/varyonic/activeadmin-rails/pull/62
497
+ [#54]: https://github.com/varyonic/activeadmin-rails/pull/64
476
498
 
477
499
  [@5t111111]: https://github.com/5t111111
478
500
  [@aarek]: https://github.com/aarek
data/CONTRIBUTING.md CHANGED
@@ -36,7 +36,7 @@ Make sure you're using a recent ruby and have the `bundler` gem installed.
36
36
  Select the Gemfile for your preferred Rails version, preferably the latest:
37
37
 
38
38
  ```sh
39
- export BUNDLE_GEMFILE=gemfiles/rails_80.gemfile
39
+ export BUNDLE_GEMFILE=gemfiles/rails_81.gemfile
40
40
  ```
41
41
 
42
42
  Now install the development dependencies:
data/Gemfile CHANGED
@@ -1,6 +1,7 @@
1
1
  source 'https://rubygems.org'
2
2
 
3
3
  gem 'arbo'
4
+ gem 'jquery-ui-rails', '< 8.x' # Pending release of fixed version, see jquery/jquery-ui#2344
4
5
 
5
6
  # Optional dependencies
6
7
  gem 'cancan'
@@ -42,7 +43,7 @@ group :test do
42
43
  gem 'simplecov', require: false # Test coverage generator. Go to /coverage/ after running tests
43
44
  gem 'codecov', require: false # Test coverage website. Go to https://codecov.io
44
45
  gem 'cucumber-rails', require: false
45
- gem 'cucumber'
46
+ gem 'cucumber', '< 10'
46
47
  gem 'database_cleaner'
47
48
  gem 'jasmine'
48
49
  gem 'launchy'
data/Rakefile CHANGED
@@ -21,6 +21,7 @@ task :setup, [:parallel, :dir, :template] do |_t, opts|
21
21
  )
22
22
  args << "--skip-turbolinks" unless ENV['BUNDLE_GEMFILE'] =~ /turbolinks/
23
23
  args << "--skip-hotwire" unless ENV['BUNDLE_GEMFILE'] =~ /hotwire/
24
+ args << "--javascript=rollup"
24
25
 
25
26
  command = ['bundle', 'exec', 'rails', 'new', app_dir, *args].join(' ')
26
27
 
@@ -25,15 +25,12 @@ Gem::Specification.new do |s|
25
25
  s.required_ruby_version = '>= 2.5'
26
26
 
27
27
  s.add_dependency 'arbo'
28
+ s.add_dependency 'csv'
28
29
  s.add_dependency 'formtastic'
29
30
  s.add_dependency 'formtastic_i18n'
30
31
  s.add_dependency 'inherited_resources', '>= 1.13.1'
31
- s.add_dependency 'jquery-rails', '>= 4.2.0'
32
- s.add_dependency 'jquery-ui-rails', '>= 6.0'
33
32
  s.add_dependency 'kaminari', '>= 1.0.1'
34
33
  s.add_dependency 'railties', '>= 5.0'
35
34
  s.add_dependency 'ransack', '>= 1.8.7'
36
- s.add_dependency 'sass-rails'
37
- s.add_dependency 'sprockets'
38
- s.add_dependency 'sprockets-es6', '>= 0.9.2'
35
+ s.add_dependency 'dartsass-rails'
39
36
  end