iqvoc 4.12.0 → 4.12.1

data/app/controllers/dashboard_controller.rb

@@ -31,6 +31,8 @@ class DashboardController < ApplicationController
       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')
 
       concepts = concepts.includes(:pref_labels, :locking_user).references(:pref_labels).references(:locking_user).order(order_params)
+    else
+      concepts = concepts.includes(:pref_labels).order('labels.value')
     end
 
     @items = Kaminari.paginate_array(concepts).page(params[:page])
@@ -52,6 +54,8 @@ class DashboardController < ApplicationController
       order_params = order_params.gsub('value', 'labels.value').gsub('locking_user', 'users.surname').gsub('updated_at', 'concepts.updated_at')
 
       collections = collections.includes(:pref_labels, :locking_user).references(:pref_labels).references(:locking_user).order(order_params)
+    else
+      collections = collections.includes(:pref_labels).order('labels.value')
     end
 
     @items = Kaminari.paginate_array(collections).page(params[:page])
@@ -65,7 +69,7 @@ class DashboardController < ApplicationController
     object = objects.send(params[:published] == "1" ? 'published' : 'unpublished').first
 
     @title = object.to_s
-    @editorial_notes = Note::SKOS::EditorialNote.where(owner_id: object.id, owner_type: object.class)
+    @editorial_notes = object.notes_for_class(Note::SKOS::EditorialNote)
 
     @path = send(object.class_path, id: object, published: params[:published])
 

data/app/controllers/user_sessions_controller.rb

@@ -26,7 +26,7 @@ class UserSessionsController < ApplicationController
   def create
     authorize! :create, UserSession
 
-    @user_session = UserSession.new(user_session_params)
+    @user_session = UserSession.new(user_session_params.to_h)
     if @user_session.save
       @current_ability = nil
       flash[:success] = I18n.t('txt.controllers.user_sessions.login_success')

data/app/helpers/dashboard_helper.rb

@@ -18,9 +18,9 @@ module DashboardHelper
   def sorting_controls_for(name)
     content_tag :div, class: 'sorting-controls' do
       link_to(icon('arrow-circle-o-up', 'sorting-arrow'),
-        params.merge(sort: "#{name} ASC") { |key,oldval,newval| oldval.include?(newval) ? oldval : "#{oldval},#{newval}" }) +
-        link_to(icon('arrow-circle-o-down', 'sorting-arrow'),
-        params.merge(sort: "#{name} DESC") { |key,oldval,newval| oldval.include?(newval) ? oldval : "#{oldval},#{newval}" })
+        params.merge({ sort: "#{name} ASC" })) +
+      link_to(icon('arrow-circle-o-down', 'sorting-arrow'),
+        params.merge({ sort: "#{name} DESC" }))
     end
   end
 

data/app/views/concepts/new.html.erb

@@ -1,4 +1,5 @@
 <%= page_header :title => t("txt.views.concepts.new", :concept_class_name => Iqvoc::Concept.base_class.model_name.human(:count => 1)) %>
 
 <%= error_messages_for @concept %>
-<%= render 'concepts/form', :concept => @concept %>
+<%= render 'concepts/form', :concept => @concept %>
+<%= render 'concepts/sidebars/singular' %>

data/app/views/concepts/sidebars/_singular.html.erb

@@ -1,13 +1,17 @@
-<%- published_param = concept.published? ? nil : "0" -%>
+<%- published_param = concept.published? ? nil : "0" if defined?(concept) -%>
 
 <%= sidebar do %>
