Merge branch 'release/0.3.1'

geobtaa · Oct 18, 2023 · f8ac73e · f8ac73e
2 parents 194e056 + 5ec9859
commit f8ac73e
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 14 deletions.
diff --git a/app/jobs/bulk_action_revert_document_job.rb b/app/jobs/bulk_action_revert_document_job.rb
@@ -2,7 +2,7 @@
 
 # BulkActionRevertDocumentJob
 class BulkActionRevertDocumentJob < ApplicationJob
-  queue_as :default
+  queue_as :priority
 
   def perform(action, doc)
     case action

diff --git a/app/jobs/bulk_action_revert_job.rb b/app/jobs/bulk_action_revert_job.rb
@@ -2,7 +2,7 @@
 
 # BulkActionRevertJob
 class BulkActionRevertJob < ApplicationJob
-  queue_as :default
+  queue_as :priority
 
   def perform(bulk_action)
     action = case bulk_action.field_name

diff --git a/app/jobs/bulk_action_run_document_job.rb b/app/jobs/bulk_action_run_document_job.rb
@@ -2,7 +2,7 @@
 
 # BulkActionRunDocumentJob
 class BulkActionRunDocumentJob < ApplicationJob
-  queue_as :default
+  queue_as :priority
 
   def perform(action, doc, field_name, field_value)
     case action

diff --git a/app/jobs/bulk_action_run_job.rb b/app/jobs/bulk_action_run_job.rb
@@ -2,7 +2,7 @@
 
 # BulkActionRunJob
 class BulkActionRunJob < ApplicationJob
-  queue_as :default
+  queue_as :priority
 
   def perform(bulk_action)
     action = case bulk_action.field_name

diff --git a/app/jobs/export_job.rb b/app/jobs/export_job.rb
@@ -4,7 +4,7 @@
 
 # ExportJob
 class ExportJob < ApplicationJob
-  queue_as :default
+  queue_as :priority
 
   def perform(request, current_user, query_params, export_service)
     logger.debug("\n\n Background Job: ♞")

diff --git a/app/jobs/export_json_bulk_job.rb b/app/jobs/export_json_bulk_job.rb
@@ -4,7 +4,7 @@
 
 # ExportJsonBulkJob
 class ExportJsonBulkJob < ApplicationJob
-  queue_as :default
+  queue_as :priority
 
   def perform(request, current_user, query_params, export_service)
     logger.debug("\n\n Background Job: ♞")

diff --git a/app/jobs/export_json_job.rb b/app/jobs/export_json_job.rb
@@ -5,7 +5,7 @@
 
 # ExportJsonJob
 class ExportJsonJob < ApplicationJob
-  queue_as :default
+  queue_as :priority
 
   def perform(request, current_user, query_params, export_service)
     logger.debug("\n\n Background Job: ♞")

diff --git a/app/jobs/import_document_job.rb b/app/jobs/import_document_job.rb
@@ -2,7 +2,7 @@
 
 # ImportDocumentJob class
 class ImportDocumentJob < ApplicationJob
-  queue_as :default
+  queue_as :priority
 
   def perform(import_document)
     # @TODO: Check for friendlier_id or raise error

diff --git a/app/jobs/import_run_job.rb b/app/jobs/import_run_job.rb
@@ -2,7 +2,7 @@
 
 # ImportRunJob class
 class ImportRunJob < ApplicationJob
-  queue_as :default
+  queue_as :priority
 
   def perform(import)
     data = CSV.parse(import.csv_file.download.force_encoding("UTF-8"), headers: true)

diff --git a/app/models/blacklight_api_ids.rb b/app/models/blacklight_api_ids.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "httparty"
+
 # BlacklightApi
 class BlacklightApiIds
   include HTTParty

diff --git a/app/views/admin/documents/_result_selected_options.html.erb b/app/views/admin/documents/_result_selected_options.html.erb
@@ -1,4 +1,4 @@
-<span id="result-selected-options" class="hidden" data-scope="pageset" data-controller="results" data-resultset="<%= admin_documents_path( params.to_unsafe_h.merge({rows: '10000'})) %>" data-pageset="/fetch?">
+<span id="result-selected-options" class="hidden" data-scope="pageset" data-controller="results" data-resultset="<%= admin_documents_path( params.to_unsafe_h.merge({rows: '1000'})) %>" data-pageset="/fetch?">
 
   <%= form_with(model: BulkAction.new, html: { id: 'result-action-form', data: { type: "html", action: "submit->results#setPubState" }, style: 'display:inline'}, url: admin_bulk_actions_path) do |form| -%>
     <%= form.hidden_field :request, value: "#{request.protocol}#{request.host}:#{request.port}" %>

diff --git a/lib/generators/geoblacklight_admin/config_generator.rb b/lib/generators/geoblacklight_admin/config_generator.rb
@@ -9,9 +9,10 @@ class ConfigGenerator < Rails::Generators::Base
     desc <<-DESCRIPTION
       This generator makes the following changes to your application:
        1. Copies GBL Admin initializer files to host config
-       5. Copies database.yml connection to host config
-       5. Copies settings.yml to host config
-       6. Copies .env.development and .env.test to host
+       2. Copies database.yml connection to host config
+       3. Copies sidekiq.yml connection to host config
+       4. Copies settings.yml to host config
+       5. Copies .env.development and .env.test to host
        6. Copies JSON Schema to host
        7. Copies solr/* to host
        8. Sets Routes
@@ -38,6 +39,10 @@ def create_database_yml
       copy_file "config/database.yml", "config/database.yml", force: true
     end
 
+    def create_sidekiq_yml
+      copy_file "config/sidekiq.yml", "config/sidekiq.yml", force: true
+    end
+
     def create_dotenv
       copy_file ".env.development.example", ".env.development"
       copy_file ".env.development.example", ".env.test"
@@ -281,6 +286,11 @@ def copy_app_javascript
       directory "javascript", "app/javascript", force: true
     end
 
+    def copy_app_images
+      copy_file "images/bookmark-regular.svg", "app/assets/images/bookmark-regular.svg"
+      copy_file "images/bookmark-solid.svg", "app/assets/images/bookmark-solid.svg"
+    end
+
     def add_package_json
       copy_file "package.json", "package.json", force: true
     end

diff --git a/lib/generators/geoblacklight_admin/templates/config/sidekiq.yml b/lib/generators/geoblacklight_admin/templates/config/sidekiq.yml
@@ -0,0 +1,7 @@
+:concurrency:  3
+:max_retries: 1
+
+:queues:
+  - priority
+  - devise
+  - default
diff --git a/lib/generators/geoblacklight_admin/templates/images/bookmark-regular.svg b/lib/generators/geoblacklight_admin/templates/images/bookmark-regular.svg
diff --git a/lib/generators/geoblacklight_admin/templates/images/bookmark-solid.svg b/lib/generators/geoblacklight_admin/templates/images/bookmark-solid.svg
diff --git a/lib/geoblacklight_admin/version.rb b/lib/geoblacklight_admin/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoblacklightAdmin
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end