spina-admin-conferences 1.3.7 → 1.3.8

data/app/views/spina/admin/hooks/conferences/_primary_navigation.html.haml

@@ -1,20 +1,21 @@
-%li{ class: ('active' if %w[conferences delegates presentations dietary_requirements presentation_types institutions rooms].include? controller_name) }
+%li#conferences-primary-navigation{ data: { turbolinks: 'false', turbo: 'permanent' },
+                                    class: ('active' if %w[conferences delegates presentations presentation_types institutions rooms].include? controller_name) }
   = link_to admin_conferences_presentations_path do
     = icon('comment')
     = t("spina.admin.conferences.title")
     = icon('caret-right')
 
-    %ul
-      %li{ class: ('active' if %w[institutions rooms].include? controller_name) }
-        = link_to Spina::Admin::Conferences::Institution.model_name.human(count: 0), spina.admin_conferences_institutions_path
-      %li{ class: ('active' if %w[conferences presentation_types sessions].include? controller_name) }
-        = link_to Spina::Admin::Conferences::Conference.model_name.human(count: 0), spina.admin_conferences_conferences_path
-      %li{ class: ('active' if %w[delegates dietary_requirements].include? controller_name) }
-        = link_to Spina::Admin::Conferences::Delegate.model_name.human(count: 0), spina.admin_conferences_delegates_path
-      %li{ class: ('active' if %w[presentations].include? controller_name) }
-        = link_to Spina::Admin::Conferences::Presentation.model_name.human(count: 0), spina.admin_conferences_presentations_path
+  %ul
+    %li{ class: ('active' if %w[institutions rooms].include? controller_name) }
+      = link_to Spina::Admin::Conferences::Institution.model_name.human(count: 0), spina.admin_conferences_institutions_path
+    %li{ class: ('active' if %w[conferences presentation_types sessions].include? controller_name) }
+      = link_to Spina::Admin::Conferences::Conference.model_name.human(count: 0), spina.admin_conferences_conferences_path
+    %li{ class: ('active' if %w[delegates].include? controller_name) }
+      = link_to Spina::Admin::Conferences::Delegate.model_name.human(count: 0), spina.admin_conferences_delegates_path
+    %li{ class: ('active' if %w[presentations].include? controller_name) }
+      = link_to Spina::Admin::Conferences::Presentation.model_name.human(count: 0), spina.admin_conferences_presentations_path
 
-      %li
-        = link_to '#', class: 'back-to-main-menu' do
-          = icon('caret-left')
-          =t 'spina.main_menu'
+    %li
+      = link_to '#', class: 'back-to-main-menu' do
+        = icon('caret-left')
+        =t 'spina.main_menu'

data/app/views/spina/admin/hooks/conferences/_settings_secondary_navigation.html.haml

@@ -1,4 +1,6 @@
 %li{ class: ('active' if %w[dietary_requirements].include? controller_name) }
-  = link_to Spina::Admin::Conferences::DietaryRequirement.model_name.human(count: 0), spina.admin_conferences_dietary_requirements_path
+  = link_to Spina::Admin::Conferences::DietaryRequirement.model_name.human(count: 0), spina.admin_conferences_dietary_requirements_path,
+            data: { turbolinks: 'false' }
 %li{ class: ('active' if %w[presentation_attachment_types].include? controller_name) }
-  = link_to Spina::Admin::Conferences::PresentationAttachmentType.model_name.human(count: 0), spina.admin_conferences_presentation_attachment_types_path
+  = link_to Spina::Admin::Conferences::PresentationAttachmentType.model_name.human(count: 0), spina.admin_conferences_presentation_attachment_types_path,
+            data: { turbolinks: 'false' }

data/app/views/spina/admin/partables/admin/conferences/date_parts/_form.html.haml

@@ -2,4 +2,4 @@
   = f.object.title
 .horizontal-form-content
   = f.fields_for :partable, f.object.partable do |ff|
-    = ff.date_field :content, class: 'conference-datepicker'
+    = ff.date_field :content

data/app/views/spina/admin/partables/admin/conferences/time_parts/_form.html.haml

@@ -3,5 +3,5 @@
 = f.fields_for :partable, f.object.partable do |ff|
   .horizontal-form-content
     .input-group
-      = ff.date_field :date, class: 'conference-datepicker'
+      = ff.date_field :date
       = ff.time_field :time

data/config/initializers/assets.rb

@@ -5,7 +5,7 @@
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
 # Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Spina::Admin::Conferences::Engine.root.join('node_modules')
+# Rails.application.config.assets.paths << Spina::Admin::Conferences::Engine.root.join('node_modules')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets

data/lib/spina/admin/conferences.rb

@@ -4,6 +4,8 @@ require 'spina'
 require 'spina/admin/conferences/engine'
 require 'spina/admin/conferences/railtie' if defined?(Rails::Railtie)
 require 'rails-i18n'
+require 'stimulus-rails'
+require 'turbo-rails'
 require 'icalendar'
 
 # Spina content management system.

data/lib/spina/admin/conferences/version.rb

@@ -4,7 +4,7 @@ module Spina
   module Admin
     module Conferences
       # Version number.
-      VERSION = '1.3.7'
+      VERSION = '1.3.8'
     end
   end
 end

metadata

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: spina-admin-conferences
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2021-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: babel-transpiler
+  name: icalendar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: icalendar
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: mobility
+  name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.10
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.10
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rails-i18n
+  name: spina
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: spina
+  name: stimulus-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.33'
-  type: :development
+        version: 0.5.9
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.33'
+        version: 0.5.9
 - !ruby/object:Gem::Dependency
