lcms-engine 0.2.0 → 0.3.0

data/app/assets/stylesheets/lcms/engine/pdf.scss

@@ -2,10 +2,7 @@
 
 @import
   'utils/variables',
-  'utils/mixins',
-  'base/colors',
-  'base/cg-colors',
-  'base/ld-colors';
+  'utils/mixins';
 
 @import
   'themes/settings';
@@ -20,34 +17,13 @@
   'utils/colorcodes',
   'utils/functions';
 
-@import
-  //'print/b64-fonts',
-  'base/icons',
-  'base/typography',
-  'print/typography';
-
-@import
-  'components/cg/annotations',
-  'components/cg/colorscheme',
-  'components/cg/elements',
-  'components/cg/footnote',
-  'components/cg/icons',
-  'components/cg/keywords',
-  'components/cg/quotes',
-  'components/cg/standards',
-  'components/cg/table',
-  'components/cg/task',
-  'components/cg/hacks';
+@import 'print/typography';
 
-@import
-  'components/lesson-base',
-  'components/material/material';
+@import 'components/material/material';
 
 @import
   'print/base',
-  'print/cg-base',
   'print/colorscheme',
-  'print/hacks',
   'print/header',
   'print/helpers',
   'print/lesson-base',

data/app/assets/stylesheets/lcms/engine/pdf_plain.scss

@@ -2,10 +2,7 @@
 
 @import
   'utils/variables',
-  'utils/mixins',
-  'base/colors',
-  'base/cg-colors',
-  'base/ld-colors';
+  'utils/mixins';
 
 @import
   'themes/settings';
@@ -17,17 +14,12 @@
   'utils/colorcodes',
   'utils/helpers';
 
-@import
-  //'print/b64-fonts',
-  'print/typography';
+@import 'print/typography';
 
-@import
-  'components/cg/colorscheme',
-  'components/lesson/override';
+@import 'components/lesson/override';
 
 @import
   'print/base',
-  'print/cg-base',
   'print/cover',
   'print/colorscheme',
   'print/footer',

data/app/assets/stylesheets/lcms/engine/print/_typography.scss

@@ -1,8 +1,3 @@
-// Font families
-// $ub-sanserif: 'PF Centro Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-// $ub-serif: 'Caponi Slab Web', Georgia, "Times New Roman", Times, serif;
-// $ub-sanserif-condensed: 'PF Centro Sans Condensed', $ub-sanserif;
-
 $ub-pdf-typography: (
   h1: ('font-size': 30pt, 'line-height': 30pt, 'font-family': $ub-serif, 'font-weight': 500, 'font-style': normal, color: $ub-pdf-black),
   h2: ('font-size': 15pt, 'line-height': 18pt, 'font-family': $ub-serif, color: $ub-pdf-gray, 'font-style': normal),

data/app/assets/stylesheets/lcms/engine/utils/_variables.scss

@@ -1,8 +1,8 @@
 // Font families
-$ub-sanserif: 'PF Centro Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-$ub-serif: 'Caponi Slab Web', Georgia, "Times New Roman", Times, serif;
-$ub-sanserif-condensed: 'PF Centro Sans Condensed', $ub-sanserif;
-$ub-cursive: 'Sriracha', cursive;
+$ub-sanserif: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+$ub-serif: Georgia, 'Times New Roman', Times, serif;
+$ub-sanserif-condensed: $ub-sanserif;
+$ub-cursive: 'Times New Roman', cursive;
 
 $panel-radius: 3px;
 

data/app/controllers/concerns/lcms/engine/reimportable.rb

@@ -5,6 +5,15 @@ module Lcms
     module Reimportable
       private
 
+      def create_from_folder
+        # Import all from a folder
+        file_ids = gdoc_files_from form_params[:link]
+        return bulk_import(file_ids) && render(:import) if file_ids.any?
+
+        flash.now[:alert] = t 'lcms.engine.admin.common.empty_folder'
+        render(:new)
+      end
+
       def import_status_for(job_class)
         params.fetch(:jids, []).each_with_object({}) do |jid, obj|
           status = job_class.status(jid)

data/app/controllers/lcms/engine/admin/admin_controller.rb

@@ -11,6 +11,8 @@ module Lcms
           materials_query: Lcms::Engine::AdminMaterialsQuery
         }.freeze
 
+        RE_GOOGLE_FOLDER = %r{/drive/(.*/)?folders/}
+
         layout :customized_layout
 
         before_action :authenticate_admin!

data/app/controllers/lcms/engine/admin/documents_controller.rb

@@ -18,17 +18,14 @@ module Lcms
         end
 
         def create
-          if gdoc_files.size > 1
-            bulk_import gdoc_files
-            return render :import
-          end
+          return create_from_folder if form_params[:link].match?(RE_GOOGLE_FOLDER)
 
           @document = reimport_lesson
           if @document.save
             redirect_to AdminController.document_path(@document.document),
                         notice: t('.success', name: @document.document.name)
           else
