iqvoc 4.13.0 → 4.14.4

data/config/database.yml

@@ -1,25 +1,26 @@
 development:
   adapter: postgresql
-  host: 127.0.0.1
-  encoding: utf8
-  username: mjansing
-  password:
-  database: iqvoc_development
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_development' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
 
 test:
   adapter: postgresql
-  encoding: utf8
-  reconnect: false
-  database: iqvoc_test
+  host: localhost
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_test' %>
   pool: 5
-  username: mjansing
-  password:
-  host: 127.0.0.1
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>
 
 production:
   adapter: postgresql
-  host: 127.0.0.1
-  encoding: utf8
-  username: mjansing
-  password:
-  database: iqvoc_development
+  host: <%= ENV["POSTGRES_HOST"] || 'localhost' %>
+  encoding: unicode
+  database: <%= ENV["POSTGRES_DB"] || 'iqvoc_production' %>
+  pool: 5
+  username: <%= ENV["POSTGRES_USER"] || 'postgres' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || 'postgres' %>

data/config/database.yml.postgresql

@@ -18,7 +18,7 @@ test:
 
 production:
   adapter: postgresql
-  host: localhost
+  host: <%= ENV["POSTGRES_HOST"] || 'localhost' %>
   encoding: unicode
   database: <%= ENV["POSTGRES_DB"] || 'iqvoc_production' %>
   pool: 5

data/config/engine.rb

@@ -11,11 +11,11 @@ require 'deep_cloneable'
 require 'json'
 require 'rails_autolink'
 require 'bootstrap_form'
-require 'uglifier'
 require 'apipie-rails'
 require 'database_cleaner'
 require 'delayed_job_active_record'
 require 'carrierwave'
+require 'carrierwave-i18n'
 require 'faraday'
 require 'faraday_middleware'
 require 'rack-mini-profiler'

data/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require_relative 'application'
+require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/config/initializers/active_record.rb

@@ -14,5 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'search_extension'
+
 ActiveRecord::Base.store_full_sti_class = true
 ActiveRecord::Base.send :include, SearchExtension

data/config/initializers/backtrace_silencers.rb

@@ -1,7 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
 
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
+# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
+Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]

data/config/initializers/content_security_policy.rb

@@ -1,25 +1,25 @@
 # Be sure to restart your server when you modify this file.
 
-# Define an application-wide content security policy
-# For further information see the following documentation
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+# Define an application-wide content security policy.
+# See the Securing Rails Applications Guide for more information:
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
 
-# Rails.application.config.content_security_policy do |policy|
-#   policy.default_src :self, :https
-#   policy.font_src    :self, :https, :data
-#   policy.img_src     :self, :https, :data
-#   policy.object_src  :none
-#   policy.script_src  :self, :https
-#   policy.style_src   :self, :https
-
-#   # Specify URI for violation reports
-#   # policy.report_uri "/csp-violation-report-endpoint"
+# Rails.application.configure do
+#   config.content_security_policy do |policy|
+#     policy.default_src :self, :https
+#     policy.font_src    :self, :https, :data
+#     policy.img_src     :self, :https, :data
+#     policy.object_src  :none
+#     policy.script_src  :self, :https
+#     policy.style_src   :self, :https
+#     # Specify URI for violation reports
+#     # policy.report_uri "/csp-violation-report-endpoint"
+#   end
+#
+#   # Generate session nonces for permitted importmap and inline scripts
+#   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+#   config.content_security_policy_nonce_directives = %w(script-src)
+#
+#   # Report violations without enforcing the policy.
+#   # config.content_security_policy_report_only = true
 # end
-
-# If you are using UJS then enable automatic nonce generation
-# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
-
-# Report CSP violations to a specified URI
-# For further information see the following documentation:
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
-# Rails.application.config.content_security_policy_report_only = true

data/config/initializers/filter_parameter_logging.rb

@@ -1,4 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+# Configure parameters to be filtered from the log file. Use this to limit dissemination of
+# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
+# notations and behaviors.
+Rails.application.config.filter_parameters += [
+  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+]

data/config/initializers/inflections.rb

@@ -4,13 +4,13 @@
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
+#   inflect.plural /^(ox)$/i, "\\1en"
+#   inflect.singular /^(ox)en/i, "\\1"
+#   inflect.irregular "person", "people"
 #   inflect.uncountable %w( fish sheep )
 # end
 
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
+#   inflect.acronym "RESTful"
 # end

data/config/initializers/iqvoc.rb

@@ -16,6 +16,7 @@
 
 require 'iqvoc'
 require 'iqvoc/version'
+require 'iqvoc_module_helper'
 
 ##### INSTANCE SETTINGS #####
 

data/config/initializers/permissions_policy.rb

