iqvoc_skosxl 2.9.0 → 2.11.3

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/innoq/iqvoc_skosxl.svg?branch=master)](https://travis-ci.org/innoq/iqvoc_skosxl)
+![CI](https://github.com/innoq/iqvoc_skosxl/workflows/CI/badge.svg?branch=master)
 
 # Iqvoc::SKOSXL
 

data/app/assets/javascripts/iqvoc_skosxl/duplicate_check.js

@@ -0,0 +1,104 @@
+jQuery(document).ready(function($) {
+  var $labelInput = $('#label_value');
+  var target = $labelInput.data('query-url');
+  var uriTemplate = $labelInput.data('entity-uri');
+  var mode = $labelInput.data('duplicate-check-mode')
+
+  if (target && uriTemplate) {
+    $labelInput.on('input', IQVOC.debounce(function() {
+      var labelValue = this.value.trim();
+
+      queryLabels(target, labelValue, mode).then(function(labels) {
+        resetInput($labelInput);
+
+        if (labels.length > 0) {
+          setWarningState($labelInput);
+          setFeedback($labelInput, labels, uriTemplate);
+        }
+      });
+      }, 300)
+    );
+  }
+
+  function queryLabels(target, value, mode) {
+    return new Promise(function(resolve, _reject) {
+      if (value === '' || value.length < 3) {
+        resolve([])
+        return;
+      }
+
+      $.ajax({
+        url: target,
+        data: {
+          query: value,
+          mode: searchMode(mode),
+        }
+      })
+      .done(function(response) {
+        resolve(response);
+      })
+      .fail(function() {
+        resolve([]); // return empty result on failure
+      })
+    });
+  }
+
+  function searchMode(mode) {
+    const MODES = ['begins', 'exact_match', 'contains']
+    if (MODES.includes(mode)) {
+      return mode
+    } else {
+      return 'contains'
+    }
+  }
+
+  function setWarningState($valueInput) {
+    var formGroup = $valueInput.closest('.form-group');
+    $(formGroup).addClass('has-warning has-feedback');
+
+    var warningSign = $('<span id="duplicate-warning" class="glyphicon glyphicon-warning-sign form-control-feedback" aria-hidden="true">')
+    $valueInput.after(warningSign);
+  }
+
+  function setFeedback($valueInput, labels, uriTemplate) {
+    var duplicates = buildLabelList($valueInput, labels, uriTemplate);
+    var message = $valueInput.data('duplicate-message');
+    var feedback = $('<span id="feedback" class="form-text text-muted"></span>')
+      .text(message)
+      .append(duplicates);
+
+    $valueInput.after(feedback);
+  }
+
+  function buildLabelList($valueInput, labels, uriTemplate) {
+    var ul = $('<ul class="list-inline"></ul>')
+    var lis =  labels.map(function(label) {
+      return $('<li class="list-inline-item mr-1">').append(buildLabelLink(label, uriTemplate))
+    });
+
+    return ul.append(lis);
+  }
+
+  function buildLabelLink(label, uriTemplate) {
+    var uri = uriTemplate.replace("%7Bid%7D", label.id);
+    if (!label.published) {
+      uri = uri.concat('?published=0');
+    }
+
+    var labelLink = $('<a>', {
+      class: "badge badge-secondary",
+      text: label.name,
+      href: uri
+    });
+    return labelLink;
+  }
+
+  function resetInput($valueInput) {
+    var formGroup = $valueInput.closest('.form-group');;
+    $(formGroup).removeClass('has-warning has-feedback');
+
+    // remove sign and message from dom
+    $(formGroup).find('#feedback').remove();
+    $(formGroup).find('#duplicate-warning').remove();
+  }
+});

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

@@ -0,0 +1,4 @@
+import 'es6-promise/auto';
+
+import './new_label_modal';
+import './duplicate_check';

data/app/assets/javascripts/iqvoc_skosxl/new_label_modal.js

@@ -0,0 +1,19 @@
+jQuery(document).ready(function($) {
+  $(".new-label-modal").click(function(ev) {
+    ev.preventDefault();
+
+    var modal = $("#label-in-concept-modal");
+    var target = $(this).attr("href");
+    $('.navbar-fixed-bottom').hide()
+
+    $.get(target, function(data) {
+      modal.html(data);
+      modal.modal();
+    });
+  });
+
+  $('#label-in-concept-modal').on('hidden.bs.modal', function () {
+    $('.navbar-fixed-bottom').show();
+  });
+
+});

data/app/assets/javascripts/manifest.js

@@ -1,3 +1,3 @@
-//= require framework
-//= require iqvoc/manifest
-//= require iqvoc_skosxl/manifest
+import '../../../node_modules/iqvoc/app/assets/javascripts/framework';
+import '../../../node_modules/iqvoc/app/assets/javascripts/iqvoc/manifest';
+import './iqvoc_skosxl/manifest';

data/app/assets/stylesheets/manifest.scss

@@ -0,0 +1,4 @@
+@import 'iqvoc/app/assets/stylesheets/iqvoc/settings/manifest';
+@import 'iqvoc/app/assets/stylesheets/framework';
+@import 'iqvoc/app/assets/stylesheets/iqvoc/_manifest';
+@import './iqvoc_skosxl/manifest';

data/app/controllers/labels/versions_controller.rb

@@ -7,7 +7,7 @@ class Labels::VersionsController < ApplicationController
 
     ActiveRecord::Base.transaction do
       new_version.publish
-      new_version.unlock
+
       if new_version.publishable?
         new_version.save
         begin
@@ -40,52 +40,29 @@ class Labels::VersionsController < ApplicationController
 
   def branch
     current_label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).published.last!
-    if Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last
-      raise "There is already an unpublished version for Label '#{params[:origin]}'"
-    end
 
-    authorize! :branch, current_label
-    new_version = nil
-    ActiveRecord::Base.transaction do
-      new_version = current_label.branch(current_user)
-      new_version.save!
-      Iqvoc.change_note_class.create! do |note|
-        note.owner = new_version
-        note.language = I18n.locale.to_s
-        note.annotations_attributes = [
-          { namespace: 'dct', predicate: 'creator', value: current_user.name },
-          { namespace: 'dct', predicate: 'modified', value: DateTime.now.to_s }
-        ]
+    if draft_label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last
+      flash[:info] = t('txt.controllers.versioning.branch_error')
+      redirect_to label_path(published: 0, id: draft_label)
+    else
+      authorize! :branch, current_label
+      new_version = nil
+      ActiveRecord::Base.transaction do
+        new_version = current_label.branch
+        new_version.save!
+        Iqvoc.change_note_class.create! do |note|
+          note.owner = new_version
+          note.language = I18n.locale.to_s
+          note.position = (current_label.send(Iqvoc.change_note_class_name.to_relation_name).maximum(:position) || 0).succ
+          note.annotations_attributes = [
+            { namespace: 'dct', predicate: 'creator', value: current_user.name },
+            { namespace: 'dct', predicate: 'modified', value: DateTime.now.to_s }
+          ]
+        end
       end
+      flash[:success] = t('txt.controllers.versioning.branched')
+      redirect_to edit_label_path(published: 0, id: new_version, check_associations_in_editing_mode: true)
     end
-    flash[:success] = t('txt.controllers.versioning.branched')
-    redirect_to edit_label_path(published: 0, id: new_version, check_associations_in_editing_mode: true)
-  end
-
-  def lock
-    new_version = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last!
-    raise "Label with origin '#{params[:origin]}' has already been locked." if new_version.locked?
-
-    authorize! :lock, new_version
-
-    new_version.lock_by_user(current_user.id)
-    new_version.save!
-
-    flash[:success] = t('txt.controllers.versioning.locked')
-    redirect_to edit_label_path(published: 0, id: new_version)
-  end
-
-  def unlock
-    new_version = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last!
-    raise "Label with origin '#{params[:origin]}' wasn't locked." unless new_version.locked?
-
-    authorize! :unlock, new_version
-
-    new_version.unlock
-    new_version.save!
-
-    flash[:success] = t('txt.controllers.versioning.unlocked')
-    redirect_to label_path(published: 0, id: new_version)
   end
 
   def consistency_check
@@ -106,13 +83,16 @@ class Labels::VersionsController < ApplicationController
     label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last!
 
     authorize! :send_to_review, label
-    label.to_review
 
-    authorize! :unlock, label
-    label.unlock
+    if label.publishable?
+      label.to_review
 
-    label.save!
-    flash[:success] = t('txt.controllers.versioning.to_review_success')
-    redirect_to label_path(published: 0, id: label)
+      label.save!
+      flash[:success] = t('txt.controllers.versioning.to_review_success')
+      redirect_to label_path(published: 0, id: label)
+    else
+      flash[:error] = t('txt.controllers.versioning.consistency_check_error')
+      redirect_to edit_label_path(published: 0, id: label, full_consistency_check: 1)
+    end
   end
 end

data/app/controllers/labels_controller.rb

@@ -1,14 +1,18 @@
 class LabelsController < ApplicationController
-  skip_before_filter :require_user
+  before_action proc { |ctrl| (ctrl.action_has_layout = false) if ctrl.request.xhr? }
 
   def index
     authorize! :read, Iqvoc::XLLabel.base_class
 
-    scope = Iqvoc::XLLabel.base_class.by_query_value("%#{params[:query]}%")
+    search_string = search_string(params[:query], params[:mode])
+    scope = Iqvoc::XLLabel.base_class
+                          .editor_selectable
+                          .by_query_value(search_string)
+
     if params[:language] # NB: this is not the same as :lang, which is supplied via route
       scope = scope.by_language(params[:language])
     end
-    @labels = scope.published.order('LOWER(value)').all
+    @labels = scope.order(Arel.sql("LENGTH(#{Iqvoc::XLLabel.base_class.table_name}.value)")).all
 
     respond_to do |format|
       format.html do
@@ -20,7 +24,11 @@ class LabelsController < ApplicationController
       end
       format.json do
         response = []
-        @labels.each { |label| response << label_widget_data(label) }
+        # group labels to avoid duplicates
+        # FIXME: filter in SQL directly
+        @labels.group_by { |l| l.origin }.each { |origin, labels|
+          response << label_widget_data(labels.first)
+        }
 
         render json: response
       end
@@ -46,34 +54,21 @@ class LabelsController < ApplicationController
       format.html do
         @published ? render('show_published') : render('show_unpublished')
       end
-      format.ttl
+      format.any(:rdf, :ttl, :nt)
     end
   end
 
   def new
     authorize! :create, Iqvoc::XLLabel.base_class
     @label = Iqvoc::XLLabel.base_class.new
-
-    # initial created-ChangeNote creation
-    @label.send(Iqvoc::change_note_class_name.to_relation_name).new do |change_note|
-      change_note.value = I18n.t('txt.views.versioning.initial_version')
-      change_note.language = I18n.locale.to_s
-      change_note.annotations_attributes = [
-        { namespace: 'dct', predicate: 'creator', value: current_user.name },
-        { namespace: 'dct', predicate: 'created', value: DateTime.now.to_s }
-      ]
-    end
-
-    Iqvoc::XLLabel.note_class_names.each do |note_class_name|
-      @label.send(note_class_name.to_relation_name).build if @label.send(note_class_name.to_relation_name).empty?
-    end
+    @label.build_initial_change_note(current_user)
+    @label.build_notes
   end
 
   def create
     authorize! :create, Iqvoc::XLLabel.base_class
 
     @label = Iqvoc::XLLabel.base_class.new(label_params)
-    @label.lock_by_user(current_user.id)
 
     if @label.valid?
       if @label.save
@@ -104,9 +99,7 @@ class LabelsController < ApplicationController
       @label.publishable?
     end
 
-    Iqvoc::XLLabel.note_class_names.each do |note_class_name|
-      @label.send(note_class_name.to_relation_name).build if @label.send(note_class_name.to_relation_name).empty?
-    end
+    @label.build_notes
   end
 
   def update
@@ -118,7 +111,7 @@ class LabelsController < ApplicationController
 
     respond_to do |format|
       format.html do
-        if @label.update_attributes(label_params)
+        if @label.update(label_params)
           flash[:success] = I18n.t('txt.controllers.versioned_label.update_success')
           redirect_to label_path(published: 0, id: @label)
         else
@@ -134,17 +127,70 @@ class LabelsController < ApplicationController
     authorize! :destroy, @new_label
 
     if @new_label.destroy
+      published_label = Iqvoc::XLLabel.base_class.published.by_origin(@new_label.origin).first
       flash[:success] = I18n.t('txt.controllers.label_versions.delete')
-      redirect_to dashboard_path
+      redirect_to published_label.present? ? label_path(id: published_label.origin) : dashboard_path
     else
       flash[:error] = I18n.t('txt.controllers.label_versions.delete_error')
       redirect_to label_path(published: 0, id: @new_label)
     end
   end
 
+  def duplicate
+    authorize! :create, Iqvoc::XLLabel.base_class
+    label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).published.first
+    if Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last
+      flash[:error] = t('txt.controllers.label.duplicate_error')
+      redirect_to label_path(published: 1, id: label)
+    end
+
+    @new_label = label.duplicate(current_user)
+    @new_label.build_notes
+  end
+
+  def new_from_concept
+    authorize! :create, Iqvoc::XLLabel.base_class
+    @label = Iqvoc::XLLabel.base_class.new
+
+    respond_to do |format|
+      format.html do
+        render layout: false
+      end
+    end
+  end
+
+  def create_from_concept
+    authorize! :create, Iqvoc::XLLabel.base_class
+
+    @label = Iqvoc::XLLabel.base_class.new(label_params)
+    @label.build_initial_change_note(current_user)
+
+    if @label.save
+      #TODO: idea for solving this
+      #flash[:success] = I18n.t('txt.controllers.versioned_label.success')
+      head :created
+    else
+      #TODO: idea for solving this
+      #flash.now[:error] = I18n.t('txt.controllers.versioned_label.error')
+      head :bad_request
+    end
+  end
+
   private
 
   def label_params
     params.require(:label).permit!
   end
