iqvoc 4.13.0 → 4.14.4

data/README.md

@@ -75,10 +75,11 @@ fork.
 4. Create the necessary tables by running `rake db:migrate`
 5. Load some base data by running `rake db:seed`
 6. Make sure you have got `config/secrets.yml` in place
-7. Boot up the app using `bundle exec rails s` (or `passenger start`
-   if you use passenger)
-8. Log in with "admin@iqvoc" / "admin" or "demo@iqvoc" / "cooluri" (cf. step #5)
-9. Visit the Users section and change the default passwords
+7. Install nodejs dependencies for compiling assets: `npm install` (make sure nodejs is installed)
+8. Compile assets using: `npm run compile` (or `npm run watch` to compile and listen for changes in development)
+8. Boot up the app using `bundle exec rails s` (or `passenger start` if you use passenger)
+9. Log in with "admin@iqvoc" / "admin123" or "demo@iqvoc" / "cooluri123" (cf. step #5)
+10. Visit the Users section and change the default passwords
 
 ## Background Jobs
 
@@ -98,7 +99,7 @@ $ rake jobs:workoff
 
 ## Compatibility
 
-iQvoc is fully compatible with Ruby 2.5 and 2.6.
+iQvoc is fully compatible with Ruby 2.6.
 
 ## Customization
 
@@ -144,7 +145,7 @@ If you want to help out there are several options:
 If you make changes to existing code please make sure that the test suite stays
 green. Please include tests to your additional contributions.
 
-Tests can be run via `bundle exec rake test`. We're using Poltergeist for
+Tests can be run via `bundle exec rake test`. We're using Cuprite for
 integration tests with JavaScript support.
 
 ## Maintainer & Contributors

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/framework.js

@@ -1,5 +1,5 @@
 import 'document-register-element/build/document-register-element.js';
 import 'jquery-ujs/src/rails';
-import 'bootstrap-datepicker/js/bootstrap-datepicker';;
-import 'bootstrap-datepicker/js/locales/bootstrap-datepicker.de.js';;
-import 'simplete/simplete';
+import 'bootstrap-datepicker/js/bootstrap-datepicker';
+import 'bootstrap-datepicker/js/locales/bootstrap-datepicker.de.js';
+import 'simplete/simplete';

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

@@ -0,0 +1,14 @@
+(function($) {
+  "use strict";
+
+  $(function() {
+    $('ul.navbar-nav li.dropdown').hover(function() {
+      $(this).find('.dropdown-menu').stop(true, true).delay(100).show();
+      $(this).find('> .nav-link').addClass('hover')
+    }, function() {
+      $(this).find('.dropdown-menu').stop(true, true).delay(100).hide();
+      $(this).find('> .nav-link').removeClass('hover')
+    });
+  });
+
+}(jQuery));

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)
@@ -102,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/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/_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/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])
@@ -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 } }])
 
@@ -125,7 +132,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

@@ -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])
@@ -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/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/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