biovision-base 0.37.190607.0 → 0.39.190804.1

data/db/migrate/20181217000200_create_feedback_requests.rb

@@ -8,6 +8,7 @@ class CreateFeedbackRequests < ActiveRecord::Migration[5.1]
     create_table :feedback_requests, comment: 'Feedback request' do |t|
       t.timestamps
       t.references :language, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.references :user, foreign_key: { on_update: :cascade, on_delete: :cascade }
       t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
       t.inet :ip
       t.boolean :processed, default: false, null: false

data/db/migrate/20190326120000_create_simple_blocks.rb

@@ -27,7 +27,9 @@ class CreateSimpleBlocks < ActiveRecord::Migration[5.2]
 
   def seed_default_blocks
     data = [
-      ['counters', 'Счётчики для сайта']
+      ['counters', 'Счётчики для сайта'],
+      ['head_counters_js', 'Счётчики для head с поддержкой JS'],
+      ['head_counters_no_js', 'Счётчики для head без JS']
     ]
 
     data.each do |row|

data/db/migrate/20190610141414_add_user_to_feedback_requests.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Add reference to user from feedback request
+class AddUserToFeedbackRequests < ActiveRecord::Migration[5.2]
+  def up
+    return if column_exists?(:feedback_requests, :user_id)
+
+    add_reference :feedback_requests, :user, foreign_key: { on_update: :cascade, on_delete: :cascade }
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/db/migrate/20190730000000_create_biovision_component_users.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Create table for user privileges in components
+class CreateBiovisionComponentUsers < ActiveRecord::Migration[5.2]
+  def up
+    create_component_users unless BiovisionComponentUser.table_exists?
+  end
+
+  def down
+    drop_table :biovision_component_users if BiovisionComponentUser.table_exists?
+  end
+
+  private
+
+  def create_component_users
+    create_table :biovision_component_users, comment: 'User privileges in component' do |t|
+      t.references :biovision_component, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :user, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.timestamps
+      t.boolean :administrator, default: false, null: false
+      t.jsonb :data, default: {}, null: false
+    end
+  end
+end

data/db/migrate/20190731222222_add_biovision_component_to_metrics.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Add reference to biovision_component from metrics
+class AddBiovisionComponentToMetrics < ActiveRecord::Migration[5.2]
+  def up
+    return if column_exists? :metrics, :biovision_component_id
+
+    add_reference :metrics, :biovision_component, foreign_key: { on_update: :cascade, on_delete: :cascade }
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/db/migrate/20190801111111_add_components.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Add users and content components if they do not exist
+class AddComponents < ActiveRecord::Migration[5.2]
+  def up
+    %w[users content].each do |slug|
+      BiovisionComponent.create(slug: slug)
+    end
+
+    copy_contact_parameters
+  end
+
+  def down
+    # No rollback needed
+  end
+
+  private
+
+  def copy_contact_parameters
+    component = BiovisionComponent['contact']
+
+    return unless component.settings['feedback_receiver'].blank?
+
+    component.settings['feedback_receiver'] = component.get('feedback_receiver')
+    component.save
+  end
+end

data/lib/biovision/base/version.rb

@@ -2,6 +2,6 @@
 
 module Biovision
   module Base
-    VERSION = '0.37.190607.0'
+    VERSION = '0.39.190804.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.37.190607.0
+  version: 0.39.190804.1
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.5
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +188,9 @@ files:
 - app/assets/images/biovision/base/icons/breadcrumb-hover.svg
 - app/assets/images/biovision/base/icons/breadcrumb.svg
 - app/assets/images/biovision/base/icons/components/contact.svg
+- app/assets/images/biovision/base/icons/components/content.svg
 - app/assets/images/biovision/base/icons/components/registration.svg
+- app/assets/images/biovision/base/icons/components/users.svg
 - app/assets/images/biovision/base/icons/create.svg
 - app/assets/images/biovision/base/icons/destroy.svg
 - app/assets/images/biovision/base/icons/edit.svg