-  <%= sidebar_header t('txt.common.representations') %>
-  <%= sidebar_item :icon => 'link', :text => 'HTML', :path => concept_path(:id => concept, :format => :html, :published => published_param) %>
-  <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => concept_path(:id => concept, :format => :rdf, :published => published_param), :id => 'rdf_link_xml' %>
-  <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => concept_path(:id => concept, :format => :ttl, :published => published_param), :id => 'rdf_link_ttl' %>
-  <%= sidebar_item :icon => 'link', :text => 'RDF/NTriples', :path => concept_path(:id => concept, :format => :nt, :published => published_param), :id => 'rdf_link_nt' %>
+  <% if defined?(concept) %>
+    <%= sidebar_header t('txt.common.representations') %>
+    <%= sidebar_item :icon => 'link', :text => 'HTML', :path => concept_path(:id => concept, :format => :html, :published => published_param) %>
+    <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => concept_path(:id => concept, :format => :rdf, :published => published_param), :id => 'rdf_link_xml' %>
+    <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => concept_path(:id => concept, :format => :ttl, :published => published_param), :id => 'rdf_link_ttl' %>
+    <%= sidebar_item :icon => 'link', :text => 'RDF/NTriples', :path => concept_path(:id => concept, :format => :nt, :published => published_param), :id => 'rdf_link_nt' %>
+  <% end %>
   <%= sidebar_header 'Links' if can?(:create, Iqvoc::Concept.base_class) %>
-  <%= sidebar_item :icon => 'link', :text => t('txt.models.concept.uri'), :path => rdf_url(concept.origin, :format => nil, :published => published_param, :lang => nil) %>
+  <% if defined?(concept) %>
+    <%= sidebar_item :icon => 'link', :text => t('txt.models.concept.uri'), :path => rdf_url(concept.origin, :format => nil, :published => published_param, :lang => nil) %>
+  <% end %>
   <%= sidebar_item :icon => :edit, :text => t('txt.views.concepts.new', :concept_class_name => Iqvoc::Concept.base_class.model_name.human), :path => new_concept_path,
     :perms => [:create, Iqvoc::Concept.base_class], :active => params[:action] == 'new' %>
 <% end %>

data/app/views/dashboard/_table.html.erb

@@ -22,7 +22,7 @@
         <td>
           <%= render item.class.edit_link_partial_name, :item => item %>
         </td>
-        <th><a href="<%= dashboard_glance_path(type: item.class, origin: item.origin, published: item.published? ? 1 : 0) %>" class="dashboard-glance-link"><i class="fa fa-search-plus"></i></a</th>
+        <td><a href="<%= dashboard_glance_path(type: item.class, origin: item.origin, published: item.published? ? 1 : 0) %>" class="dashboard-glance-link"><i class="fa fa-search-plus"></i></a</td>
         <td class="text-nowrap"><%= item.locking_user.blank? ? "" : item.locking_user.name %></td>
         <% unless item.class == Iqvoc::Collection.base_class %>
           <td class="<%= 'dashboard-activated-follow-up-column' if item.follow_up.present? %>"><%= l(item.follow_up) if item.follow_up.present? %></td>

data/app/views/dashboard/glance.html.erb

@@ -18,7 +18,7 @@
       <ul class="label-list">
         <% @editorial_notes.each do |note| %><!--
         --><li class="label-list-item">
-             <span class="label-list-item-value"><%= notes.value %></span>
+             <span class="label-list-item-value"><%= note.value %></span>
            </li><!--
         --><% end %>
       </ul>

data/app/views/search_results/_sidebar.html.erb

@@ -1,8 +1,13 @@
-<% if results %>
-  <%= sidebar do %>
+<%= sidebar do %>
+  <% if results %>
     <%= sidebar_header t('txt.common.representations') %>
     <%= sidebar_item :icon => 'link', :text => 'RDF/XML', :path => rdf_search_path({:lang => nil, :page => results.current_page, :format => :rdf}.merge(request.query_parameters)), :id => 'rdf_link_xml' %>
     <%= sidebar_item :icon => 'link', :text => 'RDF/Turtle', :path => rdf_search_path({:lang => nil, :page => @results.current_page, :format => :ttl}.merge(request.query_parameters)), :id => 'rdf_link_ttl' %>
     <%= sidebar_item :icon => 'link', :text => 'RDF/NTriples', :path => rdf_search_path({:lang => nil, :page => @results.current_page, :format => :nt}.merge(request.query_parameters)), :id => 'rdf_link_nt' %>
   <% end %>
