biovision 0.1.210414.0 → 0.3.210504.0

data/db/migrate/20210405000000_create_acl.rb

@@ -8,6 +8,8 @@ class CreateAcl < ActiveRecord::Migration[6.1]
     create_role_groups unless RoleGroup.table_exists?
     create_user_groups unless UserGroup.table_exists?
     create_user_roles unless UserRole.table_exists?
+
+    create_component_roles
   end
 
   def down
@@ -71,4 +73,17 @@ class CreateAcl < ActiveRecord::Migration[6.1]
       t.timestamps
     end
   end
+
+  def create_component_roles
+    BiovisionComponent.pluck(:slug).each do |component|
+      next if component == Biovision::Components::BaseComponent.slug
+
+      Biovision::Components::BaseComponent.handler(component).create_roles
+    end
+
+    base_component = BiovisionComponent[Biovision::Components::BaseComponent]
+    %w[admin components.view].each do |role|
+      Role.create(biovision_component: base_component, slug: role)
+    end
+  end
 end

data/db/migrate/{20200529000000_create_content_component.rb → 20210421000000_create_content_component.rb}

@@ -1,23 +1,8 @@
 # frozen_string_literal: true
 
 # Create Content component and tables
-class CreateContentComponent < ActiveRecord::Migration[6.0]
-  def up
-    BiovisionComponent.create(slug: Biovision::Components::ContentComponent.slug)
-
-    create_dynamic_pages unless DynamicPage.table_exists?
-    create_navigation_groups unless NavigationGroup.table_exists?
-    create_pages_in_groups unless NavigationGroupPage.table_exists?
-    create_dynamic_blocks unless DynamicBlock.table_exists?
-  end
-
-  def down
-    Biovision::Components::ContentComponent.dependent_models.each do |model|
-      drop_table model.table_name if model.table_exists?
-    end
-
-    BiovisionComponent[Biovision::Components::ContentComponent]&.destroy
-  end
+class CreateContentComponent < ActiveRecord::Migration[6.1]
+  include Biovision::Migrations::ComponentMigration
 
   private
 
@@ -50,7 +35,7 @@ class CreateContentComponent < ActiveRecord::Migration[6.0]
     add_index :dynamic_pages, :data, using: :gin
   end
 
-  def create_pages_in_groups
+  def create_navigation_group_pages
     create_table :navigation_group_pages, comment: 'Dynamic pages in navigation groups' do |t|
       t.references :navigation_group, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
       t.references :dynamic_page, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }

data/db/migrate/{20210401000000_create_contact_component.rb → 20210421000010_create_contact_component.rb}

@@ -2,31 +2,10 @@
 
 # Create tables for contact component
 class CreateContactComponent < ActiveRecord::Migration[6.1]
-  def up
-    create_component
-    create_feedback_messages unless FeedbackMessage.table_exists?
-    create_feedback_responses unless FeedbackResponse.table_exists?
-    create_contact_types unless ContactType.table_exists?
-    create_contact_methods unless ContactMethod.table_exists?
-  end
-
-  def down
-    Biovision::Components::ContactComponent.dependent_models.each do |model|
-      drop_table model.table_name if model.table_exists?
-    end
-
-    BiovisionComponent[Biovision::Components::ContactComponent]&.destroy
-  end
+  include Biovision::Migrations::ComponentMigration
 
   private
 
-  def create_component
-    settings = { feedback_email: '' }
-    slug = Biovision::Components::ContactComponent.slug
-
-    BiovisionComponent.create(slug: slug, settings: settings)
-  end
-
   def create_feedback_messages
     create_table :feedback_messages, comment: 'Feedback messages from visitors' do |t|
       t.uuid :uuid, null: false

data/lib/biovision/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Biovision
-  VERSION = '0.1.210414.0'
+  VERSION = '0.3.210504.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision
 version: !ruby/object:Gem::Version
-  version: 0.1.210414.0
+  version: 0.3.210504.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -252,11 +252,13 @@ files:
 - app/assets/stylesheets/biovision/components/breadcrumbs.scss
 - app/assets/stylesheets/biovision/components/buttons.scss
 - app/assets/stylesheets/biovision/components/carousel.scss
