Gems "dartsass-rails", "importmap-rails", "turbo-rails" and others

leikind · Jun 22, 2024 · de407f1 · de407f1
1 parent 4ddd116
commit de407f1
Show file tree

Hide file tree

Showing 89 changed files with 35,348 additions and 1,180 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
+# Use custom version of jquery-ui-rails and font-awesome-sass
+gem 'jquery-ui-rails', github: 'dima4p/jquery-ui-rails'
+gem 'font-awesome-sass', github: 'dima4p/font-awesome-sass'
+
 gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,10 +1,26 @@
+GIT
+  remote: https://github.com/dima4p/font-awesome-sass.git
+  revision: bed06b0e9c62ec7e9523879d2012d43ec14afa75
+  specs:
+    font-awesome-sass (6.5.2.1)
+      sassc (~> 2.0)
+
+GIT
+  remote: https://github.com/dima4p/jquery-ui-rails.git
+  revision: 619d63474aeef3ad200834e843fa43f2b8299c02
+  specs:
+    jquery-ui-rails (7.0.3)
+      jquery-rails
+      railties (>= 3.2.16)
+
 PATH
   remote: .
   specs:
     wice_grid (7.1.0)
-      coffee-rails
+      coffee-rails (>= 5.0.0)
+      jquery-rails
       kaminari
-      rails (~> 7.1.3)
+      rails (~> 7.1)
 
 GEM
   remote: https://rubygems.org/
@@ -89,10 +105,13 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
+    autoprefixer-rails (10.4.16.0)
+      execjs (~> 2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    bootstrap-sass (3.1.1.1)
-      sass (~> 3.2)
+    bootstrap (5.3.3)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 2.11.8, < 3)
     builder (3.3.0)
     byebug (11.1.3)
     capybara (3.40.0)
@@ -121,6 +140,9 @@ GEM
     connection_pool (2.4.1)
     crass (1.0.6)
     csv (3.3.0)
+    dartsass-rails (0.5.0)
+      railties (>= 6.0.0)
+      sass-embedded (~> 1.63)
     date (3.3.4)
     diff-lcs (1.5.1)
     docile (1.4.0)
@@ -139,11 +161,27 @@ GEM
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
     ffi (1.17.0-x86_64-linux-musl)
-    font-awesome-sass (4.4.0)
-      sass (>= 3.2)
     formatador (1.1.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
+    google-protobuf (4.27.1)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.27.1-aarch64-linux)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.27.1-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.27.1-x86-linux)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.27.1-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.27.1-x86_64-linux)
+      bigdecimal
+      rake (>= 13)
     guard (2.18.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -168,6 +206,10 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
+    importmap-rails (2.0.1)
+      actionpack (>= 6.0.0)
+      activesupport (>= 6.0.0)
+      railties (>= 6.0.0)
     inch (0.8.0)
       pry
       sparkr (>= 0.2.0)
@@ -181,8 +223,6 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (7.0.0)
-      railties (>= 3.2.16)
     jquery-ui-themes (0.0.12)
       httparty
     kaminari (1.2.2)
@@ -258,14 +298,15 @@ GEM
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
+    popper_js (2.11.8)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     psych (5.1.2)
       stringio
     public_suffix (5.0.5)
     racc (1.8.0)
-    rack (3.0.11)
+    rack (3.1.3)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -310,9 +351,9 @@ GEM
       psych (>= 4.0.0)
     ref (2.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.2.9)
+    rexml (3.3.0)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -336,21 +377,28 @@ GEM
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
     rubyzip (2.3.2)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (6.0.0)
-      sassc-rails (~> 2.1, >= 2.1.1)
+    sass-embedded (1.77.5-aarch64-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.5-aarch64-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.5-arm-linux-gnueabihf)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.5-arm-linux-musleabihf)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.5-arm64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.5-x86-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.5-x86-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.5-x86_64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.5-x86_64-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.5-x86_64-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
     selenium-webdriver (4.21.1)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
@@ -396,9 +444,10 @@ GEM
     tins (1.33.0)
       bigdecimal
       sync