+
+  <%= sidebar_header 'Links' if can?(:create, Iqvoc::Concept.base_class) %>
+  <% (Iqvoc.first_level_classes - [Collection::SKOS::Unordered]).each do |klass| %>
+    <%= sidebar_item { render(klass.new_link_partial_name) } %>
+  <% end %>
 <% end %>

data/config/database.template.yml

@@ -1,6 +1,6 @@
 development:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   database: iqvoc_development
   pool: 5
@@ -10,7 +10,7 @@ development:
 
 test:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   database: iqvoc_test
   pool: 5
@@ -20,7 +20,7 @@ test:
 
 production:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   database: iqvoc_production
   pool: 5

data/config/database.yml

@@ -1,29 +1,24 @@
 development:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
+  adapter: postgresql
+  encoding: unicode
   database: iqvoc_development
   pool: 5
-  username: root
+  username: mjansing
   password:
-  host: 127.0.0.1
 
 test:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
+  adapter: postgresql
+  encoding: unicode
   database: iqvoc_test
   pool: 5
-  username: root
+  username: mjansing
   password:
-  host: 127.0.0.1
 
 production:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: iqvoc_production
-  pool: 5
-  username: root
-  password:
-  host: 127.0.0.1
+  adapter: <%= ENV['DB_ADAPTER'] ||= 'postgresql' %>
+  encoding: unicode
+  database: <%= ENV["DB_NAME"] %>
+  pool: 20
+  username: <%= ENV["DB_USER"] %>
+  password: <%= ENV["DB_PW"] %>
+  host: <%= ENV["DB_HOST"] %>

data/config/database.yml.mysql

@@ -1,6 +1,6 @@
 development:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   database: iqvoc_development
   pool: 5
@@ -10,7 +10,7 @@ development:
 
 test:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   database: iqvoc_test
   pool: 5
@@ -20,10 +20,10 @@ test:
 
 production:
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
-  database: iqvoc_production
+  database: <%= ENV["DB_NAME"] %>
   pool: 5
-  username: root
-  password:
-  host: 127.0.0.1
+  username: <%= ENV["DB_USER"] %>
+  password: <%= ENV["DB_PW"] %>
+  host: <%= ENV["DB_HOST"] %>

data/config/database.yml.postgresql

@@ -15,9 +15,10 @@ test:
   password:
 
 production:
-  adapter: postgresql
+  adapter: <%= ENV['DB_ADAPTER'] ||= 'postgresql' %>
   encoding: unicode
-  database: iqvoc_production
-  pool: 5
-  username: root
-  password:
+  database: <%= ENV["DB_NAME"] %>
+  pool: 20
+  username: <%= ENV["DB_USER"] %>
+  password: <%= ENV["DB_PW"] %>
+  host: <%= ENV["DB_HOST"] %>

data/config/initializers/mysql_column_limit.rb

@@ -0,0 +1,14 @@
+require 'active_record/connection_adapters/abstract_mysql_adapter'
+
+# Hack to set max varchar column size to 191 instead of 255.
+# This is necessary to use mysql's utf8mb4 encoding and use
+# full unicode support
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractMysqlAdapter
+      if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+        NATIVE_DATABASE_TYPES[:string] = { :name => "varchar", :limit => 191 }
+      end
+    end
+  end
+end

data/config/locales/activerecord.de.yml

@@ -58,6 +58,9 @@ de:
       labeling/skos/alt_label:
         one:   "Alternatives Label"
         other: "Alternative Labels"
+      labeling/skos/hidden_label:
+        one:   "Verstecktes Label"
+        other: "Versteckte Labels"
       match/base:
         one:   "Match"
         other: "Matches"

data/config/locales/activerecord.en.yml