+- app/assets/stylesheets/biovision/components/filters.scss
 - app/assets/stylesheets/biovision/components/forms.scss
 - app/assets/stylesheets/biovision/components/hamburger.scss
 - app/assets/stylesheets/biovision/components/lists.scss
 - app/assets/stylesheets/biovision/components/messages.scss
 - app/assets/stylesheets/biovision/components/pagination.scss
+- app/assets/stylesheets/biovision/components/quick_search.scss
 - app/assets/stylesheets/biovision/components/simple_image.scss
 - app/assets/stylesheets/biovision/components/toggleable.scss
 - app/assets/stylesheets/biovision/default.scss
@@ -276,6 +278,7 @@ files:
 - app/controllers/admin/index_controller.rb
 - app/controllers/admin/ip_addresses_controller.rb
 - app/controllers/admin/navigation_groups_controller.rb
+- app/controllers/admin/tokens_controller.rb
 - app/controllers/admin/users_controller.rb
 - app/controllers/admin_controller.rb
 - app/controllers/authentication_controller.rb
@@ -302,7 +305,6 @@ files:
 - app/lib/biovision/components/base/component_parameters.rb
 - app/lib/biovision/components/base/component_privileges.rb
 - app/lib/biovision/components/base/component_settings.rb
-- app/lib/biovision/components/base/privilege_handler.rb
 - app/lib/biovision/components/base_component.rb
 - app/lib/biovision/components/contact_component.rb
 - app/lib/biovision/components/content_component.rb
@@ -314,6 +316,8 @@ files:
 - app/lib/biovision/components/users/registration_handler.rb
 - app/lib/biovision/components/users/validation.rb
 - app/lib/biovision/components/users_component.rb
+- app/lib/biovision/helpers/data_helper.rb
+- app/lib/biovision/migrations/component_migration.rb
 - app/lib/biovision/notifiers/base_notifier.rb
 - app/lib/biovision/notifiers/contact_notifier.rb
 - app/lib/biovision/notifiers/socialization_notifier.rb
@@ -321,6 +325,7 @@ files:
 - app/lib/canonizer.rb
 - app/lib/carrier_wave/image_optim.rb
 - app/mailers/code_sender.rb
+- app/mailers/feedback_mailer.rb
 - app/models/agent.rb
 - app/models/biovision_component.rb
 - app/models/biovision_component_user.rb
@@ -376,14 +381,7 @@ files:
 - app/views/admin/components/image.jbuilder
 - app/views/admin/components/images.jbuilder
 - app/views/admin/components/index.html.erb
-- app/views/admin/components/links/_content.html.erb
-- app/views/admin/components/links/_track.html.erb
-- app/views/admin/components/links/_users.html.erb
-- app/views/admin/components/links/extra/_content.html.erb
-- app/views/admin/components/privileges.html.erb
-- app/views/admin/components/privileges/_component_user.html.erb
-- app/views/admin/components/privileges/_links.html.erb
-- app/views/admin/components/privileges/_users.html.erb
+- app/views/admin/components/links/_base.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
@@ -396,29 +394,47 @@ files:
 - app/views/admin/dynamic_blocks/entity/_in_list.html.erb
 - app/views/admin/dynamic_blocks/index.html.erb
 - app/views/admin/dynamic_blocks/show.html.erb
+- app/views/admin/dynamic_pages/_dynamic_page.jbuilder
 - app/views/admin/dynamic_pages/_form.html.erb
 - app/views/admin/dynamic_pages/_nav_item.html.erb
 - app/views/admin/dynamic_pages/entity/_in_list.html.erb
+- app/views/admin/dynamic_pages/entity/_in_search.html.erb
 - app/views/admin/dynamic_pages/index.html.erb
+- app/views/admin/dynamic_pages/search.jbuilder
 - app/views/admin/dynamic_pages/show.html.erb
 - app/views/admin/index/index.html.erb
 - app/views/admin/ip_addresses/_nav_item.html.erb
 - app/views/admin/ip_addresses/entity/_in_list.html.erb
 - app/views/admin/ip_addresses/index.html.erb
+- app/views/admin/navigation_group_pages/entity/_in_list.html.erb
 - app/views/admin/navigation_groups/_form.html.erb
 - app/views/admin/navigation_groups/_nav_item.html.erb
