Merge branch 'development' into fix-pagniable-links

DMPRoadmap · Jan 27, 2023 · 223a7f9 · 223a7f9
2 parents 5246ce3 + 1b816d9
commit 223a7f9
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@
 - Added popover for org profile page and added explanation for public plan
 ### Fixed
 
+- Updated sans-serif font used in PDF downloads to Roboto since Google API no longer offers Helvetica
+- Fixed discrepencies with default/max per_page values for API and UI pagination
 - Updated JS that used to call the TinyMCE `setMode()` function so that it now calls `mode.set()` because the former is now deprecated.
 - Fixed an issue with the Rails 6 keyword arguments change that was causing the `paginable_sort_link` to fail
 

diff --git a/app/controllers/api/v0/plans_controller.rb b/app/controllers/api/v0/plans_controller.rb
@@ -98,7 +98,11 @@ def index
         plan_ids = extract_param_list(params, 'plan')
         @plans = @plans.where(id: plan_ids) if plan_ids.present?
         # apply pagination after filtering
-        @args = { per_page: params[:per_page], page: params[:page] }
+        max_per_page = Rails.configuration.x.application.api_max_page_size
+        page = params.fetch('page', 1).to_i
+        per_page = params.fetch('per_page', max_per_page).to_i
+        per_page = max_per_page if @per_page > max_per_page
+        @args = { per_page: per_page, page: page }
         @plans = refine_query(@plans)
         respond_with @plans
       end

diff --git a/app/controllers/api/v1/base_api_controller.rb b/app/controllers/api/v1/base_api_controller.rb
@@ -60,9 +60,10 @@ def base_response_content
       # Retrieve the requested pagination params or use defaults
       # only allow 100 per page as the max
       def pagination_params
+        max_per_page = Rails.configuration.x.application.api_max_page_size
         @page = params.fetch('page', 1).to_i
-        @per_page = params.fetch('per_page', 20).to_i
-        @per_page = 100 if @per_page > 100
+        @per_page = params.fetch('per_page', max_per_page).to_i
+        @per_page = max_per_page if @per_page > max_per_page
       end
 
       # Parse the body of the incoming request

diff --git a/app/controllers/concerns/paginable.rb b/app/controllers/concerns/paginable.rb
@@ -156,7 +156,7 @@ def refine_query(scope)
     if @args[:page] != 'ALL'
       # Can raise error if page is not a number
       scope = scope.page(@args[:page])
-                   .per(@args.fetch(:per_page, Rails.configuration.x.application.api_max_page_size))
+                   .per(@args.fetch(:per_page, Rails.configuration.x.results_per_page))
     end
     scope
   end

diff --git a/app/helpers/exports_helper.rb b/app/helpers/exports_helper.rb
@@ -10,7 +10,7 @@ module ExportsHelper
   }.freeze
 
   def font_face
-    @formatting[:font_face].presence || 'Arial, Helvetica, Sans-Serif'
+    @formatting[:font_face].presence || 'Roboto, Arial, Sans-Serif'
   end
 
   def font_size

diff --git a/app/models/settings/template.rb b/app/models/settings/template.rb
@@ -18,7 +18,7 @@ module Settings
   class Template < RailsSettings::SettingObject
     VALID_FONT_FACES = [
       '"Times New Roman", Times, Serif',
-      'Arial, Helvetica, Sans-Serif'
+      'Roboto, Arial, Sans-Serif'
     ].freeze
 
     VALID_FONT_SIZE_RANGE = (8..14).freeze

diff --git a/app/views/shared/export/_plan_styling.erb b/app/views/shared/export/_plan_styling.erb
@@ -1,5 +1,5 @@
 <style>
-  @import 'https://fonts.googleapis.com/css?family=<%= font_face.downcase.include?('times') ? 'Times' : 'Helvetica' %>';
+  @import 'https://fonts.googleapis.com/css?family=<%= font_face.downcase.include?('times') ? 'Times' : 'Roboto' %>';
 
   body {
     font-family: <%= font_face %>;
@@ -58,5 +58,5 @@
     }
     .bold {
       font-weight: bold;
-    }  
+    }
 </style>