lcms-engine 0.1.2 → 0.3.1

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

@@ -1,5 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
+import _ from 'lodash'
 
 class MultiSelectedOperation extends React.Component {
   componentDidMount() {

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

@@ -1,5 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
+import _ from 'lodash'
 // eslint-disable-next-line no-unused-vars
 import AssociationPickerItem from './AssociationPickerItem'
 import AssociationPickerWindow from './AssociationPickerWindow'

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import _ from 'lodash'
 
 function AssociationPickerResults(props) {
   let items
@@ -40,7 +41,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/association-picker/AssociationPickerWindow.jsx

@@ -1,4 +1,5 @@
 import React from 'react'
+import _ from 'lodash'
 import AssociationPickerResults from './AssociationPickerResults'
 
 class AssociationPickerWindow extends React.Component {

data/app/javascript/components/admin/curriculum/CurriculumEditor.jsx

@@ -1,5 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
+import _ from 'lodash'
 
 class CurriculumEditor extends React.Component {
   constructor(props) {

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/javascript/components/admin/resource-picker/ResourcePicker.jsx

@@ -1,5 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
+import _ from 'lodash'
 import ResourcePickerWindow from './ResourcePickerWindow'
 import ResourcePickerResource from './ResourcePickerResource'
 import PickerButton from '../picker/PickerButton'

data/app/jobs/concerns/lcms/engine/nested_resque_job.rb

@@ -29,10 +29,7 @@ module Lcms
           [].tap do |result|
             self::NESTED_JOBS.each do |job_klass|
               Resque.redis.scan_each(match: "#{job_klass.constantize.result_key(jid)}*") do |key|
-                res = Resque.redis.multi do
-                  Resque.redis.get key
-                  Resque.redis.del key
-                end.first
+                res = Resque.redis.get key
                 result << JSON.parse(res) rescue res
               end
             end

data/app/jobs/lcms/engine/document_generate_gdoc_job.rb

@@ -10,8 +10,8 @@ module Lcms
 
       GDOC_EXPORTERS = {
         'full' => DocumentExporter::Gdoc::Document,
-        'sm'   => DocumentExporter::Gdoc::StudentMaterial,
-        'tm'   => DocumentExporter::Gdoc::TeacherMaterial
+        'sm' => DocumentExporter::Gdoc::StudentMaterial,
+        'tm' => DocumentExporter::Gdoc::TeacherMaterial
       }.freeze
 
       before_perform do |job|

data/app/jobs/lcms/engine/document_generate_job.rb

@@ -56,7 +56,7 @@ module Lcms
       # Checks if there are jobs queued or running for current document
       # and any of its materials
       #
-      def materials_generating?
+      def materials_generating? # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         document.materials.each do |material|
           queued = Resque.peek(queue_name, 0, 0)
                      .map { |job| job['args'].first }

data/app/jobs/lcms/engine/document_parse_job.rb

@@ -31,7 +31,7 @@ module Lcms
       def reimport_document(link)
         form = DocumentForm.new({ link: link }, import_retry: true)
         @result = if form.save
-                    { ok: true, link: link, model: form.document }
+                    { ok: true, link: link, model: form.document, warnings: form.service_errors }
                   else
                     { ok: false, link: link, errors: form.errors[:link] }
                   end

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/component.rb

@@ -53,9 +53,9 @@ module Lcms
           Elasticsearch::Persistence::Repository::Response::Results.new(
             repo,
             hits: {
-              total:     resp[:total],
+              total: resp[:total],
               max_score: resp[:max_score],
-              hits:      resp[:results]
+              hits: resp[:results]
             }
           ).paginate(resp.slice(:page, :per_page))
         end
@@ -73,7 +73,7 @@ module Lcms
         # can define how to deserialize the results
         def repo
           @repo ||= Elasticsearch::Persistence::Repository.new do
-            def deserialize(document) # rubocop:disable Lint/NestedMethodDefinition
+            def deserialize(document)
               Component.new(document)
             end
           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,12 +2,12 @@
 
 module Lcms
   module Engine
-    class Download < ActiveRecord::Base
+    class Download < ApplicationRecord
       CONTENT_TYPES = {
         zip: 'application/zip',
         pdf: 'application/pdf',
         excel: %w(application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet),
-        powerpoint: %w(application/vnd.ms-powerpoint application/vnd.openxmlformats-officedocument.presentationml.presentation), # rubocop:disable Metrics/LineLength
+        powerpoint: %w(application/vnd.ms-powerpoint application/vnd.openxmlformats-officedocument.presentationml.presentation), # rubocop:disable Layout/LineLength
         doc: %w(application/msword application/vnd.openxmlformats-officedocument.wordprocessingml.document)
       }.freeze
       S3_URL = 'http://k12-content.s3-website-us-east-1.amazonaws.com/'
@@ -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/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/document.rb

@@ -31,10 +31,11 @@ module Lcms
 
         class << self
           def build_from(model)
-            if model.is_a?(Lcms::Engine::Resource)
+            case model
+            when Lcms::Engine::Resource
               new(**attrs_from_resource(model))
 
-            elsif model.is_a?(Lcms::Engine::ExternalPage)
+            when Lcms::Engine::ExternalPage
               new(**attrs_from_page(model))
 
             else
@@ -68,7 +69,7 @@ module Lcms
             if model.is_a?(Lcms::Engine::Resource) && model.generic?
               rtype = model[:resource_type] || 0
               # for generic resource use the min grade, instead the avg
-              grade_pos = model.grades.list.map { |g| Lcms::Engine::Grades::GRADES.index(g) }.compact.min || 0
+              grade_pos = model.grades.list.map { |g| Lcms::Engine::Grades.grades.index(g) }.compact.min || 0
               last_pos = model.grades.list.size
             else
               rtype = 0

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)