lcms-engine 0.1.4 → 0.2.0

data/app/entities/lcms/engine/pagination.rb

@@ -3,15 +3,16 @@
 module Lcms
   module Engine
     class Pagination
+      PARAMS_DEFAULT = { page: 1, per_page: 20, order: :asc }.freeze
+
       def initialize(params)
-        @params = params
+        @params = handle_params params
       end
 
       def params(strict: false)
         @pagination_params ||= begin
-          default_params = { page: 1, per_page: 20, order: :asc }
-          expected_params = @params.slice(:page, :per_page, :order).symbolize_keys
-          pagination = default_params.merge(expected_params)
+          expected_params = @params.slice(*PARAMS_DEFAULT.keys).symbolize_keys
+          pagination = PARAMS_DEFAULT.merge(expected_params)
 
           pagination[:page] = pagination[:page].to_i
           pagination[:per_page] = pagination[:per_page].to_i
@@ -37,7 +38,15 @@ module Lcms
           total_hits: resources.total_entries
         }
         options[:each_serializer] = serializer
-        ActiveModel::ArraySerializer.new(resources, options).as_json
+        ActiveModel::Serializer::CollectionSerializer.new(resources, options).as_json
+      end
+
+      private
+
+      def handle_params(params)
+        return params unless params.is_a?(ActionController::Parameters)
+
+        params.permit(*PARAMS_DEFAULT.keys).to_h
       end
     end
   end

data/app/forms/lcms/engine/material_form.rb

@@ -22,7 +22,6 @@ module Lcms
         return false unless valid?
 
         params = {
-          dpi: options[:dpi],
           import_retry: options[:import_retry],
           source_type: source_type.presence
         }.compact

data/app/helpers/lcms/engine/application_helper.rb

@@ -8,12 +8,8 @@ module Lcms
       include ViewHelper
       include ::Webpacker::Helper
 
-      # Use this to include lcms-engine based packs
-      def lcms_engine_javascript_pack_tag(*names, **options)
-        entries = names
-                    .map { |name| Lcms::Engine.webpacker.manifest.lookup!(name, type: :javascript) }
-                    .flatten
-        javascript_include_tag(*entries, **options)
+      def current_webpacker_instance
+        Lcms::Engine.webpacker
       end
     end
   end

data/app/helpers/lcms/engine/view_helper.rb

@@ -3,9 +3,7 @@
 module Lcms
   module Engine
     module ViewHelper # rubocop:disable Metrics/ModuleLength