@@ -230,6 +238,7 @@ files:
 - app/controllers/admin/agents_controller.rb
 - app/controllers/admin/browsers_controller.rb
 - app/controllers/admin/codes_controller.rb
+- app/controllers/admin/components_controller.rb
 - app/controllers/admin/editable_blocks_controller.rb
 - app/controllers/admin/editable_pages_controller.rb
 - app/controllers/admin/feedback_requests_controller.rb
@@ -243,7 +252,6 @@ files:
 - app/controllers/admin/metrics_controller.rb
 - app/controllers/admin/privilege_groups_controller.rb
 - app/controllers/admin/privileges_controller.rb
-- app/controllers/admin/settings_controller.rb
 - app/controllers/admin/simple_blocks_controller.rb
 - app/controllers/admin/stored_values_controller.rb
 - app/controllers/admin/tokens_controller.rb
@@ -284,6 +292,7 @@ files:
 - app/controllers/stored_values_controller.rb
 - app/controllers/tokens_controller.rb
 - app/controllers/users_controller.rb
+- app/helpers/biovision_components_helper.rb
 - app/helpers/biovision_helper.rb
 - app/helpers/biovision_users_helper.rb
 - app/helpers/codes_helper.rb
@@ -305,6 +314,7 @@ files:
 - app/models/agent.rb
 - app/models/application_record.rb
 - app/models/biovision_component.rb
+- app/models/biovision_component_user.rb
 - app/models/biovision_parameter.rb
 - app/models/browser.rb
 - app/models/code.rb
@@ -341,7 +351,10 @@ files:
 - app/models/user_privilege.rb
 - app/models/user_profile.rb
 - app/services/biovision/components/base_component.rb
+- app/services/biovision/components/contact_component.rb
+- app/services/biovision/components/content_component.rb
 - app/services/biovision/components/registration_component.rb
+- app/services/biovision/components/users_component.rb
 - app/services/canonizer.rb
 - app/services/code_manager.rb
 - app/services/code_manager/confirmation.rb
@@ -377,6 +390,17 @@ files:
 - app/views/admin/codes/entity/_in_list.html.erb
 - app/views/admin/codes/index.html.erb
 - app/views/admin/codes/show.html.erb
+- app/views/admin/components/entity/_links.html.erb
+- app/views/admin/components/index.html.erb
+- app/views/admin/components/links/_contact.html.erb
+- app/views/admin/components/links/_content.html.erb
+- app/views/admin/components/links/_users.html.erb
+- app/views/admin/components/settings.html.erb
+- app/views/admin/components/settings/_new_parameter.html.erb
+- app/views/admin/components/settings/_parameters.html.erb
+- app/views/admin/components/settings/_setting.html.erb
+- app/views/admin/components/settings/_settings.html.erb
+- app/views/admin/components/show.html.erb
 - app/views/admin/editable_blocks/_nav_item.html.erb
 - app/views/admin/editable_blocks/entity/_in_list.html.erb
 - app/views/admin/editable_blocks/index.html.erb
@@ -392,15 +416,8 @@ files:
 - app/views/admin/foreign_users/entity/_in_list.html.erb
 - app/views/admin/foreign_users/index.html.erb
 - app/views/admin/foreign_users/show.html.erb
-- app/views/admin/index/_biovision_base.html.erb
 - app/views/admin/index/_components.html.erb
 - app/views/admin/index/_custom_dashboard.html.erb
-- app/views/admin/index/dashboard/_biovision_feedback.html.erb
-- app/views/admin/index/dashboard/_biovision_links.html.erb
-- app/views/admin/index/dashboard/_biovision_track.html.erb
-- app/views/admin/index/dashboard/_biovision_user.html.erb
-- app/views/admin/index/dashboard/_editorial.html.erb
-- app/views/admin/index/dashboard/_settings.html.erb
 - app/views/admin/index/index.html.erb
 - app/views/admin/link_block_items/entity/_in_list.html.erb
 - app/views/admin/link_block_items/show.html.erb
@@ -439,12 +456,6 @@ files:
 - app/views/admin/privileges/index.html.erb
 - app/views/admin/privileges/show.html.erb
 - app/views/admin/privileges/users.html.erb
