lcms-engine 0.1.2 → 0.3.1

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

@@ -78,9 +78,9 @@
 
 @mixin txt-heading($element) {
   @include txt-heading-base($element);
-  @each $size, $headers in $header-sizes {
+  @each $size, $headers in $header-styles {
     @include breakpoint($size) {
-      $font-size: map-get($headers, $element);
+      $font-size: map-get(map-get($headers, $element), 'font-size');
       font-size: rem-calc($font-size);
     }
   }

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/assets/stylesheets/lcms/engine/vendors/foundation_and_overrides-pdf.scss

@@ -11,7 +11,6 @@
 @include foundation-dropdown-menu;
 @include foundation-menu;
 @include foundation-menu-icon;
-@include foundation-flex-video;
 @include foundation-label;
 @include foundation-media-object;
 @include foundation-table;

data/app/assets/stylesheets/lcms/engine/vendors/foundation_and_overrides.scss

@@ -1,9 +1,18 @@
+@charset "utf-8";
+
 @import 'foundation';
+
+// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package.
+//
 @import 'motion-ui/motion-ui';
 
 // We include everything by default.  To slim your CSS, remove components you don't use.
+
 @include foundation-global-styles;
+//@include foundation-xy-grid-classes;
+//@include foundation-grid;
 @include foundation-flex-grid;
+@include foundation-flex-classes;
 @include foundation-typography;
 @include foundation-forms;
 @include foundation-button;
@@ -13,13 +22,14 @@
 @include foundation-breadcrumbs;
 @include foundation-button-group;
 @include foundation-callout;
+@include foundation-card;
 @include foundation-close-button;
 @include foundation-menu;
 @include foundation-menu-icon;
 @include foundation-drilldown-menu;
 @include foundation-dropdown;
 @include foundation-dropdown-menu;
-@include foundation-flex-video;
+@include foundation-responsive-embed;
 @include foundation-label;
 @include foundation-media-object;
 @include foundation-off-canvas;
@@ -38,7 +48,8 @@
 @include foundation-top-bar;
 @include foundation-visibility-classes;
 @include foundation-float-classes;
-@include foundation-flex-classes;
+
+// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package.
 
 @include motion-ui-transitions;
 @include motion-ui-animations;

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

@@ -5,15 +5,34 @@ 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)
           obj[jid] = {
             status: status,
-            result: (status == :done ? job_class.fetch_result(jid) : nil)
+            result: (status == :done ? prepare_result(job_class, jid) : nil)
           }.compact
         end
       end
+
+      def prepare_result(job_class, jid)
+        jid_res = job_class.fetch_result(jid)
+        return jid_res if jid_res['ok']
+
+        {
+          ok: false,
+          errors: Array.wrap("<a href=\"#{jid_res['link']}\">Source</a>: #{jid_res['errors'].join(', ')}")
+        }
+      end
     end
   end
 end

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/}.freeze
+
         layout :customized_layout
 
         before_action :authenticate_admin!

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

@@ -13,7 +13,7 @@ module Lcms
         def index
           @items = association_items
           @items = @items.where('name ilike ?', "%#{params[:q]}%") if index_params[:q].present?
-          @items = @items.paginate(page: pagination.params[:page], per_page: 10).order('name asc')
+          @items = @items.paginate(page: params[:page], per_page: 10).order('name asc')
 
           respond_to do |format|
             format.json { render json: pagination.serialize(@items, AssociationItemSerializer) }
@@ -23,19 +23,20 @@ module Lcms
         private
 
         def pagination
-          @pagination ||= Pagination.new(params)
+          @pagination ||= Pagination.new params
         end
 
         def index_params
-          @index_params ||= begin
-            expected_params = params.slice(:association, :q).symbolize_keys
-            index_p = { q: nil }.merge(expected_params)
+          @index_params ||=
+            begin
+              expected_params = params.permit(:association, :q).to_h.symbolize_keys
+              index_p = { q: nil }.merge(expected_params)
 
-            raise StandardError unless VALID_ASSOCIATIONS.include?(index_p[:association])
+              raise StandardError unless VALID_ASSOCIATIONS.include?(index_p[:association])
 
-            index_p[:association] = index_p[:association].to_sym
-            index_p
-          end
+              index_p[:association] = index_p[:association].to_sym
+              index_p
+            end
         end
 
         def association_items

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

@@ -10,37 +10,35 @@ module Lcms
         include Reimportable
 
         before_action :find_selected, only: %i(destroy_selected reimport_selected)
+        before_action :set_query_params
 
         def index
-          @query = OpenStruct.new(params[:query])
+          @query = OpenStruct.new @query_params
           @documents = DocTemplate.config['queries']['document'].constantize.call(@query, page: params[:page])
           render_customized_view
         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)
