lcms-engine 0.3.0 → 0.3.1

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

@@ -7,7 +7,7 @@ module Lcms
         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/'

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/presenters/lcms/engine/document_presenter.rb

@@ -131,7 +131,7 @@ module Lcms
         Lcms::Engine::ReactMaterialsResolver.resolve(content, self)
       end
 
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def short_breadcrumb(join_with: ' / ', with_short_lesson: false, with_subject: true, unit_level: false)
         unless unit_level
           lesson_abbr =
@@ -149,7 +149,7 @@ module Lcms
           lesson_abbr
         ].compact.join(join_with)
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
 
       def short_title
         assessment? ? doc_type : "Lesson #{lesson}"

data/app/queries/lcms/engine/admin_documents_query.rb

@@ -20,7 +20,7 @@ module Lcms
 
       private
 
-      def apply_filters # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def apply_filters # rubocop:disable Metrics/AbcSize
         @scope = @scope.actives unless q.inactive == '1'
         @scope = @scope.failed if q.only_failed == '1'
         @scope = @scope.filter_by_term(q.search_term) if q.search_term.present?

data/app/serializers/lcms/engine/previews_material_serializer.rb

@@ -5,6 +5,7 @@ module Lcms
     class PreviewsMaterialSerializer < ActiveModel::Serializer
       attributes :activity, :color, :content_type, :data, :for_group, :lesson, :subject
       attr_reader :document
+
       delegate :content_type, :subject, to: :document
 
       def initialize(props, document)

data/app/services/lcms/engine/document_build_service.rb

@@ -7,8 +7,11 @@ module Lcms
     class DocumentBuildService
       EVENT_BUILT = 'document:built'
 
+      attr_reader :errors
+
       def initialize(credentials, opts = {})
         @credentials = credentials
+        @errors = []
         @options = opts
       end
 
@@ -19,6 +22,7 @@ module Lcms
         @content = download url
         @expand_document = expand
         @template = DocTemplate::Template.parse @content
+        @errors = @template.metadata_service.errors
 
         create_document
         clear_preview_link

data/app/services/lcms/engine/html_sanitizer.rb

@@ -5,10 +5,10 @@ require 'sanitize'
 module Lcms
   module Engine
     class HtmlSanitizer # rubocop:disable Metrics/ClassLength
-      LIST_STYLE_RE = /\.lst-(\S+)[^{}]+>\s*(?:li:before)\s*{\s*content[^{}]+counter\(lst-ctn-\1,([^)]+)\)/
+      LIST_STYLE_RE = /\.lst-(\S+)[^{}]+>\s*(?:li:before)\s*{\s*content[^{}]+counter\(lst-ctn-\1,([^)]+)\)/.freeze
       CLEAN_ELEMENTS = %w(a div h1 h2 h3 h4 h5 h6 p table).join(',')
       GDOC_REMOVE_EMPTY_SELECTOR = '.o-ld-activity'
-      LINK_UNDERLINE_REGEX = /text-decoration\s*:\s*underline/i
+      LINK_UNDERLINE_REGEX = /text-decoration\s*:\s*underline/i.freeze
       SKIP_P_CHECK = %w(ul ol table).freeze
       STRIP_ELEMENTS = %w(a div h1 h2 h3 h4 h5 h6 p span table).freeze
 
@@ -169,7 +169,7 @@ module Lcms
         ].freeze
         private_constant :FONT_STYLES_RE
 
-        BORDER_RE = /border-\w+-width:\s*0\w+;?/
+        BORDER_RE = /border-\w+-width:\s*0\w+;?/.freeze
         private_constant :BORDER_RE
 
         BORDER_REPLACE_RE = {
@@ -186,7 +186,7 @@ module Lcms
         ].freeze
         private_constant :SUB_SUP_RE
 
-        SUB_SUP_STYLE_RE = /vertical-align:\s*(sub|super);?/i
+        SUB_SUP_STYLE_RE = /vertical-align:\s*(sub|super);?/i.freeze
         private_constant :SUB_SUP_STYLE_RE
 
         def add_css_class(el, *classes)
@@ -242,7 +242,7 @@ module Lcms
         end
 
         def fix_table_styles(nodes, param, selector)
