spina-admin-conferences-fork 2.1.1 → 3.0.0.rc3

data/db/migrate/20190701174807_remove_spina_conference_pages.rb

@@ -2,9 +2,9 @@
 
 # This migration comes from spina_conferences (originally 20190701174807)
 
-class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
+class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] # :nodoc:
   def up
-    insert <<-SQL, 'Insert conferences parts'
+    insert <<-SQL.squish, 'Insert conferences parts'
       WITH parts AS (
         SELECT
           title,
@@ -29,7 +29,7 @@ class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
       INSERT INTO spina_conferences_parts (title, name, partable_id, partable_type, pageable_id, pageable_type)
         SELECT title, name, page_partable_id, page_partable_type, pageable_id, pageable_type FROM parts
     SQL
-    delete <<-SQL, 'Delete page parts'
+    delete <<-SQL.squish, 'Delete page parts'
       WITH parts AS (
         SELECT spina_page_parts.id AS id
           FROM spina_conferences_conferences
@@ -47,10 +47,10 @@ class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
       )
       DELETE FROM spina_page_parts USING parts WHERE spina_page_parts.id = parts.id
     SQL
-    delete <<-SQL, 'Delete pages'
+    delete <<-SQL.squish, 'Delete pages'
       DELETE FROM spina_pages USING spina_conferences_conference_page_parts WHERE conference_page_id = spina_pages.id
     SQL
-    delete <<-SQL, 'Delete conference page parts'
+    delete <<-SQL.squish, 'Delete conference page parts'
       DELETE FROM spina_conferences_conference_page_parts
         USING spina_conferences_conferences, spina_conferences_presentations
           WHERE (
@@ -62,10 +62,10 @@ class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
                 AND conference_page_partable_type = 'Spina::Conferences::Presentation'
             )
     SQL
-    delete <<-SQL, 'Delete conferences page'
+    delete <<-SQL.squish, 'Delete conferences page'
       DELETE FROM spina_pages WHERE name = 'conferences'
     SQL
-    delete <<-SQL, 'Delete conference pages resource'
+    delete <<-SQL.squish, 'Delete conference pages resource'
       DELETE FROM spina_resources WHERE name = 'conference_pages'
     SQL
     remove_column :spina_pages, :type
@@ -73,13 +73,13 @@ class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
 
   def down
     add_column :spina_pages, :type, :string
-    insert <<-SQL, 'Insert resource if missing'
+    insert <<-SQL.squish, 'Insert resource if missing'
       INSERT INTO spina_resources (name, label, created_at, updated_at)
         SELECT 'conference_pages', 'Conference pages', current_timestamp, current_timestamp
           WHERE NOT EXISTS (SELECT name FROM spina_resources WHERE name = 'conference_pages')
     SQL
     locale = ActiveRecord::Relation::QueryAttribute.new('locale', I18n.default_locale, ActiveRecord::Type::String.new)
-    insert <<-SQL, 'Insert root page if missing', nil, nil, nil, [locale]
+    insert <<-SQL.squish, 'Insert root page if missing', nil, nil, nil, [locale]
       WITH pages AS (
         INSERT INTO spina_pages (name, view_template, deletable, created_at, updated_at)
           SELECT 'conferences', 'conferences', false, current_timestamp, current_timestamp
@@ -89,7 +89,7 @@ class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
       INSERT INTO spina_page_translations (title, spina_page_id, locale, created_at, updated_at)
         SELECT 'Conferences', pages.id, $1, current_timestamp, current_timestamp FROM pages
     SQL
-    insert <<-SQL, 'Insert conference pages for conferences', nil, nil, nil, [locale]
+    insert <<-SQL.squish, 'Insert conference pages for conferences', nil, nil, nil, [locale]
       WITH
         resources AS (SELECT id FROM spina_resources WHERE name = 'conference_pages' LIMIT 1),
         conferences_pages AS (SELECT id FROM spina_pages WHERE view_template = 'conferences' LIMIT 1),
@@ -124,7 +124,7 @@ class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
                 ) AS pages_with_indices USING (index)
         )
       INSERT INTO spina_conferences_conference_page_parts
-        (conference_page_id, conference_page_partable_id, conference_page_partable_type, created_at, updated_at) 
+        (conference_page_id, conference_page_partable_id, conference_page_partable_type, created_at, updated_at)#{' '}
         SELECT page_id, conference_id, type, current_timestamp, current_timestamp
           FROM (
             SELECT conference_id, type, row_number() OVER (ORDER BY type, conference_id) AS index FROM conference_pages_to_insert
@@ -133,7 +133,7 @@ class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
               SELECT page_id, row_number() OVER (ORDER BY page_id) AS index FROM conference_pages
             ) AS pages_with_indices USING (index)
     SQL
-    insert <<-SQL, 'Insert conference pages for presentations', nil, nil, nil, [locale]
+    insert <<-SQL.squish, 'Insert conference pages for presentations', nil, nil, nil, [locale]
       WITH
         resources AS (SELECT id FROM spina_resources WHERE name = 'conference_pages' LIMIT 1),
         conference_pages_to_insert AS (
@@ -169,7 +169,7 @@ class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
                 ) AS pages_with_indices USING (index)
         )
       INSERT INTO spina_conferences_conference_page_parts
-        (conference_page_id, conference_page_partable_id, conference_page_partable_type, created_at, updated_at) 
+        (conference_page_id, conference_page_partable_id, conference_page_partable_type, created_at, updated_at)#{' '}
         SELECT page_id, presentation_id, type, current_timestamp, current_timestamp
           FROM (
             SELECT presentation_id, type, row_number() OVER (ORDER BY type, presentation_id) AS index FROM conference_pages_to_insert
@@ -178,7 +178,7 @@ class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
               SELECT page_id, row_number() OVER (ORDER BY page_id) AS index FROM conference_pages
             ) AS pages_with_indices USING (index)
     SQL
-    insert <<-SQL, 'Insert page parts'
+    insert <<-SQL.squish, 'Insert page parts'
       INSERT INTO spina_page_parts (title, name, page_id, page_partable_id, page_partable_type, created_at, updated_at)
         SELECT
           spina_conferences_parts.title, spina_conferences_parts.name, spina_pages.id, partable_id, partable_type, current_timestamp,
@@ -192,7 +192,7 @@ class RemoveSpinaConferencePages < ActiveRecord::Migration[6.0] #:nodoc:
               ON pageable_id = conference_page_partable_id AND pageable_type = conference_page_partable_type
             INNER JOIN spina_pages ON conference_page_id = spina_pages.id
     SQL
-    delete <<-SQL, 'Delete conference parts'
+    delete <<-SQL.squish, 'Delete conference parts'
       DELETE FROM spina_conferences_parts USING spina_page_parts WHERE page_partable_id = partable_id AND page_partable_type = partable_type
     SQL
   end

data/db/migrate/20190704135524_add_constraints_to_columns.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddConstraintsToColumns < ActiveRecord::Migration[6.0] # :nodoc:
-  def change # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  def change # rubocop:disable Metrics/AbcSize
     change_column_null :spina_conferences_conferences, :dates, false
     change_column_null :spina_conferences_conferences, :institution_id, false
     change_column_null :spina_conferences_delegates, :first_name, false

data/db/migrate/20200126213718_create_spina_conferences_presentation_attachments.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CreateSpinaConferencesPresentationAttachments < ActiveRecord::Migration[6.0] # :nodoc:
-  def change # rubocop:disable Metrics/MethodLength
+  def change
     create_table :spina_conferences_presentation_attachments do |t|
       t.references :presentation,
                    null: false, foreign_key: { to_table: :spina_conferences_presentations, on_delete: :cascade },

data/db/migrate/20200802184921_create_spina_conferences_event_name_description_and_location_translations.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CreateSpinaConferencesEventNameDescriptionAndLocationTranslations < ActiveRecord::Migration[6.0] # rubocop:disable Style/Documentation
-  def change # rubocop:disable Metrics/MethodLength
+  def change
     create_table :spina_conferences_event_translations do |t|
       # Translated attribute(s)
       t.string :name

data/db/migrate/20200911161739_move_conference_parts.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class MoveConferenceParts < ActiveRecord::Migration[6.0] # rubocop:disable Metrics/ClassLength, Style/Documentation
+class MoveConferenceParts < ActiveRecord::Migration[6.0] # rubocop:disable Style/Documentation
   def up
     insert <<-SQL.squish, 'Create events', nil, nil, nil
       WITH event_structure_items_with_parts AS (
@@ -75,7 +75,7 @@ class MoveConferenceParts < ActiveRecord::Migration[6.0] # rubocop:disable Metri
           RETURNING id
       ), event_translations AS (
         INSERT INTO spina_conferences_event_translations
-          (name, description, location, locale, spina_conferences_event_id, created_at, updated_at) 
+          (name, description, location, locale, spina_conferences_event_id, created_at, updated_at)#{' '}
           SELECT DISTINCT ON (event_structure_items_with_parts_and_indices.structure_item_id, locale)
             title, description, location, locale, structure_item_events.id, current_timestamp, current_timestamp
             FROM (
@@ -203,7 +203,7 @@ class MoveConferenceParts < ActiveRecord::Migration[6.0] # rubocop:disable Metri
               ) AS time_parts_with_indices USING (index)
       ), structure_parts AS (
         INSERT INTO spina_structure_parts
-          (structure_item_id, structure_partable_id, structure_partable_type, name, title, created_at, updated_at) 
+          (structure_item_id, structure_partable_id, structure_partable_type, name, title, created_at, updated_at)#{' '}
           SELECT
             structure_items_with_indices.id, partable_id, type, replace(lower(title), '\W', '_'), title, current_timestamp,
             current_timestamp

data/db/migrate/20201002122517_remove_spina_conferences_conference_page_parts.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RemoveSpinaConferencesConferencePageParts < ActiveRecord::Migration[6.0]
+class RemoveSpinaConferencesConferencePageParts < ActiveRecord::Migration[6.0] # :nodoc:
   def change
     drop_table :spina_conferences_conference_page_parts do |t|
       t.references :conference_page, foreign_key: { to_table: :spina_pages, on_delete: :cascade },

data/db/migrate/20201007125625_add_timestamps_to_spina_conferences_parts.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-class AddTimestampsToSpinaConferencesParts < ActiveRecord::Migration[6.0]
+class AddTimestampsToSpinaConferencesParts < ActiveRecord::Migration[6.0] # :nodoc:
   def change
-    default = Time.now
+    default = Time.zone.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

data/db/migrate/20210315164411_convert_partables_to_json.rb

@@ -11,7 +11,7 @@ Spina::Part.register(Spina::Parts::Admin::Conferences::Url)
 # If you have custom partables you must modify this migration to ensure the conversion of your partables is handled appropriately
 # by implementing <tt>convert_to_json!</tt> for your partables.
 class ConvertPartablesToJson < ActiveRecord::Migration[6.1]
-  def up # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  def up # rubocop:disable Metrics/AbcSize
     announce 'converting partables to JSON parts'
     Spina.config.locales.each do |locale|
       I18n.with_locale(locale) do
@@ -37,7 +37,7 @@ class ConvertPartablesToJson < ActiveRecord::Migration[6.1]
     end
   end
 
-  def down # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  def down # rubocop:disable Metrics/AbcSize
     announce 'converting JSON parts to partables'
     Spina.config.locales.each do |locale|
       I18n.with_locale(locale) do
@@ -204,15 +204,13 @@ module Spina # :nodoc: all
 
     def convert_page_parts_to_json!
       page_parts.reject { |page_part| page_part.page_partable.nil? }
-                .collect(&:convert_to_json!)
-                .compact
+                .filter_map(&:convert_to_json!)
                 .then { |parts| send(:"#{I18n.locale}_content").union(parts) }
                 .then { |parts| update("#{I18n.locale}_content": parts) }
     end
 
     def convert_json_to_parts!
-      update(page_parts: send(:"#{I18n.locale}_content").collect(&:convert_to_partable!)
-                                                        .compact
+      update(page_parts: send(:"#{I18n.locale}_content").filter_map(&:convert_to_partable!)
                                                         .collect { |partable| PagePart.new(page_partable: partable) })
     end
   end
@@ -222,16 +220,14 @@ module Spina # :nodoc: all
 
     def convert_layout_parts_to_json!
       layout_parts.reject { |layout_part| layout_part.layout_partable.nil? }
-                  .collect(&:convert_to_json!)
-                  .compact
+                  .filter_map(&:convert_to_json!)
                   .then { |parts| send(:"#{I18n.locale}_content").union(parts) }
                   .then { |parts| update("#{I18n.locale}_content": parts) }
     end
 
     def convert_json_to_parts!
       update(layout_parts: send(:"#{I18n.locale}_content")
-                             .collect(&:convert_to_partable!)
-                             .compact
+                             .filter_map(&:convert_to_partable!)
                              .collect { |partable| LayoutPart.new(layout_partable: partable) })
     end
   end
@@ -242,8 +238,7 @@ module Spina # :nodoc: all
 
     def convert_to_json!
       Parts::RepeaterContent.new(parts: structure_parts.reject { |structure_part| structure_part.structure_partable.nil? }
-                                                       .collect(&:convert_to_json!)
-                                                       .compact)
+                                                       .filter_map(&:convert_to_json!))
     end
   end
 
@@ -298,8 +293,7 @@ module Spina # :nodoc: all
 
     class RepeaterContent < Base
       def convert_to_structure_item!
-        Spina::StructureItem.new(structure_parts: parts.collect(&:convert_to_partable!)
-                                                       .compact
+        Spina::StructureItem.new(structure_parts: parts.filter_map(&:convert_to_partable!)
                                                        .collect { |partable| StructurePart.new(structure_partable: partable) })
       end
     end
@@ -381,15 +375,13 @@ module Spina # :nodoc: all
 
           def convert_parts_to_json!
             parts.reject { |part| part.partable.nil? }
-                 .collect(&:convert_to_json!)
-                 .compact
+                 .filter_map(&:convert_to_json!)
                  .then { |parts| send(:"#{I18n.locale}_content").union(parts) }
                  .then { |parts| update("#{I18n.locale}_content": parts) }
           end
 
           def convert_json_to_parts!
-            update(parts: send(:"#{I18n.locale}_content").collect(&:convert_to_partable!)
-                                                         .compact
+            update(parts: send(:"#{I18n.locale}_content").filter_map(&:convert_to_partable!)
                                                          .collect { |partable| Part.new(partable: partable) })
           end
         end

data/db/migrate/20210417102513_add_locale_to_action_text_rich_texts.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddLocaleToActionTextRichTexts < ActiveRecord::Migration[6.1]
+class AddLocaleToActionTextRichTexts < ActiveRecord::Migration[6.1] # :nodoc:
   def change
     add_column :action_text_rich_texts, :locale, :string
     remove_index :action_text_rich_texts, column: %i[record_type record_id name], name: :index_action_text_rich_texts_uniqueness,

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

@@ -8,6 +8,19 @@ module Spina
       class Engine < ::Rails::Engine
         isolate_namespace Spina::Admin::Conferences
 
+        initializer 'spina.admin.conferences.assets' do
+          Spina.config.importmap.draw do
+            pin_all_from Spina::Admin::Conferences::Engine.root.join('app/assets/javascripts/spina/admin/conferences/controllers'),
+                         under: 'controllers', to: 'spina/admin/conferences/controllers'
+          end
+
+          Spina.config.tailwind_content.concat(["#{Spina::Admin::Conferences::Engine.root}/app/views/**/*.*",
+                                                "#{Spina::Admin::Conferences::Engine.root}/app/components/**/*.*",
+                                                "#{Spina::Admin::Conferences::Engine.root}/app/helpers/**/*.*",
+                                                "#{Spina::Admin::Conferences::Engine.root}/app/assets/javascripts/**/*.js",
+                                                "#{Spina::Admin::Conferences::Engine.root}/app/**/application.tailwind.css"])
+        end
+
         config.before_initialize do
           ::Spina::Plugin.register do |plugin|
             plugin.name = 'conferences'

data/lib/spina/admin/conferences/migration/renaming.rb

@@ -6,7 +6,7 @@ module Spina
   module Admin
     module Conferences
       module Migration
-        module Renaming
+        module Renaming # :nodoc:
           extend ActiveSupport::Concern
 
           included do
@@ -14,7 +14,7 @@ module Spina
             @migrations_path ||= nil
           end
 
-          class_methods do
+          class_methods do # rubocop:disable Metrics/BlockLength
             def rename_migration(name, to:)
               config.after_initialize do
                 migration = {}
@@ -32,7 +32,7 @@ module Spina
 
             attr_reader :duplicate_migrations
 
-            class DuplicateMigrationsError < ::StandardError
+            class DuplicateMigrationsError < ::StandardError # :nodoc:
               def initialize(migrations)
                 messages = migrations.collect { |migration| generate_message(migration) }
                 super(messages.join("\n"))
@@ -42,7 +42,7 @@ module Spina
 
               MIGRATION_REGEXP = /([0-9]+)_.+\.(spina(_admin)?_conferences).rb$/.freeze
 
-              def generate_message(migration)
+              def generate_message(migration) # rubocop:disable Metrics/AbcSize
                 old_version, old_scope = parse_filename(migration[:old][:file])
                 messages = []
                 messages << "#{File.basename(migration[:new][:file])} is a renamed version of #{File.basename(migration[:old][:file])}."

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

@@ -5,6 +5,7 @@ require 'spina/admin/conferences/migration/renaming'
 module Spina
   module Admin
     module Conferences
+      # Railtie for renaming some migrations to be more concise, if they were previously installed
       class Railtie < Rails::Railtie
         include Migration::Renaming
 

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

@@ -4,7 +4,7 @@ module Spina
   module Admin
     module Conferences
       # Version number.
-      VERSION = '2.1.1'
+      VERSION = '3.0.0.rc3'
     end
   end
 end

data/lib/spina/admin/conferences.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+require 'haml-rails'
 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'
 require 'icalendar/tzinfo'