-    turbolinks (5.2.1)
-      turbolinks-source (~> 5.2)
-    turbolinks-source (5.2.0)
+    turbo-rails (2.0.5)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     webrick (1.8.1)
@@ -430,34 +479,35 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
-  bootstrap-sass (= 3.1.1.1)
+  bootstrap
   bundler
   byebug
   capybara
   capybara-screenshot
   coderay
+  dartsass-rails
   faker
-  font-awesome-sass (= 4.4.0)
+  font-awesome-sass!
   guard-rspec
   haml
+  importmap-rails
   inch
-  jquery-rails
-  jquery-ui-rails
+  jquery-ui-rails!
   jquery-ui-themes
   phantomjs (>= 2.1.1)
   poltergeist
   rake
   rdoc
   rspec
   rspec-rails
-  sass-rails (>= 3.2)
   selenium-webdriver
   shoulda-matchers
   simplecov
+  sprockets-rails
   sqlite3 (~> 1.4)
   stimulus-rails
   therubyracer
-  turbolinks
+  turbo-rails
   wice_grid!
   yard
 

diff --git a/app/views/kaminari/wice_grid/_paginator.html.erb b/app/views/kaminari/wice_grid/_paginator.html.erb
@@ -1,6 +1,6 @@
 <%= paginator.render do %>
   <div class="pagination">
-    <ul class="pagination">
+    <ul class="grid pagination">
       <% unless current_page.first? %>
         <%= prev_page_tag %>
       <% end %>
@@ -16,4 +16,4 @@
       <% end %>
     </ul>
   </div>
-<% end %>
+<% end %>
diff --git a/lib/wice/columns/column_action.rb b/lib/wice/columns/column_action.rb
@@ -35,11 +35,11 @@ def name  #:nodoc:
           check_box_tag :select_all, 1, false, class: 'wg-select-all'
         else
           content_tag(:div,
-                      content_tag(:i, '', class: 'fa fa-check-square-o'),
+                      content_tag(:i, '', class: 'fa-regular fa-square-check'),
                       class: 'clickable select-all',
                       title: NlMessage['select_all']) + ' ' +
             content_tag(:div,
-                        content_tag(:i, '', class: 'fa fa-square-o'),
+                        content_tag(:i, '', class: 'fa-regular fa-square'),
                         class: 'clickable deselect-all',
                         title: NlMessage['deselect_all'])
         end

diff --git a/lib/wice/columns/column_bootstrap_datepicker.rb b/lib/wice/columns/column_bootstrap_datepicker.rb
@@ -9,16 +9,16 @@ class ViewColumnBootstrapDatepicker < ViewColumn #:nodoc:
       def do_render(params) #:nodoc:
         calendar_data_from = prepare_data_for_bscalendar(
           initial_date: params[:fr],
-          name:         @name1,
-          fire_event:   auto_reload,
-          grid_name:    self.grid.name
+          name:       @name1,
+          fire_event: auto_reload,
+          grid_name:  self.grid.name
         )
 
         calendar_data_to = prepare_data_for_bscalendar(
           initial_date: params[:to],
-          name:         @name2,
-          fire_event:   auto_reload,
-          grid_name:    self.grid.name
+          name:       @name2,
+          fire_event: auto_reload,
+          grid_name:  self.grid.name
         )
 
         calendar_data_from.the_other_datepicker_id_to   = calendar_data_to.dom_id