-          attr_regex = /(^|;\s*)#{param}\s*:\s*([\w\.]+)\s*($|;)*/
+          attr_regex = /(^|;\s*)#{param}\s*:\s*([\w.]+)\s*($|;)*/
           nodes.css(selector).each do |node|
             node[param] = node['style'].match(attr_regex)&.[](2)
           end

data/app/services/lcms/engine/lessons_gdoc_bundler.rb

@@ -67,7 +67,7 @@ module Lcms
 
       def dirname(res)
         subject = res.subject.casecmp('math').zero? ? 'Math' : 'ELA'
-        Breadcrumbs.new(res).short_pieces[1..-1].unshift(subject).join('-')
+        Breadcrumbs.new(res).short_pieces[1..].unshift(subject).join('-')
       end
 
       def drive_id(url)

data/app/services/lcms/engine/material_build_service.rb

@@ -7,10 +7,13 @@ module Lcms
   module Engine
     class MaterialBuildService
       EVENT_BUILT = 'material:built'
-      PDF_EXT_RE = /\.pdf$/
+      PDF_EXT_RE = /\.pdf$/.freeze
+
+      attr_reader :errors
 
       def initialize(credentials, opts = {})
         @credentials = credentials
+        @errors = []
         @options = opts
       end
 
@@ -25,7 +28,7 @@ module Lcms
 
       attr_reader :credentials, :material, :downloader, :options, :url
 
-      def build_from_pdf
+      def build_from_pdf # rubocop:disable Metrics/AbcSize
         @downloader = ::Lt::Lcms::Lesson::Downloader::PDF.new(credentials, url)
         create_material
         title = @downloader.file.name.sub(PDF_EXT_RE, '')
@@ -60,6 +63,7 @@ module Lcms
         create_material
         content = @downloader.download.content
         template = DocTemplate::Template.parse(content, type: :material)