-  name: coveralls_reborn
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '3.33'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '3.33'
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.93'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.93'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +276,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.142'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +304,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: web-console
   requirement: !ruby/object:Gem::Requirement
@@ -329,10 +357,11 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/spina_admin_conferences_manifest.js
-- app/assets/javascripts/spina/admin/conferences/application.es6
-- app/assets/javascripts/spina/admin/conferences/controllers/conference_events_form_controller.es6
-- app/assets/javascripts/spina/admin/conferences/controllers/presentation_attachments_form_controller.es6
-- app/assets/javascripts/spina/admin/conferences/controllers/select_options_controller.es6
+- app/assets/javascripts/controllers/spina/admin/conferences/conference_events_form_controller.js
+- app/assets/javascripts/controllers/spina/admin/conferences/presentation_attachments_form_controller.js
+- app/assets/javascripts/controllers/spina/admin/conferences/select_options_controller.js
+- app/assets/javascripts/importmap.json.erb
+- app/assets/javascripts/spina/admin/conferences/application.js
 - app/assets/stylesheets/spina/admin/conferences/application.sass
 - app/controllers/spina/admin/conferences/application_controller.rb
 - app/controllers/spina/admin/conferences/conferences_controller.rb
@@ -375,6 +404,7 @@ files:
 - app/validators/spina/admin/conferences/finish_date_validator.rb
 - app/validators/spina/admin/conferences/finish_time_validator.rb
 - app/validators/spina/admin/conferences/http_url_validator.rb
+- app/views/layouts/spina/admin/conferences/application.html.haml
 - app/views/layouts/spina/admin/conferences/conferences.html.haml
 - app/views/layouts/spina/admin/conferences/delegates.html.haml
 - app/views/layouts/spina/admin/conferences/dietary_requirements.html.haml
@@ -383,7 +413,7 @@ files:
 - app/views/layouts/spina/admin/conferences/presentations.html.haml
 - app/views/spina/admin/conferences/application/_empty_list.html.haml
 - app/views/spina/admin/conferences/application/_errors.html.haml
-- app/views/spina/admin/conferences/application/_errors.js.erb
+- app/views/spina/admin/conferences/application/_errors.turbo_stream.haml
 - app/views/spina/admin/conferences/conferences/_conference.html.haml
 - app/views/spina/admin/conferences/conferences/_event_fields.html.haml
 - app/views/spina/admin/conferences/conferences/_event_row.html.haml
@@ -468,7 +498,6 @@ files:
 - app/views/spina/admin/partables/admin/conferences/time_parts/_form.html.haml
 - app/views/spina/admin/partables/admin/conferences/url_parts/_form.html.haml
 - config/initializers/assets.rb
-- config/initializers/types.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20180907141228_create_spina_dates.rb
@@ -532,7 +561,6 @@ files:
 - lib/spina/admin/conferences/engine.rb
 - lib/spina/admin/conferences/migration/renaming.rb
 - lib/spina/admin/conferences/railtie.rb
-- lib/spina/admin/conferences/types/interval_type.rb
 - lib/spina/admin/conferences/version.rb
 - lib/tasks/spina/admin/conferences_tasks.rake
 homepage: https://jmalcic.github.io/projects/spina-admin-conferences
@@ -554,7 +582,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Conference management plugin for Spina.

data/app/assets/javascripts/spina/admin/conferences/application.es6

@@ -1,20 +0,0 @@
-//= require stimulus
-//= require_directory ./controllers
-
-/**
- * @external Stimulus
- */
-/* global Stimulus, SelectOptionsController, PresentationAttachmentsFormController, ConferenceEventsFormController */
-const application = Stimulus.Application.start()
-application.register('select-options', SelectOptionsController)
-application.register('presentation-attachments-form', PresentationAttachmentsFormController)
-application.register('conference-events-form', ConferenceEventsFormController)
-
-document.addEventListener('turbolinks:load', () => {
-  Array.from(document.getElementsByClassName('conference-datepicker')).forEach(element => {
-    $(element).datepicker({
-      dateFormat: 'yy-mm-dd',
-      firstDay: 1
-    })
-  })
-})

data/app/views/spina/admin/conferences/application/_errors.js.erb

@@ -1,2 +0,0 @@
-document.querySelector('aside#notifications')
-  .insertAdjacentHTML('beforeend', '<%= j(render partial: 'errors', formats: :html, locals: { errors: errors }) %>');

data/config/initializers/types.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'spina/admin/conferences/types/interval_type'
-
-ActiveRecord::Type.register :interval, Spina::Admin::Conferences::IntervalType, adapter: :postgresql
-
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
-  alias_method :configure_connection_without_interval, :configure_connection
-  define_method :configure_connection do
-    configure_connection_without_interval
-    execute 'SET IntervalStyle = iso_8601', 'SCHEMA'
-  end
-end

data/lib/spina/admin/conferences/types/interval_type.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Spina
-  module Admin
-    module Conferences
-      # This type maps between ActiveSupport::Duration and interval in PostgreSQL
-      class IntervalType < ActiveRecord::Type::Value
-        def cast(value)
-          case value
-          when ::ActiveSupport::Duration
-            value
-          when ::String
-            ::ActiveSupport::Duration.parse(value)
-          when ::Integer
-            ::ActiveSupport::Duration.build(value)
-          end
-        rescue ActiveSupport::Duration::ISO8601Parser::ParsingError
-          nil
-        end
-
-        def serialize(value)
-          return unless value.class == ::ActiveSupport::Duration
-
-          value.iso8601
-        end
-      end
-    end
-  end
-end