biovision-base 0.39.190804.1 → 0.41.190905.0

data/app/models/biovision_component_user.rb

@@ -14,4 +14,6 @@ class BiovisionComponentUser < ApplicationRecord
   belongs_to :user
 
   validates_uniqueness_of :user_id, scope: :biovision_component_id
+
+  scope :recent, -> { order('updated_at desc') }
 end

data/app/models/concerns/checkable.rb

@@ -5,7 +5,7 @@ module Checkable
   extend ActiveSupport::Concern
 
   included do
-    # @param [Integer] id
+    # @param id
     # @param [Hash] parameters
     def self.instance_for_check(id, parameters)
       if id.blank?

data/app/models/concerns/toggleable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Adds list of toggleable attributes to model
 #
 # @author Maxim Khan-Magomedov <maxim.km@gmail.com>
@@ -10,17 +12,19 @@ module Toggleable
     # @param [String, Symbol] attribute
     # @return [Hash]
     def toggle_parameter(attribute)
-      return unless self::toggleable_attributes.include? attribute.to_sym
+      return unless toggleable_attributes.include? attribute.to_sym
+
       toggle! attribute
       { attribute => self[attribute] }
     end
   end
 
+  # Additional class methods
   module ClassMethods
 
     private
 
-    # @param [Array<Symbol, String>] attributes
+    # @param [Array<Symbol>] attributes
     def toggleable(*attributes)
       cattr_accessor :toggleable_attributes
       self.toggleable_attributes = attributes.flatten

data/app/services/biovision/components/base_component.rb

@@ -4,7 +4,7 @@ module Biovision
   module Components
     # Base biovision component
     class BaseComponent
-      attr_reader :component, :slug, :name, :user
+      attr_reader :component, :slug, :name, :user, :role
 
       # @param [BiovisionComponent] component
       # @param [User] user
@@ -25,7 +25,7 @@ module Biovision
         if input.is_a?(BiovisionComponent)
           handler_class(input.slug).new(input, user)
         else
-          entity = BiovisionComponent.find_by!(slug: input)
+          entity = BiovisionComponent.find_by(slug: input)
           handler_class(input).new(entity, user)
         end
       end
@@ -36,18 +36,21 @@ module Biovision
         handler_name.safe_constantize || BaseComponent
       end
 
-      def self.default_privilege_name
-        self.class.to_s.demodulize.underscore.gsub('component', 'manager')
+      # Privilege names for using in biovision_component_user.data
+      def self.privilege_names
+        []
       end
 
       # @param [User] user
-      # @param [Hash] options
-      def self.allow?(user, options = {})
+      # @param [String] privilege_name
+      def self.allow?(user, privilege_name = '')
         return false if user.nil?
+        return true if user.super_user?
 
-        privilege = options[:privilege] || default_privilege_name
+        slug = self.class.to_s.demodulize.underscore.gsub('component', '')
+        component = BiovisionComponent.find_by(slug: slug)
 
-        UserPrivilege.user_has_privilege?(user, privilege)
+        self.class.new(component, user).allow?(privilege_name)
       end
 
       # @param [User] user
@@ -66,16 +69,27 @@ module Biovision
         true
       end
 
-      # @param [Hash] options
-      def allow?(options = {})
+      def administrator?
         return false if user.nil?
-        return true if user.super_user? || @role&.administrator?
 
-        if options.key?(:action)
-          @role.data[options[:action].to_s]
-        else
-          !@role.nil?
-        end
+        user.super_user? || @role&.administrator?
+      end
+
+      # @param [String|Array] privilege_names
+      def allow?(*privilege_names)
+        return false if user.nil?
+        return true if administrator? || privilege_names.blank?
+        return false if @role.nil?
+
+        privilege_names.flatten.each { |slug| return true if privilege?(slug) }
+        false
+      end
+
+      # @param [String] privilege_name
+      def privilege?(privilege_name)
+        return false if @role.nil?
+
+        @role.data[privilege_name.to_s]
       end
 
       # @param [Hash] data
@@ -134,6 +148,20 @@ module Biovision
         metric << quantity
       end
 
+      # @param [User] user
+      # @param [Hash] data
+      def update_privileges(user, data = nil)
+        criteria = {
+          user: user,
+          biovision_component: @component
+        }
+        link = BiovisionComponentUser.find_or_create_by(criteria)
+
+        link&.update(data: data) unless data.nil?
+
+        link
+      end
+
       protected
 
       # @param [Hash] data

data/app/services/biovision/components/contact_component.rb