+        @errors = template.metadata_service.errors
 
         metadata = template.metadata_service.options_for(:default)[:metadata]
         material.update!(

data/app/services/lcms/engine/material_preview_generator.rb

@@ -6,8 +6,8 @@ module Lcms
     # Generates and uploads PDF/GDoc files for material
     #
     class MaterialPreviewGenerator
-      GDOC_RE = %r{docs.google.com/document/d/([^/]*)}i
-      GDOC_BROKEN_RE = %r{/open\?id=$}i
+      GDOC_RE = %r{docs.google.com/document/d/([^/]*)}i.freeze
+      GDOC_BROKEN_RE = %r{/open\?id=$}i.freeze
       PDF_S3_FOLDER = 'temp-materials-pdf'
 
       attr_reader :error, :url

data/app/services/lcms/engine/react_materials_resolver.rb

@@ -14,8 +14,9 @@ module Lcms
 
         private
 
-        def replace_react(node, document)
+        def replace_react(node, document) # rubocop:disable Metrics/PerceivedComplexity
           node.remove && return if (data = node.attr('data-react-props')).blank?
+
           raw_props = if data.match?(/^\d+(?:,\s*\d+)*$/)
                         # comma separated list of numbers, i.e: '123' or '123,432' or '123, 42, 12'
                         { 'material_ids' => data.split(',').map(&:strip), 'activity' => {} }
@@ -25,7 +26,7 @@ module Lcms
           node.remove && return if (raw_props['material_ids']).empty?
 
           props = PreviewsMaterialSerializer.new(raw_props, document)
-          node.remove && return if props.data&.empty?
+          node.remove && return if props.data && props.data.empty?
 
           node.replace(component(props, document))
         end

data/app/views/lcms/engine/admin/batch_reimports/_search_form.html.erb

@@ -17,7 +17,7 @@
                           required: false,
                           as: :select,
                           include_blank: true,
-                          collection: Lcms::Engine::Grades::GRADES,
+                          collection: Lcms::Engine::Grades.grades,
                           label_method: :humanize %>
     </div>
 

data/app/views/lcms/engine/admin/curriculums/edit.html.erb

@@ -1,12 +1,10 @@
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css"/>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css" />
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/jstree.min.js"></script>
 
 <% set_page_title 'Curriculum Tree Manager' %>
 
 <div class="o-page">
 
-  <h1 class="text-center">Import Curriculum Tree</h1>
-
   <% if @curriculum.present? %>
     <h1 class="text-center">Curriculum Tree</h1>
     <div class="row">

data/app/views/lcms/engine/admin/documents/_materials_links.html.erb

@@ -3,10 +3,10 @@
   <% urls = material_urls(m, lesson) %>
   <li class="u-text--small">
     <% if urls[:gdoc].present? %>
-    <a class="lessons-table__materials--file" href="<%= urls[:gdoc] %>" target="_blank"> <i class="ub-icon ub-file-gdoc"></i></a>
+    <a class="lessons-table__materials--file" href="<%= urls[:gdoc] %>" target="_blank"> <i class="fab fa-google"></i></a>
     <% end %>
     <% if urls[:pdf].present? %>
-    <a class="lessons-table__materials--file" href="<%= urls[:pdf] %>" target="_blank"> <i class="ub-icon ub-file-pdf"></i></a>
+    <a class="lessons-table__materials--file" href="<%= urls[:pdf] %>" target="_blank"> <i class="far fa-file-pdf"></i></a>
     <% end %>
     <%= link_to(m.identifier, m, target: '_blank') %>
   </li>

data/app/views/lcms/engine/admin/documents/_search_form.html.erb

@@ -18,7 +18,7 @@
                           required: false,
                           as: :select,
                           include_blank: true,
-                          collection: Lcms::Engine::Grades::GRADES,
+                          collection: Lcms::Engine::Grades.grades,
                           label_method: :humanize %>
     </div>
 

data/app/views/lcms/engine/admin/documents/index.html.erb

@@ -16,12 +16,12 @@
       <%= react_component 'admin/MultiSelectedOperation', {
             text: t('.reimport_selected'),
             operation: 'reimport',
-            path: reimport_selected_admin_documents_path(query: params[:query]),
+            path: reimport_selected_admin_documents_path(query: @query_params),
             btn_style: 'primary' } %>
       <%= react_component 'admin/MultiSelectedOperation', {
             text: t('.delete_selected'),
             operation: 'delete',
-            path: delete_selected_admin_documents_path(query: params[:query]),
+            path: delete_selected_admin_documents_path(query: @query_params),
             btn_style: 'alert'} %>
 
       <%= link_to t('.new_lesson'), :new_admin_document, class: 'button primary' %>

data/app/views/lcms/engine/admin/documents/new.html.erb

@@ -1,7 +1,7 @@
 <div class="o-page">
   <h2 class=text-center><%= t('.page_title') %></h2>
 
-  <%= simple_form_for @document, url: [:admin, :documents] do |f| %>
+  <%= simple_form_for @document || DocumentForm.new, url: [:admin, :documents] do |f| %>
       <%= f.input :link, error: f.object.errors[:link].first.try(:html_safe), label: t('ui.url') %>
     <%= f.button :submit, t('.submit') %>
   <% end %>

data/app/views/lcms/engine/admin/materials/_search_form.html.erb

@@ -31,7 +31,7 @@
                           required: false,
                           as: :select,
                           include_blank: true,
-                          collection: Lcms::Engine::Grades::GRADES_ABBR.zip(Lcms::Engine::Grades::GRADES.map(&:humanize)).last(4),
+                          collection: Lcms::Engine::Grades.grades_abbrevs.zip(Lcms::Engine::Grades.grades.map(&:humanize)).last(4),
                           label_method: :last,
                           value_method: :first %>
     </div>

data/app/views/lcms/engine/admin/materials/index.html.erb

@@ -16,12 +16,12 @@
       <%= react_component 'admin/MultiSelectedOperation', {
             text: t('.reimport_selected'),
             operation: 'reimport',
-            path: reimport_selected_admin_materials_path(query: params[:query]),
+            path: reimport_selected_admin_materials_path(query: @query_params),
             btn_style: 'primary' } %>
       <%= react_component 'admin/MultiSelectedOperation', {
             text: t('.delete_selected'),
             operation: 'delete',
-            path: delete_selected_admin_materials_path(query: params[:query]),
+            path: delete_selected_admin_materials_path(query: @query_params),
             btn_style: 'alert'} %>
       <%# link_to t('.new_material_pdf'), new_admin_material_path(source_type: 'pdf'), class: 'button primary' %>
       <%= link_to t('.new_material'), :new_admin_material, class: 'button primary' %>
@@ -70,7 +70,7 @@
                 <% material.documents.each do |lesson| %>
                   <% lesson = ::Lcms::Engine::DocumentGenerator.document_presenter.new lesson %>
                   <li class="u-text--small">
-                    <a href="<%= lesson.file_url%>" target="_blank" class="materials-table__lessons--file"><i class="ub-icon ub-file-gdoc"></i></a>
+                    <a href="<%= lesson.file_url%>" target="_blank" class="materials-table__lessons--file"><i class="fab fa-google"></i></a>
                     <%= link_to lesson.title, ::Lcms::Engine::Admin::AdminController.document_path(lesson, request.query_parameters), target: '_blank' %>
                   </li>
                 <% end %>
@@ -78,7 +78,7 @@
             <td class="u-txt--small"><%= material.reimported_at.to_s.presence || material.updated_at.to_s %>
             <td class="materials-table__btns text-left">
               <%= render partial: 'lcms/engine/admin/materials/reimport', locals: { material: material } %>
-              <%= button_to t('ui.delete'), admin_material_path(material, query: params[:query]), class: 'button small alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
+              <%= button_to t('ui.delete'), admin_material_path(material, query: @query_params), class: 'button small alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
               <% unless material.pdf? %>
                 <%# link_to material.pdf_preview_title, preview_pdf_material_path(material), class: 'button warning', target: '_blank' %>
                 <%# link_to material.gdoc_preview_title, preview_gdoc_material_path(material), class: 'button warning', target: '_blank' %>

data/app/views/lcms/engine/admin/resource_bulk_edits/new.html.erb

@@ -9,7 +9,7 @@
 
     <%= f.association :standards, as: :select, input_html: { class: 'selectize', multiple: true } %>
 
-    <%= f.input :grades, collection: Lcms::Engine::Grades::GRADES, as: :select, value_method: :humanize, input_html: { class: 'selectize', id: 'grades_select', multiple: true } %>
+    <%= f.input :grades, collection: Lcms::Engine::Grades.grades, as: :select, value_method: :humanize, input_html: { class: 'selectize', id: 'grades_select', multiple: true } %>
 
     <%= f.input :tag_list, collection: Lcms::Engine::Tag.where_context('tags').select(:id, :name).distinct(:name), as: :select, value_method: :name, input_html: { class: 'selectize', id: 'subjects_select', multiple: true } %>
 

data/app/views/lcms/engine/admin/resources/_fields.html.erb

@@ -14,6 +14,9 @@
 
 <%= f.input :opr_description, label: t('lcms.engine.admin.resources.form.opr_description'), wrapper_html: {class: (resource.unit? ? '': 'c-hidden')} %>
 
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css"/>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/jstree.min.js"></script>
+
 <%= react_component('admin/curriculum/DirectoryPicker', directory_picker_props(resource)) %>
 
 <%= f.input :time_to_teach %>

data/app/views/lcms/engine/admin/resources/_search_form.html.erb

@@ -1,7 +1,7 @@
 <%= simple_form_for @query, url: :admin_resources, html: { class: 'form-inline well admin-resource-search', method: :get } do |f| %>
 
   <div class='row align-justify'>
-    <%= f.input :grades, as: :select, collection: Lcms::Engine::Grades::GRADES, input_html: { class: 'selectize resource-search-select', multiple: true }, label: t('.grades'), label_method: :humanize, required: false, wrapper_html: { class: 'resource-search-wrap' } %>
+    <%= f.input :grades, as: :select, collection: Lcms::Engine::Grades.grades, input_html: { class: 'selectize resource-search-select', multiple: true }, label: t('.grades'), label_method: :humanize, required: false, wrapper_html: { class: 'resource-search-wrap' } %>
 
     <%= f.input :resource_standards_standard_id_in, as: :select, collection: Lcms::Engine::Standard.all, input_html: { class: 'selectize resource-search-select', multiple: true }, label: t('.standards'), required: false, wrapper_html: { class: 'resource-search-wrap' } %>