lato 3.20.0 → 3.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 075c975b6664915db69f259de96df142661e1fdc15e105de7abbb7ccd0cb2e42
-  data.tar.gz: d43336a66ac83b70fb2eb07c18486c3be17faae34c5f86d6cc2754b419e25960
+  metadata.gz: 925e5dd4e3c5460a38172e5f67acaf5130c15e080777a91330becf009888dd52
+  data.tar.gz: 672b343b2de9def169bc3a97314b4ccee9db6f3254f89fb42f3e5c3ae17de863
 SHA512:
-  metadata.gz: 3b811fca6c275c24eac441c330d4a73c101e5d12625ef66b6d8211bc15d9f2435693e0a51c777cdd83a4750e4b0fad48b2584e018ed99d7ff881d7745144aa00
-  data.tar.gz: b137ac3b8cfa26e7b28d3cd37a3cef8ee72927903892ed3eca307913fced39cdbf12951c7f97bf8ed5cd72edff05778c44b4ac917b8c6a3125e909a05193f83e
+  metadata.gz: 3b558bf2e8b153d3c173d1219b0689147611f341e80a9454634247bcf830cf378fb6780045ece64ecd54d42b34efb57e246e66d89e292aa67cd7ad4c7ba13536
+  data.tar.gz: dfd3b28e1322227882c6b8b1432b6119cb3678cedb28b6cadde4fce09358b31d451b1297af664f0f6c03a26df10cdb7c0e1cf8d2b10ef4ecabea24c69e36cd67

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

@@ -1,22 +1,39 @@
 // Import turbo rails
-import "@hotwired/turbo-rails"
+import '@hotwired/turbo-rails'
 // Import bootstrap js
-import "bootstrap"
+import 'bootstrap'
 // Import controllers (stimulus rails)
-import "controllers"
+import 'controllers'
+// Import local time js
+import LocalTime from 'local-time'
+
+/**
+ * Setup local time to update time elements on page load and after turbo morph or frame render
+ */
+
+LocalTime.start()
+
+document.addEventListener('turbo:morph', () => {
+  LocalTime.run()
+})
+
+document.addEventListener('turbo:frame-render', () => {
+  LocalTime.run()
+})
 
 /**
  * Include service worker
  */
 
 if (navigator.serviceWorker) {
-  navigator.serviceWorker.register("/service-worker.js", { scope: "/" })
-  .then(() => navigator.serviceWorker.ready)
-  .then((registration) => {
-    const event = new CustomEvent("service-worker:ready", { detail: registration })
-    document.dispatchEvent(event)
-  })
-  .then(() => console.log("[App]", "Service worker registered! -> listen to 'service-worker:ready' document event to get the registration object"))
+  navigator.serviceWorker
+    .register('/service-worker.js', { scope: '/' })
+    .then(() => navigator.serviceWorker.ready)
+    .then((registration) => {
+      const event = new window.CustomEvent('service-worker:ready', { detail: registration })
+      document.dispatchEvent(event)
+    })
+    .then(() => window.console.log('[App]', 'Service worker registered! -> listen to \'service-worker:ready\' document event to get registration object'))
 }
 
 /**
@@ -24,7 +41,7 @@ if (navigator.serviceWorker) {
  * https://github.com/hotwired/turbo-rails/issues/440
  */
 