+- app/views/admin/navigation_groups/entity/_dynamic_pages.html.erb
 - app/views/admin/navigation_groups/entity/_in_list.html.erb
 - app/views/admin/navigation_groups/index.html.erb
 - app/views/admin/navigation_groups/show.html.erb
+- app/views/admin/tokens/_form.html.erb
+- app/views/admin/tokens/_nav_item.html.erb
+- app/views/admin/tokens/entity/_in_list.html.erb
+- app/views/admin/tokens/index.html.erb
+- app/views/admin/tokens/show.html.erb
 - app/views/admin/unauthorized.html.erb
 - app/views/admin/users/_form.html.erb
 - app/views/admin/users/_nav_item.html.erb
+- app/views/admin/users/_user.jbuilder
 - app/views/admin/users/entity/_fields.html.erb
 - app/views/admin/users/entity/_in_list.html.erb
+- app/views/admin/users/entity/_in_search.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/roles.html.erb
+- app/views/admin/users/roles/_component.html.erb
+- app/views/admin/users/search.jbuilder
 - app/views/admin/users/show.html.erb
+- app/views/admin/widgets/_filters.html.erb
+- app/views/admin/widgets/_quick_search.html.erb
+- app/views/admin/widgets/filters/_flag.html.erb
 - app/views/application/forbidden.html.erb
 - app/views/application/forbidden.jbuilder
 - app/views/application/not_found.html.erb
@@ -427,6 +443,7 @@ files:
 - app/views/application/unauthorized.jbuilder
 - app/views/authentication/new.html.erb
 - app/views/components/content/_dynamic_page.html.erb
+- app/views/components/content/_dynamic_page_content.html.erb
 - app/views/components/users/_form_tabs.html.erb
 - app/views/components/users/_join_form.html.erb
 - app/views/components/users/_login_form.html.erb
@@ -437,6 +454,8 @@ files:
 - app/views/contact/feedback.html.erb
 - app/views/contact/index.html.erb
 - app/views/fallback/show.html.erb
+- app/views/feedback_mailer/new_feedback_request.html.erb
+- app/views/feedback_mailer/new_feedback_request.text.erb
 - app/views/index/index.html.erb
 - app/views/layouts/admin.html.erb
 - app/views/layouts/admin/_breadcrumbs.html.erb
@@ -484,7 +503,9 @@ files:
 - app/views/shared/entity/_slug.html.erb
 - app/views/shared/entity/_text_field.html.erb
 - app/views/shared/entity/_text_fields.html.erb
+- app/views/shared/entity/_time_field.html.erb
 - app/views/shared/entity/_timestamps.html.erb
+- app/views/shared/entity/_track.html.erb
 - app/views/shared/entity/_tree_caches.html.erb
 - app/views/shared/entity/_uuid.html.erb
 - app/views/shared/entity/edit.html.erb
@@ -523,9 +544,9 @@ files:
 - db/migrate/20200224000000_create_track_component.rb
 - db/migrate/20200224000010_create_users_component.rb
 - db/migrate/20200404000000_create_simple_images.rb
-- db/migrate/20200529000000_create_content_component.rb
-- db/migrate/20210401000000_create_contact_component.rb
 - db/migrate/20210405000000_create_acl.rb
+- db/migrate/20210421000000_create_content_component.rb
+- db/migrate/20210421000010_create_contact_component.rb
 - lib/biovision.rb
 - lib/biovision/base_methods.rb
 - lib/biovision/engine.rb