@@ -4,8 +4,10 @@ module Biovision
   module Components
     # Component for feedback
     class ContactComponent < BaseComponent
-      def allow?(options = {})
-        UserPrivilege.user_has_privilege?(user, :feedback_manager)
+      SLUG = 'contact'
+
+      def self.privilege_names
+        %w[feedback_manager]
       end
 
       protected

data/app/services/biovision/components/content_component.rb

@@ -4,8 +4,10 @@ module Biovision
   module Components
     # Component for content
     class ContentComponent < BaseComponent
-      def allow?(options = {})
-        UserPrivilege.user_has_privilege?(user, :content_manager)
+      SLUG = 'content'
+
+      def self.privilege_names
+        %w[content_manager]
       end
     end
   end

data/app/services/biovision/components/users_component.rb

@@ -4,6 +4,12 @@ module Biovision
   module Components
     # Component for handling users
     class UsersComponent < BaseComponent
+      SLUG = 'users'
+
+      def self.privilege_names
+        %w[view edit manage_codes]
+      end
+
       def use_parameters?
         false
       end

data/app/uploaders/simple_image_uploader.rb

@@ -9,7 +9,8 @@ class SimpleImageUploader < CarrierWave::Uploader::Base
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    slug = "#{model.id / 1000}/#{model.id}"
+    id = model&.id.to_i
+    slug = "#{id / 1000}/#{id}"
 
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{slug}"
   end
@@ -44,6 +45,19 @@ class SimpleImageUploader < CarrierWave::Uploader::Base
     %w[jpg jpeg png svg svgz]
   end
 
+  # Text for image alt attribute
+  #
+  # @param [String] default
+  # @return [String]
+  def alt_text(default = '')
+    method_name = "#{mounted_as}_alt_text".to_sym
+    if model.respond_to?(method_name)
+      model.send(method_name)
+    else
+      default
+    end
+  end
+
   # @param [SanitizedFile]
   def raster_image?(new_file)
     !new_file.extension.match?(/svgz?\z/i)

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

@@ -1,6 +1,7 @@
 <% content_for :meta_title, t('.title', page: current_page) %>
 <% content_for :breadcrumbs do %>
-    <span><%= t('admin.codes.nav_item.text') %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <span><%= t('admin.codes.nav_item.text') %></span>
 <% end %>
 
 <article>

data/app/views/admin/codes/show.html.erb

@@ -1,7 +1,8 @@
 <% content_for :meta_title, t('.title', body: @entity.body) %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.codes.nav_item.text'), admin_codes_path) %>
-    <span><%= @entity.body %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.codes.nav_item.text'), admin_codes_path) %>
+  <span><%= @entity.body %></span>
 <% end %>
 
 <article>
@@ -29,17 +30,17 @@
     </dd>
 
     <% unless @entity.updated_at.nil? %>
-        <dt><%= t(:updated_at) %></dt>
-        <dd>
-          <%= time_tag(@entity.updated_at) %>
-        </dd>
+      <dt><%= t(:updated_at) %></dt>
+      <dd>
+        <%= time_tag(@entity.updated_at) %>
+      </dd>
     <% end %>
 
     <% unless @entity.payload.blank? %>
-        <dt><%= t('activerecord.attributes.code.payload') %></dt>
-        <dd>
-          <%= @entity.payload %>
-        </dd>
+      <dt><%= t('activerecord.attributes.code.payload') %></dt>
+      <dd>
+        <%= @entity.payload %>
+      </dd>
     <% end %>
 
     <dt><%= t('activerecord.attributes.code.quantity') %></dt>
@@ -47,5 +48,6 @@
       <%= t(:code_activation_count, count: @entity.quantity) %>
     </dd>
   </dl>
+
   <%= render partial: 'shared/track', locals: { item: @entity } %>
 </article>

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

@@ -1,5 +1,5 @@
 <nav class="biovision-component-nav">