-            render :new, alert: t('.error')
+            render :new
           end
         end
 
@@ -77,18 +74,11 @@ module Lcms
           @documents = Document.where(id: ids)
         end
 
-        def gdoc_files
-          @gdoc_files ||= begin
-            link = form_params[:link]
-            if link.match?(%r{/drive/(.*/)?folders/})
-              folder_id = ::Lt::Google::Api::Drive.folder_id_for(link)
-              ::Lt::Google::Api::Drive.new(google_credentials)
-                .list_file_ids_in(folder_id)
-                .map { |id| Lt::Lcms::Lesson::Downloader::Gdoc.gdoc_file_url(id) }
-            else
-              [link]
-            end
-          end
+        def gdoc_files_from(url)
+          folder_id = ::Lt::Google::Api::Drive.folder_id_for(url)
+          ::Lt::Google::Api::Drive.new(google_credentials)
+            .list_file_ids_in(folder_id)
+            .map { |id| ::Lt::Lcms::Lesson::Downloader::Gdoc.gdoc_file_url(id) }
         end
 
         def form_params

data/app/controllers/lcms/engine/admin/materials_controller.rb

@@ -16,12 +16,14 @@ module Lcms
         end
 
         def create
-          return bulk_import(gdoc_files) && render(:import) if gdoc_files.size > 1
-
           @material_form = DocumentGenerator.material_form.new(form_params)
+
+          return create_from_folder if form_params[:link].match?(RE_GOOGLE_FOLDER)
+
           if @material_form.save
             material = @material_form.material
-            redirect_to AdminController.material_path(material.id), notice: t('.success', name: material.name)
+            redirect_to AdminController.material_path(material),
+                        notice: t('.success', name: material.name)
           else
             render :new
           end
@@ -74,22 +76,17 @@ module Lcms
           params.require(:material_form).permit(:link, :source_type)
         end
 
-        def gdoc_files
-          @gdoc_files ||= begin
-            link = form_params[:link]
-            return [link] unless link =~ %r{/drive/(.*/)?folders/}
-
-            folder_id = ::Lt::Google::Api::Drive.folder_id_for(link)
-            if form_params[:source_type] == 'pdf'
-              mime_type = Lt::Lcms::Lesson::Downloader::PDF::MIME_TYPE
-              ::Lt::Google::Api::Drive.new(google_credentials)
-                .list_file_ids_in(folder_id, mime_type: mime_type)
-                .map { |id| Lt::Lcms::Lesson::Downloader::PDF.gdoc_file_url(id) }
-            else
-              ::Lt::Google::Api::Drive.new(google_credentials)
-                .list_file_ids_in(folder_id)
-                .map { |id| Lt::Lcms::Lesson::Downloader::Gdoc.gdoc_file_url(id) }
-            end
+        def gdoc_files_from(url)
+          folder_id = ::Lt::Google::Api::Drive.folder_id_for(url)
+          if form_params[:source_type] == 'pdf'
+            mime_type = Lt::Lcms::Lesson::Downloader::PDF::MIME_TYPE
+            ::Lt::Google::Api::Drive.new(google_credentials)
+              .list_file_ids_in(folder_id, mime_type: mime_type)
+              .map { |id| ::Lt::Lcms::Lesson::Downloader::PDF.gdoc_file_url(id) }
+          else
+            ::Lt::Google::Api::Drive.new(google_credentials)
+              .list_file_ids_in(folder_id)
+              .map { |id| ::Lt::Lcms::Lesson::Downloader::Gdoc.gdoc_file_url(id) }
           end
         end
       end

data/app/controllers/lcms/engine/admin/resources_controller.rb

@@ -81,6 +81,80 @@ module Lcms
           redirect_to :admin_resources, notice: t('.success', resource_id: @resource.id)
         end
 
+        protected
+
+        def form_params_arrays
+          download_categories_settings =
+            DownloadCategory.select(:title).map do |category|
+              { category.title.parameterize => %i(show_long_description show_short_description) }
+            end
+          {
+            additional_resource_ids: [],
+            common_core_standard_ids: [],
+            download_categories_settings: download_categories_settings,
+            resource_downloads_attributes: [
+              :_destroy,
+              :description,
+              :id,
+              :download_category_id, { download_attributes: %i(description file main filename_cache id title) }
+            ],
+            related_resource_ids: [],
+            standard_ids: [],
+            new_standard_names: [],
+            topic_ids: [],
+            tag_ids: [],
+            content_source_ids: [],
+            reading_assignment_text_ids: [],
+            new_topic_names: [],
+            new_tag_names: [],
+            new_content_source_names: [],
+            **form_params_arrays_override
+          }
+        end
+
+        #
+        # The result of this method will be splatted into +form_params_ararys+
+        # and will be injected into the final +form_params+ call.
+        #
+        # Should be used to extend the list of permitted parameters
+        #
+        # @return [Hash]
+        def form_params_arrays_override
+          {}
+        end
+
+        def form_params_simple
+          %i(
+            curriculum_type
+            directory
+            parent_id
+            tree
+            description
+            hidden
+            resource_type
+            short_title
+            subtitle
+            title
+            teaser
+            url
+            time_to_teach
+            ell_appropriate
+            image_file
+            opr_description
+          ).concat(form_params_simple_override)
+        end
+
+        #
+        # The result of this method will be added to +form_params_simple+
+        # and will be injected into the final +form_params+ call.
+        #
+        # Should be used to extend the list of permitted parameters
+        #
+        # @return [Array]
+        def form_params_simple_override
+          []
+        end
+
         private
 
         def can_bundle?(resource)