@@ -58,6 +58,9 @@ en:
       labeling/skos/alt_label:
         one:   "Alternative label"
         other: "Alternative labels"
+      labeling/skos/hidden_label:
+        one:   "Hidden label"
+        other: "Hidden labels"
       match/base:
         one:   "Match"
         other: "Matches"

data/db/migrate/20170626074649_add_note_annotations_index.rb

@@ -1,5 +1,9 @@
 class AddNoteAnnotationsIndex < ActiveRecord::Migration
   def change
-    add_index :note_annotations, :value
+    # causes https://github.com/innoq/iqvoc/issues/389
+    # outcommented as fix because we either could have had a custom index name
+    # or migrated to utf8mb4 to create the index afterwards
+    # we have chosen utf8mb4 since that also fixes utf8 encoding problems in mysql and avoids customized solutions per database
+    # add_index :note_annotations, :value
   end
 end

data/db/migrate/20180430163647_utf8mb4_conversion.rb

@@ -0,0 +1,122 @@
+class Utf8mb4Conversion < ActiveRecord::Migration
+
+  def up
+    if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      change_column :collection_members, :type, :string, limit: 191
+      change_column :concept_relations, :type, :string, limit: 191
+      change_column :concepts, :type, :string, limit: 191
+
+      change_column :configuration_settings, :key, :string, limit: 191
+      change_column :configuration_settings, :value, :string, limit: 191
+
+      change_column :delayed_jobs, :locked_by, :string, limit: 191
+      change_column :delayed_jobs, :queue, :string, limit: 191
+      change_column :delayed_jobs, :error_message, :string, limit: 191
+      change_column :delayed_jobs, :delayed_reference_type, :string, limit: 191
+      change_column :delayed_jobs, :delayed_global_reference_id, :string, limit: 191
+
+      change_column :exports, :token, :string, limit: 191
+      change_column :exports, :default_namespace, :string, limit: 191
+
+      change_column :imports, :import_file, :string, limit: 191
+      change_column :imports, :default_namespace, :string, limit: 191
+
+      change_column :labelings, :type, :string, limit: 191
+
+      change_column :labels, :type, :string, limit: 191
+      change_column :labels, :language, :string, limit: 191
+
+      change_column :matches, :type, :string, limit: 191
+      change_column :matches, :value, :string, limit: 191
+
+      change_column :note_annotations, :value, :string, limit: 191
+      change_column :note_annotations, :language, :string, limit: 191
+
+      change_column :notes, :owner_type, :string, limit: 191
+
+      change_column :schema_migrations, :version, :string, limit: 191
+
+      change_column :users, :forename, :string, limit: 191
+      change_column :users, :surname, :string, limit: 191
+      change_column :users, :email, :string, limit: 191
+      change_column :users, :crypted_password, :string, limit: 191
+      change_column :users, :password_salt, :string, limit: 191
+      change_column :users, :persistence_token, :string, limit: 191
+      change_column :users, :perishable_token, :string, limit: 191
+      change_column :users, :role, :string, limit: 191
+      change_column :users, :telephone_number, :string, limit: 191
+      change_column :users, :type, :string, limit: 191
+
+      change_database_encoding('utf8mb4', 'utf8mb4_general_ci')
+    end
+  end
+
+  def down
+    if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      change_database_encoding('utf8', 'utf8_general_ci')
+
+      change_column :collection_members, :type, :string, limit: 255
+      change_column :concept_relations, :type, :string, limit: 255
+      change_column :concepts, :type, :string, limit: 255
+
+      change_column :configuration_settings, :key, :string, limit: 255
+      change_column :configuration_settings, :value, :string, limit: 255
+
+      change_column :delayed_jobs, :locked_by, :string, limit: 255
+      change_column :delayed_jobs, :queue, :string, limit: 255
+      change_column :delayed_jobs, :error_message, :string, limit: 255
+      change_column :delayed_jobs, :delayed_reference_type, :string, limit: 255
+      change_column :delayed_jobs, :delayed_global_reference_id, :string, limit: 255
+
+      change_column :exports, :token, :string, limit: 255
+      change_column :exports, :default_namespace, :string, limit: 255
+
+      change_column :imports, :import_file, :string, limit: 255
+      change_column :imports, :default_namespace, :string, limit: 255
+
+      change_column :labelings, :type, :string, limit: 255
+
+      change_column :labels, :type, :string, limit: 255
+      change_column :labels, :language, :string, limit: 255
+
+      change_column :matches, :type, :string, limit: 255
+      change_column :matches, :value, :string, limit: 255
+
+      change_column :note_annotations, :value, :string, limit: 255
+      change_column :note_annotations, :language, :string, limit: 255
+
+      change_column :notes, :owner_type, :string, limit: 255
+
+      change_column :schema_migrations, :version, :string, limit: 255
+
+      change_column :users, :forename, :string, limit: 255
+      change_column :users, :surname, :string, limit: 255
+      change_column :users, :email, :string, limit: 255
+      change_column :users, :crypted_password, :string, limit: 255
+      change_column :users, :password_salt, :string, limit: 255
+      change_column :users, :persistence_token, :string, limit: 255
+      change_column :users, :perishable_token, :string, limit: 255
+      change_column :users, :role, :string, limit: 255
+      change_column :users, :telephone_number, :string, limit: 255
+      change_column :users, :type, :string, limit: 255
+    end
+  end
+
+  private
+
+  def change_database_encoding(encoding, collation)
+    connection = ActiveRecord::Base.connection
+    database = connection.current_database
+    tables = connection.tables
+
+    execute <<-SQL
+      ALTER DATABASE #{database} CHARACTER SET #{encoding} COLLATE #{collation};
+      SQL
+
+    tables.each do |table|
+      execute <<-SQL
+        ALTER TABLE #{database}.#{table} CONVERT TO CHARACTER SET #{encoding} COLLATE #{collation};
+        SQL
+    end
+  end
+end