@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+#   f.camera      :none
+#   f.gyroscope   :none
+#   f.microphone  :none
+#   f.usb         :none
+#   f.fullscreen  :self
+#   f.payment     :self, "https://secure.example.com"
+# end

data/config/initializers/wrap_parameters.rb

@@ -4,9 +4,9 @@
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-# ActiveSupport.on_load(:action_controller) do
-#   wrap_parameters format: [:json]
-# end
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
 
 # To enable root element in JSON for ActiveRecord objects.
 # ActiveSupport.on_load(:active_record) do

data/config/initializers/zeitwerk.rb

@@ -0,0 +1,6 @@
+# FIXME: custom auto loading inflections due class naming inconsistencies with acronyms
+Rails.autoloaders.main.inflector.inflect(
+  'skos' => 'SKOS',
+  'rdfs' => 'RDFS',
+  'rdfapi' => 'RDFAPI'
+)

data/config/locales/activerecord.de.yml

@@ -65,8 +65,8 @@ de:
         one:   "Match"
         other: "Matches"
       match/skos/base:
-        one:   "Match"
-        other: "Matches"
+        one:   "Link zu anderem Vokabular"
+        other: "Links zu anderen Vokabularen"
       match/skos/broad_match:
         one:   "Broader Match"
         other: "Broader Matches"

data/config/locales/de.yml

@@ -75,7 +75,6 @@ de:
      of: von
      ops: Ups!
      pending: "Lade…"
-     translation_missing_for: "keine Übersetzung für"
      type_to_search: "Tippen um zu suchen"
      hint_csv_input: "Mehrere Werte können kommagetrennt eingeben werden."
      form_errors: "Fehler"
@@ -113,6 +112,7 @@ de:
          sources: Föderation
        settings:
          title: Titel
+         concept_modal_preview: Konzept Kurzansicht aktivieren
          available_languages: verfügbare Sprachen
          languages_pref_labeling: Sprachen für bevorzugte Labels
          languages_notes: Sprachen für Notes
@@ -124,6 +124,7 @@ de:
          triplestore_password: Passwort für Triplestore
          triplestore_autosync: automatische Synchronisation mit Triplestore
          sources_iqvoc: Quellen (iQvoc)
+         sources_create_reverse_matches: Links zu anderen Vokabularen automatisch erstellen
      alphabetical_concepts:
      untranslated_concepts:
        caption: "Fehlende Übersetzungen"
@@ -209,12 +210,12 @@ de:
      search_results:
        header: "Suche"
        inflectionals: "Schreibweisen"
-       contains: "enthält"
-       ends_with: "endet mit"
-       begins_with: "beginnt mit"
-       exact: "exakte Übereinstimmung"
+       contains: "enthalten Suchbegriff"
+       ends_with: "enden mit Suchbegriff"
+       begins_with: "starten mit Suchbegriff"
+       exact: "stimmen exakt mit Suchbegriff überein"
        regexp: "regulärer Ausdruck (fortgeschritten)"
-       search_term: "Suchbegriff(e)"
+       search_term: "Suchbegriff"
        note: mit Anmerkung
        search_term_in_results: "Suchbegriff"
        no_results: "Keine Ergebnisse"
@@ -225,22 +226,26 @@ de:
          one: "Ihre Suche nach <strong>%{query}</strong> lieferte %{count} Ergebnis."
          other: "Ihre Suche nach <strong>%{query}</strong> lieferte %{count} Ergebnisse."
        no_results_found: "Ihre Suche lieferte keine Ergebnisse."
-       submit: "Suche"
+       submit: "Suchen"
+       detailed_search: "Detailsuche"
        type: "Typ"
        used_as: "benutzt als"
+       expired: "stillgelegte einbeziehen?"
        language: "Sprache"
        all: "alle"
        none: "keine"
-       for: "In"
-       mode: "Modus"
+       in: "Suche umfasst"
+       for: "Suchen in"
+       mode: "Suchtreffer"
        datasets: "Externe Quellen"
        change_note:
+         all: "Erstellungs- oder Änderungsdatum"
          type: "Typ"
          created: 'Erstellungsdatum'
          modified: 'Änderungsdatum'
          date: "Datumsbereich"
-         date_from: 'von'
-         date_to: 'bis'
+         date_from: 'Von'
+         date_to: 'Bis'
      user_sessions:
        header: "Anmelden"
        login: "Anmelden"
@@ -279,14 +284,13 @@ de:
       server_error:
         message: Entschuldigung da ist bei uns etwas schief gegangen.
      versioning:
-       edit_mode: "Weiterbearbeiten"
+       edit_mode: "Bearbeiten"
        to_edit_mode: "In Bearbeitung versetzen"
        publishing: "Veröffentlichen"
        delete: "Löschen"
        delete_copy: "Kopie löschen"
        delete_confirm: "Kopie wirklich löschen?"
        versioning_mode: "Neue Version erstellen"