data/app/lib/biovision/components/base/privilege_handler.rb

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-module Biovision
-  module Components
-    module Base
-      # Handling user privileges in component
-      class PrivilegeHandler
-        attr_accessor :component
-
-        # @param [BaseComponent] component
-        def initialize(component)
-          @component = component
-        end
-
-        # @param [String|Symbol]
-        def privilege?(slug)
-          return false if @component.user_link.nil?
-
-          privileges = Array(@component.user_link.data['privileges'])
-          privileges.include?(slug)
-        end
-
-        def administrator!
-          return if @component.user.nil?
-
-          link = @component.user_link!
-          link.administrator = true
-          link.save
-        end
-
-        def not_administrator!
-          return if @component.user.nil? || @component.user_link.nil?
-
-          @component.user_link.update(administrator: false)
-        end
-
-        # @param [Array] new_privileges
-        def privileges=(new_privileges)
-          return if @component.user.nil?
-
-          link = @component.user_link!
-          link.data['privileges'] = Array(new_privileges).uniq
-          link.save
-        end
-
-        # @param [Hash] new_settings
-        def settings=(new_settings)
-          return if @component.user.nil?
-
-          link = @component.user_link!
-          link.data['settings'] = new_settings
-          link.save
-        end
-
-        # @param [String] slug
-        def add_privilege(slug)
-          return if @component.user.nil?
-
-          link = @component.user_link!
-          link.data['privileges'] ||= []
-          link.data['privileges'] += [slug.to_s]
-          link.data['privileges'].uniq!
-          link.save
-        end
-
-        # @param [String] slug
-        def remove_privilege(slug)
-          link = @component.user_link
-
-          return if link.nil?
-
-          link.data['privileges'] ||= []
-          link.data['privileges'] -= [slug.to_s]
-          link.save
-        end
-      end
-    end
-  end
-end

data/app/views/admin/components/links/_content.html.erb

@@ -1,9 +0,0 @@
-<li><%= render 'admin/navigation_groups/nav_item' %></li>
-<li><%= render 'admin/dynamic_blocks/nav_item' %></li>
-<li><%= render 'admin/dynamic_pages/nav_item' %></li>
-<%=
-  render(
-    partial: 'admin/components/links/extra/content',
-    locals: { handler: handler }
-  )
-%>

data/app/views/admin/components/links/_track.html.erb

@@ -1,2 +0,0 @@
-<li><%= render 'admin/agents/nav_item' %></li>
-<li><%= render 'admin/ip_addresses/nav_item' %></li>

data/app/views/admin/components/links/_users.html.erb

@@ -1,4 +0,0 @@
-<li><%= render 'admin/users/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>-->

data/app/views/admin/components/privileges.html.erb

@@ -1,20 +0,0 @@
-<% content_for :meta_title, t('.title', slug: @handler.slug) %>
-<% content_for :breadcrumbs do %>
-  <%= link_to(t('admin.components.index.nav_text'), admin_components_path) %>
-  <%= admin_biovision_component_link(@handler.component, @handler.name) %>
-  <span><%= t('.nav_text') %></span>
-<% end %>
-
-<article>
-  <h1><%= @handler.name %></h1>
-
-  <%=
-    render(
-        partial: 'admin/components/privileges/users',
-        locals: {
-            collection: @handler.component.privileges,
-            handler: @handler
-        }
-    )
-  %>
-</article>

data/app/views/admin/components/privileges/_component_user.html.erb

@@ -1,17 +0,0 @@
-<figure class="image">
-  <%= user_image_small(entity.user) %>
-</figure>
-<div class="data">
-  <div><%= admin_user_link(entity.user) %></div>
-  <div>
-    <%=
-      render(
-          partial: 'admin/components/privileges/links',
-          locals: {
-              handler: handler,
-              entity: entity
-          }
-      )
-    %>
-  </div>
-</div>

data/app/views/admin/components/privileges/_links.html.erb

@@ -1,17 +0,0 @@
-<ul class="entity-links">
-  <li>
-    <% element_id = "component_administrator_#{handler.slug}_#{entity.user_id}" %>
-    <%=
-      check_box_tag(
-          'user_id',
-          entity.user_id,
-          entity.administrator?,
-          data: {
-              url: admin_component_administrators_path(slug: handler.slug, user_id: entity.user_id)
-          },
-          id: element_id
-      )
-    %>
-    <%= label_tag(element_id, t('activerecord.attributes.biovision_component_user.administrator')) %>
-  </li>
-</ul>

data/app/views/admin/components/privileges/_users.html.erb

@@ -1,23 +0,0 @@
-<section>
-  <h2><%= t('.heading') %></h2>
-
-  <% if collection.any? %>
-    <ul class="list-of-entities">
-      <% collection.each do |entity| %>
-        <li data-id="<%= entity.id %>">
-          <%=
-            render(
-                partial: 'admin/components/privileges/component_user',
-                locals: {
-                    handler: handler,
-                    entity: entity
-                }
-            )
-          %>
-        </li>
-      <% end %>
-    </ul>
-  <% else %>
-    <%= render 'shared/nothing_found' %>
-  <% end %>
-</section>