iqvoc 4.13.2 → 4.14.4

data/app/aides/inline_data_helper.rb

@@ -29,14 +29,14 @@ class InlineDataHelper
     options = CSV_OPTIONS.clone
     options[:col_sep] = options[:col_sep].strip
     begin
-      values = inline_values.parse_csv(options)
+      values = inline_values.parse_csv(**options)
     rescue CSV::MalformedCSVError => exc
-      values = inline_values.parse_csv(CSV_OPTIONS)
+      values = inline_values.parse_csv(**CSV_OPTIONS)
     end
     values ? values.compact.map(&:strip) : []
   end
 
   def self.generate_inline_values(values)
-    values.to_csv(CSV_OPTIONS).strip
+    values.to_csv(**CSV_OPTIONS).strip
   end
 end

data/app/aides/skos_exporter.rb

@@ -98,7 +98,7 @@ class SkosExporter
 
       # 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 :-)
-      ActiveRecord::Associations::Preloader.new.preload(concepts,
+      Iqvoc::Concept.base_class.preload(concepts,
       Iqvoc::Concept.base_class.default_includes + [
         :matches,
         :collection_members,

data/app/assets/javascripts/iqvoc/iqvoc.js

@@ -107,26 +107,6 @@ jQuery(document).ready(function($) {
     });
   });
 
-  // Search
-  $(".checkbox-select-all").on('click', function() {
-    $(this).closest('.checkbox-controls').find("input:checkbox").prop("checked", true);
-  });
-  $(".checkbox-select-none").on('click', function() {
-    $(this).closest('.checkbox-controls').find("input:checkbox").prop("checked", false);
-  });
-  $("select.search_type").on('change', function() {
-    var result_type_filter = $(".result_type_filter");
-    var selected = $(this).val();
-    var targets = ['labels', 'pref_labels', 'alt_labels'];
-    if($.inArray(selected, targets) !== -1) {
-      result_type_filter.show();
-    }
-    else {
-      result_type_filter.hide();
-    }
-  });
-  $("select.search_type").trigger('change');
-
   // unobtrusive tabs
   $(".tab-panels").addClass("tab-content"); // the latter is for Bootstrap Tabs
 

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

@@ -15,3 +15,4 @@
 @import 'components/onebox';
 
 @import 'hacks/hacks';
+@import 'search_results';

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

@@ -0,0 +1,14 @@
+form#search {
+  .collapse-toggle[aria-expanded=false] .hide-if-collapsed {
+    display: none;
+  }
+
+  .collapse-toggle[aria-expanded=true] .hide-if-expanded {
+    display: none;
+  }
+
+  input[type="search"] {
+    -webkit-box-shadow: none;
+    outline: none;
+  }
+}

data/app/controllers/collections/versions_controller.rb

@@ -28,7 +28,7 @@ class Collections::VersionsController < ApplicationController
     ActiveRecord::Base.transaction do
       new_version.rdf_updated_at = nil
       new_version.publish
-      new_version.unlock
+
       if new_version.publishable?
         new_version.save
 
@@ -63,7 +63,7 @@ class Collections::VersionsController < ApplicationController
 
       new_version = nil
       ActiveRecord::Base.transaction do
-        new_version = current_collection.branch(current_user)
+        new_version = current_collection.branch
         new_version.save!
       end
       flash[:success] = t('txt.controllers.versioning.branched')
@@ -71,45 +71,6 @@ class Collections::VersionsController < ApplicationController
     end
   end
 