@@ -89,6 +163,7 @@ module Lcms
             .detect { |type| resource.send "#{type}?" }
             .present?
         end
+
         helper_method :can_bundle?
 
         def find_resource
@@ -99,50 +174,12 @@ module Lcms
           params.fetch(:q, {}).fetch(:grades, []).select(&:present?)
         end
 
-        # rubocop:disable Metrics/MethodLength
         def form_params
           @form_params ||=
             begin
-              download_categories_settings =
-                DownloadCategory.select(:title).map do |category|
-                  { category.title.parameterize => %i(show_long_description show_short_description) }
-                end
               ps = params.require(:resource).permit(
-                :curriculum_type,
-                :directory,
-                :parent_id,
-                :tree,
-                :description,
-                :hidden,
-                :resource_type,
-                :short_title,
-                :subtitle,
-                :title,
-                :teaser,
-                :url,
-                :time_to_teach,
-                :ell_appropriate,
-                :image_file,
-                :opr_description,
-                additional_resource_ids: [],
-                common_core_standard_ids: [],
-                download_categories_settings: download_categories_settings,
-                resource_downloads_attributes: [
-                  :_destroy,
-                  :description,
-                  :id,
-                  :download_category_id, { download_attributes: %i(description file main filename_cache id title) }
-                ],
-                related_resource_ids: [],
-                standard_ids: [],
-                new_standard_names: [],
-                topic_ids: [],
-                tag_ids: [],
-                content_source_ids: [],
-                reading_assignment_text_ids: [],
-                new_topic_names: [],
-                new_tag_names: [],
-                new_content_source_names: []
+                form_params_simple,
+                form_params_arrays
               ).to_h
               if ps[:download_categories_settings].present?
                 ps[:download_categories_settings].transform_values! do |settings|
@@ -153,7 +190,6 @@ module Lcms
               ps
             end
         end
-        # rubocop:enable Metrics/MethodLength
 
         def metadata(directory)
           return {} unless @resource.present?

data/app/controllers/lcms/engine/surveys_controller.rb

@@ -9,33 +9,22 @@ module Lcms
         @form = SurveyForm.new(permitted_params)
         if @form.valid?
           current_user.update(survey: @form.attributes)
-          notify_heap
           loc = stored_location_for(:user)
-          loc = root_path if loc.is_a?(String) && loc[survey_path]
-          redirect_to loc || root_path
+          loc = lcms_engine.root_path if loc.is_a?(String) && loc[survey_path]
+          redirect_to loc || lcms_engine.root_path
         else
           render :show
         end
       end
 
       def show
-        return redirect_to root_path if current_user.ready_to_go?
+        return redirect_to lcms_engine.root_path if current_user.ready_to_go?
 
         @form = SurveyForm.new(current_user.survey)
       end
 
       private
 
-      def notify_heap
-        data = current_user
-                 .survey.except('first_name', 'last_name')
-                 .merge(
-                   access_code: current_user.access_code,
-                   email: current_user.email
-                 )
-        Heap.add_user_properties current_user.id, data
-      end
-
       def permitted_params
         params.require(:survey_form).permit(
           :additional_period,

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

@@ -22,6 +22,7 @@ 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,8 +8,12 @@ module Lcms
       include ViewHelper
       include ::Webpacker::Helper
 
-      def current_webpacker_instance
-        Lcms::Engine.webpacker
+      # 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)
       end
     end
   end

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

@@ -37,13 +37,6 @@ module Lcms
         ResourceDownload::DOWNLOAD_PER_CATEGORY_LIMIT
       end
 
-      def download_heap_data(download, opts = {})
-        {
-          category: download.download_category&.title,
-          url: download.download.filename.url
-        }.merge(opts).to_json
-      end
-
       def resource_breadcrumbs_with_links(resource)
         return GenericPresenter.new(resource).generic_title if resource.generic?
 
@@ -78,16 +71,6 @@ module Lcms
           .where(id: ids).pluck(:alt_names).flatten.uniq
           .map { |n| Standard.filter_ccss_standards(n, resource.subject) }.compact.sort
       end
-
-      def bundle_heap_data(resource, bundle, cat, content_type)
-        {
-          resource_id: resource.id,
-          resource_title: resource.title,
-          url: bundle.file&.url.presence || bundle.url,
-          category: cat,
-          type: content_type
-        }.to_json
-      end
     end
   end
 end