-- app/views/admin/settings/component/_new_parameter.html.erb
-- app/views/admin/settings/component/_parameters.html.erb
-- app/views/admin/settings/component/_setting.html.erb
-- app/views/admin/settings/component/_settings.html.erb
-- app/views/admin/settings/index.html.erb
-- app/views/admin/settings/show.html.erb
 - app/views/admin/simple_blocks/_nav_item.html.erb
 - app/views/admin/simple_blocks/entity/_in_list.html.erb
 - app/views/admin/simple_blocks/index.html.erb
@@ -469,6 +480,7 @@ files:
 - app/views/admin/users/entity/_privilege.html.erb
 - app/views/admin/users/entity/_privilege_tree.html.erb
 - app/views/admin/users/entity/_profile.html.erb
+- app/views/admin/users/entity/in_list/_additional_data.html.erb
 - app/views/admin/users/index.html.erb
 - app/views/admin/users/privileges.html.erb
 - app/views/admin/users/search.jbuilder
@@ -649,7 +661,9 @@ files:
 - config/locales/common-en.yml
 - config/locales/common-ru.yml
 - config/locales/common-sv.yml
+- config/locales/components-en.yml
 - config/locales/components-ru.yml
+- config/locales/components-sv.yml
 - config/locales/editable-pages-en.yml
 - config/locales/editable-pages-ru.yml
 - config/locales/editable-pages-sv.yml
@@ -680,13 +694,14 @@ files:
 - db/migrate/20181217000100_create_media_folders.rb
 - db/migrate/20181217000110_create_editable_pages.rb
 - db/migrate/20181217000200_create_feedback_requests.rb
-- db/migrate/20181217121211_add_uuid_to_users.rb
-- db/migrate/20181217121212_update_fields181217.rb
-- db/migrate/20190311121212_convert_json_columns.rb
 - db/migrate/20190324181818_add_data_to_feedback_requests.rb
 - db/migrate/20190326120000_create_simple_blocks.rb
 - db/migrate/20190423101010_add_parameters_to_biovision_components.rb
 - db/migrate/20190429111111_add_parsed_body_to_editable_pages.rb
+- db/migrate/20190610141414_add_user_to_feedback_requests.rb
+- db/migrate/20190730000000_create_biovision_component_users.rb
+- db/migrate/20190731222222_add_biovision_component_to_metrics.rb
+- db/migrate/20190801111111_add_components.rb
 - db/obsolete_migrations/20171223333333_amend_foreign_keys.rb
 - db/obsolete_migrations/20180117151515_add_language_to_models.rb
 - db/obsolete_migrations/20180321000000_add_profile_data_to_users.rb
@@ -700,6 +715,9 @@ files:
 - db/obsolete_migrations/20181012222222_add_deletable_to_privileges.rb
 - db/obsolete_migrations/20181012222223_convert_stored_values.rb
 - db/obsolete_migrations/20181030080808_update_editable_pages_meta.rb
+- db/obsolete_migrations/20181217121211_add_uuid_to_users.rb
+- db/obsolete_migrations/20181217121212_update_fields181217.rb
+- db/obsolete_migrations/20190311121212_convert_json_columns.rb
 - lib/biovision/base.rb
 - lib/biovision/base/base_methods.rb
 - lib/biovision/base/engine.rb
@@ -730,7 +748,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Base components for Biovision applications

data/app/controllers/admin/settings_controller.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-# Administrative controller for managing component settings and parameters
-class Admin::SettingsController < AdminController
-  before_action :set_handler, except: :index
-
-  # get /admin/settings
-  def index
-    @collection = BiovisionComponent.pluck(:slug)
-  end
-
-  # get /admin/settings/:slug
-  def show
-  end
-
-  # patch /admin/settings/:slug
-  def update
-    new_settings = params.dig(:component, :settings).permit!
-    @handler.settings = new_settings.to_h
-    flash[:notice] = t('admin.settings.update.success')
-    redirect_to(admin_component_path(slug: params[:slug]))
-  end
-
-  # put /admin/settings/:slug/parameter
-  def set_parameter
-    slug = param_from_request(:key, :slug).downcase
-    value = param_from_request(:key, :value)
-
-    @handler[slug] = value
-
-    head :no_content
-  end
-
-  # delete /admin/settings/:slug/:parameter_slug
-  def delete_parameter
-    @handler.component.parameters.delete(params[:parameter_slug])
-    @handler.component.save
-
-    head :no_content
-  end
-
-  private
-
-  def set_handler
-    @handler = Biovision::Components::BaseComponent.handler(params[:slug])
-  end
-end

