spina-admin-conferences 1.3.3 → 1.3.9

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/db/migrate/20200911161739_move_conference_parts.rb

@@ -14,9 +14,9 @@ class MoveConferenceParts < ActiveRecord::Migration[6.0] # rubocop:disable Metri
           descriptions.content AS description,
           names.locale AS locale,
           start_times.id AS start_time_id,
-          names.id AS title_translation_id,
-          locations.id AS location_translation_id,
-          descriptions.id AS description_translation_id
+          names.translation_id AS title_translation_id,
+          locations.translation_id AS location_translation_id,
+          descriptions.translation_id AS description_translation_id
           FROM spina_conferences_parts
             INNER JOIN spina_structure_items ON partable_id = structure_id AND partable_type = 'Spina::Structure'
             LEFT JOIN (
@@ -29,7 +29,7 @@ class MoveConferenceParts < ActiveRecord::Migration[6.0] # rubocop:disable Metri
             ) AS start_times ON start_times.structure_item_id = spina_structure_items.id
             LEFT JOIN (
               SELECT
-                spina_lines.id AS id, content, locale, structure_item_id
+                spina_line_translations.id AS translation_id, content, locale, structure_item_id
                 FROM spina_structure_parts
                   INNER JOIN spina_lines
                     ON structure_partable_id = spina_lines.id
@@ -40,7 +40,7 @@ class MoveConferenceParts < ActiveRecord::Migration[6.0] # rubocop:disable Metri
                 WHERE content IS NOT NULL
             ) AS names ON names.structure_item_id = spina_structure_items.id
             LEFT JOIN (
-              SELECT spina_lines.id AS id, content, locale, structure_item_id
+              SELECT spina_line_translations.id AS translation_id, content, locale, structure_item_id
                 FROM spina_structure_parts
                   INNER JOIN spina_lines
                     ON structure_partable_id = spina_lines.id
@@ -51,7 +51,7 @@ class MoveConferenceParts < ActiveRecord::Migration[6.0] # rubocop:disable Metri
                 WHERE content IS NOT NULL
             ) AS locations ON locations.structure_item_id = spina_structure_items.id
             LEFT JOIN (
-              SELECT spina_texts.id AS id, content, locale, structure_item_id
+              SELECT spina_text_translations.id AS translation_id, content, locale, structure_item_id
                 FROM spina_structure_parts
                   INNER JOIN spina_texts
                     ON structure_partable_id = spina_texts.id
@@ -130,7 +130,8 @@ class MoveConferenceParts < ActiveRecord::Migration[6.0] # rubocop:disable Metri
         ), parts AS (
           INSERT INTO spina_conferences_parts (title, name, partable_type, partable_id, pageable_type, pageable_id)
             SELECT
-              'Events', 'events', 'Spina::Structure', structures_with_indices.id, 'Spina::Admin::Conferences::Conference', conferences.id
+              'Events', 'events', 'Spina::Structure', structures_with_indices.id, 'Spina::Admin::Conferences::Conference',
+              conferences_with_indices.id
               FROM (SELECT id, row_number() OVER (ORDER BY id) AS index FROM structures) AS structures_with_indices
                 INNER JOIN (SELECT id, row_number() OVER (ORDER BY id) AS index FROM conferences) AS conferences_with_indices USING (index)
       ), events AS (
@@ -207,7 +208,8 @@ class MoveConferenceParts < ActiveRecord::Migration[6.0] # rubocop:disable Metri
             structure_items_with_indices.id, partable_id, type, replace(lower(title), '\W', '_'), title, current_timestamp,
             current_timestamp
             FROM structure_parts_to_insert
-              INNER JOIN (SELECT id, row_number() OVER (ORDER BY id) AS index FROM events) AS events_with_indices ON event_id = events.id
+              INNER JOIN (SELECT id, row_number() OVER (ORDER BY id) AS index FROM events) AS events_with_indices
+                ON event_id = events_with_indices.id
               INNER JOIN (SELECT id, row_number() OVER (ORDER BY id) AS index FROM structure_items) AS structure_items_with_indices
                 USING (index)
       ), deleted_events AS (

data/db/migrate/20201007125625_add_timestamps_to_spina_conferences_parts.rb

@@ -2,8 +2,9 @@
 
 class AddTimestampsToSpinaConferencesParts < ActiveRecord::Migration[6.0]
   def change
-    add_timestamps :spina_conferences_parts, default: Time.now
-    change_column_default :spina_conferences_parts, :created_at, nil
-    change_column_default :spina_conferences_parts, :updated_at, nil
+    default = Time.now
+    add_timestamps :spina_conferences_parts, default: default
+    change_column_default :spina_conferences_parts, :created_at, from: default, to: nil
+    change_column_default :spina_conferences_parts, :updated_at, from: default, to: nil
   end
 end

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/migration/renaming.rb

@@ -20,14 +20,12 @@ module Spina
                 migration = {}
                 migration[:old] = migration_hash(name)
                 migration[:new] = migration_hash(to)
-                if [migration[:old], migration[:new]].pluck(:file).all?(&:present?)
-                  @stale_migrations << migration
-                end
+                @stale_migrations << migration if [migration[:old], migration[:new]].pluck(:file).all?(&:present?)
               end
             end
 
             def raise_on_duplicate_migrations!
-              raise DuplicateMigrationsError.new(@stale_migrations) if @stale_migrations.any?
+              raise DuplicateMigrationsError, @stale_migrations if @stale_migrations.any?
             end
 
             private
@@ -42,7 +40,7 @@ module Spina
 
               private
 
-              MIGRATION_REGEXP = /([0-9]+)_.+\.(spina(_admin)?_conferences).rb$/
+              MIGRATION_REGEXP = /([0-9]+)_.+\.(spina(_admin)?_conferences).rb$/.freeze
 
               def generate_message(migration)
                 old_version, old_scope = parse_filename(migration[:old][:file])
@@ -67,7 +65,7 @@ module Spina
             end
 
             def engine_migration_glob(name)
-              "#{migrations_path}/**/*_#{name}.spina{_admin,}_conferences.rb"
+              "#{migrations_path}/**/*_#{name}.spina{_admin,}_conferences_engine.rb"
             end
 
             def detect_migration(name)

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

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

metadata

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: spina-admin-conferences
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.9
 platform: ruby
 authors:
 - Justin Malčić
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-24 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,14 +561,13 @@ 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
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -555,7 +583,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Conference management plugin for Spina.
 test_files: []