diff --git a/lib/wice/columns/column_jquery_datepicker.rb b/lib/wice/columns/column_jquery_datepicker.rb
@@ -9,18 +9,18 @@ class ViewColumnJqueryDatepicker < ViewColumn #:nodoc:
       def do_render(params) #:nodoc:
         calendar_data_from = prepare_data_for_calendar(
           initial_date: params[:fr],
-          title:        NlMessage['date_selector_tooltip_from'],
-          name:         @name1,
-          fire_event:   auto_reload,
-          grid_name:    self.grid.name
+          title:      NlMessage['date_selector_tooltip_from'],
+          name:       @name1,
+          fire_event: auto_reload,
+          grid_name:  self.grid.name
         )
 
         calendar_data_to = prepare_data_for_calendar(
           initial_date: params[:to],
-          title:        NlMessage['date_selector_tooltip_to'],
-          name:         @name2,
-          fire_event:   auto_reload,
-          grid_name:    self.grid.name
+          title:      NlMessage['date_selector_tooltip_to'],
+          name:       @name2,
+          fire_event: auto_reload,
+          grid_name:  self.grid.name
         )
 
         calendar_data_from.the_other_datepicker_id_to   = calendar_data_to.dom_id

diff --git a/lib/wice/grid_renderer.rb b/lib/wice/grid_renderer.rb
@@ -161,11 +161,11 @@ def action_column(opts = {}, &block)
       end
 
       options = {
-        param_name:          :selected,
-        html:                {},
-        select_all_buttons:  true,
-        object_property:     :id,
-        html_check_box:      true
+        param_name:         :selected,
+        html:               {},
+        select_all_buttons: true,
+        object_property:    :id,
+        html_check_box:     true
       }
 
       opts.assert_valid_keys(options.keys)
@@ -303,28 +303,28 @@ def action_column(opts = {}, &block)
 
     def column(opts = {}, &block)
       options = {
-        allow_multiple_selection:    ConfigurationProvider.value_for(:ALLOW_MULTIPLE_SELECTION),
-        assoc:                       nil,
-        attribute:                   nil,
-        auto_reload:                 ConfigurationProvider.value_for(:AUTO_RELOAD),
-        boolean_filter_false_label:  NlMessage['boolean_filter_false_label'],
-        boolean_filter_true_label:   NlMessage['boolean_filter_true_label'],
-        class:                       nil,
-        custom_filter:               nil,
-        detach_with_id:              nil,
-        filter:                      true,
-        filter_all_label:            ConfigurationProvider.value_for(:CUSTOM_FILTER_ALL_LABEL),
-        filter_control_options:      {},
-        filter_type:                 nil,
-        html:                        {},
-        in_csv:                      true,
-        in_html:                     true,
-        model:                       nil, # will throw an exception with instructions
-        name:                        '',
-        negation:                    ConfigurationProvider.value_for(:NEGATION_IN_STRING_FILTERS),
-        ordering:                    true,
-        table_alias:                 nil,
-        sort_by:                     nil,
+        allow_multiple_selection: ConfigurationProvider.value_for(:ALLOW_MULTIPLE_SELECTION),
+        assoc:                      nil,
+        attribute:                  nil,
+        auto_reload:                ConfigurationProvider.value_for(:AUTO_RELOAD),
+        boolean_filter_false_label: NlMessage['boolean_filter_false_label'],
+        boolean_filter_true_label:  NlMessage['boolean_filter_true_label'],
+        class:                      nil,
+        custom_filter:              nil,
+        detach_with_id:             nil,
+        filter:                     true,
+        filter_all_label: ConfigurationProvider.value_for(:CUSTOM_FILTER_ALL_LABEL),
+        filter_control_options: {},
+        filter_type:            nil,
+        html:                   {},
+        in_csv:                 true,
+        in_html:                true,
+        model:                  nil, # will throw an exception with instructions
+        name:                   '',
+        negation: ConfigurationProvider.value_for(:NEGATION_IN_STRING_FILTERS),
+        ordering:               true,
+        table_alias:            nil,
+        sort_by:                nil,
       }
 
       opts.assert_valid_keys(options.keys)

diff --git a/lib/wice/helpers/js_calendar_helpers.rb b/lib/wice/helpers/js_calendar_helpers.rb
@@ -59,7 +59,7 @@ def date_calendar_jquery(calendar_data)  #:nodoc:
       content_tag(
         :span,
         date_picker,
-        id:    calendar_data.datepicker_placeholder_id,
+        id: calendar_data.datepicker_placeholder_id,
         class: 'jq-datepicker-container'
       )
     end