iqvoc 4.15.0 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2740d42eb0dd6bb005e754e8a9da763ba97b94035517d3c9be03c66722a451a1
-  data.tar.gz: 45e4438aa2325af76c97f51e35a04d05955333bfa6f184b031c73c3535167752
+  metadata.gz: 6f67e560f1aac50c13bd28d33a5929ac876f297bda3e023c3474f728c397bfba
+  data.tar.gz: '0818c7dfe12e3b7fd16fcf9098871d3fa1d50859c03f5264a4665ec8a8e840c7'
 SHA512:
-  metadata.gz: fd84849fc8e6186979cd4a1a9ab657a5ad8a256b86575809b5dce0c0c085ec7f74c218c7b8b3a3fa0ee9ad1980c91590a86fb37b63418e0265c26da4b1c7b72c
-  data.tar.gz: d4f0907c035dda3e447b448f54ed96cc127d352451ee5c51a1a7ae59877b0632be4f3a47150804ac27b988c5933d08005ccfb0a8572ca567b99d1b449fca73a8
+  metadata.gz: c5d7c4b4a4a3c79a9add3e8e350cdb021ff72bdeb620fa31622dca5c1848c963a94f75cce7547df16076de497a0bde490d07db348cec3ba198b8e24740fd1e7d
+  data.tar.gz: 990188563110861ce3ad6a80095e772f003502e64bacf81a78c044ba4f7ac4a45648929ac01cc47e37b1372636bc2afbbaabb67069954939477293713fb577f5

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## [4.17.0]
+
+* upgrade to Bootstrap v5 (and `bootstrap_form` v5)
+* replace faucet-pipeline with Propshaft, `jsbundling-rails` (esbuild) and
+  `cssbundling-rails` (Sass); JavaScript moved to `app/javascript`
+* upgrade to Font Awesome v7, replace `jquery-ujs` with `@rails/ujs`
+* `bin/dev` now starts all processes from `Procfile.dev` via foreman
+* add a `draft` relation to the `Versioning` concern
+* add an index on `labelings.target_id` (requires migration)
+* rename SKOS dumps to `<export_file_prefix>-<timestamp>.<type>` and default
+  `Iqvoc.export_file_prefix` to `iqvoc-data`
+* drop some inline styles
+* test against Ruby 4 on CI
+
+## [4.16.0]
+
+* export SKOS as a ZIP archive, via `rake iqvoc:export ZIP=true` and the web interface
+* add `LINK` to `rake iqvoc:export`, keeping a symlink on the newest dump
+* add `Iqvoc.export_file_prefix` to name dumps after the hosting application
+* speed up the SKOS export on a large thesaurus
+* restore preloading of concept associations, which had silently become a no-op
+* let additional associations declare their `inverse_of`, so that rendering a
+  child no longer reloads the record it belongs to
+* look up the concept scheme once per export instead of once per concept
+* sort note annotations in Ruby, so that preloaded annotations are used
+* no longer load ActiveStorage and ActionText, which were unused
+* upgrade to Faraday v2
+* render 503 when a remote label target is unreachable
+* fix rendering the concept scheme
+* fix i18n glitches in exports
+
 ## [4.15.0]
 
 * upgrade to Rails v8.1

data/Gemfile

@@ -19,7 +19,7 @@ source 'https://rubygems.org'
 # TODO: The following dependencies could be included by the "gemspec" command.
 # There is only one problem: gemspec puts the dependencies automatically to a
 # group (:development by default). This is not what we need.
-gem 'rails', '~> 8.1.2'
+gem 'rails', '>= 8.1.2', '< 9'
 gem 'puma', '>= 5.0'
 gem 'kaminari'
 gem 'authlogic'
@@ -27,23 +27,27 @@ gem 'scrypt'
 gem 'cancancan'
 gem 'iq_rdf'
 gem 'iq_triplestorage'
-gem 'json'
+# TODO: Remove once a Rails 8.1.x release with the fix shipped: https://github.com/rails/rails/pull/58601
+gem 'json', '< 3'
 gem 'csv'
 gem 'rails_autolink'
-gem 'faraday', '1.10.3'
-gem 'faraday_middleware'
+gem 'faraday', '~> 2.0'
+gem 'faraday-follow_redirects', '~> 0.5'
 gem 'nokogiri'
 gem 'linkeddata'
 gem 'rdf-vocab'
 gem "deep_cloneable"