data/app/views/admin/index/_biovision_base.html.erb

@@ -1,9 +0,0 @@
-<%#= render 'admin/index/dashboard/settings' %>
-<%#= render 'admin/index/dashboard/biovision_track' %>
-<%= render 'admin/index/dashboard/biovision_user' %>
-<%= render 'admin/index/dashboard/editorial' %>
-<%= render 'admin/index/dashboard/biovision_links' if LinkBlock.table_exists? && LinkBlock.any? %>
-<%= render 'admin/index/dashboard/biovision_feedback' %>
-<% %w[partners post vote poll comment testimonials].each do |part| %>
-  <%= render "admin/index/dashboard/biovision_#{part}" if Gem.loaded_specs.key?("biovision-#{part}") %>
-<% end %>

data/app/views/admin/index/dashboard/_biovision_feedback.html.erb

@@ -1,9 +0,0 @@
-<% if current_user_has_privilege?(:feedback_manager) %>
-  <nav>
-    <div class="heading"><%= t('.heading') %></div>
-
-    <ul>
-      <li><%= render 'admin/feedback_requests/nav_item' %></li>
-    </ul>
-  </nav>
-<% end %>

data/app/views/admin/index/dashboard/_biovision_links.html.erb

@@ -1,11 +0,0 @@
-<% if current_user_has_privilege?(:content_manager) %>
-  <nav>
-    <div class="heading" id="biovision-links-heading">
-      <%= t('.heading') %>
-    </div>
-
-    <ul aria-describedby="biovision-links-heading">
-      <li><%= render 'admin/link_blocks/nav_item' %></li>
-    </ul>
-  </nav>
-<% end %>

data/app/views/admin/index/dashboard/_biovision_track.html.erb

@@ -1,8 +0,0 @@
-<% if current_user_has_privilege?(:metrics_manager) %>
-  <nav>
-    <div class="heading"><%= t('.heading') %></div>
-    <ul>
-      <li><%= render 'admin/metrics/nav_item' %></li>
-    </ul>
-  </nav>
-<% end %>

data/app/views/admin/index/dashboard/_biovision_user.html.erb

@@ -1,14 +0,0 @@
-<% if current_user_has_privilege?(:administrator) %>
-  <nav>
-    <div class="heading"><%= t('.heading') %></div>
-    <ul>
-      <li><%= render 'admin/users/nav_item' %></li>
-      <li><%= render 'admin/foreign_users/nav_item' %></li>
-      <li><%= render 'admin/privileges/nav_item' %></li>
-      <li><%= render 'admin/privilege_groups/nav_item' %></li>
-      <li><%= render 'admin/login_attempts/nav_item' %></li>
-      <li><%= render 'admin/tokens/nav_item' %></li>
-      <li><%= render 'admin/codes/nav_item' %></li>
-    </ul>
-  </nav>
-<% end %>

data/app/views/admin/index/dashboard/_editorial.html.erb

@@ -1,11 +0,0 @@
-<% if current_user_has_privilege?(:content_manager) %>
-  <nav>
-    <h3><%= t('.heading') %></h3>
-    <ul>
-      <li><%= render 'admin/editable_pages/nav_item' %></li>
-      <li><%= render 'admin/simple_blocks/nav_item' %></li>
-<!--      <li><%#= render 'admin/media_folders/nav_item' %></li>-->
-<!--      <li><%#= render 'admin/media_files/nav_item' %></li>-->
-    </ul>
-  </nav>
-<% end %>