From 5d21e59ff5ad3f8da73652d0671ecb84b2e01bcd Mon Sep 17 00:00:00 2001
From: Simon Mayer <simon.mayer@onb.ac.at>
Date: Wed, 21 Sep 2022 14:58:46 +0200
Subject: [PATCH] QA/Bugfixing for multiple files
---
app/controllers/dataset_controller.rb | 6 +++---
.../packs/controllers/viewer_controller.js | 4 +++-
config/application.rb | 18 +++++++++---------
config/initializers/sidekiq.rb | 5 +++++
package.json | 2 +-
yarn.lock | 2 +-
6 files changed, 22 insertions(+), 15 deletions(-)
create mode 100644 config/initializers/sidekiq.rb
diff --git a/app/controllers/dataset_controller.rb b/app/controllers/dataset_controller.rb
index 4675069..e67f613 100644
--- a/app/controllers/dataset_controller.rb
+++ b/app/controllers/dataset_controller.rb
@@ -158,9 +158,9 @@ class DatasetController < ApplicationController
@nb_removed_docs = params[:documents_ids].size
dataset = Dataset.find(session[:working_dataset])
dataset.remove_documents params[:documents_ids]
- redirect_url = ENV['NEP_REDIRECT_URL'] || 'http://127.0.0.1:8001/en/tool/newspapers-platform'
- puts redirect_url
- redirect_to redirect_url + "/dataset/#{dataset.id}", id: dataset.id
+ respond_to do |format|
+ format.js {render inline: "location.reload();" } # https://stackoverflow.com/questions/7465259/how-can-i-reload-the-current-page-in-ruby-on-rails
+ end
end
def add_all_documents
diff --git a/app/javascript/packs/controllers/viewer_controller.js b/app/javascript/packs/controllers/viewer_controller.js
index 116d234..62a64df 100644
--- a/app/javascript/packs/controllers/viewer_controller.js
+++ b/app/javascript/packs/controllers/viewer_controller.js
@@ -21,12 +21,14 @@ export default class extends Controller {
this.selectedCompound = {id: selectedCompoundParam, parts: compoundParts}
$(`#compound-articles-panel li[data-compound-id="${selectedCompoundParam}"]`).addClass("active")
}
+ this.load_named_entities([this.issueIdValue])
}
else {
this.selectedArticlesValue = [selectedParam]
+ this.load_named_entities([selectedParam])
}
this.setup_viewer()
- this.load_named_entities([this.issueIdValue])
+
this.setup_mention_click()
this.setup_compound()
this.sortable = new Sortable(document.getElementById("compound_list"), {
diff --git a/config/application.rb b/config/application.rb
index 7eaa9a2..392ea7d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,14 +26,14 @@ module NewspapersPlatform
config.iiif_sources = config_for("iiif_sources")
# Allow requests from different origins
- config.middleware.use Rack::Cors do
- allow do
- origins "*"
- resource "*",
- headers: :any,
- expose: %w(access-token expiry token-type uid client),
- methods: %i(post)
- end
- end
+ # config.middleware.use Rack::Cors do
+ # allow do
+ # origins "*"
+ # resource "*",
+ # headers: :any,
+ # expose: %w(access-token expiry token-type uid client),
+ # methods: %i(post)
+ # end
+ # end
end
end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
new file mode 100644
index 0000000..b6ecfbe
--- /dev/null
+++ b/config/initializers/sidekiq.rb
@@ -0,0 +1,5 @@
+Sidekiq.configure_server do |config|
+ config.redis = {
+ url: ENV.fetch("SIDEKIQ_REDIS_URL", "redis://redis:6379/1")
+ }
+ end
\ No newline at end of file
diff --git a/package.json b/package.json
index d1db7e1..5b65fa0 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
"@rails/actioncable": "^6.0.0",
"@rails/activestorage": "^6.0.0",
"@rails/ujs": "^6.0.0",
- "@rails/webpacker": "^5.4.3",
+ "@rails/webpacker": "5.4.3",
"@shopify/draggable": "^1.0.0-beta.8",
"bootstrap": "^5.0.2",
"chart.js": "^3.6.0",
diff --git a/yarn.lock b/yarn.lock
index 130434a..44bc431 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1020,7 +1020,7 @@
resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.6.tgz#de486ae0a663e1bed637a012cbb2739bfcfa2031"
integrity sha512-2M4zlthYmOC6X/tcPcFd//sIL26a7JbCpGNl8uIrQf+pR1Z47uhYt9cOwVqJTJZPurdy2k+YY3Pn64pqruAPEA==
-"@rails/webpacker@^5.4.3":
+"@rails/webpacker@5.4.3":
version "5.4.3"
resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.4.3.tgz#cfe2d8faffe7db5001bad50a1534408b4f2efb2f"
integrity sha512-tEM8tpUtfx6FxKwcuQ9+v6pzgqM5LeAdhT6IJ4Te3BPKFO1xrGrXugqeRuZ+gE8ASDZRTOK6yuQkapOpuX5JdA==
--
GitLab