-gem "bootstrap_form", "~> 4.0"
+gem "bootstrap_form", "~> 5.0"
 gem 'apipie-rails'
 gem 'maruku', require: false # needed for apipie documentation
 gem 'database_cleaner'
 gem 'delayed_job_active_record'
+gem 'rubyzip'
 gem 'carrierwave'
 gem 'carrierwave-i18n'
-gem 'faucet_pipeline_rails'
+gem 'propshaft'
+gem 'cssbundling-rails'
+gem 'jsbundling-rails'
 gem 'bootsnap', require: false
 
 # database adapters
@@ -56,7 +60,6 @@ gem 'rack-mini-profiler'
 
 group :development do
   gem 'web-console', '>= 4.1.0'
-  gem 'listen', '~> 3.3'
 end
 
 group :development, :test do

data/app/aides/skos_exporter.rb

@@ -1,19 +1,25 @@
 require 'iq_rdf'
 require 'uri'
 require 'fileutils'
+require 'pathname'
+require 'zip'
 
 class SkosExporter
   include RdfHelper # necessary to use render_concept helper
   include RdfNamespacesHelper
   include Rails.application.routes.url_helpers
 
-  def initialize(file_path, type, default_namespace_url, logger = Rails.logger)
+  def initialize(file_path, type, default_namespace_url, logger = Rails.logger, zip: false, entry_name: nil, link_path: nil, batch_size: 500)
     default_url_options[:port] = URI.parse(default_namespace_url).port
     default_url_options[:host] = URI.parse(default_namespace_url).to_s.gsub(/\/$/, '')
 
     @file_path = file_path
     @type = type
     @logger = logger
+    @zip = zip
+    @entry_name = entry_name
+    @link_path = link_path
+    @batch_size = batch_size
     @document = IqRdf::Document.new
 
     unless ['ttl', 'nt', 'xml'].include? @type
@@ -48,6 +54,7 @@ class SkosExporter
 
     # saving export to disk
     save_file(@file_path, @type, @document)
+    update_link(@link_path, @file_path) if @link_path
 
     done = Time.now
     @logger.info "Export Job finished in #{(done - start).to_i} seconds."
@@ -69,67 +76,88 @@ class SkosExporter
   def add_collections(document)
     @logger.info 'Exporting collections...'
 
-    offset = 0
-    while true
-      collections = Iqvoc::Collection.base_class.published.order('id').limit(100).offset(offset)
-      limit = collections.size < 100 ? collections.size : 100
-      break if collections.size == 0
-
+    total = 0
+    Iqvoc::Collection.base_class.published.find_in_batches(batch_size: @batch_size) do |collections|
       # Todo: Preloading???
-      collections.each do |collection|
-        render_collection(document, collection)
-      end
-
-      @logger.info "Collections #{offset+1}-#{offset+limit} exported."
-      offset += collections.size # Size is important!
+      collections.each { |collection| render_collection(document, collection) }
+      @logger.info "Collections #{total + 1}-#{total + collections.size} exported."
+      total += collections.size
     end
 
-    @logger.info "Finished exporting collections (#{offset} collections exported)."
+    @logger.info "Finished exporting collections (#{total} collections exported)."
   end
 
   def add_concepts(document)
     @logger.info 'Exporting concepts...'
 
-    offset = 0
-    while true
-      concepts = Iqvoc::Concept.base_class.published.order('id').limit(100).offset(offset)
-      limit = concepts.size < 100 ? concepts.size : 100
-      break if concepts.size == 0
-
-      # When in single query mode, AR handles ALL includes to be loaded by that
-      # one query. We don't want that! So let's do it manually :-)
-      Iqvoc::Concept.base_class.preload(concepts,
-      Iqvoc::Concept.base_class.default_includes + [
+    total = 0
+    Iqvoc::Concept.base_class.published.find_in_batches(batch_size: @batch_size) do |concepts|
+      # rendering touches every association below, so preload them per batch
+      # rather than letting each concept load them one by one. Note that this
+      # has to be the Preloader: Model.preload builds a relation and would
+      # leave the records passed to it untouched.
+      associations = Iqvoc::Concept.base_class.default_includes + [
         :matches,
         :collection_members,
         :notations,
-        { relations: :target, labelings: :target, notes: :annotations }
-      ])
+        { relations: :target, labelings: :target }
+      ] + Iqvoc::Concept.additional_association_preloads
+      # notes are rendered behind the same condition, see render_concept
+      associations << { notes: :annotations } if Iqvoc.rdf_show_change_notes
 