+                        notice: t('.success', name: @document.document.name, errors: collect_errors)
           else
-            render :new, alert: t('.error')
+            render :new
           end
         end
 
         def destroy
           @document = Document.find(params[:id])
           @document.destroy
-          redirect_to admin_documents_path(query: params[:query]), notice: t('.success')
+          redirect_to admin_documents_path(query: @query_params), notice: t('.success')
         end
 
         def destroy_selected
           count = @documents.destroy_all.count
-          redirect_to admin_documents_path(query: params[:query]), notice: t('.success', count: count)
+          redirect_to admin_documents_path(query: @query_params), notice: t('.success', count: count)
         end
 
         def import_status
@@ -70,6 +68,12 @@ module Lcms
           @props = { jobs: jobs, type: :documents, links: view_links }
         end
 
+        def collect_errors
+          return if @document.service_errors.empty?
+
+          "Errors: #{@document.service_errors.join(' ')}"
+        end
+
         def find_selected
           return head(:bad_request) unless params[:selected_ids].present?
 
@@ -77,24 +81,17 @@ 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
           @form_params ||=
             begin
-              data = params.require(:document_form).permit(:link, :link_fs, :reimport, :with_materials)
+              data = params.require(:document_form).permit(:link, :link_fs, :reimport, :with_materials).to_h
               data.delete(:with_materials) if data[:with_materials].to_i.zero?
               data
             end
@@ -115,6 +112,14 @@ module Lcms
             MaterialForm.new({ link: material.file_url, source_type: material.source_type }, google_credentials).save
           end
         end
+
+        def set_query_params
+          @query_params = params[:query]
+            &.permit(
+              :broken_materials, :course, :grade, :inactive, :locale, :module, :only_failed, :reimport_required,
+              :search_term, :sort_by
+            ) || {}
+        end
       end
     end
   end

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

@@ -8,20 +8,23 @@ module Lcms
         include Reimportable
 
         before_action :find_selected, only: %i(destroy_selected reimport_selected)
+        before_action :set_query_params
 
         def index
-          @query = OpenStruct.new params[:query]
+          @query = OpenStruct.new @query_params
           @materials = DocTemplate.config['queries']['material'].constantize.call(@query, page: params[:page])
           render_customized_view
         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
@@ -30,12 +33,12 @@ module Lcms
         def destroy
           material = Material.find(params[:id])
           material.destroy
-          redirect_to admin_materials_path(query: params[:query]), notice: t('.success')
+          redirect_to admin_materials_path(query: @query_params), notice: t('.success')
         end
 
         def destroy_selected
           count = @materials.destroy_all.count
-          redirect_to admin_materials_path(query: params[:query]), notice: t('.success', count: count)
+          redirect_to admin_materials_path(query: @query_params), notice: t('.success', count: count)
         end
 
         def import_status
@@ -74,24 +77,27 @@ 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
+
+        def set_query_params
+          @query_params = params[:query]
+            &.permit(
+              :course, :lesson, :name_date, :orientation, :search_term, :search_file_name, :sort_by, :title, :type,
+              :unit
+            ) || {}
+        end
       end
     end
   end

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

@@ -24,7 +24,7 @@ module Lcms
         def index_params
           @index_params ||= begin
             default_params = { type: nil, subject: nil, grade: nil, q: nil }
-            expected_params = params.slice(:type, :subject, :grade, :q).symbolize_keys
+            expected_params = params.permit(:type, :subject, :grade, :q).to_h.symbolize_keys
             index_p = default_params.merge(expected_params)
 
             grade_ok = index_p[:grade].blank? || Filterbar::GRADES.include?(index_p[:grade])
@@ -38,7 +38,7 @@ module Lcms
         end
 
         def pagination
-          @pagination ||= Pagination.new(params)
+          @pagination ||= Pagination.new params
         end
 
         def grade_name

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

@@ -40,7 +40,9 @@ module Lcms
 
         def export_to_lti_cc
           # TODO: Later may need to extend this check to allow unit export as well
-          return redirect_to :back, notice: 'Unsupported resource type' unless @resource.module?
+          unless @resource.module?
+            return redirect_back fallback_location: admin_resources_path, notice: 'Unsupported resource type'
+          end
 
           data = LtiExporter.perform @resource
           filename = "#{@resource.slug.parameterize}.zip"
@@ -79,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)
@@ -87,6 +163,7 @@ module Lcms
             .detect { |type| resource.send "#{type}?" }
             .present?
         end
+
         helper_method :can_bundle?
 
         def find_resource
@@ -97,51 +174,13 @@ 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|
                   settings.transform_values! { |x| x == '1' }
@@ -151,7 +190,6 @@ module Lcms
               ps
             end
         end
-        # rubocop:enable Metrics/MethodLength
 
         def metadata(directory)
           return {} unless @resource.present?