-  def lock
-    new_version = Iqvoc::Collection.base_class.
-        by_origin(params[:origin]).
-        unpublished.
-        last!
-
-    if new_version.locked?
-      raise "Collection '#{new_version.origin}' is already locked."
-    end
-
-    authorize! :lock, new_version
-
-    new_version.lock_by_user(current_user.id)
-    new_version.save validate: false
-
-    flash[:success] = t('txt.controllers.versioning.locked')
-    redirect_to edit_collection_path(new_version, published: 0)
-  end
-
-  def unlock
-    new_version = Iqvoc::Collection.base_class.
-        by_origin(params[:origin]).
-        unpublished.
-        last!
-
-    unless new_version.locked?
-      raise "Collection '#{new_version.origin}' is not locked."
-    end
-
-    authorize! :unlock, new_version
-
-    new_version.unlock
-    new_version.save validate: false
-
-    flash[:success] = t('txt.controllers.versioning.unlocked')
-
-    redirect_to collection_path(new_version, published: 0)
-  end
-
   def consistency_check
     collection = Iqvoc::Collection.base_class.
         by_origin(params[:origin]).
@@ -134,13 +95,17 @@ class Collections::VersionsController < ApplicationController
         last!
 
     authorize! :send_to_review, collection
-    collection.to_review
 
-    authorize! :unlock, collection
-    collection.unlock
+    # Only send the concept to review if it is publishable (e.g. consistency check is OK)
+    if collection.publishable?
+      collection.to_review
 
-    collection.save!
-    flash[:success] = t('txt.controllers.versioning.to_review_success')
-    redirect_to collection_path(collection, published: 0)
+      collection.save!
+      flash[:success] = t('txt.controllers.versioning.to_review_success')
+      redirect_to collection_path(collection, published: 0)
+    else
+      flash[:error] = t('txt.controllers.versioning.consistency_check_error')
+      redirect_to edit_collection_path(collection, published: 0, full_consistency_check: '1')
+    end
   end
 end

data/app/controllers/collections_controller.rb

@@ -29,11 +29,16 @@ class CollectionsController < ApplicationController
 
         @top_collections.to_a.sort! { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }
 
-        ActiveRecord::Associations::Preloader.new.preload(@top_collections, { members: :target })
+        Iqvoc::Collection.base_class.preload(@top_collections, { members: :target })
       end
       format.json do # For the widget and treeview
         response = if params[:root].present?