-       unlock: "Entsperren"
        preview_new_version: "Vorschau der Version in Bearbeitung"
        consistency_check: "Konsistenz prüfen"
        current_revision: "Aktuelle Revision %{rev}"
@@ -304,7 +308,6 @@ de:
      dashboard:
        type: "Typ"
        value: "Name"
-       locking_user: "Gesperrt"
        follow_up: "Wiedervorlage"
        updated_at: "Geändert am"
        to_review: "Vorlage zur Freigabe"
@@ -374,11 +377,7 @@ de:
        published_with_warning: "Instanz wurde erfolgreich veröffentlicht, hat aber keine Relationen zu anderen Instanzen."
        merged_delete_error: "Das alte Label konnte nicht gelöscht werden."
        merged_publishing_error: "Instanz konnte nicht veröffentlicht werden - bitte führen Sie eine Konsistenzprüfung durch."
-       branched: "Instanzkopie wurde erfolgreich angelegt und für andere Benutzer gesperrt."
-       locked: "Instanz wurde für andere User gesperrt."
-       lock_error: "Instanz ist bereits gesperrt."
-       unlocked: "Instanz wurde für andere User entsperrt."
-       unlock_error: "Instanz ist bereits entsperrt."
+       branched: "Instanzkopie wurde erfolgreich angelegt."
        new_version_blank_error: "Es existiert noch keine neue Version."
        delete: "Instanz löschen."
        consistency_check_success: "Instanz ist konsistent."

data/config/locales/en.yml

@@ -75,7 +75,6 @@ en:
      of: of
      ops: Oops!
      pending: "Loading…"
-     translation_missing_for: "translation missing for"
      type_to_search: "Type to search"
      hint_csv_input: "Multiple values can be entered comma-separated."
      form_errors: "Errors"
@@ -113,6 +112,7 @@ en:
          sources: Federation
        settings:
          title: Site title
+         concept_modal_preview: Enable concept modal preview
          available_languages: available languages
          languages_pref_labeling: Languages for preferred labels
          languages_notes: Languages for notes
@@ -124,6 +124,7 @@ en:
          triplestore_password: Password for triplestore
          triplestore_autosync: Automatic triplestore synchronization
          sources_iqvoc: Sources (iQvoc)
+         sources_create_reverse_matches: Create reverse matches for concept mappings
      alphabetical_concepts:
      untranslated_concepts:
        caption: "Missing Translations"
@@ -217,10 +218,10 @@ en:
      search_results:
        header: "Search"
        inflectionals: "inflectionals"
-       contains: "contains"
-       ends_with: "ends with"
-       begins_with: "begins with"
-       exact: "exact match"
+       contains: "contain keyword"
+       ends_with: "end with keyword"
+       begins_with: "start with keyword"
+       exact: "exactly match"
        regexp: "regular expression (advanced)"
        search_term: "Search term(s)"
        note: with note
@@ -234,21 +235,25 @@ en:
          other: "Your search for <strong>%{query}</strong> yielded the following %{count} results."
        no_results_found: "Your search yielded no results."
        submit: "Search"
+       detailed_search: "Detailed search"
        type: "type"
        used_as: "used as"
-       language: "language"
+       expired: "include expired?"
+       language: "Language"
        all: "all"
        none: "none"
-       for: "In"
-       mode: "Mode"
+       in: "Search contains"
+       for: "Search in"
+       mode: "Search results"
        datasets: "External sources"
        change_note:
+         all: "Creation or update date"
          type: "type"
          created: "creation date"
          modified: "modification date"
          date: "Date range"
-         date_from: '(from)'
-         date_to: '(to)'
+         date_from: 'From'
+         date_to: 'To'
      user_sessions:
        header: "Login"
        login: "Login"
@@ -297,7 +302,6 @@ en:
        delete_copy: "Delete copy"
        delete_confirm: "Do you really want to delete this copy?"
        versioning_mode: "Create new version"
-       unlock: "Unlock"
        preview_new_version: "Preview of the version in editing"
        consistency_check: "Check consistency"
        current_revision: "Current revision %{rev}"
@@ -314,7 +318,6 @@ en:
      dashboard:
        type: "Type"
        value: "Name"
-       locking_user: "Locked by"
        follow_up: "Follow up"
        updated_at: "Updated at"
        to_review: "Submission for review"
@@ -384,11 +387,7 @@ en:
        published_with_warning: "Instance has been successfully published, but it has no relations!"
        merged_delete_error: "Label could not be deleted."
        merged_publishing_error: "Instance could not be published - please consult the consistency check."
-       branched: "Instance copy has been created and locked."
-       locked: "Instance has been locked."
-       lock_error: "Instance is already locked."
-       unlocked: "Instance has been unlocked."
-       unlock_error: "Instance has been alraedy unlocked."
+       branched: "Instance copy has been created."
        to_review_success: "Sent to review."
        to_review_error: "Can't send to review."
        new_version_blank_error: "A new version does not yet exist!"

