iqvoc 4.8.2 → 4.9.0

data/README.md

@@ -133,6 +133,6 @@ iQvoc was originally created and is being maintained by [innoQ Deutschland GmbH]
 
 ## License
 
-Copyright 2014 [innoQ Deutschland GmbH](https://www.innoq.com).
+Copyright 2015 [innoQ Deutschland GmbH](https://www.innoq.com).
 
 Licensed under the Apache License, Version 2.0.

data/app/aides/skos_importer.rb

@@ -248,8 +248,8 @@ class SkosImporter
     end
     begin
       types[predicate].build_from_rdf(subject, predicate, object)
-    rescue InvalidStringLiteralError => e
-      @logger.warn e.message
+    rescue Exception => e
+      @logger.warn "#{e.class.name}: #{e.message}. Skipping entry ':#{subject} #{predicate} #{object}.'"
     end
   end
 

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

@@ -159,8 +159,11 @@ jQuery(document).ready(function($) {
       firstDay: 1
     });
   }
+
   $("input.datepicker").pickadate({
-    editable: true,
+    // currently disabled beacause of a pickadate-bug
+    // https://github.com/amsul/pickadate.js/issues/640
+    // editable: true,
     format: 'yyyy-mm-dd'
   });
 
@@ -176,10 +179,10 @@ jQuery(document).ready(function($) {
 
   // Search
   $(".checkbox-select-all").click(function() {
-    $(this).closest('.checkbox-controls').find("input:checkbox").attr("checked", true);
+    $(this).closest('.checkbox-controls').find("input:checkbox").prop("checked", true);
   });
   $(".checkbox-select-none").click(function() {
-    $(this).closest('.checkbox-controls').find("input:checkbox").attr("checked", false);
+    $(this).closest('.checkbox-controls').find("input:checkbox").prop("checked", false);
   });
   $("select.search_type").change(function() {
     var result_type_filter = $(".result_type_filter");

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

@@ -9,7 +9,7 @@ function OneBox(container) {
   this.container = container.jquery ? container : $(container);
   this.form = this.container.find('form');
   this.input = $(".onebox-input", this.form); // TODO: document
-  this.results = $('<ol class="results concept-items list-unstyled" />');
+  this.results = $('<ol class="search-results list-unstyled" />');
   this.indicator = $('<i class="fa fa-refresh fa-spin fa-3x onebox-indicator" />').
       appendTo(this.container).hide();
 
@@ -21,20 +21,18 @@ OneBox.prototype.reset = function() {
 };
 OneBox.prototype.renderResults = function(html) {
   var doc = $("<div />").append(html);
-  var items = $(".concept-items > li", doc);
+  var items = $(".search-results > li", doc);
   var pagination = $(".pagination", doc);
 
   this.reset();
   this.results.empty().append(items).appendTo(this.container);
   pagination.appendTo(this.container);
 };
-OneBox.prototype.onSubmit = function(ev) {
-  ev.preventDefault(); // handled by #onInput
-};
 OneBox.prototype.onInput = function(ev) {
   var val = this.input.val();
   this.reset();
-  if(val.length > 0 && val !== this.initialValue) {
+  // start search if there are at least two characters in onebox
+  if(val.length >= 2 && val !== this.initialValue) {
     this.getConcepts();
   }
 };

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

@@ -31,7 +31,7 @@ function Treeview(container) {
         update_url: item.data('update-url'),
         glance_url: item.data('glance-url'),
         published: item.data('published'),
-        additionalText: item.children('span.additional_info')
+        additionalText: item.children('span.additional_info').html()
       };
     });
 
@@ -48,9 +48,14 @@ function Treeview(container) {
         return uri.normalize().toString();
       },
       onCreateLi: function(node, $li) {
-        var link = buildLink(node.url, node.name, node.additionalText);
+        var link = buildLink(node.url, node.name);
         $li.find('.jqtree-title').replaceWith(link);
 
+        // add aditional info if present (e.g. for collections)
+        if (node.additionalText) {
+          link.after(' ', node.additionalText);
+        }
+
         // mark published/unpublished items
         if (typeof node.published !== 'undefined' && !node.published) {
           // modify draft link
@@ -61,32 +66,35 @@ function Treeview(container) {
           link.addClass('published');
         }
 
-        if (typeof link[0] !== 'undefined') {
+        if (link[0]) {
           var teaserLink = buildTeaserLink(node, link[0]);
+          $li.find('.jqtree-element').append(teaserLink);
         }
 
         if (dragabbleSupport) {
           // mark locked items
-          if (typeof node.locked !== 'undefined' && node.locked) {
+          if (node && node.locked) {
             // add icon only to the first element of the collection.
             // the second one could be a nodelist for parents nodes.
-            $(link[0]).after(' <i class="fa fa-lock"/>');
+            $li.find('.jqtree-element').append(' <i class="fa fa-lock"/>');
           }
 
-          if (typeof node.locked !== 'undefined' && !node.locked) {
+          if (node && !node.locked) {
             // add icon only to the first element of the collection.
             // the second one could be a nodelist for parents nodes.
-            $(link[0]).after(' <i class="fa fa-arrows"/>');
+            $li.find('.jqtree-element').append(' <i class="fa fa-arrows"/>');
           }
         }
 
         if(node.moved) {
-          $li.data('node-id', node.id);
-          $li.data('old-parent-node-id', node.old_parent_id);
-          $li.data('new-parent-node-id', node.target_node_id);
-          $li.data('old-previous-sibling-id', node.old_previous_sibling_id);
-          $li.data('update-url', node.update_url),
-          $li.data('glance-url', node.glance_url);
+          $li.data({
+            'node-id': node.id,
+            'old-parent-node-id': node.old_parent_id,
+            'new-parent-node-id': node.target_node_id,
+            'old-previous-sibling-id': node.old_previous_sibling_id,
+            'update-url': node.update_url,
+            'glance-url': node.glance_url
+          });
 
           var saveButton = $('<button type="button" class="btn btn-primary btn-xs node-btn" data-tree-action="move"><i class="fa fa-save"></i> ' + saveLabel + '</button>');
           var copyButton = $('<button type="button" class="btn btn-primary btn-xs node-btn" data-tree-action="copy"><i class="fa fa-copy"></i> ' + copyLabel + '</button>');
@@ -94,7 +102,7 @@ function Treeview(container) {
 
           // add icon only to the first element of the collection.
           // the second one could be a nodelist for parents nodes.
-          $(link[0]).after(saveButton, undoButton);
+          $li.find('.jqtree-element').append(saveButton, undoButton);
 
           if(polyhierarchySupport) {
             saveButton.after(copyButton);
@@ -125,7 +133,7 @@ function Treeview(container) {
   });
 
   // mark moved nodes
-  $('ul.hybrid-treeview').on('tree.move', function(event) {
+  $('#content > ul.hybrid-treeview').on('tree.move', function(event) {
     var moved_node = event.move_info.moved_node;
 
     $(this).tree('updateNode', moved_node, {
@@ -136,14 +144,14 @@ function Treeview(container) {
     if (moved_node.getPreviousSibling() !== null) {
       $(this).tree('updateNode', moved_node, {old_previous_sibling_id: moved_node.getPreviousSibling().id});
     }
-    if (typeof moved_node.parent.id !== 'undefined') {
+    if (moved_node && moved_node.parent.id) {
       $(this).tree('updateNode', moved_node, {old_parent_id: moved_node.parent.id});
     }
   });
 
   // save/copy moved node
-  $('ul.hybrid-treeview').on('click', 'button.node-btn', function(event) {
-    var $tree = $('ul.hybrid-treeview');
+  $('#content > ul.hybrid-treeview').on('click', 'button.node-btn', function(event) {
+    var $tree = $('#content > ul.hybrid-treeview');
     var treeAction = $(this).data('tree-action');
     var updateUrl = $(this).closest('li').data('update-url');
 
@@ -162,19 +170,19 @@ function Treeview(container) {
         new_parent_node_id: newParentNodeId
       },
       statusCode: {
-        200: function() {
-          [movedNodeId, newParentNodeId, oldParentNodeId].forEach(function(nodeId){
-            setToDraft(nodeId, $tree);
-          });
+        200: function(response) {
+          // mark moved node to draft
+          var newNodeId = response.new_node_id;
+          setToDraft(movedNodeId, newNodeId, $tree);
 
           // add node to old parent, necessary to see both node directly after movement,
           // this is not necessary if you refresh the page
           if (treeAction === 'copy') {
             var node = $tree.tree('getNodeById', movedNodeId);
-            if (typeof oldPreviousSiblingId !== 'undefined') {
+            if (oldPreviousSiblingId) {
               var old_previous_sibling = $tree.tree('getNodeById', oldPreviousSiblingId);
               $tree.tree('addNodeAfter', node, old_previous_sibling);
-            } else if (typeof oldParentNodeId !== 'undefined') {
+            } else if (oldParentNodeId) {
               var old_parent_node = $tree.tree('getNodeById', oldParentNodeId);
               $tree.tree('appendNode', node, old_parent_node);
             }
@@ -185,8 +193,8 @@ function Treeview(container) {
   });
 
   // reset moved node
-  $('ul.hybrid-treeview').on('click', 'button.reset-node-btn', function(event) {
-    var $tree = $('ul.hybrid-treeview');
+  $('#content > ul.hybrid-treeview').on('click', 'button.reset-node-btn', function(event) {
+    var $tree = $('#content > ul.hybrid-treeview');
     var nodeId = $(this).closest('li').data('node-id');
     var oldPreviousSiblingId = $(this).closest('li').data('old-previous-sibling-id');
     var oldParentNodeId = $(this).closest('li').data('old-parent-node-id');
@@ -194,10 +202,11 @@ function Treeview(container) {
     moveToOldPosition(nodeId, oldPreviousSiblingId, oldParentNodeId, $tree);
   });
 
-  function setToDraft(nodeId, $tree) {
-    if (typeof nodeId !== 'undefined') {
+  function setToDraft(nodeId, newNodeId, $tree) {
+    if (nodeId) {
       var moved_node = $tree.tree('getNodeById', nodeId);
       $tree.tree('updateNode', moved_node, {
+        id: newNodeId,
         moved: false,
         published: false
       });
@@ -205,31 +214,31 @@ function Treeview(container) {
   }
 
   function moveToOldPosition(nodeId, oldPreviousSiblingId, oldParentNodeId, $tree) {
-
     var node = $tree.tree('getNodeById', nodeId);
 
-    if (typeof oldPreviousSiblingId !== 'undefined') {
+    if (oldPreviousSiblingId) {
       var old_previous_sibling = $tree.tree('getNodeById', oldPreviousSiblingId);
       $tree.tree('moveNode', node, old_previous_sibling, 'after');
     }
-    else if (typeof oldParentNodeId !== 'undefined') {
+    else if (oldParentNodeId) {
       var oldParentNode = $tree.tree('getNodeById', oldParentNodeId);
       $tree.tree('moveNode', node, oldParentNode, 'inside');
     }
     $tree.tree('updateNode', node, {moved: false});
   }
 
-  function buildLink(url, label, additionalText) {
-    var link = $('<a>').attr('href', url).addClass('tree-element-link').html(label);
+  function buildLink(url, label) {
+    var link = $('<a/>')
+
+    link.attr('href', url)
+        .addClass('tree-element-link')
+        .html(label);
 
-    if (additionalText) {
-      link = link.after(' ', additionalText);
-    }
     return link;
   }
 
   function buildTeaserLink(node, link) {
-    if (typeof node.glance_url === 'undefined') {
+    if (node && !node.glance_url) {
       return;
     }
 
@@ -239,8 +248,6 @@ function Treeview(container) {
               .attr('href', node.glance_url)
               .append($('<i class="fa fa-search-plus"/>'))
 
-    $(link).after(teaserLink);
-
     teaserLink.click(function(ev) {
       ev.preventDefault();
 

data/app/assets/stylesheets/_framework.scss

@@ -1,5 +1,3 @@
-@import 'iqvoc/settings/bootstrap-variables';
-
 @import 'bootstrap-sass/assets/stylesheets/bootstrap-sprockets';
 @import 'bootstrap-sass/assets/stylesheets/bootstrap';
 

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

@@ -40,14 +40,9 @@
   padding: 0;
 }
 
-.sections .entity_list li,
-.relation-body .entity_list li {
-  margin-right: 1em;
-}
-
 .sections .entity_list li:after,
 .relation-body .entity_list li:after {
-  content: ",";
+  content: ",\00a0"; // => ', '
 }
 .sections .entity_list li:last-child:after,
 .relation-body .entity_list li:last-child:after {

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

@@ -5,4 +5,9 @@
   input[type=checkbox] {
     display: inline;
   }
+
+  .box {
+    border: 1px solid $list-group-border;
+    padding: 0 15px;
+  }
 }

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

@@ -1,4 +1,6 @@
-ul.hybrid-treeview { padding: 0;}
+ul.hybrid-treeview {
+  padding: 0;
+}
 
 ul.jqtree-tree {
   margin-left: 0;
@@ -121,3 +123,7 @@ span.jqtree-dragging {
 .tree-element-teaser-link {
   margin-left: .25em;
 }
+
+.box > .hybrid-treeview {
+  margin-top: 10px;
+}

data/app/assets/stylesheets/iqvoc/settings/_bootstrap-variables.scss

@@ -327,7 +327,7 @@ $zindex-modal:             10400;
 // $grid-gutter-width:         30px
 // Navbar collapse
 //** Point at which the navbar becomes uncollapsed.
-// $grid-float-breakpoint:     $screen-sm-min
+$grid-float-breakpoint:     1200px;
 //** Point at which the navbar begins collapsing.
 // $grid-float-breakpoint-max: ($grid-float-breakpoint - 1)
 

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

@@ -63,6 +63,11 @@ form#search {
   border-radius: 0;
 }
 
-label, th {
+label, th, dt, strong {
   @extend %font-bold;
 }
+
+.navbar-toggle {
+  color: $navbar-default-color;
+  text-transform: uppercase;
+}

data/app/assets/stylesheets/manifest.css.scss

@@ -1,2 +1,3 @@
+@import 'iqvoc/settings/bootstrap-variables';
 @import 'framework';
 @import 'iqvoc/manifest';

data/app/controllers/collections/versions_controller.rb

@@ -133,8 +133,11 @@ class Collections::VersionsController < ApplicationController
         last!
 
     authorize! :send_to_review, collection
-
     collection.to_review
+
+    authorize! :unlock, collection
+    collection.unlock
+
     collection.save!
     flash[:success] = t('txt.controllers.versioning.to_review_success')
     redirect_to collection_path(collection, published: 0)

data/app/controllers/collections_controller.rb

@@ -91,6 +91,8 @@ class CollectionsController < ApplicationController
 
     @collection = Iqvoc::Collection.base_class.new(concept_params)
 
+    @collection.lock_by_user(current_user.id)
+
     if @collection.save
       flash[:success] = I18n.t('txt.controllers.collections.save.success')
       redirect_to collection_path(published: 0, id: @collection.origin)

data/app/controllers/concepts/hierarchical_controller.rb

@@ -25,6 +25,10 @@ class Concepts::HierarchicalController < ConceptsController
     scope = Iqvoc::Concept.base_class
     scope = params[:published] == '0' ? scope.published_with_newer_versions : scope.published
 
+    # 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
 
@@ -51,9 +55,7 @@ class Concepts::HierarchicalController < ConceptsController
     ActiveRecord::Associations::Preloader.new.preload(@concepts,
         Iqvoc::Concept.base_class.default_includes + [:pref_labels])
 
-    @concepts.to_a.sort! do |a, b|
-      a.pref_label.to_s <=> b.pref_label.to_s
-    end
+    @concepts.to_a.sort_by! {|c| c.pref_label }
 
     respond_to do |format|
       format.html

data/app/controllers/concepts/scheme_controller.rb

@@ -39,7 +39,7 @@ class Concepts::SchemeController < ApplicationController
     @scheme = Iqvoc::Concept.root_class.instance
     authorize! :read, @scheme
 
-    @top_concepts = Iqvoc::Concept.base_class.tops.published
+    @top_concepts = Iqvoc::Concept.base_class.tops.published.sort_by {|c| c.pref_label }
 
     respond_to do |format|
       format.html

data/app/controllers/concepts/versions_controller.rb

@@ -146,8 +146,11 @@ class Concepts::VersionsController < ApplicationController
         last!
 
     authorize! :send_to_review, concept
-
     concept.to_review
+
+    authorize! :unlock, concept
+    concept.unlock
+
     concept.save!
     flash[:success] = t('txt.controllers.versioning.to_review_success')
     redirect_to concept_path(published: 0, id: concept)

data/app/controllers/concepts_controller.rb

@@ -40,16 +40,18 @@ class ConceptsController < ApplicationController
     @datasets = datasets_as_json
     respond_to do |format|
       format.html do
-        if @concept.jobs
+
+        jobs = @concept.jobs
+        if jobs.any?
           match_classes = Iqvoc::Concept.reverse_match_class_names
 
-          @jobs = @concept.job_relations.map do |jr|
-            handler = YAML.load(jr.job.handler)
+          @jobs = jobs.map do |j|
+            handler = YAML.load(j.handler)
             match_class_name = match_classes.key(handler.match_class)
             reverse_match_class_name = match_class_name.constantize.reverse_match_class_name
             reverse_match_class_label = reverse_match_class_name.constantize.rdf_predicate.camelize if reverse_match_class_name
 
-            result = {response_error: jr.response_error}
+            result = {response_error: j.error_message}
             result[:subject] = handler.subject
             result[:type] = handler.type
             result[:match_class] = reverse_match_class_label || reverse_match_class_name
@@ -129,10 +131,13 @@ class ConceptsController < ApplicationController
   def create
     authorize! :create, Iqvoc::Concept.base_class
 
-    @concept = Iqvoc::Concept.base_class.new(concept_params)
-    # TODO: add reverse match service
+    @concept = Iqvoc::Concept.base_class.new
+    @concept.reverse_match_service = Services::ReverseMatchService.new(request.host, request.port)
+    @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)
@@ -192,57 +197,6 @@ class ConceptsController < ApplicationController
     end
   end
 
-  def move
-    moved_concept = Iqvoc::Concept.base_class.find(params.require(:moved_node_id))
-
-    if moved_concept.published?
-      authorize! :branch, moved_concept
-    else
-      authorize! :update, moved_concept
-    end
-
-    new_parent_concept = Iqvoc::Concept.base_class.find(params.require(:new_parent_node_id))
-    new_parent_concept_version = concept_version(new_parent_concept)
-
-    ActiveRecord::Base.transaction do
-      moved_concept_version = concept_version(moved_concept)
-
-      if params[:tree_action] == 'move' && Iqvoc::Concept.root_class.instance.mono_hierarchy?
-        if moved_concept.top_term?
-          moved_concept_version.update_attribute(:top_term, false)
-        else
-          # removed old relations
-          old_parent_concept = Iqvoc::Concept.base_class.find(params.require(:old_parent_node_id))
-          old_parent_concept_version = concept_version(old_parent_concept)
-
-          moved_concept_version.send(Iqvoc::Concept.broader_relation_class_name.to_relation_name)
-             .destroy_with_reverse_relation(old_parent_concept_version)
-
-          # delete relations which will be created during branching
-          if old_parent_concept_version.narrower_relations.find_by(target_id: moved_concept.id)
-            old_parent_concept_version.narrower_relations.find_by(target_id: moved_concept.id).destroy!
-          end
-          if moved_concept_version.broader_relations.find_by(target_id: old_parent_concept.id)
-            moved_concept_version.broader_relations.find_by(target_id: old_parent_concept.id).destroy!
-          end
-        end
-      end
-
-      # add new relations to concept version
-      Iqvoc::Concept.broader_relation_class.create! do |r|
-        r.owner = moved_concept_version
-        r.target = new_parent_concept_version
-      end
-
-      Concept::Relation::SKOS::Narrower::Base.create! do |r|
-        r.owner = new_parent_concept_version
-        r.target = moved_concept_version
-      end
-    end
-
-    render nothing: true
-  end
-
   protected
 
   def get_concept
@@ -263,21 +217,6 @@ class ConceptsController < ApplicationController
     params.require(:concept).permit!
   end
 
-  # get concept to work with
-  # return a new version of the concept or the current draft (if exists)
-  def concept_version(concept)
-    if concept.published?
-      # create a new version
-      version = concept.branch(current_user)
-      version.save!
-    else
-      # use current draft concept
-      version = concept
-    end
-
-    version
-  end
-
   # TODO: rename to match the behavior of the method
   def labeling_as_json(labeling)
     label = labeling.target