-      concepts.each do |concept|
-        render_concept(document, concept, true)
-      end
+      ActiveRecord::Associations::Preloader.new(records: concepts, associations: associations).call
 
-      @logger.info "Concepts #{offset+1}-#{offset+limit} exported."
-      offset += concepts.size # Size is important!
+      concepts.each { |concept| render_concept(document, concept, true) }
+      @logger.info "Concepts #{total + 1}-#{total + concepts.size} exported."
+      total += concepts.size
     end
 
-    @logger.info "Finished exporting concepts (#{offset} concepts exported)."
+    @logger.info "Finished exporting concepts (#{total} concepts exported)."
   end
 
   def save_file(file_path, type, content)
-    begin
-      @logger.info "Saving export to '#{@file_path}'"
-      create_directory(@file_path)
-      file = File.open(@file_path, 'w')
-      content = serialize_rdf(content, type)
-      file.write(content)
-    rescue IOError => e
-      # some error occur
-      # e.g not writable
-    ensure
-      file.close unless file == nil
+    serialized = serialize_rdf(content, type)
+    create_directory(file_path)
+
+    @logger.info "Saving export to '#{file_path}'"
+    if @zip
+      save_zipped(file_path, serialized)
+    else
+      File.write(file_path, serialized)
     end
+  rescue IOError, SystemCallError, Zip::Error => e
+    @logger.error "Failed to save export: #{e.message}"
+    raise
+  end
+
+  def save_zipped(file_path, serialized)
+    entry_name = @entry_name || File.basename(file_path, '.zip')
+    Zip::OutputStream.open(file_path) do |zos|
+      zos.put_next_entry(entry_name)
+      zos.write(serialized)
+    end
+  end
+
+  # points the symlink at the file just written, so that a stable URL can serve
+  # the most recent export while its file name carries the creation date
+  def update_link(link_path, file_path)
+    link_dir = File.dirname(File.expand_path(link_path))
+    FileUtils.mkdir_p(link_dir)
+
+    # a relative target survives the export directory being moved
+    target = Pathname.new(File.expand_path(file_path)).
+        relative_path_from(Pathname.new(link_dir)).to_s
+
+    # symlink under a temporary name, then rename it into place: rename is
+    # atomic, so a concurrent download never sees a missing link
+    tmp_path = "#{link_path}.tmp#{Process.pid}"
+    File.symlink(target, tmp_path)
+    File.rename(tmp_path, link_path)
+
+    @logger.info "Updated symlink '#{link_path}' -> '#{target}'"
+  rescue IOError, SystemCallError => e
+    @logger.error "Failed to update symlink: #{e.message}"
+    raise
   end
 
   def create_directory(file_path)

data/app/assets/stylesheets/_fontawesome.scss

@@ -0,0 +1,4 @@
+@use '@fortawesome/fontawesome-free/scss/variables' with ($font-path: '');
+@use '@fortawesome/fontawesome-free/scss/fontawesome';
+@use '@fortawesome/fontawesome-free/scss/solid';
+@use '@fortawesome/fontawesome-free/scss/regular';

data/app/assets/stylesheets/_framework.scss

@@ -1,4 +1,4 @@
 @import 'bootstrap/scss/bootstrap';
 
-@import 'font-awesome/scss/font-awesome';
+@import 'fontawesome';
 @import 'bootstrap-datepicker/dist/css/bootstrap-datepicker3.standalone';

data/app/assets/stylesheets/application.scss

@@ -0,0 +1 @@
+@import 'manifest';

data/app/assets/stylesheets/iqvoc/_bootstrap_overrides.scss