data/config/locales/pt.yml

@@ -70,7 +70,6 @@ pt:
        checked_out: "Verificado"
      of: de
      pending: "Carregando…"
-     translation_missing_for: "tradução faltando para"
      type_to_search: "Digite para buscar"
      hint_csv_input: " Vários valores podem ser inseridos separados por vírgula."
      form_errors: "Erros"
@@ -234,7 +233,6 @@ pt:
        delete: "Excluir cópia"
        delete_confirm: "Você realmente deseja excluir esta cópia?"
        versioning_mode: "Criar nova versão"
-       unlock: "Destravar"
        preview_new_version: "Pré-visualização da versão em alteração"
        consistency_check: "Verificar consistência"
        current_revision: "Revisão atual %{rev}"
@@ -250,7 +248,6 @@ pt:
      dashboard:
        type: "Tipo"
        value: "Nome"
-       locking_user: "Travado por"
        follow_up: "Reapresentar"
        updated_at: "Atualizado em"
        to_review: "Submissão para revisão"
@@ -301,10 +298,6 @@ pt:
        merged_delete_error: "Não foi possível excluir o rótulo!"
        merged_publishing_error: "Não foi possível lançar a instância!"
        branched: "Cópia da instância foi criada e travada."
-       locked: "Instância foi travada."
-       lock_error: "Instância já foi travada!"
-       unlocked: "Instância foi destravada."
-       unlock_error: "Instância já foi destravada!"
        to_review_success: "Enviado para revisão com sucesso."
        to_review_error: "Não foi possível enviar para revisão."
        new_version_blank_error: "Ainda não existe uma nova versão!"

data/config/puma.rb

@@ -4,12 +4,18 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
-threads threads_count, threads_count
+max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
+threads min_threads_count, max_threads_count
+
+# Specifies the `worker_timeout` threshold that Puma will use to wait before
+# terminating a worker in development environments.
+#
+worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
-port        ENV.fetch("PORT") { 3000 }
+port ENV.fetch("PORT") { 3000 }
 
 # Specifies the `environment` that Puma will run in.
 #
@@ -19,7 +25,7 @@ environment ENV.fetch("RAILS_ENV") { "development" }
 pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
 
 # Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked webserver processes. If using threads and workers together
+# Workers are forked web server processes. If using threads and workers together
 # the concurrency of the application would be max `threads` * `workers`.
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).

data/config/routes.rb

@@ -51,8 +51,6 @@ Rails.application.routes.draw do
 
     post 'concepts/:origin/branch'      => 'concepts/versions#branch',    as: 'concept_versions_branch'
     post 'concepts/:origin/merge'       => 'concepts/versions#merge',     as: 'concept_versions_merge'
-    post 'concepts/:origin/lock'        => 'concepts/versions#lock',      as: 'concept_versions_lock'
-    post 'concepts/:origin/unlock'      => 'concepts/versions#unlock',    as: 'concept_versions_unlock'
     post 'concepts/:origin/to_review'   => 'concepts/versions#to_review', as: 'concept_versions_to_review'
     get 'concepts/:origin/consistency_check' => 'concepts/versions#consistency_check', as: 'concept_versions_consistency_check'
 
@@ -60,8 +58,6 @@ Rails.application.routes.draw do
 
     post 'collections/:origin/branch'      => 'collections/versions#branch',    as: 'collection_versions_branch'
     post 'collections/:origin/merge'       => 'collections/versions#merge',     as: 'collection_versions_merge'
-    post 'collections/:origin/lock'        => 'collections/versions#lock',      as: 'collection_versions_lock'
-    post 'collections/:origin/unlock'      => 'collections/versions#unlock',    as: 'collection_versions_unlock'
     post 'collections/:origin/to_review'   => 'collections/versions#to_review', as: 'collection_versions_to_review'
     get 'collections/:origin/consistency_check' => 'collections/versions#consistency_check', as: 'collection_versions_consistency_check'
 

data/db/migrate/20220107114201_add_fk_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb

@@ -0,0 +1,10 @@
+# This migration comes from active_storage (originally 20180723000244)
+class AddFkConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
+  def up
+    return if foreign_key_exists?(:active_storage_attachments, column: :blob_id)
+
+    if table_exists?(:active_storage_blobs)
+      add_foreign_key :active_storage_attachments, :active_storage_blobs, column: :blob_id
+    end
+  end
+end

data/db/migrate/20231012135837_remove_locked_by.rb

@@ -0,0 +1,6 @@
+class RemoveLockedBy < ActiveRecord::Migration[7.0]
+
+  def change
+    remove_column :concepts, :locked_by
+  end
+end