-  <% if handler.allow?(action: 'settings') %>
+  <% if handler.allow?('settings') %>
     <% if handler.use_parameters? || handler.component.settings.any? %>
       <%=
         link_to(
@@ -11,10 +11,25 @@
     <% end %>
   <% end %>
 
+  <% if handler.administrator? %>
+    <%=
+      link_to(
+          t('admin.components.privileges.nav_text'),
+          admin_component_privileges_path(slug: handler.slug),
+          class: 'privileges'
+      )
+    %>
+  <% end %>
+
   <% prefix = 'admin/components/links/' %>
   <% if lookup_context.exists?("#{prefix}_#{handler.slug}") %>
     <ul class="biovision-component-links">
-      <%= render "#{prefix}#{handler.slug}" %>
+      <%=
+        render(
+            partial: "#{prefix}#{handler.slug}",
+            locals: { handler: handler }
+        )
+      %>
     </ul>
   <% end %>
 </nav>

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

@@ -1 +1,3 @@
-<li><%= render 'admin/feedback_requests/nav_item' %></li>
+<% if handler.allow?('feedback_manager') %>
+  <li><%= render 'admin/feedback_requests/nav_item' %></li>
+<% end %>

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

@@ -1,2 +1,4 @@
-<li><%= render 'admin/editable_pages/nav_item' %></li>
-<li><%= render 'admin/simple_blocks/nav_item' %></li>
+<% if handler.allow?('content_manager') %>
+  <li><%= render 'admin/editable_pages/nav_item' %></li>
+  <li><%= render 'admin/simple_blocks/nav_item' %></li>
+<% end %>

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

@@ -1,7 +1,11 @@
-<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>
+<% if handler.allow?('view', 'edit') %>
+  <li><%= render 'admin/users/nav_item' %></li>
+  <li><%= render 'admin/foreign_users/nav_item' %></li>
+<% end %>
+<% if handler.administrator? %>
+  <li><%= render 'admin/login_attempts/nav_item' %></li>
+  <li><%= render 'admin/tokens/nav_item' %></li>
+<% end %>
+<% if handler.allow?('manage_codes') %>
+  <li><%= render 'admin/codes/nav_item' %></li>
+<% end %>

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

@@ -0,0 +1,34 @@
+<% 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>
+
+  <ul class="actions">
+    <li><%= back_icon(admin_components_path) %></li>
+    <li><%= return_icon(admin_component_path(slug: @handler.slug)) %></li>
+  </ul>
+
+  <%=
+    render(
+        partial: 'admin/components/privileges/users',
+        locals: {
+            collection: @handler.component.privileges,
+            handler: @handler
+        }
+    )
+  %>
+
+  <%=
+    render(
+        partial: 'admin/components/privileges/new_user',
+        locals: {
+            handler: @handler
+        }
+    )
+  %>
+</article>

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

@@ -0,0 +1,67 @@
+<div class="image">
+  <%= profile_avatar(entity.user) %>
+</div>
+<div class="data">
+  <div><%= admin_user_link(entity.user) %></div>
+  <div>
+    <ul class="entity-links">
+      <li>
+        <% element_id = "component_administrator_#{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>
+      <% if handler.use_parameters? || handler.component.settings.any? %>
+        <li>
+          <% element_id = "component_privilege_settings" %>
+          <%=
+            check_box_tag(
+                'user_id',
+                entity.user_id,
+                entity.data['settings'],
+                data: {
+                    url: admin_component_privilege_path(
+                        slug: handler.slug,
+                        user_id: entity.user_id,
+                        privilege_slug: 'settings'
+                    )
+                },
+                id: element_id
+            )
+          %>
+          <%= label_tag(element_id, t('activerecord.attributes.biovision_component_user.privileges.settings')) %>
+        </li>
+      <% end %>
+      <% handler.class.privilege_names.each do |privilege_slug| %>
+        <li>
+          <% element_id = "component_privilege_#{privilege_slug}" %>
+          <%=
+            check_box_tag(
+                'user_id',
+                entity.user_id,
+                entity.data[privilege_slug],
+                data: {
+                    url: admin_component_privilege_path(
+                        slug: handler.slug,
+                        user_id: entity.user_id,
+                        privilege_slug: privilege_slug
+                    )
+                },
+                id: element_id
+            )
+          %>
+          <%= label_tag(element_id, t("biovision.components.#{handler.slug}.privileges.#{privilege_slug}", default: privilege_slug)) %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

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

@@ -0,0 +1,15 @@
+<section>
+  <h2><%= t('.heading') %></h2>
+
+  <div class="js-admin-user-search" data-url="<%= search_admin_users_path %>" data-callback="Biovision.components.userPrivilege.addUser">
+    <%= search_field_tag('user_search', '', id: nil, size: 24) %>
+    <%= button_tag t(:find), disabled: true, type: :button %>
+    <select class="results"></select>
+  </div>
+
+  <ul
+    class="js-component-added-users"
+    data-url="<%= admin_component_privileges_path(slug: handler.slug) %>"
+    aria-label="<%= t('.added_users') %>"
+  ></ul>
+</section>