iqvoc 4.13.0 → 4.13.2

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

@@ -9,52 +9,57 @@ jQuery(document).ready(function($) {
   var locale = document.documentElement.getAttribute("lang");
 
   var langWidget = $("ul.lang-widget")[0];
-  // primary language (converting links to radio buttons)
-  $("a", langWidget).each(function(i, node) {
-    var link = $(node);
-    var el = link.closest("li");
-    var btn = $('<input type="radio" name="primary_language">');
-    if(link.hasClass("active")) {
-      btn[0].checked = true;
-    }
-    var label = $("<label />").append(btn).append(link);
-    el.append(label);
-    return label[0];
-  });
-  $("input:radio", langWidget).on("change", function(ev) {
-    window.location = $(this).closest("label").find("a").attr("href");
-  });
-  // secondary language
-  var toggleSections = function(langSelected) {
-    $(".translation[lang]").each(function(i, node) {
-      var el = $(node),
-        lang = el.attr("lang");
-      if(lang && lang !== locale && $.inArray(lang, langSelected) === -1) {
-        el.addClass("hidden");
-      } else {
-        el.removeClass("hidden");
+
+  if (langWidget) {
+    // primary language (converting links to radio buttons)
+    $("a", langWidget).each(function(i, node) {
+      var link = $(node);
+      var el = link.closest("li");
+      var btn = $('<input type="radio" name="primary_language">');
+      if(link.hasClass("active")) {
+        btn[0].checked = true;
       }
+      var label = $("<label />").append(btn).append(link);
+      el.append(label);
+      return label[0];
     });
-  };
-  var updateNoteLangs = function(langSelected) {
-    $(".inline_note.new select[id*=language]").each(function(i, sel) { // NB: new notes only!
-      $(sel).find("option").each(function(i, opt) {
-        var el = $(opt),
-          lang = el.val();
-        if(lang !== locale && $.inArray(lang, langSelected) === -1) {
-          el.remove();
+
+    $("input:radio", langWidget).on("change", function(ev) {
+      window.location = $(this).closest("label").find("a").attr("href");
+    });
+
+    // secondary language
+    var toggleSections = function(langSelected) {
+      $(".translation[lang]").each(function(i, node) {
+        var el = $(node),
+          lang = el.attr("lang");
+        if(lang && lang !== locale && $.inArray(lang, langSelected) === -1) {
+          el.addClass("hidden");
+        } else {
+          el.removeClass("hidden");
         }
       });
+    };
+    var updateNoteLangs = function(langSelected) {
+      $(".inline_note.new select[id*=language]").each(function(i, sel) { // NB: new notes only!
+        $(sel).find("option").each(function(i, opt) {
+          var el = $(opt),
+            lang = el.val();
+          if(lang !== locale && $.inArray(lang, langSelected) === -1) {
+            el.remove();
+          }
+        });
+      });
+    };
+    $(document).on("lang_selected", function(ev, data) {
+      toggleSections(data.langs);
+      updateNoteLangs(data.langs);
     });
-  };
-  $(document).on("lang_selected", function(ev, data) {
-    toggleSections(data.langs);
-    updateNoteLangs(data.langs);
-  });
-  var langSelector = new IQVOC.LanguageSelector(langWidget, "lang_selected");
-  if($("#new_concept, #edit_concept").length) { // edit mode
-    // disable secondary language selection to avoid excessive state complexity
-    $(":checkbox", langSelector.container).prop("disabled", true);
+    var langSelector = new IQVOC.LanguageSelector(langWidget, "lang_selected");
+    if($("#new_concept, #edit_concept").length) { // edit mode
+      // disable secondary language selection to avoid excessive state complexity
+      $(":checkbox", langSelector.container).prop("disabled", true);
+    }
   }
 
   // hide broader relations for top+ terms (mutually exclusive in mono hierarchies)

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

@@ -8,4 +8,5 @@ import './federated_concept_mapper'
 import './concept_mapping_manager'
 import './label_resolver'
 import './treeview'
-import './autocomplete'
+import './autocomplete'
+import './hover_menues'

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

@@ -15,6 +15,7 @@ import 'jqtree/tree.jquery.js';
 
       var dragabbleSupport = $(container).data('dragabble');
       var polyhierarchySupport = $(container).data('polyhierarchy-support');
+      var conceptModalPreviewEnabled = $(container).data('concept-modal-preview-enabled');
       var saveLabel = $(container).data('save-label');
       var copyLabel = $(container).data('copy-label');
       var undoLabel = $(container).data('undo-label');
@@ -65,7 +66,7 @@ import 'jqtree/tree.jquery.js';
             link.addClass('published');
           }
 
-          if (link[0]) {
+          if (link[0] && conceptModalPreviewEnabled) {
             var teaserLink = buildTeaserLink(node, link[0]);
             $li.find('.jqtree-element').append(teaserLink);
           }

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

@@ -30,8 +30,9 @@
   list-style-type: none;
   margin-top: 5px;
   padding-left: 0;
+
   li {
-    float: left;
+    display: inline-block;
   }
 }
 
@@ -40,11 +41,7 @@
   padding: 0;
 }
 
-.sections .entity_list li:after,
-.relation-body .entity_list li:after {
-  content: ",\00a0"; // => ', '
-}
-.sections .entity_list li:last-child:after,
-.relation-body .entity_list li:last-child:after {
-  content: "";
+.relation-body .entity_list li:not(:last-child):after {
+  content: ",";
+  margin-left: -0.2rem;
 }

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

@@ -12,6 +12,7 @@ simplete-suggestions {
   position: absolute;
   width: 100%;
   display: block;
+  z-index: 100;
 
   .search-results {
     overflow-y: auto;
@@ -34,4 +35,4 @@ simplete-suggestions {
   li.search-result:hover {
     background-color: $gray-200;
   }
-}
+}

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

@@ -1,5 +1,6 @@
 ul.hybrid-treeview {
   padding: 0;
+  margin-bottom: 0;
 }
 
 ul.jqtree-tree {

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

@@ -2,7 +2,7 @@ legend {
   margin-bottom: 0;
 }
 
-fieldset > div:first-of-type, ol:first-of-type, p {
+fieldset > div:first-of-type, ol:first-of-type {
   -webkit-margin-top-collapse: separate;
   margin-top: 27px;
 }

data/app/controllers/collections/versions_controller.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 class Collections::VersionsController < ApplicationController
-  include RDFSyncService::Helper
+  include RdfSyncService::Helper
 
   def merge
     scope = Iqvoc::Collection.base_class.by_origin(params[:origin])

data/app/controllers/collections_controller.rb

@@ -125,7 +125,7 @@ class CollectionsController < ApplicationController
     # set to_review to false if someone edits a concepts
     concept_params["to_review"] = "false"
 
-    if @collection.update_attributes(concept_params)
+    if @collection.update(concept_params)
       flash[:success] = I18n.t('txt.controllers.collections.save.success')
       redirect_to collection_path(@collection, published: 0)
     else

data/app/controllers/concepts/alphabetical_controller.rb

@@ -61,7 +61,7 @@ class Concepts::AlphabeticalController < ConceptsController
 
   def find_labelings
     letter = (@letters.include?('A')) ? 'a' : @letters.first
-    query = (params[:prefix] || letter).mb_chars.downcase.to_s
+    query = (params[:prefix] || letter)&.mb_chars&.downcase.to_s
 
     Iqvoc::Concept.pref_labeling_class
       .concept_published

data/app/controllers/concepts/scheme_controller.rb

@@ -42,6 +42,7 @@ class Concepts::SchemeController < ApplicationController
     @top_concepts = Iqvoc::Concept.base_class
                         .preload(:pref_labels)
                         .tops
+                        .not_expired
                         .published.sort_by {|c| c.pref_label }
 
     respond_to do |format|
@@ -59,7 +60,7 @@ class Concepts::SchemeController < ApplicationController
     @scheme = Iqvoc::Concept.root_class.instance
     authorize! :update, @scheme
 
-    if @scheme.update_attributes(concept_params)
+    if @scheme.update(concept_params)
       flash[:success] = t('txt.controllers.concept_scheme.save.success')
       redirect_to scheme_path
     else

data/app/controllers/concepts/versions_controller.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 class Concepts::VersionsController < ApplicationController
-  include RDFSyncService::Helper
+  include RdfSyncService::Helper
 
   def merge
     concept_scope = Iqvoc::Concept.base_class.by_origin(params[:origin])

data/app/controllers/concepts_controller.rb

@@ -147,7 +147,7 @@ class ConceptsController < ApplicationController
     authorize! :create, Iqvoc::Concept.base_class
 
     @concept = Iqvoc::Concept.base_class.new
-    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.protocol)
+    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.protocol) if match_sync_enabled?
     @concept.assign_attributes(concept_params)
     @datasets = datasets_as_json
 
@@ -185,14 +185,14 @@ class ConceptsController < ApplicationController
   def update
     @concept = Iqvoc::Concept.base_class.by_origin(params[:id]).unpublished.last!
     authorize! :update, @concept
-    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.protocol)
+    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.protocol) if match_sync_enabled?
 
     @datasets = datasets_as_json
 
     # set to_review to false if someone edits a concepts
     concept_params["to_review"] = "false"
 
-    if @concept.update_attributes(concept_params)
+    if @concept.update(concept_params)
       flash[:success] = I18n.t('txt.controllers.versioned_concept.update_success')
       redirect_to concept_path(published: 0, id: @concept)
     else
@@ -247,4 +247,10 @@ class ConceptsController < ApplicationController
       # TODO: relations (XL only)
     }
   end
+
+  private
+
+  def match_sync_enabled?
+    Iqvoc.config['sources.create_reverse_matches']
+  end
 end

data/app/controllers/hierarchy_controller.rb

@@ -164,7 +164,7 @@ class HierarchyController < ApplicationController
     @relation_class = @relation_class.narrower_class unless direction == 'up'
 
     respond_to do |format|
-      format.any(:html, :rdf, :ttl) { render 'hierarchy/show' }
+      format.any(:html, :rdf, :ttl, :nt) { render 'hierarchy/show' }
     end
   end
 

data/app/controllers/search_results_controller.rb

@@ -44,6 +44,8 @@ class SearchResultsController < ApplicationController
   param 'ds[]', String ,
       desc: 'Specifies one or more external data sets (connected thesauri)'\
                'to include in search.'
+  param :include_expired, String,
+        desc: 'Specifies if expired concepts should be included (defaults to false).'
   example <<-DOC
     GET /search.ttl
     200
@@ -176,5 +178,6 @@ class SearchResultsController < ApplicationController
     controller.params['qt'] = 'contains' if controller.params['qt'].nil?
     controller.params['for'] = 'all' if controller.params['for'].nil?
     controller.params['l'] = langs.keys if controller.params['l'].nil?
+    controller.params['include_expired'] = (controller.params['include_expired'] == "true")
   end
 end

data/app/controllers/triplestore_sync_controller.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 class TriplestoreSyncController < ApplicationController
-  include RDFSyncService::Helper
+  include RdfSyncService::Helper
 
   def index
     authorize! :sync, :triplestore
@@ -40,7 +40,7 @@ class TriplestoreSyncController < ApplicationController
     end
 
     # per-class pagination
-    @candidates = RDFSyncService.candidates.map do |records|
+    @candidates = RdfSyncService.candidates.map do |records|
       records.page(params[:page])
     end
   end

data/app/controllers/users_controller.rb

@@ -50,7 +50,7 @@ class UsersController < ApplicationController
     # could not change his own role and permissions
     params = can?(:manage, User) ? user_params : user_params.except(:active, :role, :comment)
 
-    if @user.update_attributes(params)
+    if @user.update(params)
       flash[:success] = I18n.t('txt.controllers.users.successfully_updated')
       redirect_to can?(:manage, User) ? users_path : dashboard_path
     else

data/app/helpers/application_helper.rb

@@ -54,16 +54,19 @@ module ApplicationHelper
     end
   end
 
-  def page_header(args = {})
+  def page_header(args = {}, &block)
     if title = args[:title]
       content_for(:title, strip_tags(title))
     end
 
     content_for :page_header do
       content_tag :div, class: 'page-header' do
-        content_tag :h1 do
-          ("#{title} #{content_tag(:small, args[:desc])}").html_safe
+        res = content_tag :h1 do
+          ("#{title} #{content_tag(:small, args[:desc]) if args[:desc]}").html_safe
         end
+        res << capture(&block) if block_given?
+
+        res
       end
     end
   end

data/app/helpers/concepts_helper.rb

@@ -82,7 +82,7 @@ module ConceptsHelper
     concept.never_published? ? t("txt.views.versioning.delete") : t("txt.views.versioning.delete_copy")
   end
 
-  def concept_header(concept)
+  def concept_header(concept, &block)
     desc = concept.class.model_name.human
 
     if concept.expired_at
@@ -91,7 +91,7 @@ module ConceptsHelper
 
     title = concept.pref_label || concept.origin
 
-    page_header title: title.to_s, desc: desc.html_safe
+    page_header(title: title.to_s, desc: desc.html_safe, &block)
   end
 
   private
@@ -120,7 +120,7 @@ module ConceptsHelper
         render(association_class.partial_name(concept), further_options.merge(concept: concept, klass: association_class))
       end
     end
-    html = render partial: '/partials/match/panel', locals: { body: matches_html }
+    html = render partial: '/partials/match/panel', locals: { body: matches_html, klass: Match::SKOS::Base }
     if String.new(html).squish.present?
       ((hash[association_classes.first.view_section(concept)] ||= {})[association_classes.first.view_section_sort_key(concept)] ||= '') << html.html_safe
     end

data/app/helpers/link_helper.rb

@@ -1,13 +1,13 @@
 module LinkHelper
   def link_to_object(object, name, html_options = nil, &block)
     path = case object
-    when Iqvoc::Concept.base_class
-      concept_path(id: object)
-    when Iqvoc::Collection.base_class
-      collection_path(id: object)
-    when Label::Base
-      label_path(id: object)
-    end
+           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, path, html_options, &block
   end

data/app/helpers/navigation_helper.rb

@@ -26,18 +26,13 @@ module NavigationHelper
   # :items - a list of hashes to be used as second-level navigation items
   def nav_items(items)
     items.map do |item|
-      if !item.has_key?(:authorized?) || instance_eval(&item[:authorized?])
+      if nav_item_authorized?(item)
         if item[:items]
           content_tag :li, class: 'nav-item dropdown' do
-            raw(link_to(element_value(item[:text]).html_safe +
-                    content_tag(:i), '#',
-                    class: 'nav-link dropdown-toggle',
-                    role: 'button',
-                    'aria-haspopup': true,
-                    'aria-expanded': false,
-                    data: { toggle: 'dropdown' }) +
+            raw(nav_link(item, has_children: true) +
                 content_tag(:div,
-                    item[:items].map { |i| dropdown_nav_item(i) }.join.html_safe,
+                    item[:items].select { |i| nav_item_authorized?(i) }
+                                .map { |i| nav_link(i, class: 'dropdown-item') }.join.html_safe,
                     class: 'dropdown-menu'))
           end
         else
@@ -90,14 +85,30 @@ module NavigationHelper
     active = item[:active?] ? instance_eval(&item[:active?]) : (item[:controller] ? params[:controller] == item[:controller] : false)
     css = 'nav-item'
     css << ' active' if active
-    content_tag :li, link_to(element_value(item[:text]), element_value(item[:href]), class: 'nav-link'), class: css
+    content_tag :li, class: css do
+      nav_link(item)
+    end
   end
 
-  def dropdown_nav_item(item)
+  def nav_link(item, opts = {})
     active = item[:active?] ? instance_eval(&item[:active?]) : (item[:controller] ? params[:controller] == item[:controller] : false)
-    css = 'dropdown-item'
+
+    css = opts[:class] || 'nav-link'
     css << ' active' if active
-    link_to(element_value(item[:text]), element_value(item[:href]), class: css)
+    css << ' dropdown-toggle' if opts[:has_children]
+
+    link_opts = {
+      class: css
+    }
+
+    dropdown_opts = {
+      role: 'button',
+      'aria-haspopup': true,
+      'aria-expanded': false
+    }
+    link_opts.merge!(dropdown_opts) if opts[:has_children]
+
+    link_to(element_value(item[:text]), element_value(item[:href] || '#'), link_opts)
   end
 
   def nav_item_authorized?(item)

data/app/models/abstract_user.rb

@@ -41,7 +41,7 @@ class AbstractUser < ApplicationRecord
     config.crypto_provider = Authlogic::CryptoProviders::SCrypt
   end
 
-  def self.default_role
+  def self.default_user_role
     'reader'
   end
 

data/app/models/concept/base.rb

@@ -358,6 +358,15 @@ class Concept::Base < ApplicationRecord
 
   # ********** Scopes
 
+  def self.expired(time = Time.now)
+    where(arel_table[:expired_at].lt(time))
+  end
+
+  def self.not_expired(time = Time.now)
+    col = arel_table[:expired_at]
+    where((col.eq(nil)).or(col.gteq(time)))
+  end
+
   def self.tops
     where(top_term: true)
   end
@@ -506,7 +515,7 @@ class Concept::Base < ApplicationRecord
     @labels ||= labelings.each_with_object({}) do |labeling, hash|
       ((hash[labeling.class.name.to_s] ||= {})[labeling.target.language] ||= []) << labeling.target if labeling.target
     end
-    ((@labels && @labels[labeling_class] && @labels[labeling_class][lang]) || []).select{ |l| l.published? || !only_published }.sort_by(&:value)
+    ((@labels && @labels[labeling_class] && @labels[labeling_class][lang]) || []).select{ |l| l.published? || !only_published }
   end
 
   def related_concepts_for_relation_class(relation_class, only_published = true)

data/app/models/concept/skos/base.rb

@@ -31,16 +31,6 @@ class Concept::SKOS::Base < Concept::Base
     return subject
   end
 
-  # ********** Scopes
-  def self.expired(time = Time.now)
-    where(arel_table[:expired_at].lt(time))
-  end
-
-  def self.not_expired(time = Time.now)
-    col = arel_table[:expired_at]
-    where((col.eq(nil)).or(col.gteq(time)))
-  end
-
   def self.recent(limit = 5)
     self
     .published

data/app/models/concept/validations.rb

@@ -91,10 +91,12 @@ module Concept
       if validatable_for_publishing?
         alt_labels = alt_labelings.collect { |l| l.target }
 
-        if alt_labels.include? pref_label
-            errors.add :base,
-              I18n.t('txt.models.concept.pref_label_defined_in_alt_labels',
-                label: pref_label.value)
+        pref_labels.each do |pref_label|
+          if alt_labels.include? pref_label
+              errors.add :base,
+                I18n.t('txt.models.concept.pref_label_defined_in_alt_labels',
+                  label: pref_label.value)
+          end
         end
       end
     end

data/app/models/concerns/versioning.rb

@@ -37,7 +37,7 @@ module Versioning
 
   module ClassMethods
     def by_origin(origin)
-      where(origin: origin)
+      default_scoped.where(origin: origin)
     end
 
     def published

data/app/models/dataset/adaptors/iqvoc/http_adaptor.rb

@@ -1,6 +1,6 @@
 require 'faraday'
 
-class Dataset::Adaptors::Iqvoc::HTTPAdaptor
+class Dataset::Adaptors::Iqvoc::HttpAdaptor
   DEFAULT_TIMEOUT = 5.freeze
   attr_reader :url
 

data/app/models/dataset/adaptors/iqvoc/label_adaptor.rb

@@ -1,4 +1,4 @@
-class Dataset::Adaptors::Iqvoc::LabelAdaptor < Dataset::Adaptors::Iqvoc::HTTPAdaptor
+class Dataset::Adaptors::Iqvoc::LabelAdaptor < Dataset::Adaptors::Iqvoc::HttpAdaptor
   def find(concept_url)
     path = URI.parse(concept_url).path
     if response = http_get(path)

data/app/models/dataset/adaptors/iqvoc/search_adaptor.rb

@@ -1,4 +1,4 @@
-class Dataset::Adaptors::Iqvoc::SearchAdaptor < Dataset::Adaptors::Iqvoc::HTTPAdaptor
+class Dataset::Adaptors::Iqvoc::SearchAdaptor < Dataset::Adaptors::Iqvoc::HttpAdaptor
   def search(raw_params = {})
     languages = raw_params.fetch(:languages, I18n.locale)
     languages = Array.wrap(languages).flatten.join(',')

data/app/models/labeling/skos/base.rb

@@ -69,16 +69,20 @@ class Labeling::SKOS::Base < Labeling::Base
     scope = scope.includes(:owner)
 
     scope = case params[:for]
-    when 'concept'
-      scope.where('concepts.type' => Iqvoc::Concept.base_class_name).
-        references(:concepts)
-    when 'collection'
-      scope.where('concepts.type' => Iqvoc::Collection.base_class_name).
-        references(:concepts)
-    else
-      # no additional conditions
-      scope
-    end
+            when 'concept'
+              scope.merge(Iqvoc::Concept.base_class.published)
+            when 'collection'
+              scope.merge(Iqvoc::Collection.base_class.published)
+            else
+              # no additional conditions
+              scope
+            end
+
+    scope = if params[:include_expired]
+              scope.merge(Concept::Base.not_expired).or(scope.merge(Concept::Base.expired))
+            else
+              scope.merge(Concept::Base.not_expired)
+            end
 
     if params[:change_note_date_from].present? || params[:change_note_date_to].present?
       change_note_relation = Iqvoc.change_note_class_name.to_relation_name

data/app/models/user_session.rb

@@ -15,7 +15,4 @@
 # limitations under the License.
 
 class UserSession < Authlogic::Session::Base
-  def to_key
-    new_record? ? nil : [ self.send(self.class.primary_key) ]
-  end
 end

data/app/services/rdf_sync_service.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-class RDFSyncService
+class RdfSyncService
   delegate :url_helpers, to: 'Rails.application.routes'
 
   ADAPTORS = { # XXX: inappropriate?
@@ -105,11 +105,11 @@ class RDFSyncService
   end
 end
 
-module RDFSyncService::Helper # TODO: rename -- XXX: does not belong here!?
+module RdfSyncService::Helper # TODO: rename -- XXX: does not belong here!?
   def triplestore_syncer
     base_url = root_url(lang: nil) # XXX: brittle in the face of future changes?
 
-    return RDFSyncService.new(base_url, Iqvoc.config['triplestore.url'],
+    return RdfSyncService.new(base_url, Iqvoc.config['triplestore.url'],
         username: Iqvoc.config['triplestore.username'].presence,
         password: Iqvoc.config['triplestore.password'].presence,
         view_context: view_context) # fugly, but necessary; cf. RDFSync#serialize

data/app/views/concepts/alphabetical/_search_result.html.erb

@@ -2,7 +2,9 @@
   <p>
     <%= link_to result.label.to_s, rdf_path(result.concept, lang: nil, format: nil),
       alt: result.concept.origin, data: { 'resource-path': result.path, 'resource-url': rdf_url(result.concept, lang: nil, format: nil) }, class: 'concept-item-link' %>
-    <a href="<%= glance_concept_url(result.concept, format: :html) %>" class="dashboard-glance-link"><i class="fa fa-search-plus"></i></a>
+    <% if Iqvoc.concept_modal_preview_enabled? %>
+      <a href="<%= glance_concept_url(result.concept, format: :html) %>" class="dashboard-glance-link"><i class="fa fa-search-plus"></i></a>
+    <% end %>
 
     <% if result.concept.additional_info.present? %>
       <span class="additional_info">(<%= result.concept.additional_info %>)</span>