-          collections = Iqvoc::Collection.base_class.with_pref_labels.published.by_parent_id(params[:root])
+          collections = Iqvoc::Collection.base_class
+                                         .with_pref_labels
+                                         .published
+                                         .by_parent_id(params[:root])
+                                         .sort_by { |c| c.pref_label.to_s }
+
           collections.map do |collection|
             res = {
               id: collection.id,
@@ -46,10 +51,12 @@ class CollectionsController < ApplicationController
             res
           end
         else
-          collections = Iqvoc::Collection.base_class.with_pref_labels.published.merge(Label::Base.by_query_value("#{params[:query]}%"))
-          collections.map do |c|
-            collection_widget_data(c)
-          end
+          collections = Iqvoc::Collection.base_class
+                                         .with_pref_labels
+                                         .published
+                                         .merge(Label::Base.by_query_value("#{params[:query]}%"))
+                                         .sort_by { |c| c.pref_label.to_s }
+                                         .map { |c| collection_widget_data(c) }
         end
         render json: response
       end
@@ -72,7 +79,7 @@ class CollectionsController < ApplicationController
 
     # 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 :-)
-    ActiveRecord::Associations::Preloader.new.preload(@collection,
+    Iqvoc::Collection.base_class.preload(@collection,
       [:pref_labels,
         { members: { target: [:pref_labels] + Iqvoc::Collection.base_class.default_includes } }])
 
@@ -111,7 +118,7 @@ class CollectionsController < ApplicationController
 
     # 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 :-)
-    ActiveRecord::Associations::Preloader.new.preload(@collection, [
+    Iqvoc::Collection.base_class.preload(@collection, [
         :pref_labels,
         { members: { target: [:pref_labels] + Iqvoc::Concept.base_class.default_includes } }])
 

data/app/controllers/concepts/alphabetical_controller.rb

@@ -42,7 +42,7 @@ class Concepts::AlphabeticalController < ConceptsController
 
       search_results_size = find_labelings.count
       search_results = find_labelings.page(params[:page])
-      ActiveRecord::Associations::Preloader.new.preload(search_results, owner: includes)
+      Iqvoc::Concept.pref_labeling_class.preload(search_results, owner: includes)
 
       @search_results = search_results.to_a.map { |pl| AlphabeticalSearchResult.new(pl) }
       @search_results = Kaminari.paginate_array(@search_results, total_count: search_results_size).page(params[:page])

data/app/controllers/concepts/hierarchical_controller.rb

@@ -16,22 +16,24 @@
 
 class Concepts::HierarchicalController < ConceptsController
   def index
+    base_class = Iqvoc::Concept.base_class
+
     if params[:published] == '0'
-      authorize! :update, Iqvoc::Concept.base_class
+      authorize! :update, base_class
     else
-      authorize! :read, Iqvoc::Concept.base_class
+      authorize! :read, base_class
     end
 
-    scope = Iqvoc::Concept.base_class.includes(:pref_labels).order('labels.value')
+    scope = base_class.includes(base_class.default_includes + [:pref_labels]).order('labels.value')
     scope = params[:published] == '0' ? scope.published_with_newer_versions : scope.published
 
+    # only select unexpired concepts
+    scope = scope.not_expired
+
     # unrelated concepts for sidebar
     # TODO: order parentless concepts
     @loose_concepts = scope.parentless.includes(:pref_labels).page(params[:page])
 
-    # only select unexpired concepts
-    scope = scope.not_expired
-
     # if params[:broader] is given, the action is handling the reversed tree
     root_id = params[:root]
     if root_id && root_id =~ /\d+/
@@ -50,11 +52,6 @@ class Concepts::HierarchicalController < ConceptsController
       end
     end
 
-    # 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 :-)
-    ActiveRecord::Associations::Preloader.new.preload(@concepts,
-        Iqvoc::Concept.base_class.default_includes + [:pref_labels])
-
     respond_to do |format|
       format.html
       format.json do # Treeview data
@@ -75,8 +72,7 @@ class Concepts::HierarchicalController < ConceptsController
             url: url,
             update_url: move_concept_url(c),
             glance_url: glance_concept_url(c, format: :html),
-            published: (c.published?) ? true : false,
-            locked: (can?(:branch, c) || can?(:update, c) ? false : true)
+            published: (c.published?) ? true : false
           }
         end
         render json: concepts

data/app/controllers/concepts/versions_controller.rb

@@ -33,7 +33,7 @@ class Concepts::VersionsController < ApplicationController
     ActiveRecord::Base.transaction do
       new_version.rdf_updated_at = nil
       new_version.publish
-      new_version.unlock
+
       if new_version.publishable?
         new_version.save
 
@@ -68,7 +68,7 @@ class Concepts::VersionsController < ApplicationController
 
       new_version = nil
       ActiveRecord::Base.transaction do
-        new_version = current_concept.branch(current_user)
+        new_version = current_concept.branch
         new_version.save!
         Iqvoc.change_note_class.create! do |note|
           note.owner = new_version
@@ -85,45 +85,6 @@ class Concepts::VersionsController < ApplicationController
     end
   end
 
-  def lock
-    new_version = Iqvoc::Concept.base_class.
-        by_origin(params[:origin]).
-        unpublished.
-        last!
-
-    if new_version.locked?
-      raise "Concept with origin '#{new_version.origin}' is already locked."
-    end
-
-    authorize! :lock, new_version
-
-    new_version.lock_by_user(current_user.id)
-    new_version.save validate: false
-
-    flash[:success] = t('txt.controllers.versioning.locked')
-    redirect_to edit_concept_path(published: 0, id: new_version)
-  end
-
-  def unlock
-    new_version = Iqvoc::Concept.base_class.
-        by_origin(params[:origin]).
-        unpublished.
-        last!
-
-    unless new_version.locked?
-      raise "Concept with origin '#{new_version.origin}' is not locked."
-    end
-
-    authorize! :unlock, new_version
-
-    new_version.unlock
-    new_version.save validate: false
-
-    flash[:success] = t('txt.controllers.versioning.unlocked')
-
-    redirect_to concept_path(published: 0, id: new_version)
-  end
-
   def consistency_check
     concept = Iqvoc::Concept.base_class.
         by_origin(params[:origin]).
@@ -137,7 +98,7 @@ class Concepts::VersionsController < ApplicationController
       redirect_to concept_path(published: 0, id: concept)
     else
       flash[:error] = t('txt.controllers.versioning.consistency_check_error')
-      redirect_to edit_concept_path(published: 0, id: concept, full_consistency_check: '1')
+      redirect_to concept_path(published: 0, id: concept, full_consistency_check: '1')
     end
   end
 
@@ -148,13 +109,17 @@ class Concepts::VersionsController < ApplicationController
         last!
 
     authorize! :send_to_review, concept
-    concept.to_review
 
-    authorize! :unlock, concept
-    concept.unlock
+    # Only send the concept to review if it is publishable (e.g. consistency check is OK)
+    if concept.publishable?
+      concept.to_review
+      concept.save!
 
-    concept.save!
-    flash[:success] = t('txt.controllers.versioning.to_review_success')
-    redirect_to concept_path(published: 0, id: concept)
+      flash[:success] = t('txt.controllers.versioning.to_review_success')
+      redirect_to concept_path(published: 0, id: concept)
+    else
+      flash[:error] = t('txt.controllers.versioning.consistency_check_error')
+      redirect_to concept_path(published: 0, id: concept, full_consistency_check: '1')
+    end
   end
 end

data/app/controllers/concepts_controller.rb

@@ -28,10 +28,16 @@ class ConceptsController < ApplicationController
         redirect_to hierarchical_concepts_url
       end
       format.json do # Search for widget
-        scope = Iqvoc::Concept.base_class.editor_selectable.with_pref_labels.
-            merge(Label::Base.by_query_value("%#{params[:query]}%"))
+        labels_scope = Label::Base.by_query_value("%#{params[:query]}%")
+        labels_scope = labels_scope.merge(Label::Base.by_language(params[:language])) if params[:language].present?
+
+        scope = Iqvoc::Concept.base_class
+                              .editor_selectable
+                              .with_pref_labels
+                              .merge(labels_scope)
         scope = scope.where(top_term: false) if params[:exclude_top_terms]
-        @concepts = scope.all.map { |concept| concept_widget_data(concept) }
+
+        @concepts = scope.uniq.map { |concept| concept_widget_data(concept) }
         render json: @concepts
       end
     end
@@ -41,6 +47,10 @@ class ConceptsController < ApplicationController
     get_concept
     authorize! :read, @concept
 
+    if params[:full_consistency_check] && can?(:check_consistency, @concept)
+      @concept.publishable?
+    end
+
     @datasets = datasets_as_json
     respond_to do |format|
       format.html do
@@ -63,19 +73,19 @@ class ConceptsController < ApplicationController
           end
         end
 
-        # 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 :-)
-        ActiveRecord::Associations::Preloader.new.preload(@concept,
-          Iqvoc::Concept.base_class.default_includes + [collection_members: { collection: :labels },
+        Iqvoc::Concept.base_class.preload(
+          @concept, Iqvoc::Concept.base_class.default_includes + [
+          collection_members: { collection: :labels },
           broader_relations: { target: [:pref_labels, :broader_relations] },
-          narrower_relations: { target: [:pref_labels, :narrower_relations] }])
+          narrower_relations: { target: [:pref_labels, :narrower_relations] }
+        ])
 
         @published ? render('show_published') : render('show_unpublished')
       end
       format.json do
         # 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 :-)
-        ActiveRecord::Associations::Preloader.new.preload(@concept, [:labels,
+        Iqvoc::Concept.base_class.preload(@concept, [:labels,
             { relations: { target: [:labelings, :relations] } }])
 
         published_relations = lambda { |concept|
@@ -151,8 +161,6 @@ class ConceptsController < ApplicationController
     @concept.assign_attributes(concept_params)
     @datasets = datasets_as_json
 
-    @concept.lock_by_user(current_user.id)
-
     if @concept.save
       flash[:success] = I18n.t('txt.controllers.versioned_concept.success')
       redirect_to concept_path(published: 0, id: @concept.origin)
@@ -169,10 +177,6 @@ class ConceptsController < ApplicationController
 
     @association_objects_in_editing_mode = @concept.associated_objects_in_editing_mode
 
-    if params[:full_consistency_check]
-      @concept.publishable?
-    end
-
     Iqvoc::Concept.note_class_names.each do |note_class_name|
       @concept.send(note_class_name.to_relation_name).build if @concept.send(note_class_name.to_relation_name).empty?
     end

data/app/controllers/concepts_movement_controller.rb

@@ -70,7 +70,7 @@ class ConceptsMovementController < ApplicationController
       result = draft.first
     else
       # create a new version
-      result = concept.branch(current_user)
+      result = concept.branch
       result.save!
     end
 

data/app/controllers/dashboard_controller.rb

@@ -28,9 +28,9 @@ class DashboardController < ApplicationController
       order_params = params[:sort]
       #FIXME: how to order by state in database?
       order_params = sanatize_order order_params
-      order_params = order_params.gsub('value', 'labels.value').gsub('locking_user', 'users.surname').gsub('follow_up', 'concepts.follow_up').gsub('updated_at', 'concepts.updated_at')
+      order_params = order_params.gsub('value', 'labels.value').gsub('follow_up', 'concepts.follow_up').gsub('updated_at', 'concepts.updated_at')
 
-      concepts = concepts.includes(:pref_labels, :locking_user).references(:pref_labels).references(:locking_user).order(order_params)
+      concepts = concepts.includes(:pref_labels).references(:pref_labels).order(order_params)
     else
       concepts = concepts.includes(:pref_labels).order('labels.value')
     end
@@ -51,9 +51,9 @@ class DashboardController < ApplicationController
       collections = sort == 'DESC' ? collections.reverse : collections
     elsif params[:sort]
       order_params = sanatize_order params[:sort]
-      order_params = order_params.gsub('value', 'labels.value').gsub('locking_user', 'users.surname').gsub('updated_at', 'concepts.updated_at')
+      order_params = order_params.gsub('value', 'labels.value').gsub('updated_at', 'concepts.updated_at')
 
-      collections = collections.includes(:pref_labels, :locking_user).references(:pref_labels).references(:locking_user).order(order_params)
+      collections = collections.includes(:pref_labels).references(:pref_labels).order(order_params)
     else
       collections = collections.includes(:pref_labels).order('labels.value')
     end
@@ -102,7 +102,7 @@ class DashboardController < ApplicationController
     return '' if search_params.include?(';')
     param_array = search_params.split(',').compact.select do |order_column|
       column_and_order = order_column.split(' ')
-      column_and_order.count == 2 && ['value', 'locking_user', 'follow_up', 'updated_at'].include?(column_and_order[0]) && ['ASC', 'DESC'].include?(column_and_order[1])
+      column_and_order.count == 2 && ['value', 'follow_up', 'updated_at'].include?(column_and_order[0]) && ['ASC', 'DESC'].include?(column_and_order[1])
     end
     param_array.join(',')
   end

data/app/controllers/imports_controller.rb

@@ -29,19 +29,22 @@ class ImportsController < ApplicationController
   end
 
   def create
-    import = Import.new(import_params)
-    import.user = current_user
+    @import = Import.new(import_params)
+    @import.user = current_user
 
-    if import.save
-      job = ImportJob.new(import, import.import_file.current_path, current_user,
-                          import.default_namespace, import.publish)
+    if @import.save
+      job = ImportJob.new(@import, @import.import_file.current_path, current_user,
+                          @import.default_namespace, @import.publish)
 
       Delayed::Job.enqueue(job)
       flash[:success] = t('txt.views.import.success')
+      redirect_to imports_path
     else
+      @imports = Import.order('id DESC')
+
       flash[:error] = t('txt.views.import.error')
+      render :index
     end
-    redirect_to imports_path
   end
 
   private

data/app/controllers/reverse_matches_controller.rb

@@ -11,10 +11,9 @@ class ReverseMatchesController < ApplicationController
     render_response :mapping_exists and return if matches
 
     ActiveRecord::Base.transaction do
-      unpublished_concept = @published_concept.branch(@botuser)
+      unpublished_concept = @published_concept.branch
       unpublished_concept.save!
       @target_match_class.constantize.create(concept_id: unpublished_concept.id, value: @uri)
-      unpublished_concept.unlock
       unpublished_concept.publish!
       @published_concept.destroy!
     end
@@ -23,7 +22,7 @@ class ReverseMatchesController < ApplicationController
   end
 
   def remove_match
-    unpublished_concept = @published_concept.branch(@botuser)
+    unpublished_concept = @published_concept.branch
     unpublished_concept.save!
     match = @target_match_class.constantize.find_by(concept_id: unpublished_concept.id, value: @uri)
     if match.nil?
@@ -32,7 +31,6 @@ class ReverseMatchesController < ApplicationController
     end
     ActiveRecord::Base.transaction do
       match.destroy!
-      unpublished_concept.unlock
       unpublished_concept.publish!
       @published_concept.destroy!
     end

data/app/controllers/search_results_controller.rb

@@ -108,25 +108,8 @@ class SearchResultsController < ApplicationController
       end
       klass = klass.constantize
 
-      query_size = params[:query].split(/\r\n/).size
-
-      if klass.forces_multi_query? || (klass.supports_multi_query? && query_size > 1)
-        @multi_query = true
-        @results = klass.multi_query(params.merge({ languages: languages.flatten }))
-        # TODO: Add a worst case limit here; e.g. when on page 2 (per_page == 50)
-        # each sub-query has to return 100 objects at most.
-        @klass = klass
-      else
-        @multi_query = false
-        @results = klass.single_query(params.merge({ languages: languages.flatten }))
-      end
-
-      if @multi_query
-        @results = Kaminari.paginate_array(@results)
-        logger.debug('Using multi query mode')
-      else
-        logger.debug('Using single query mode')
-      end
+      @results = klass.single_query(params.merge({ languages: languages.flatten }))
+                      .filter { |search_result| result_allowed?(search_result) }
 
       if params[:limit] && Iqvoc.unlimited_search_results
         @results = @results.per(params[:limit].to_i)
@@ -180,4 +163,15 @@ class SearchResultsController < ApplicationController
     controller.params['l'] = langs.keys if controller.params['l'].nil?
     controller.params['include_expired'] = (controller.params['include_expired'] == "true")
   end
+
+  private
+
+  def result_allowed?(result)
+    if result.result_object.is_a?(Labeling::Base)
+      can?(:read, result.owner)
+    else
+      can?(:read, result.result_object)
+    end
+  end
+
 end

data/app/helpers/application_helper.rb

@@ -20,14 +20,6 @@ module ApplicationHelper
     no: '✗'
   }
 
-  def user_details(user)
-    details = mail_to(user.email, user.name)
-    if user.telephone_number?
-      details << ' ' << user.telephone_number
-    end
-    details
-  end
-
   # Formats a list of items or returns a remark if no items where given
   def item_listing(items, &block)
     return '&nbsp;'.html_safe if items.empty?

data/app/helpers/link_helper.rb

@@ -1,14 +1,18 @@
 module LinkHelper
   def link_to_object(object, name, html_options = nil, &block)
-    path = case object
-           when Iqvoc::Concept.base_class
-             concept_url(id: object)
-           when Iqvoc::Collection.base_class
-             collection_url(id: object)
-           when Label::Base
-             label_url(id: object)
-           end
+    link_to name, link_for(object), html_options, &block
+  end
 
-    link_to name, path, html_options, &block
+  def link_for(object, params = {})
+    case object
+    when Iqvoc::Concept.base_class
+      concept_url(object, params)
+    when Iqvoc::Collection.base_class
+      collection_url(object, params)
+    when Label::Base
+      label_url(object, params)
+    else
+      raise 'Unsupported object type'
+    end
   end
 end