data/db/migrate/20180525135715_fix_note_annotations_index.rb

@@ -0,0 +1,6 @@
+class FixNoteAnnotationsIndex < ActiveRecord::Migration
+  def change
+    remove_index :note_annotations, column: :value if index_exists? :note_annotations, :value
+    add_index :note_annotations, :value
+  end
+end

data/db/migrate/20190403133600_change_collation.rb

@@ -0,0 +1,39 @@
+class ChangeCollation < ActiveRecord::Migration
+  MYSQL_COLLATION_SUPPORT_VERSION = 8
+
+  def up
+    change_database_encoding('utf8mb4', 'utf8mb4_0900_as_ci') if check_supporting_mysql_version
+  end
+
+  def down
+    change_database_encoding('utf8', 'utf8mb4_general_ci') if check_supporting_mysql_version
+  end
+
+  private
+  def check_supporting_mysql_version
+    connection = ActiveRecord::Base.connection
+    if connection.adapter_name == 'Mysql2'
+      version_row = connection.select_rows("SHOW VARIABLES WHERE variable_name = 'version'").try(:first)
+      raise "There is a problem of our code with your MySQL version, please report in GitHub Repository" if version_row.first != "version"
+      version_row.last.first.to_i >= MYSQL_COLLATION_SUPPORT_VERSION
+    else
+      false
+    end
+  end
+
+  def change_database_encoding(encoding, collation)
+    connection = ActiveRecord::Base.connection
+    database = connection.current_database
+    tables = connection.tables
+
+    execute <<-SQL
+      ALTER DATABASE #{database} CHARACTER SET #{encoding} COLLATE #{collation};
+      SQL
+
+    tables.each do |table|
+      execute <<-SQL
+        ALTER TABLE #{database}.#{table} CONVERT TO CHARACTER SET #{encoding} COLLATE #{collation};
+        SQL
+    end
+  end
+end