lcms-engine 0.3.0 → 0.4.0

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
@@ -253,7 +253,7 @@ module Lcms
           return unless node.element? && node.name == 'li' && node['style'].to_s.include?('margin-left')
 
           indent = /margin-left\s*:\s*(\d+)/.match(node['style']).try(:[], 1).to_i
-          add_css_class(node, "u-ld-indent--l#{(indent - 50) / 30 + 2}") if indent >= 50
+          add_css_class(node, "u-ld-indent--l#{((indent - 50) / 30) + 2}") if indent >= 50
         end
 
         def post_processing_default(nodes)

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

@@ -29,7 +29,7 @@ module Lcms
         end
 
         def create_cartridge(resource)
-          # Note: For now work only with Modules
+          # NOTE: For now work only with Modules
           # Subject - Grade - Module
           parent = {
             children: [{

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
@@ -54,7 +54,7 @@ module Lcms
 
       def generate_pdf
         pdf_filename = "#{PDF_S3_FOLDER}/#{material.id}/#{material.base_filename}#{ContentPresenter::PDF_EXT}"
-        pdf = DocumentExporter::PDF::Material.new(material).export
+        pdf = DocumentExporter::Pdf::Material.new(material).export
         @url = S3Service.upload pdf_filename, pdf
         true
       end

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/services/lcms/engine/s3_service.rb

@@ -12,9 +12,21 @@ module Lcms
           .object(key)
       end
 
-      def self.upload(key, data)
+      #
+      # Upload data to the specified resource by key
+      #
+      # @param [String] key Key of the object. Usually represents the full path inside a bucket
+      # @param [IO|StringIO] data The data to be uploaded
+      # @param [Hash] options Additional options to be passed to Aws::S3::Object#put method
+      #
+      # @return [String] The final URL of the uploaded object
+      #
+      def self.upload(key, data, options = {})
         object = create_object key
-        object.put(body: data)
+        options = options.merge(
+          body: data
+        )
+        object.put(options)
         object.public_url
       end
 

data/app/tasks/resource_tasks.rb

@@ -40,13 +40,13 @@ class ResourceTasks
       Resource.lessons.find_each do |res|
         next if res.time_to_teach.present? && res.time_to_teach != 0
 
-        res.update_attributes(time_to_teach: 60)
+        res.update(time_to_teach: 60)
       end
 
       %i(units modules grades subjects).each do |level|
         Resource.send(level).find_each do |res|
           total = res.children.map(&:time_to_teach).sum
-          res.update_attributes(time_to_teach: total)
+          res.update(time_to_teach: total)
         end
       end
     end

data/app/views/layouts/lcms/engine/admin.html.erb

@@ -8,11 +8,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <%= render partial: 'lcms/engine/shared/favicon' %>
     <script>document.querySelector('html').className = 'js';</script>
-    <%= stylesheet_link_tag 'lcms/engine/admin', media: 'all', 'data-turbolinks-track' => 'reload' %>
+    <%= stylesheet_link_tag 'lcms/engine/lcms_engine_admin', media: 'all', 'data-turbolinks-track' => 'reload' %>
     <%= csrf_meta_tags %>
     <%# NOTE: JS served via Assets pipeline should be added first %>
-    <%= javascript_include_tag 'lcms/engine/admin/application', 'data-turbolinks-track' => 'reload' %>
-    <%= lcms_engine_javascript_pack_tag 'admin' %>
+    <%= javascript_include_tag 'lcms/engine/admin/lcms_engine_application', 'data-turbolinks-track' => 'reload' %>
+    <%= lcms_engine_javascript_pack_tag 'lcms_engine_admin' %>
   </head>
   <body>
     <div class="u-page-wrap c-admin u-supported">

data/app/views/layouts/lcms/engine/application.html.erb

@@ -9,8 +9,8 @@
     <%= redirect_meta_tag %>
     <%= render partial: 'lcms/engine/shared/favicon' %>
     <script>document.querySelector('html').className = 'js';</script>
-    <%= stylesheet_link_tag 'lcms/engine/application', media: 'all', 'data-turbolinks-track' => 'reload' %>
-    <%= javascript_include_tag 'lcms/engine/application', 'data-turbolinks-track' => 'reload' %>
+    <%= stylesheet_link_tag 'lcms/engine/lcms_engine_application', media: 'all', 'data-turbolinks-track' => 'reload' %>
+    <%= javascript_include_tag 'lcms/engine/lcms_engine_application', 'data-turbolinks-track' => 'reload' %>
     <%= csrf_meta_tags %>
     <% if content_for?(:canonical_url) %>
       <link rel=canonical href='<%= yield(:canonical_url) %>'>

data/app/views/layouts/lcms/engine/lti.html.erb

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script>document.querySelector('html').className = 'js';</script>
-    <%= stylesheet_link_tag 'lcms/engine/application', media: 'all', 'data-turbolinks-track' => 'reload' %>
+    <%= stylesheet_link_tag 'lcms/engine/lcms_engine_application', media: 'all', 'data-turbolinks-track' => 'reload' %>
     <%= javascript_include_tag '//s7.addthis.com/js/300/addthis_widget.js#async=1' %>
     <%= javascript_include_tag 'lcms/engine/application_lti', 'data-turbolinks-track' => 'reload' %>
     <%= csrf_meta_tags %>

data/app/views/lcms/engine/admin/access_codes/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for [:admin, @access_code], html: { id: 'access_code_form' } do |f| %>
+<%= simple_form_for @access_code, url: @url.presence || lcms_engine.admin_access_codes_path, html: { id: 'access_code_form' } do |f| %>
   <%= f.input :code %>
   <%= f.input :active %>
   <%= f.button :submit, t('ui.save'), name: nil %>

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

@@ -1,7 +1,7 @@
 <div class=o-page>
   <div class=clearfix>
     <div class=pull-right>
-      <%= link_to t('.new_access_code'), :new_admin_access_code, class: 'button success', 'data-turbolinks' => false %>
+      <%= link_to t('.new_access_code'), lcms_engine.new_admin_access_code_path, class: 'button success', 'data-turbolinks' => false %>
     </div>
   </div>
 
@@ -19,10 +19,10 @@
         <% @access_codes.each do |access_code| %>
           <% cache access_code do %>
             <tr id="access_code_<%= access_code.id %>">
-              <td><%= link_to access_code.code, edit_admin_access_code_path(access_code) %>
+              <td><%= link_to access_code.code, lcms_engine.edit_admin_access_code_path(access_code) %>
               <td><%= access_code.active ? 'YES' : 'NO' %>
               <td>
-                <%= button_to t('ui.delete'), admin_access_code_path(access_code), class: 'button alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
+                <%= button_to t('ui.delete'), lcms_engine.admin_access_code_path(access_code), class: 'button alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
               </td>
             </tr>
           <% end %>

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

@@ -1,4 +1,4 @@
-<%= simple_form_for :query, url: :admin_batch_reimport, html: { class: 'form-inline well o-admin-lessons-search', method: :post } do |f| %>
+<%= simple_form_for :query, url: lcms_engine.admin_batch_reimport_path, html: { class: 'form-inline well o-admin-lessons-search', method: :post } do |f| %>
 
   <div class="row align-bottom align-justify">
     <button class="button o-admin-search-subject float-right" type="button" data-toggle="subject">Select Subject</button>
@@ -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,16 +1,16 @@
-<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>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css" />
 
 <% 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">
-      <%= react_component('admin/curriculum/CurriculumEditor', @curriculum.editor_props.merge(form_token: form_authenticity_token)) %>
+      <%= react_component('admin/curriculum/CurriculumEditor',
+                          @curriculum.editor_props.merge(
+                            form_token: form_authenticity_token,
+                            path: lcms_engine.children_admin_curriculum_path)) %>
     </div>
   <% end %>
 </div>

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/_reimport.html.erb

@@ -3,5 +3,5 @@
   <%= hidden_field_tag('document_form[link_fs]', lesson.file_fs_url) %>
   <%= hidden_field_tag('document_form[reimport]', 1) %>
   <%= hidden_field_tag('document_form[with_materials]', 0, class: 'c-reimport-with-materials__field') %>
-  <%= submit_tag 'Reimport', class: local_assigns.fetch(:btn_class, 'button small primary') %>
+  <%= submit_tag 'Reimport', class: local_assigns.fetch(:btn_class, 'button small primary'), data: { disable_with: false } %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= simple_form_for :query, url: :admin_documents, html: { class: 'form-inline well o-admin-lessons-search', method: :get } do |f| %>
+<%= simple_form_for :query, url: lcms_engine.admin_documents_path, html: { class: 'form-inline well o-admin-lessons-search', method: :get } do |f| %>
 
   <div class='row align-bottom align-justify'>
     <button class="button o-admin-search-subject float-right" type="button" data-toggle="lesson-subject">Select Subject</button>
@@ -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/import.html.erb

@@ -4,7 +4,7 @@
   <h2 class="text-center">Import Documents</h2>
 
   <div class="row">
-    <%= link_to '<- Back', admin_documents_path, class: 'button primary' %>
+    <%= link_to '<- Back', lcms_engine.admin_documents_path, class: 'button primary' %>
   </div>
 
   <%= react_component('admin/ImportStatus', @props) %>

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

@@ -16,15 +16,15 @@
       <%= 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' %>
+      <%= link_to t('.new_lesson'), lcms_engine.new_admin_document_path, class: 'button primary' %>
     </div>
     <table class="lessons-table table">
       <tr>
@@ -40,11 +40,12 @@
       </tr>
 
       <% @documents.each do |lesson| %>
-        <tr id=lesson_<%= lesson.id %>>
+        <% cache lesson do %>
+          <tr id=lesson_<%= lesson.id %>>
           <td><%= check_box_tag 'selected_ids[]', lesson.id, selected_id?(lesson.id), class: 'c-selected-ids' %></td>
           <td class="u-text--right"><%= lesson.id %></td>
           <td><%= Lcms::Engine::Breadcrumbs.new(lesson.resource).short_title if lesson.resource %></td>
-          <td><%= link_to lesson.resource&.title, ::Lcms::Engine::Admin::AdminController.document_path(lesson, request.query_parameters), target: '_blank' %></td>
+          <td><%= link_to lesson.resource&.title, dynamic_document_path(lesson, request.query_parameters), target: '_blank' %></td>
           <td>
             <% if lesson.math? %>
               <% if lesson.file_url.present? %>
@@ -73,6 +74,7 @@
             <%= button_to t('ui.delete'), admin_document_path(lesson), class: 'button small alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %>
           </td>
         </tr>
+        <% end %>
       <% end %>
     </table>
   </div>

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

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

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

@@ -1,5 +1,5 @@
 <%= form_tag(lcms_engine.admin_materials_path, method: :post, class: 'inline-form-btn', target: '_blank') do %>
   <%= hidden_field_tag('material_form[source_type]', material.source_type) %>
   <%= hidden_field_tag('material_form[link]', material.file_url) %>
-  <%= submit_tag 'Reimport', class: "button primary #{local_assigns.fetch(:btn_size, 'small')}" %>
+  <%= submit_tag 'Reimport', class: "button primary #{local_assigns.fetch(:btn_size, 'small')}", data: { disable_with: false } %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= simple_form_for :query, url: :admin_materials, html: { class: 'form-inline well o-admin-lessons-search', method: :get } do |f| %>
+<%= simple_form_for :query, url: lcms_engine.admin_materials_path, html: { class: 'form-inline well o-admin-lessons-search', method: :get } do |f| %>
 
   <div class="row align-bottom align-justify">
     <%= f.input :search_term, label: 'Identifier', required: false,
@@ -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/import.html.erb

@@ -4,7 +4,7 @@
   <h2 class="text-center">Import Materials</h2>
 
   <div class="row">
-    <%= link_to '<- Back', admin_materials_path, class: 'button primary' %>
+    <%= link_to '<- Back', lcms_engine.admin_materials_path, class: 'button primary' %>
   </div>
 
   <%= react_component('admin/ImportStatus', @props) %>

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

@@ -16,15 +16,15 @@
       <%= 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' %>
+      <%= link_to t('.new_material'), lcms_engine.new_admin_material_path, class: 'button primary' %>
     </div>
     <div class="materials-table materials-table__wrapper">
       <table class="table u-text--centered">
@@ -49,41 +49,45 @@
         </tr>
 
         <% @materials.each do |material| %>
-          <% material = ::Lcms::Engine::DocumentGenerator.material_presenter.new material %>
-          <tr id="material_<%= material.id %>">
+          <% cache material do %>
+            <% material = ::Lcms::Engine::DocumentGenerator.material_presenter.new material %>
+            <tr id="material_<%= material.id %>">
             <td><%= check_box_tag 'selected_ids[]', material.id, selected_id?(material.id), class: 'c-selected-ids' %></td>
-            <td><%= material.id %>
-            <td class="u-text--right"><%= link_to material.metadata['identifier'], ::Lcms::Engine::Admin::AdminController.material_path(material, request.query_parameters), target: '_blank' %>
-            <td><%= link_to material.name, material.file_url, target: '_blank' %>
-            <td><%= material.metadata['type'] %>
-            <td><%= material.metadata['title']  %>
-            <td><%= material.metadata['grade'] %>
-            <td><%= material.metadata['guidebook'] %>
-            <td><%= material.metadata['section'] %>
-            <td><%= material.metadata['lesson'] %>
-            <td><%= material.metadata['activity'] %>
-            <td><%= material.metadata['orientation'] %>
-            <td><%= material.metadata['name_date'] %>
-            <td><%= material.metadata['header_footer'] %>
+            <td><%= material.id %></td>
+            <td class="u-text--right"><%= link_to material.metadata['identifier'], dynamic_material_path(material, request.query_parameters), target: '_blank' %></td>
+            <td><%= link_to material.name, material.file_url, target: '_blank' %></td>
+            <td><%= material.metadata['type'] %></td>
+            <td><%= material.metadata['title']  %></td>
+            <td><%= material.metadata['grade'] %></td>
+            <td><%= material.metadata['guidebook'] %></td>
+            <td><%= material.metadata['section'] %></td>
+            <td><%= material.metadata['lesson'] %></td>
+            <td><%= material.metadata['activity'] %></td>
+            <td><%= material.metadata['orientation'] %></td>
+            <td><%= material.metadata['name_date'] %></td>
+            <td><%= material.metadata['header_footer'] %></td>
             <td>
               <ul class="materials-table__lessons">
                 <% 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>
-                    <%= link_to lesson.title, ::Lcms::Engine::Admin::AdminController.document_path(lesson, request.query_parameters), target: '_blank' %>
+                    <a href="<%= lesson.file_url%>" target="_blank" class="materials-table__lessons--file"><i class="fab fa-google"></i></a>
+                    <%= link_to lesson.title, dynamic_path(:material_path, lesson, request.query_parameters), target: '_blank' %>
                   </li>
                 <% end %>
               </ul>
-            <td class="u-txt--small"><%= material.reimported_at.to_s.presence || material.updated_at.to_s %>
+            </td>
+            <td class="u-txt--small"><%= material.reimported_at.to_s.presence || material.updated_at.to_s %></td>
             <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' %>
               <% end %>
+            </td>
           </tr>
+          <% end %>
         <% end %>
       </table>
     </div>

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

@@ -1,9 +1,13 @@
 <div class="o-page">
   <h2 class="text-center"><%= t('.page_header', type: @material_form.source_type) %></h2>
 
-  <%= simple_form_for @material_form, url: [:admin, :materials] do |f| %>
+  <%= simple_form_for @material_form || MaterialForm.new, url: lcms_engine.admin_materials_path do |f| %>
     <%= f.hidden_field :source_type, value: @material_form.source_type %>
     <%= f.input :link, label: t('ui.url') %>
+    <p>
+      <%= f.check_box :async, checked: true %>
+      <span><small><%= t('ui.async') %></small></span>
+    </p>
     <%= f.button :submit, t('.submit') %>
   <% end %>
 </div>

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

@@ -1,7 +1,7 @@
 <div class=o-page>
   <h2 class=text-center><%= t('.page_title') %></h2>
 
-  <%= simple_form_for @resource, url: :admin_resource_bulk_edits do |f| %>
+  <%= simple_form_for @resource, url: lcms_engine.admin_resource_bulk_edits_path do |f| %>
 
     <% @resources.each do |resource| %>
       <%= hidden_field_tag 'ids[]', resource.id %>
@@ -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

@@ -1,3 +1,7 @@
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css" />
+
+<%= javascript_include_tag Ckeditor.cdn_url %>
+
 <%= f.input :title %>
 
 <%= f.input :short_title %>

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

@@ -1,4 +1,4 @@
-<% url = @resource.new_record? ? :admin_resources : admin_resource_path(@resource) %>
+<% url = @resource.new_record? ? lcms_engine.admin_resources_path : lcms_engine.admin_resource_path(@resource) %>
 
 <%= simple_nested_form_for @resource, url: url, html: { id: 'resource_form' } do |f| %>
   <div class="large-10 columns">

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| %>
+<%= simple_form_for @query, url: lcms_engine.admin_resources_path, 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' } %>
 

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

@@ -28,11 +28,12 @@
     </tr>
 
     <% @resources.each do |resource| %>
-      <tr>
+      <% cache resource do %>
+        <tr>
         <% check_box_id = "ids_#{resource.id}" %>
         <td><%= check_box_tag 'ids[]', resource.id, false, class: 'resource-checkbox', id: check_box_id %>
         <td><%= label_tag check_box_id, resource.id, class: 'resource-id-label' %>
-        <td><%= link_to resource.title, [:edit, :admin, resource] %>
+        <td><%= link_to resource.title, lcms_engine.edit_admin_resource_path(resource) %>
         <td class="resource-tag-col"><%= strip_tags resource.teaser %>
         <td class="resource-tag-col"><%= resource.standards.map(&:name).select(&:present?).join(', ') %>
         <td class="resource-tag-col"><%= resource.resource_type %>
@@ -41,14 +42,15 @@
         <td class="resource-tag-col"><%= resource.tree? ? 'yes' : 'no' %>
         <td><%= resource_status(resource) %>
         <td class="resource-btns-col">
-          <%= link_to t('ui.edit'), [:edit, :admin, resource], class: 'button small' %>
+          <%= link_to t('ui.edit'), lcms_engine.edit_admin_resource_path(resource), class: 'button small' %>
           <% if can_bundle? resource %>
-            <%= link_to t('.bundle'), [:bundle, :admin, resource], class: 'button small primary', method: :post %>
+            <%= link_to t('.bundle'), lcms_engine.bundle_admin_resource_path(resource), class: 'button small primary', method: :post %>
           <% end %>
           <% if resource.module? %>
-            <%= link_to t('.export_lti_cartridge'), [:export_to_lti_cc, :admin, resource], class: 'button small primary', method: :post %>
+            <%= link_to t('.export_lti_cartridge'), lcms_engine.export_to_lti_cc_admin_resource_path(resource), class: 'button small primary', method: :post %>
           <% end %>
       </tr>
+      <% end %>
     <% end %>
   </table>