-      ENABLE_BASE64_CACHING = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(
-        ENV.fetch('ENABLE_BASE64_CACHING', true)
-      )
+      ENABLE_BASE64_CACHING = ActiveRecord::Type::Boolean.new.cast ENV.fetch('ENABLE_BASE64_CACHING', true)
 
       def add_class_for_path(link_path, klass, klass_prefix = nil)
         [

data/app/interactors/lcms/engine/explore_curriculum_interactor.rb

@@ -32,7 +32,7 @@ module Lcms
       end
 
       def grades_props
-        ActiveModel::ArraySerializer.new(
+        ActiveModel::Serializer::CollectionSerializer.new(
           grades,
           each_serializer: CurriculumResourceSerializer,
           root: :results

data/app/javascript/components/admin/ImportStatus.jsx

@@ -75,7 +75,7 @@ class ImportStatus extends React.Component {
   }
 
   spinner() {
-    return <span className="o-adm-materials__spinner button primary u-margin-bottom--zero"><i className="fa fa-spin fa-spinner" /></span>
+    return <span className="o-adm-materials__spinner button primary u-margin-bottom--zero"><i className="fas fa-spin fa-spinner" /></span>
   }
 
   render() {

data/app/javascript/components/admin/association-picker/AssociationPickerResults.jsx

@@ -40,7 +40,7 @@ function AssociationPickerResults(props) {
         </tr>
       </thead>
       <tbody>
-        {items}
+        {items.length ? items : <tr><td>Nothing to select</td></tr> }
       </tbody>
     </table>
   )

data/app/javascript/components/admin/picker/pickerWindowWrapper.jsx

@@ -1,6 +1,5 @@
 import React from 'react'
 import PaginationBoxView from '../../paginate/PaginationBoxView'
-// import Routes from '../../../js-routes.js.erb';
 
 // eslint-disable-next-line no-unused-vars
 function pickerWindowWrapper(WrappedComponent, path) {

data/app/models/lcms/engine/access_code.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class AccessCode < ActiveRecord::Base
+    class AccessCode < ApplicationRecord
       validates :code, presence: true, uniqueness: true
 
       scope :active, -> { where(active: true) }

data/app/models/lcms/engine/application_record.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Lcms
+  module Engine
+    class ApplicationRecord < ActiveRecord::Base
+      self.abstract_class = true
+    end
+  end
+end

data/app/models/lcms/engine/author.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class Author < ActiveRecord::Base
+    class Author < ApplicationRecord
       has_many :resources
       has_many :curriculums, -> { distinct }, through: :resources
     end

data/app/models/lcms/engine/copyright_attribution.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class CopyrightAttribution < ActiveRecord::Base
+    class CopyrightAttribution < ApplicationRecord
       belongs_to :resource
       validates :resource_id, :value, presence: true
     end

data/app/models/lcms/engine/curriculum.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class Curriculum < ActiveRecord::Base
+    class Curriculum < ApplicationRecord
       has_many :resources, dependent: :nullify
       has_many :authors, -> { distinct }, through: :resources
 

data/app/models/lcms/engine/document.rb

@@ -2,11 +2,11 @@
 
 module Lcms
   module Engine
-    class Document < ActiveRecord::Base
+    class Document < ApplicationRecord
       include Partable
       GOOGLE_URL_PREFIX = 'https://docs.google.com/document/d'
 
-      belongs_to :resource
+      belongs_to :resource, optional: true
       has_many :document_parts, as: :renderer, dependent: :delete_all
       has_and_belongs_to_many :materials
 
@@ -55,7 +55,7 @@ module Lcms
           .joins('LEFT JOIN materials as m on m.id = links.key::integer')
           .where('((links.value -> ?)::text IS NULL) OR ((links.value -> ?)::text IS NULL)', 'gdoc', 'url')
           .where.not("m.metadata ->> 'type' = ?", 'pdf')
-          .uniq
+          .distinct
       }
 
       scope :with_updated_materials, lambda {

data/app/models/lcms/engine/document_bundle.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class DocumentBundle < ActiveRecord::Base
+    class DocumentBundle < ApplicationRecord
       CATEGORIES = %w(full tm sm).freeze
       CONTENT_TYPES = %w(pdf gdoc).freeze
 
@@ -10,7 +10,7 @@ module Lcms
 
       mount_uploader :file, DocumentBundleUploader
 
-      validates :resource, :category, presence: true
+      validates :category, presence: true
       validates :category, inclusion: { in: CATEGORIES }
       validates :content_type, inclusion: { in: CONTENT_TYPES }
 

data/app/models/lcms/engine/document_part.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class DocumentPart < ActiveRecord::Base
+    class DocumentPart < ApplicationRecord
       belongs_to :renderer, polymorphic: true
 
       enum context_type: { default: 0, gdoc: 1 }

data/app/models/lcms/engine/download.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class Download < ActiveRecord::Base
+    class Download < ApplicationRecord
       CONTENT_TYPES = {
         zip: 'application/zip',
         pdf: 'application/pdf',
@@ -17,8 +17,8 @@ module Lcms
       alias_attribute :file, :filename
 
       validates :title, presence: true
-      validates :file, presence: true, if: 'url.nil?'
-      validates :url, presence: true, if: 'file.nil?'
+      validates :file, presence: true, if: -> { url.nil? }
+      validates :url, presence: true, if: -> { file.nil? }
 
       before_save :update_metadata
 

data/app/models/lcms/engine/download_category.rb

@@ -4,7 +4,7 @@ require 'acts_as_list'
 
 module Lcms
   module Engine
-    class DownloadCategory < ActiveRecord::Base
+    class DownloadCategory < ApplicationRecord
       has_many :resource_downloads
 
       default_scope { order(:position) }

data/app/models/lcms/engine/leadership_post.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class LeadershipPost < ActiveRecord::Base
+    class LeadershipPost < ApplicationRecord
       validates :first_name, :last_name, presence: true
       validates :description, length: { maximum: 4096 }
 

data/app/models/lcms/engine/material.rb

@@ -4,7 +4,7 @@ require 'pg_search'
 
 module Lcms
   module Engine
-    class Material < ActiveRecord::Base
+    class Material < ApplicationRecord
       include PgSearch::Model
       include Partable
 
@@ -12,7 +12,7 @@ module Lcms
       validates :identifier, uniqueness: true
 
       has_many :document_parts, as: :renderer, dependent: :delete_all
-      has_and_belongs_to_many :documents
+      has_and_belongs_to_many :documents, optional: true
 
       store_accessor :metadata
 

data/app/models/lcms/engine/material_part.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class MaterialPart < ActiveRecord::Base
+    class MaterialPart < ApplicationRecord
       belongs_to :material
       enum context_type: { default: 0, gdoc: 1 }
 

data/app/models/lcms/engine/page.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class Page < ActiveRecord::Base
+    class Page < ApplicationRecord
       validates :body, :title, :slug, presence: true
 
       def full_title

data/app/models/lcms/engine/reading_assignment_author.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class ReadingAssignmentAuthor < ActiveRecord::Base
+    class ReadingAssignmentAuthor < ApplicationRecord
       has_many :reading_assignment_texts
     end
   end

data/app/models/lcms/engine/reading_assignment_text.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class ReadingAssignmentText < ActiveRecord::Base
+    class ReadingAssignmentText < ApplicationRecord
       has_many :resource_reading_assignments
       has_many :resources, through: :resource_reading_assignments
 

data/app/models/lcms/engine/resource.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class Resource < ActiveRecord::Base
+    class Resource < ApplicationRecord
       enum resource_type: {
         resource: 1,
         podcast: 2,
@@ -26,10 +26,10 @@ module Lcms
       acts_as_taggable_on :content_sources, :download_types, :resource_types, :tags, :topics
       has_closure_tree order: :level_position, dependent: :destroy, numeric_order: true
 
-      belongs_to :parent, class_name: 'Lcms::Engine::Resource', foreign_key: 'parent_id'
+      belongs_to :parent, class_name: 'Lcms::Engine::Resource', foreign_key: 'parent_id', optional: true
 
-      belongs_to :author
-      belongs_to :curriculum
+      belongs_to :author, optional: true
+      belongs_to :curriculum, optional: true
 
       # Additional resources
       has_many :resource_additional_resources, dependent: :destroy
@@ -271,14 +271,6 @@ module Lcms
         unit? && document_bundles.any?
       end
 
-      def add_grade_author(author)
-        grade = grade? ? self : ancestors.detect(&:grade?)
-        raise 'Grade not found for this resource' unless grade
-
-        grade.author_id = author.is_a?(Integer) ? author : author.id
-        grade.save
-      end
-
       def self_and_ancestors_not_persisted
         # during create we can't call self_and_ancestors directly on the resource
         # because this query uses the associations on resources_hierarchies

data/app/models/lcms/engine/resource_additional_resource.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class ResourceAdditionalResource < ActiveRecord::Base
+    class ResourceAdditionalResource < ApplicationRecord
       belongs_to :resource
       belongs_to :additional_resource, class_name: 'Resource', foreign_key: 'additional_resource_id'
     end

data/app/models/lcms/engine/resource_download.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class ResourceDownload < ActiveRecord::Base
+    class ResourceDownload < ApplicationRecord
       DOWNLOAD_PER_CATEGORY_LIMIT = 5
 
       belongs_to :resource

data/app/models/lcms/engine/resource_reading_assignment.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class ResourceReadingAssignment < ActiveRecord::Base
+    class ResourceReadingAssignment < ApplicationRecord
       belongs_to :reading_assignment_text
       belongs_to :resource
     end

data/app/models/lcms/engine/resource_related_resource.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class ResourceRelatedResource < ActiveRecord::Base
+    class ResourceRelatedResource < ApplicationRecord
       belongs_to :resource
       belongs_to :related_resource, class_name: 'Resource', foreign_key: 'related_resource_id'
     end

data/app/models/lcms/engine/resource_standard.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class ResourceStandard < ActiveRecord::Base
+    class ResourceStandard < ApplicationRecord
       belongs_to :resource
       belongs_to :standard
     end

data/app/models/lcms/engine/search/elastic_search_document.rb

@@ -43,7 +43,7 @@ module Lcms
           repository.search query
         end
 
-        # this is necessary for the ActiveModel::ArraySerializer#as_json method to work
+        # this is necessary for the ActiveModel::Serializer::CollectionSerializer#as_json method to work
         # (used on the Pagination#serialize_with_pagination)
         # NOTE: https://github.com/rails-api/active_model_serializers/issues/891
         def read_attribute_for_serialization(key)

data/app/models/lcms/engine/settings.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class Settings < ActiveRecord::Base
+    class Settings < ApplicationRecord
       class << self
         def [](key)
           settings.data[key.to_s]

data/app/models/lcms/engine/social_thumbnail.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class SocialThumbnail < ActiveRecord::Base
+    class SocialThumbnail < ApplicationRecord
       MEDIAS = %w(all facebook pinterest twitter).freeze
 
       mount_uploader :image, SocialThumbnailUploader

data/app/models/lcms/engine/staff_member.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class StaffMember < ActiveRecord::Base
+    class StaffMember < ApplicationRecord
       validates :first_name, :last_name, presence: true
       validates :bio, length: { maximum: 4096 }
       enum staff_type: { staff: 1, board: 2 }

data/app/models/lcms/engine/standard.rb

@@ -2,7 +2,7 @@
 
 module Lcms
   module Engine
-    class Standard < ActiveRecord::Base
+    class Standard < ApplicationRecord
       # NOTE: #954 - to be removed?
       ALT_NAME_REGEX = {
         'ela' => /^[[:alpha:]]+\.(k|pk|\d+)\.\d+(\.[[:alnum:]]+)?$/,