+
+  def search_string(query, mode = 'contains')
+    input = query&.strip
+
+    if mode == 'exact_match'
+      "#{input}"
+    elsif mode == 'begins'
+      "#{input}%"
+    else
+      "%#{input}%"
+    end
+  end
 end

data/app/controllers/rdf_controller.rb

@@ -1,22 +1,23 @@
 require_dependency Iqvoc.root.join('app/controllers/rdf_controller').to_s
 
-class RdfController
-  def show_with_labels
+# TODO: move out of /controllers
+module RdfControllerLabelExtension
+  def show
     scope = params[:published] == '0' ? Iqvoc::XLLabel.base_class.unpublished : Iqvoc::XLLabel.base_class.published
     if @label = scope.by_origin(params[:id]).with_associations.last
       respond_to do |format|
         format.html {
           redirect_to label_url(id: @label.origin, published: params[:published])
         }
-        format.any {
+        format.any(:rdf, :ttl, :nt) {
           authorize! :read, @label
-          render 'show_label'
+          render 'labels/show'
         }
       end
     else
-      show_without_labels
+      super
     end
   end
-
-  alias_method_chain(:show, :labels)
 end
+
+RdfController.prepend(RdfControllerLabelExtension)

data/app/controllers/xl_dashboard_controller.rb

@@ -0,0 +1,43 @@
+# encoding: UTF-8
+
+# Copyright 2011-2013 innoQ Deutschland GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class XlDashboardController < DashboardController
+
+  def label_index
+    authorize! :use, :dashboard
+
+    labels = Iqvoc::XLLabel.base_class.for_dashboard.load
+
+    if params[:sort] && params[:sort].include?('state ')
+      sort = params[:sort].split(',').select { |s| s.include? 'state ' }.last.gsub('state ', '')
+      labels = labels.to_a.sort_by { |c| c.state }
+      labels = sort == 'DESC' ? labels.reverse : labels
+    elsif params[:sort]
+      #FIXME: how to order by state in database?
+      order_params = sanatize_order params[:sort]
+      order_params = order_params.gsub('updated_at', 'labels.updated_at')
+
+      labels = labels.order(order_params)
+    else
+      labels = labels.order('value')
+    end
+
+    @items = Kaminari.paginate_array(labels).page(params[:page])
+
+    render 'dashboard/index', locals: { active_class: Iqvoc::XLLabel.base_class }
+  end
+
+end

data/app/helpers/iqvoc_skosxl_helper.rb

@@ -9,6 +9,10 @@ module IqvocSkosxlHelper
     end
   end
 
+  def delete_button_text(label)
+    label.never_published? ? t("txt.views.versioning.delete") : t("txt.views.versioning.delete_copy")
+  end
+
   def search_result_label(label, concept)
     str = ActiveSupport::SafeBuffer.new
     str << label

data/app/helpers/labels_helper.rb

@@ -4,7 +4,7 @@ module LabelsHelper
 
       c.Schema::expires(label.expired_at.to_s) if label.expired_at
 
-      c.Owl::deprecated(true) if label.expired_at and label.expired_at <= Date.new
+      c.Owl::deprecated(true) if label.expired?
 
       c.Skosxl::literalForm(label.value, lang: label.language)
 
@@ -12,8 +12,10 @@ module LabelsHelper
         relation.build_rdf(document, c)
       end
 
-      label.notes.each do |note|
-        note.build_rdf(document, c)
+      if Iqvoc::rdf_show_change_notes
+        label.notes.each do |note|
+          note.build_rdf(document, c)
+        end
       end
 
       Iqvoc::XLLabel.additional_association_class_names.keys.each do |class_name|
@@ -33,9 +35,9 @@ module LabelsHelper
   def label_view_data(label)
     res = {'main' => {}}
 
-    res['main'][10] = render 'labels/value_and_language', label: label
+    res['main'][10] = render 'labels/language', label: label
 
-    res['main'][1000] = render 'labels/details', label: label
+    res['main'][400] = render 'labels/details', label: label
 
     Iqvoc::Concept.labeling_classes.keys.each do |labeling_class|
       render_label_association(res, label, labeling_class)
@@ -63,7 +65,7 @@ module LabelsHelper
       desc += " #{t('txt.views.concepts.expired_at', date: l(label.expired_at, format: :long))} "
     end
 
-    title = label.origin
+    title = label.value .present? ? label.value : label.origin
 
     page_header title: title.to_s, desc: desc.html_safe
   end

data/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/app/models/collection/skosxl/extension.rb

@@ -0,0 +1,8 @@
+module Collection
+  module SKOSXL
+    module Extension
+      extend ActiveSupport::Concern
+
+    end
+  end
+end

data/app/models/concept/skosxl/extension.rb

@@ -36,8 +36,10 @@ module Concept
 
       def labelings_by_id(relation_name, language)
         (@labelings_by_id && @labelings_by_id[relation_name] && @labelings_by_id[relation_name][language]) ||
-          self.send(relation_name).by_label_language(language).
-              map { |l| l.target.origin if l.target.published?}.join(InlineDataHelper::JOINER)
+          self.send(relation_name)
+              .by_label_language(language)
+              .map { |l| l.target.origin }
+              .join(InlineDataHelper::JOINER)
       end
 
       def valid_label_language

data/app/models/label/relation/base.rb

@@ -1,4 +1,4 @@
-class Label::Relation::Base < ActiveRecord::Base
+class Label::Relation::Base < ApplicationRecord
   class_attribute :rdf_namespace, :rdf_predicate
   self.rdf_namespace = nil
   self.rdf_predicate = nil
@@ -28,7 +28,7 @@ class Label::Relation::Base < ActiveRecord::Base
   end
 
   def self.range_in_edit_mode
-    joins(:range).references(:labels).merge(Iqvoc::XLLabel.base_class.in_edit_mode)
+    joins(:range).references(:labels).merge(Iqvoc::XLLabel.base_class.unpublished)
   end
 
   def self.view_section(obj)