-document.addEventListener("turbo:frame-missing", event => {
+document.addEventListener('turbo:frame-missing', event => {
   event.preventDefault()
   event.detail.visit(event.detail.response)
 })

data/app/assets/javascripts/lato/controllers/lato_confirm_controller.js

@@ -7,7 +7,7 @@ export default class extends Controller {
 
   connect() {
     this.modal = new bootstrap.Modal(this.element)
-    Turbo.setConfirmMethod(this.customConfirm.bind(this))
+    Turbo.config.forms.confirm = this.customConfirm.bind(this)
 
     this.element.addEventListener('show.bs.modal', () => {
       this.element.style.zIndex = 2001
@@ -21,7 +21,7 @@ export default class extends Controller {
   }
 
   disconnect() {
-    Turbo.setConfirmMethod(window.confirm)
+    Turbo.config.forms.confirm = window.confirm
   }
 
   async customConfirm(message) {

data/app/controllers/concerns/lato/componentable.rb

@@ -20,14 +20,12 @@ module Lato
 
       # manage sort by parameter
       unless params["#{key}_sort_by"].blank?
-        sort_by_splitted = params["#{key}_sort_by"].split('|')
-        sort_by_column = sort_by_splitted.first
-        sort_by_order = sort_by_splitted.last
+        sort_by = parse_lato_index_sort_by(params["#{key}_sort_by"], @_lato_index[key][:sortable_columns])
 
-        if collection.respond_to?(:lato_index_order)
-          collection = collection.lato_index_order(sort_by_column.to_sym, sort_by_order.to_sym)
-        else
-          collection = collection.order("#{sort_by_column} #{sort_by_order}")
+        if sort_by && collection.respond_to?(:lato_index_order)
+          collection = collection.lato_index_order(sort_by[:column].to_sym, sort_by[:order].to_sym)
+        elsif sort_by
+          collection = collection.order(sort_by[:column] => sort_by[:order])
         end
       end
 
@@ -63,5 +61,18 @@ module Lato
 
       collection
     end
+
+    private
+
+    def parse_lato_index_sort_by(sort_by, sortable_columns)
+      sort_by_column, sort_by_order = sort_by.to_s.split("|", 2)
+      sort_by_column = sort_by_column.to_s
+      sort_by_order = sort_by_order.to_s.downcase
+
+      return unless sortable_columns.map(&:to_s).include?(sort_by_column)
+      return unless %w[asc desc].include?(sort_by_order)
+
+      { column: sort_by_column, order: sort_by_order }
+    end
   end
 end

data/app/controllers/lato/application_controller.rb

@@ -6,6 +6,8 @@ module Lato
     include Lato::Layoutable
     include Lato::Componentable
 
+    helper LocalTimeHelper
+
     around_action :catch_exceptions
 
     before_action :override_request_remote_ip

data/app/views/lato/components/_operation.html.erb

@@ -74,7 +74,7 @@
           <% operation.logs.reverse.each do |log| %>
             <div class="mb-2 pb-2 border-bottom d-flex justify-content-between align-items-center">
               <p class="mb-0"><%= log[1] %></p>
-              <small class="text-muted ms-4"><%= I18n.l(Time.parse(log[0]), format: '%H:%M:%S') %></small>
+              <small class="ms-4"><%= local_time(Time.parse(log[0]), format: "%H:%M:%S", class: "text-muted") %></small>
             </div>
           <% end %>
         </div>
@@ -85,4 +85,4 @@
       <%= link_to '', lato.operation_path(operation), class: 'd-none', data: { lato_operation_target: 'update', turbo_frame: '_self' } %>
     <% end %>
   </div>
-<% end %>
+<% end %>

data/config/importmap.rb

@@ -5,4 +5,5 @@ pin "@rails/activestorage", to: "activestorage.esm.js", preload: true
 
 pin "bootstrap", to: "bootstrap.js", preload: true
 # pin "@popperjs/core", to: "popper.js", preload: true
+pin "local-time", to: "https://ga.jspm.io/npm:local-time@3.0.3/app/assets/javascripts/local-time.es2017-esm.js"
 pin "lodash", to: "https://ga.jspm.io/npm:lodash@4.17.21/lodash.js"

data/lib/lato/version.rb

@@ -1,3 +1,3 @@
 module Lato
-  VERSION = "3.20.0"
+  VERSION = "3.22.0"
 end

data/lib/lato.rb

@@ -1,4 +1,5 @@
 require "kaminari"
+require "local_time"
 require "bootstrap"
 require "browser"
 require "rotp"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lato
 version: !ruby/object:Gem::Version
-  version: 3.20.0
+  version: 3.22.0
 platform: ruby
 authors:
 - Gregorio Galante
@@ -79,6 +79,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: local_time
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement