spina-admin-conferences 1.3.6 → 2.0.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c30ccae98052b11d0de343a6db12d48a3a584da68a0c2dc8226813a3559e783
-  data.tar.gz: 6a4fe3a6af558192125fdb2a0162a32d58b4e51739208876afa33a3d33bbb2e2
+  metadata.gz: f2cf050f26e9a9367a69e05ba199802f16edbd573cdc56edf1c2b120e2baf0e6
+  data.tar.gz: 6b0288820aef5a159e4f9662dbc1a89e8b9ad627e9788898da8cac4353b193ce
 SHA512:
-  metadata.gz: fddf46fd731f71914f279a8ec253f797aee685ef31c14b7f652bd934fd9736e86196adccd24ae08b6140ae41a870fa34d788acdaf93b480282bd0c18b2b008e3
-  data.tar.gz: be324272b7adcf0cdc00968ead3f3dabfe3a9ce9a2ac5a8512389ebfd2d98af9575c7eee39d8e6f572dfcc9424c1e49041fa43dd714727b62d8f8c873b4bb9da
+  metadata.gz: 760273d0393107bd95e41dbd2c4dddb94cd971d826afb69bb09aced1775814ebbd354d79254ada1d567a325ab62d50e6b3becfb17e81480b97247407e7231c79
+  data.tar.gz: 24cf127eacd47cff18bfd50170b4954c5250a5b2cd89f78af9a46aad69062496a342571beb9b2dd77ab2959d6c81c0c0b72d4e40ad048c4a21b2cb984e6bca3b

data/README.md

@@ -1,13 +1,12 @@
 # Conferences
 
-[![Build Status](https://travis-ci.com/jmalcic/spina-conferences.svg?branch=master)](https://travis-ci.com/jmalcic/spina-conferences)
-![Rails tests](https://github.com/jmalcic/spina-conferences/workflows/Rails%20tests/badge.svg?branch=master&event=push)
-[![Coverage Status](https://coveralls.io/repos/github/jmalcic/spina-conferences/badge.svg?branch=master)](https://coveralls.io/github/jmalcic/spina-conferences?branch=master)
-[![Total alerts](https://img.shields.io/lgtm/alerts/g/jmalcic/spina-conferences.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/jmalcic/spina-conferences/alerts/)
-[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/jmalcic/spina-conferences.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/jmalcic/spina-conferences/context:javascript)
-[![Code quality](https://www.codefactor.io/repository/github/jmalcic/spina-conferences/badge)](https://www.codefactor.io/repository/github/jmalcic/spina-conferences)
-[![Inline docs](http://inch-ci.org/github/jmalcic/spina-conferences.svg?branch=master)](http://inch-ci.org/github/jmalcic/spina-conferences)
-[![Visual testing](https://percy.io/static/images/percy-badge.svg)](https://percy.io/Ulab/spina-conferences)
+![Rails tests](https://github.com/jmalcic/spina-admin-conferences/workflows/Rails%20tests/badge.svg?branch=master&event=push)
+[![Coverage Status](https://coveralls.io/repos/github/jmalcic/spina-admin-conferences/badge.svg?branch=master)](https://coveralls.io/github/jmalcic/spina-admin-conferences?branch=master)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/jmalcic/spina-admin-conferences.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/jmalcic/spina-admin-conferences/alerts/)
+[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/jmalcic/spina-admin-conferences.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/jmalcic/spina-admin-conferences/context:javascript)
+[![Code quality](https://www.codefactor.io/repository/github/jmalcic/spina-admin-conferences/badge)](https://www.codefactor.io/repository/github/jmalcic/spina-admin-conferences)
+[![Inline docs](http://inch-ci.org/github/jmalcic/spina-admin-conferences.svg?branch=master)](http://inch-ci.org/github/jmalcic/spina-admin-conferences)
+[![Visual testing](https://percy.io/static/images/percy-badge.svg)](https://percy.io/Ulab/spina-admin-conferences)
 
 *Conferences* is a plugin for [Spina](https://www.spinacms.com 'Spina website') (a [Rails](http://rubyonrails.org 'Ruby on Rails website') content management system) to add conference management functionality.
 With the plugin, you'll be able to manage details of conferences, delegates, and presentations.
@@ -73,14 +72,14 @@ Then follow the instructions below.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'spina-conferences', github: 'jmalcic/spina-conferences'
+gem 'spina-admin-conferences'
 ```
 
 You'll then need to install and run the migrations from Conferences (the Spina install generator does this for Spina).
 
 First install the migrations and then migrate the database:
 ```bash
-$ rake spina_conferences:install:migrations
+$ rake spina_admin_conferences:install:migrations
 $ rake db:migrate
 ```
 

data/app/assets/config/spina_admin_conferences_manifest.js

@@ -1,3 +1,3 @@
-//= link spina/admin/conferences/application.js
-//= link spina/admin/conferences/application.css
 //= link spina_manifest.js
+//= link spina/admin/conferences/application.css
+//= link_tree ../javascripts

data/app/assets/javascripts/{spina/admin/conferences/controllers/conference_events_form_controller.es6 → controllers/spina/admin/conferences/conference_events_form_controller.js}

@@ -1,14 +1,13 @@
-/* global Stimulus */
-
 /**
- * @external Stimulus
+ * @external Controller
  * @see {@link https://stimulusjs.org}
  */
+import { Controller } from 'stimulus'
 
 /**
  * @classdesc Controller that manages conference event inputs.
  */
-class ConferenceEventsFormController extends Stimulus.Controller { // eslint-disable-line no-unused-vars
+export default class extends Controller {
   // noinspection JSUnusedGlobalSymbols
   static get targets() {
     return [

data/app/assets/javascripts/{spina/admin/conferences/controllers/presentation_attachments_form_controller.es6 → controllers/spina/admin/conferences/presentation_attachments_form_controller.js}

@@ -1,14 +1,13 @@
-/* global Stimulus */
-
 /**
- * @external Stimulus
+ * @external Controller
  * @see {@link https://stimulusjs.org}
  */
+import { Controller } from 'stimulus'
 
 /**
  * @classdesc Controller that manages presentation attachment inputs.
  */
-class PresentationAttachmentsFormController extends Stimulus.Controller { // eslint-disable-line no-unused-vars
+export default class extends Controller {
   // noinspection JSUnusedGlobalSymbols
   static get targets() {
     return [

data/app/assets/javascripts/{spina/admin/conferences/controllers/select_options_controller.es6 → controllers/spina/admin/conferences/select_options_controller.js}

@@ -1,14 +1,13 @@
-/* global Stimulus */
-
 /**
- * @external Stimulus
+ * @external Controller
  * @see {@link https://stimulusjs.org}
  */
+import { Controller } from 'stimulus'
 
 /**
  * @classdesc Controller that links related select elements.
  */
-class SelectOptionsController extends Stimulus.Controller { // eslint-disable-line no-unused-vars
+export default class SelectOptionsController extends Controller {
   // noinspection JSUnusedGlobalSymbols
   static get targets() {
     return [
@@ -24,7 +23,7 @@ class SelectOptionsController extends Stimulus.Controller { // eslint-disable-li
     return {
       /**
        * @private
-       * @property {Array} recordValues - The record values.
+       * @property {Array} recordValue - The record values.
        */
       record: Array,
     }
@@ -44,7 +43,7 @@ class SelectOptionsController extends Stimulus.Controller { // eslint-disable-li
    * Hook to update select targets when record values change.
    * @private
    */
-  recordValuesChanged() {
+  recordValueChanged() {
     this.selectTargets.forEach(target => {
       if (!(target instanceof HTMLSelectElement)) return
       this.updateOptions(target)
@@ -59,8 +58,8 @@ class SelectOptionsController extends Stimulus.Controller { // eslint-disable-li
   setVisibility(event) {
     const target = event.currentTarget
     if (!(target instanceof HTMLSelectElement)) return
-    const recordFilter = new SelectOptionsController.RecordFilter(this.recordValues, target)
-    this.recordValues = recordFilter.setVisibility()
+    const recordFilter = new SelectOptionsController.RecordFilter(this.recordValue, target)
+    this.recordValue = recordFilter.setVisibility()
   }
 
   /**
@@ -69,7 +68,7 @@ class SelectOptionsController extends Stimulus.Controller { // eslint-disable-li
    * @param {HTMLSelectElement} target - The select element to update the options of.
    */
   updateOptions(target) {
-    let newRecords = this.recordValues
+    let newRecords = this.recordValue
     if ('keyPath' in target.dataset) {
       const keyPath = new SelectOptionsController.KeyPath(target.dataset.keyPath)
       newRecords = keyPath.visibleObjectsAtKeyPath(newRecords)

data/app/assets/javascripts/importmap.json.erb

@@ -0,0 +1,6 @@
+{
+  "imports": {
+    "turbo": "<%= asset_path "turbo" %>",
+    <%= importmap_list_with_stimulus_from Spina::Admin::Conferences::Engine.root.join('app/assets/javascripts/controllers').relative_path_from(Rails.root) %>
+  }
+}

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

@@ -0,0 +1,4 @@
+document.addEventListener('turbo:load', (event) => {
+  const customEvent = new CustomEvent('turbolinks:load', { cancelable: event.cancelable, bubbles: true, detail: event.detail })
+  document.documentElement.dispatchEvent(customEvent)
+})

data/app/assets/stylesheets/spina/admin/conferences/application.sass

@@ -1,14 +1,3 @@
-input::-webkit-calendar-picker-indicator
-  display: none
-input[type="date"]::-webkit-outer-spin-button, input[type="date"]::-webkit-inner-spin-button, input[type="time"]::-webkit-inner-spin-button, input[type="time"]::-webkit-inner-spin-button
-  display: none
-input[type="date"]
-  padding-right: 30px
-
-.multiple.select-dropdown
-  z-index: 0
-  &:before
-    content: none
-  select
-    padding: 11px 10px
-    width: 100%
+.turbo-progress-bar
+  @import spina/configuration
+  background-color: $primary-color

data/app/controllers/spina/admin/conferences/application_controller.rb

@@ -5,14 +5,17 @@ module Spina
     module Conferences
       # @abstract Subclass to implement a custom controller.
       class ApplicationController < ::Spina::Admin::AdminController
+        helper ::Spina::Engine.routes.url_helpers
+
         add_flash_types :success
 
-        layout :admin_layout, only: %i[new edit]
+        layout 'spina/admin/conferences/application', only: %i[new edit]
+        before_action :set_locale
 
         private
 
-        def admin_layout
-          'spina/admin/admin'
+        def set_locale
+          @locale = params[:locale] || I18n.default_locale
         end
       end
     end

data/app/controllers/spina/admin/conferences/conferences_controller.rb

@@ -6,16 +6,21 @@ module Spina
       # Controller for {Conference} objects.
       # @see Conference
       class ConferencesController < ApplicationController
-        PARTS = [
-          { name: 'text', title: 'Text', partable_type: 'Spina::Text' },
-          { name: 'submission_url', title: 'Submission URL', partable_type: 'Spina::Admin::Conferences::UrlPart' },
-          { name: 'submission_email_address', title: 'Submission email address',
-            partable_type: 'Spina::Admin::Conferences::EmailAddressPart' },
-          { name: 'submission_date', title: 'Submission date', partable_type: 'Spina::Admin::Conferences::DatePart' },
-          { name: 'submission_text', title: 'Submission text', partable_type: 'Spina::Line' },
-          { name: 'gallery', title: 'Gallery', partable_type: 'Spina::ImageCollection' },
-          { name: 'sponsors', title: 'Sponsors', partable_type: 'Spina::Structure' }
+        PARTS_PARAMS = [
+          :name, :title, :type, :content, :filename, :signed_blob_id, :alt, :attachment_id, :image_id,
+          images_attributes: %i[filename signed_blob_id image_id alt],
+          content_attributes: [
+            :name, :title,
+            parts_attributes: [
+              :name, :title, :type, :content, :filename, :signed_blob_id, :alt, :attachment_id, :image_id,
+              images_attributes: %i[filename signed_blob_id image_id alt]
+            ]
+          ]
         ].freeze
+        CONTENT_PARAMS = Spina.config.locales.inject({}) { |params, locale| params.merge("#{locale}_content_attributes": [*PARTS_PARAMS]) }
+        PARAMS = [:start_date, :finish_date, :name, **CONTENT_PARAMS,
+          events_attributes: %i[id name start_datetime finish_datetime description location] ].freeze
+        PARTS = %w[text submission_url submission_email_address submission_date submission_text gallery sponsors].freeze
 
         before_action :set_conference, only: %i[edit update destroy]
         before_action :set_conferences_breadcrumb
@@ -58,7 +63,7 @@ module Spina
                 add_breadcrumb t('.new')
                 render :new
               end
-              format.js { render partial: 'errors', locals: { errors: @conference.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @conference.errors } }
             end
           end
         end
@@ -74,7 +79,7 @@ module Spina
                 add_breadcrumb @conference.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @conference.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @conference.errors } }
             end
           end
         end
@@ -90,7 +95,7 @@ module Spina
                 add_breadcrumb @conference.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @conference.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @conference.errors } }
             end
           end
         end
@@ -116,31 +121,17 @@ module Spina
         end
 
         def set_parts_attributes
-          @parts_attributes = PARTS
+          @parts_attributes = current_theme.parts.select { |part| PARTS.include? part[:name] }
         end
 
         def build_parts
           return unless @parts_attributes.is_a? Array
 
-          @conference.parts = @parts_attributes.collect do |part_attributes|
-            @conference.parts.where(name: part_attributes[:name]).first_or_initialize(**part_attributes)
-                       .tap { |part| part.partable ||= part.partable_type.constantize.new }
-          end
+          @parts = @parts_attributes.collect { |part_attributes| @conference.part(part_attributes) }
         end
 
-        def conference_params # rubocop:disable Metrics/MethodLength
-          params.require(:admin_conferences_conference).permit(:start_date, :finish_date, :name,
-                                                               events_attributes:
-                                                                 %i[id name date start_time finish_time description location],
-                                                               parts_attributes:
-                                                                 [:id, :title, :name, :partable_type, :partable_id,
-                                                                  { partable_attributes:
-                                                                      [:id, :content, :image_tokens, :image_positions, :date, :time,
-                                                                       { structure_items_attributes:
-                                                                           [:id, :position, :_destroy,
-                                                                            { structure_parts_attributes:
-                                                                                [:id, :title, :structure_partable_type, :name, :partable_id,
-                                                                                 { partable_attributes: {} }] }] }] }])
+        def conference_params
+          params.require(:conference).permit(PARAMS)
         end
       end
     end

data/app/controllers/spina/admin/conferences/delegates_controller.rb

@@ -44,7 +44,7 @@ module Spina
                 add_breadcrumb t('.new')
                 render :new
               end
-              format.js { render partial: 'errors', locals: { errors: @delegate.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @delegate.errors } }
             end
           end
         end
@@ -60,7 +60,7 @@ module Spina
                 add_breadcrumb @delegate.full_name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @delegate.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @delegate.errors } }
             end
           end
         end
@@ -76,7 +76,7 @@ module Spina
                 add_breadcrumb @delegate.full_name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @delegate.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @delegate.errors } }
             end
           end
         end
@@ -105,10 +105,8 @@ module Spina
         end
 
         def delegate_params
-          params.require(:admin_conferences_delegate).permit(:first_name, :last_name, :email_address, :url,
-                                                             :institution_id,
-                                                             conference_ids: [],
-                                                             dietary_requirement_ids: [])
+          params.require(:delegate).permit(:first_name, :last_name, :email_address, :url, :institution_id,
+                                           conference_ids: [], dietary_requirement_ids: [])
         end
       end
     end

data/app/controllers/spina/admin/conferences/dietary_requirements_controller.rb

@@ -44,7 +44,7 @@ module Spina
                 add_breadcrumb t('.new')
                 render :new
               end
-              format.js { render partial: 'errors', locals: { errors: @dietary_requirement.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @dietary_requirement.errors } }
             end
           end
         end
@@ -60,7 +60,7 @@ module Spina
                 add_breadcrumb @dietary_requirement.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @dietary_requirement.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @dietary_requirement.errors } }
             end
           end
         end
@@ -76,7 +76,7 @@ module Spina
                 add_breadcrumb @dietary_requirement.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @dietary_requirement.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @dietary_requirement.errors } }
             end
           end
         end
@@ -98,7 +98,7 @@ module Spina
         end
 
         def dietary_requirement_params
-          params.require(:admin_conferences_dietary_requirement).permit(:name)
+          params.require(:dietary_requirement).permit(:name)
         end
       end
     end

data/app/controllers/spina/admin/conferences/institutions_controller.rb

@@ -44,7 +44,7 @@ module Spina
                 add_breadcrumb t('.new')
                 render :new
               end
-              format.js { render partial: 'errors', locals: { errors: @institution.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @institution.errors } }
             end
           end
         end
@@ -60,7 +60,7 @@ module Spina
                 add_breadcrumb @institution.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @institution.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @institution.errors } }
             end
           end
         end
@@ -76,7 +76,7 @@ module Spina
                 add_breadcrumb @institution.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @institution.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @institution.errors } }
             end
           end
         end
@@ -98,7 +98,7 @@ module Spina
         end
 
         def conference_params
-          params.require(:admin_conferences_institution).permit(:name, :city, :logo_id)
+          params.require(:institution).permit(:name, :city, :logo_id)
         end
       end
     end

data/app/controllers/spina/admin/conferences/presentation_attachment_types_controller.rb

@@ -43,7 +43,7 @@ module Spina
                 add_breadcrumb t('.new')
                 render :new
               end
-              format.js { render partial: 'errors', locals: { errors: @presentation_attachment_type.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @presentation_attachment_type.errors } }
             end
           end
         end
@@ -59,7 +59,7 @@ module Spina
                 add_breadcrumb @presentation_attachment_type.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @presentation_attachment_type.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @presentation_attachment_type.errors } }
             end
           end
         end
@@ -75,7 +75,7 @@ module Spina
                 add_breadcrumb @presentation_attachment_type.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @presentation_attachment_type.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @presentation_attachment_type.errors } }
             end
           end
         end
@@ -96,7 +96,7 @@ module Spina
 
         # noinspection RubyInstanceMethodNamingConvention
         def presentation_attachment_type_params
-          params.require(:admin_conferences_presentation_attachment_type).permit(:name)
+          params.require(:presentation_attachment_type).permit(:name)
         end
       end
     end

data/app/controllers/spina/admin/conferences/presentation_types_controller.rb

@@ -46,7 +46,7 @@ module Spina
                 add_breadcrumb t('.new')
                 render :new
               end
-              format.js { render partial: 'errors', locals: { errors: @presentation_type.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @presentation_type.errors } }
             end
           end
         end
@@ -62,7 +62,7 @@ module Spina
                 add_breadcrumb @presentation_type.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @presentation_type.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @presentation_type.errors } }
             end
           end
         end
@@ -78,7 +78,7 @@ module Spina
                 add_breadcrumb @presentation_type.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @presentation_type.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @presentation_type.errors } }
             end
           end
         end
@@ -101,7 +101,7 @@ module Spina
         end
 
         def presentation_type_params
-          params.require(:admin_conferences_presentation_type).permit(:name, :conference_id, :minutes)
+          params.require(:presentation_type).permit(:name, :conference_id, :minutes)
         end
       end
     end