@@ -1,7 +1,36 @@
+// These placeholders live here (rather than in settings/_mixins.scss, which
+// is imported before Bootstrap) so that Sass's @extend emits their merged
+// selector at this position in the cascade. Bootstrap 5's own .btn rule
+// sets font-family explicitly, so if the merged selector compiled in
+// earlier (pre-Bootstrap), Bootstrap's later same-specificity rule would
+// win and silently override it.
+%font-interaction {
+  font-family: 'Fira Sans Light SC';
+  text-transform: lowercase;
+}
+
+%font-bold {
+  font-family: 'Fira Sans Bold';
+  font-weight: 700;
+}
+
+%font-light {
+  font-family: 'Fira Sans Light';
+}
+
 body > .container {
   padding-top: 5rem;
 }
 
+// Bootstrap 5 floats <legend> (float: left; width: 100%) to work around a
+// Firefox fieldset/flex bug, clearing it only on the very next sibling
+// (`legend + *`). Fieldsets with more than one element after the legend
+// (like ours) leave the float uncleared, which can squeeze later siblings
+// to zero width. We don't need the Firefox fix here, so disable the float.
+legend {
+  float: none;
+}
+
 form#search {
   .btn-group {
     margin-top: 10px;
@@ -48,7 +77,7 @@ small {
     margin-bottom: -0.5em;
   }
 
-  > .close {
+  > .btn-close {
     font-size: $h3-font-size;
   }
 }

data/app/assets/stylesheets/iqvoc/components/_components.scss

@@ -1,9 +1,9 @@
 .indicator {
-  .fa {
+  .fa-solid {
     visibility: hidden;
   }
 
-  &.active .fa {
+  &.active .fa-solid {
     visibility: visible;
   }
 }

data/app/assets/stylesheets/iqvoc/components/_onebox.scss

@@ -3,7 +3,7 @@
   justify-content: center;
   padding-top: 80px;
   margin-top: 2em;
-  background: asset-url("iqvoc_logo.svg") top center no-repeat;
+  background: url("/iqvoc_logo.svg") top center no-repeat;
 
   .logo {
     margin: 2em 0 1em 0;

data/app/assets/stylesheets/iqvoc/components/_simplete.scss

@@ -1,3 +1,8 @@
+simplete-form {
+  position: relative;
+  display: block;
+}
+
 simplete-form #loading,
 simplete-suggestions #loading {
   opacity: 0;

data/app/assets/stylesheets/iqvoc/components/_treeview.scss

@@ -7,7 +7,7 @@ ul.jqtree-tree {
   margin-left: 0;
 
   li {
-    background: asset-url('treeview-default-line.gif') no-repeat;
+    background: url('/treeview-default-line.gif') no-repeat;
     background-position: 2px 0px;
     line-height: 1.8em;
     padding-left: 18px;
@@ -75,7 +75,7 @@ ul.jqtree-tree {
     border-bottom: 0;
     color: #333;
     cursor: pointer;
-    margin-left: -14px;
+    margin-left: -18px;
     margin-right: .5em;
     text-decoration: none;
 
@@ -96,10 +96,10 @@ ul.jqtree-tree {
     }
   }
 
-  .fa-arrows { cursor: move;}
+  .drag { cursor: move;}
 
   .jqtree-loading > div.jqtree-element.jqtree_common:after {
-    content: asset-url('ajax-loader.gif');
+    content: url('/ajax-loader.gif');
     margin-left: 8px;
   }
 

data/app/assets/stylesheets/iqvoc/hacks/_hacks.scss

@@ -1,12 +1 @@
-legend {
-  margin-bottom: 0;
-}
-
-fieldset > div:first-of-type, ol:first-of-type {
-  -webkit-margin-top-collapse: separate;
-  margin-top: 27px;
-}
-
-.fa {
-  font-family: FontAwesome;
-}
+// Hacks - single place of shame

data/app/assets/stylesheets/iqvoc/settings/_fonts.scss

@@ -1,79 +1,79 @@
 @font-face {
   font-family: 'Fira Sans Light SC';
-  src: asset-url('FiraSans-Light-SC.eot');
-  src: asset-url('FiraSans-Light-SC.eot') format('embedded-opentype'),
-  asset-url('FiraSans-Light-SC.woff2') format('woff2'),
-  asset-url('FiraSans-Light-SC.woff') format('woff'),
-  asset-url('FiraSans-Light-SC.ttf') format('truetype');
+  src: url('/FiraSans-Light-SC.eot');
+  src: url('/FiraSans-Light-SC.eot') format('embedded-opentype'),
+  url('/FiraSans-Light-SC.woff2') format('woff2'),
+  url('/FiraSans-Light-SC.woff') format('woff'),
+  url('/FiraSans-Light-SC.ttf') format('truetype');
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Fira Sans ExtraLight';
-  src: asset-url('FiraSans-ExtraLight.eot');
-  src: asset-url('FiraSans-ExtraLight.eot') format('embedded-opentype'),
-  asset-url('FiraSans-ExtraLight.woff') format('woff'),
-  asset-url('FiraSans-ExtraLight.ttf') format('truetype');
+  src: url('/FiraSans-ExtraLight.eot');
+  src: url('/FiraSans-ExtraLight.eot') format('embedded-opentype'),
+  url('/FiraSans-ExtraLight.woff') format('woff'),
+  url('/FiraSans-ExtraLight.ttf') format('truetype');
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Fira Sans Regular';
-  src: asset-url('FiraSans-Regular.eot');
-  src: asset-url('FiraSans-Regular.eot') format('embedded-opentype'),
-  asset-url('FiraSans-Regular.woff') format('woff'),
-  asset-url('FiraSans-Regular.ttf') format('truetype');
+  src: url('/FiraSans-Regular.eot');
+  src: url('/FiraSans-Regular.eot') format('embedded-opentype'),
+  url('/FiraSans-Regular.woff') format('woff'),
+  url('/FiraSans-Regular.ttf') format('truetype');
   font-weight: 400;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Fira Sans Regular Italic';
-  src: asset-url('FiraSans-Italic.eot');
-  src: asset-url('FiraSans-Italic.eot') format('embedded-opentype'),
-  asset-url('FiraSans-Italic.woff') format('woff'),
-  asset-url('FiraSans-Italic.ttf') format('truetype');
+  src: url('/FiraSans-Italic.eot');
+  src: url('/FiraSans-Italic.eot') format('embedded-opentype'),
+  url('/FiraSans-Italic.woff') format('woff'),
+  url('/FiraSans-Italic.ttf') format('truetype');
   font-weight: 400;
   font-style: italic;
 }
 
 @font-face {
   font-family: 'Fira Sans Bold';
-  src: asset-url('FiraSans-Bold.eot');
-  src: asset-url('FiraSans-Bold.eot') format('embedded-opentype'),
-  asset-url('FiraSans-Bold.woff') format('woff'),
-  asset-url('FiraSans-Bold.ttf') format('truetype');
+  src: url('/FiraSans-Bold.eot');
+  src: url('/FiraSans-Bold.eot') format('embedded-opentype'),
+  url('/FiraSans-Bold.woff') format('woff'),
+  url('/FiraSans-Bold.ttf') format('truetype');
   font-weight: 700;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Fira Sans Bold Italic';
-  src: asset-url('FiraSans-BoldItalic.eot');
-  src: asset-url('FiraSans-BoldItalic.eot') format('embedded-opentype'),
-  asset-url('FiraSans-BoldItalic.woff') format('woff'),
-  asset-url('FiraSans-BoldItalic.ttf') format('truetype');
+  src: url('/FiraSans-BoldItalic.eot');
+  src: url('/FiraSans-BoldItalic.eot') format('embedded-opentype'),
+  url('/FiraSans-BoldItalic.woff') format('woff'),
+  url('/FiraSans-BoldItalic.ttf') format('truetype');
   font-weight: 700;
   font-style: italic;
 }
 
 @font-face {
   font-family: 'Fira Mono Regular';
-  src: asset-url('FiraMono-Regular.eot');
-  src: asset-url('FiraMono-Regular.eot') format('embedded-opentype'),
-  asset-url('FiraMono-Regular.woff') format('woff'),
-  asset-url('FiraMono-Regular.ttf') format('truetype');
+  src: url('/FiraMono-Regular.eot');
+  src: url('/FiraMono-Regular.eot') format('embedded-opentype'),
+  url('/FiraMono-Regular.woff') format('woff'),
+  url('/FiraMono-Regular.ttf') format('truetype');
   font-weight: 400;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Fira Sans Light';
-  src: asset-url('FiraSans-Light.eot');
+  src: url('/FiraSans-Light.eot');
   src: local('Fira Sans Light'),
-  asset-url('FiraSans-Light.eot') format('embedded-opentype'),
-  asset-url('FiraSans-Light.woff') format('woff'),
-  asset-url('FiraSans-Light.ttf') format('truetype');
+  url('/FiraSans-Light.eot') format('embedded-opentype'),
+  url('/FiraSans-Light.woff') format('woff'),
+  url('/FiraSans-Light.ttf') format('truetype');
   font-weight: 300;
   font-style: normal;
 }

data/app/assets/stylesheets/iqvoc/settings/_mixins.scss

@@ -1,17 +1,3 @@
-%font-interaction {
-  font-family: 'Fira Sans Light SC';
-  text-transform: lowercase;
-}
-
-%font-bold {
-  font-family: 'Fira Sans Bold';
-  font-weight: 700;
-}
-
-%font-light {
-  font-family: 'Fira Sans Light';
-}
-
 @mixin transitional($property: all, $duration: .25s) {
   transition: $property $duration ease-in-out;
 }

data/app/controllers/concerns/controller_extensions.rb

@@ -56,6 +56,9 @@ module ControllerExtensions
     @status = current_user ? 403 : 401
     @user_session = UserSession.new if @status == 401
     @return_url = request.fullpath
+
+    return if self.performed?
+
     respond_to do |format|
       format.html { render template: 'errors/access_denied', status: @status }
       format.any  { head @status }
@@ -66,6 +69,8 @@ module ControllerExtensions
     @exception = exception
     SearchResultsController.prepare_basic_variables(self)
 
+    return if self.performed?
+
     respond_to do |format|
       format.html { render template: 'errors/not_found', status: 404 }
       format.any  { head 404 }
@@ -75,6 +80,8 @@ module ControllerExtensions
   def handle_bad_request(exception)
     @exception = exception
 
+    return if self.performed?
+
     respond_to do |format|
       format.any  { head 400 }
     end
@@ -85,6 +92,8 @@ module ControllerExtensions
     Rails.logger.error(exception.backtrace.join("\n"))
     @exception = exception
 
+    return if self.performed?
+
     respond_to do |format|
       format.html { render template: 'errors/server_error', status: 500 }
       format.any  { head 500 }
@@ -94,6 +103,8 @@ module ControllerExtensions
   def handle_unknown_format(exception)
     @exception = exception
 
+    return if self.performed?
+
     respond_to do |format|
       format.any  { head 406 }
     end

data/app/controllers/exports_controller.rb

@@ -58,10 +58,8 @@ class ExportsController < ApplicationController
 
   def download
     export = Export.find(params[:export_id])
-    time = export.finished_at&.strftime('%Y-%m-%d_%H-%M')
-
     Rails.logger.debug("Try to serve export from: #{export.build_filename}")
-    send_file export.build_filename, filename: "export-#{time}.#{export.file_type}"
+    send_file export.build_filename, filename: export.download_filename
   rescue ::ActionController::MissingFile => e
     flash[:error] = t('txt.views.export.missing_file')
     redirect_to exports_path
@@ -70,6 +68,6 @@ class ExportsController < ApplicationController
   private
 
   def export_params
-    params.require(:export).permit(:file_type, :default_namespace)
+    params.require(:export).permit(:file_type, :default_namespace, :zip)
   end
 end

data/app/controllers/remote_labels_controller.rb

@@ -1,6 +1,8 @@
 class RemoteLabelsController < ApplicationController
   include DatasetInitialization
 
+  rescue_from ServiceUnavailableError, with: :handle_service_unavailable
+  
   def show
     @datasets = init_datasets
 
@@ -9,13 +11,13 @@ class RemoteLabelsController < ApplicationController
     # ensure known dataset
     @dataset = @datasets.detect { |d| concept_url.to_s.start_with?(d.url.to_s) }
     unless @dataset
-      head 422
+      head :unprocessable_entity
       return
     end
 
     label = @dataset.find_label(concept_url)
     unless label
-      head 404
+      head :not_found
       return
     end
 
@@ -25,4 +27,14 @@ class RemoteLabelsController < ApplicationController
       end
     end
   end
+
+  private
+
+  def handle_service_unavailable(exception)
+    Rails.logger.error("External dataset unavailable: #{exception.url} - #{exception.message}")
+    render json: {
+      error: 'External service unavailable',
+      dataset_url: exception.url.to_s
+    }, status: :service_unavailable
+  end
 end