biovision-base 0.37.190607.0 → 0.39.190804.1

data/app/assets/stylesheets/biovision/base/admin.scss

@@ -259,42 +259,6 @@ nav.breadcrumbs {
   }
 }
 
-.entity-links {
-  margin: 0;
-  padding: 0;
-
-  li {
-    list-style: none;
-    margin: 0;
-    padding: var(--spacer-xxs);
-    position: relative;
-  }
-
-  label {
-    cursor: pointer;
-    display: inline-block;
-    padding: var(--spacer-xxxs) var(--spacer-s);
-    transition: .125s;
-  }
-
-  input[type=checkbox] {
-    &:not(:checked) + label {
-      background: #fafafa;
-      color: $text-color-secondary;
-    }
-
-    &:checked + label {
-      background: rgb(200, 255, 200);
-      box-shadow: 0 0 .3rem .1rem rgba(0, 127, 0, .25);
-    }
-
-    &:disabled + label {
-      opacity: .5;
-      filter: grayscale(75%);
-    }
-  }
-}
-
 .ck-content {
   ul {
     padding-left: var(--spacer-m);

data/app/assets/stylesheets/biovision/base/biovision.scss

@@ -10,6 +10,7 @@
   --font-size-xs: #{$font-size-xs};
 
   --spacer-s: #{$spacer-s};
+  --spacer-xxxs: .2rem;
   --spacer-xxs: calc(var(--spacer-s) / 4);
   --spacer-xs: calc(var(--spacer-s) / 2);
   --spacer-m: calc(var(--spacer-s) * 2);
@@ -301,6 +302,54 @@ ol.list-of-entities {
   }
 }
 
+.entity-links {
+  margin: 0;
+  padding: 0;
+
+  li {
+    list-style: none;
+    margin: 0;
+    padding: $spacer-xxs;
+    position: relative;
+  }
+
+  label {
+    cursor: pointer;
+    display: inline-block;
+    padding: $spacer-xxxs $spacer-s;
+    transition: .125s;
+  }
+
+  input[type=checkbox] {
+    &:not(:checked) + label {
+      background: #fafafa;
+      color: $text-color-secondary;
+    }
+
+    &:checked + label {
+      background: rgb(200, 255, 200);
+      box-shadow: 0 0 .3rem .1rem rgba(0, 127, 0, .25);
+    }
+
+    &:disabled + label {
+      opacity: .5;
+      filter: grayscale(75%);
+    }
+  }
+}
+
+@supports (--css: vars) {
+  .entity-links {
+    li {
+      padding: var(--spacer-xxs);
+    }
+
+    label {
+      padding: var(--spacer-xxxs) var(--spacer-s);
+    }
+  }
+}
+
 .breadcrumbs {
   a {
     background: image_url('biovision/base/icons/breadcrumb.svg') no-repeat bottom .1rem right / .6rem 1.2rem;

data/app/assets/stylesheets/biovision/base/default.scss

@@ -12,6 +12,7 @@ $font-size-small: 1.1rem !default;
 $font-size-xs: 1rem !default;
 
 $spacer-s: 1.6rem !default;
+$spacer-xxxs: .2rem !default;
 $spacer-xxs: #{$spacer-s / 4} !default;
 $spacer-xs: #{$spacer-s / 2} !default;
 $spacer-m: #{$spacer-s * 2} !default;

data/app/assets/stylesheets/biovision/base/default_admin.scss

@@ -12,6 +12,7 @@ $font-size-small: 1.2rem !default;
 $font-size-xs: 1rem !default;
 
 $spacer-s: 1.6rem !default;
+$spacer-xxxs: .2rem !default;
 $spacer-xxs: #{$spacer-s / 4} !default;
 $spacer-xs: #{$spacer-s / 2} !default;
 $spacer-m: #{$spacer-s * 2} !default;

data/app/controllers/admin/components_controller.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# Handling components
+class Admin::ComponentsController < AdminController
+  before_action :set_handler, except: :index
+
+  # get /admin/components
+  def index
+    @collection = BiovisionComponent.list_for_administration
+  end
+
+  # get /admin/components/:slug
+  def show
+    handle_http_401('Viewing component is not allowed') unless @handler.allow?
+  end
+
+  # get /admin/components/:slug/settings
+  def settings
+  end
+
+  # patch /admin/components/:slug/settings
+  def update_settings
+    new_settings = params.dig(:component, :settings).permit!
+    @handler.settings = new_settings.to_h
+    flash[:notice] = t('admin.components.update_settings.success')
+    redirect_to(admin_component_settings_path(slug: params[:slug]))
+  end
+
+  # patch /admin/components/:slug/parameters
+  def update_parameter
+    slug = param_from_request(:key, :slug).downcase
+    value = param_from_request(:key, :value)
+
+    @handler[slug] = value
+
+    head :no_content
+  end
+
+  # delete /admin/components/:slug/parameters/:parameter_slug
+  def delete_parameter
+    @handler.component.parameters.delete(params[:parameter_slug])
+    @handler.component.save
+
+    head :no_content
+  end
+
+  private
+
+  def set_handler
+    slug = params[:slug]
+    @handler = Biovision::Components::BaseComponent.handler(slug, current_user)
+  end
+
+  def restrict_access
+    return if current_user&.super_user?
+
+    links_exist = BiovisionComponentUser.where(user: current_user).exists?
+    handle_http_401('User has no component privileges') unless links_exist
+  end
+end

data/app/controllers/feedback_requests_controller.rb

@@ -34,6 +34,6 @@ class FeedbackRequestsController < ApplicationController
   def creation_parameters
     permitted = FeedbackRequest.creation_parameters
     parameters = params.require(:feedback_request).permit(permitted)
-    parameters.merge(tracking_for_entity)
+    parameters.merge(owner_for_entity(true))
   end
 end

data/app/helpers/biovision_components_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# Helper methods for component handling
+module BiovisionComponentsHelper
+  # @param [BiovisionComponent] entity
+  # @param [String] text
+  # @param [Hash] options
+  def admin_biovision_component_link(entity, text = entity.slug, options = {})
+    link_to(text, admin_component_path(slug: entity.slug), options)
+  end
+end

data/app/mailers/feedback_mailer.rb

@@ -6,7 +6,7 @@ class FeedbackMailer < ApplicationMailer
   def new_feedback_request(id)
     @entity = FeedbackRequest.find_by(id: id)
 
-    receiver = BiovisionComponent['contact'].receive('feedback_receiver')
+    receiver = BiovisionComponent['contact'].settings['feedback_receiver']
 
     mail to: receiver unless @entity.nil? || receiver.blank?
   end

data/app/models/biovision_component.rb

@@ -3,10 +3,11 @@
 # Biovision component
 #
 # Attributes:
-#   - created_at [DateTime]
-#   - settings [JSON]
-#   - slug [String]
-#   - updated_at [DateTime]
+#   created_at [DateTime]
+#   parameters [JSON]
+#   settings [JSON]
+#   slug [String]
+#   updated_at [DateTime]
 class BiovisionComponent < ApplicationRecord
   include RequiredUniqueSlug
 
@@ -15,6 +16,10 @@ class BiovisionComponent < ApplicationRecord
   SLUG_PATTERN_HTML = '^[a-zA-Z][-a-zA-Z0-9_]+[a-zA-Z0-9]$'
   VALUE_LIMIT       = 65_535
 
+  has_many :biovision_component_users, dependent: :delete_all
+
+  scope :list_for_administration, -> { ordered_by_slug }
+
   # Find component by slug
   #
   # @param [String] slug
@@ -47,4 +52,16 @@ class BiovisionComponent < ApplicationRecord
     parameters[slug.to_s] = value
     save!
   end
+
+  # @param [User] user
+  def visible_to?(user)
+    return false if user.nil?
+    return true if user.super_user?
+
+    biovision_component_users.where(user: user).exists?
+  end
+
+  def name
+    I18n.t("biovision.components.#{slug}.name", default: slug)
+  end
 end

data/app/models/biovision_component_user.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# User privileges in component
+#
+# Attributes:
+#   administrator [Boolean]
+#   biovision_component_id [BiovisionComponent]
+#   created_at [DateTime]
+#   data [Json]
+#   updated_at [DateTime]
+#   user_id [User]
+class BiovisionComponentUser < ApplicationRecord
+  belongs_to :biovision_component
+  belongs_to :user
+
+  validates_uniqueness_of :user_id, scope: :biovision_component_id
+end

data/app/models/feedback_request.rb

@@ -1,14 +1,35 @@
+# frozen_string_literal: true
+
+# Feedback request
+#
+# Attributes:
+#   agent_id [Agent], optional
+#   comment [text]
+#   consent [boolean]
+#   created_at [DateTime]
+#   data [jsonb]
+#   email [string], optional
+#   image [string], optional
+#   ip [inet], optional
+#   language_id [Language], optional
+#   name [string], optional
+#   phone [string], optional
+#   processed [boolean]
+#   updated_at [DateTime]
+#   user_id [User], optional
 class FeedbackRequest < ApplicationRecord
   include Toggleable
 
-  NAME_LIMIT    = 100
+  COMMENT_LIMIT = 5000
   EMAIL_LIMIT   = 250
+  EMAIL_PATTERN = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z0-9][-a-z0-9]+)\z/i.freeze
+  NAME_LIMIT    = 100
   PHONE_LIMIT   = 30
-  COMMENT_LIMIT = 5000
 
   toggleable :processed
 
   belongs_to :language, optional: true
+  belongs_to :user, optional: true
   belongs_to :agent, optional: true
 
   validates_acceptance_of :consent
@@ -16,7 +37,7 @@ class FeedbackRequest < ApplicationRecord
   validates_length_of :phone, maximum: PHONE_LIMIT
   validates_length_of :comment, maximum: COMMENT_LIMIT
   validates_length_of :email, maximum: EMAIL_LIMIT
-  validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z0-9][-a-z0-9]+)\z/i, allow_blank: true
+  validates_format_of :email, with: EMAIL_PATTERN, allow_blank: true
 
   scope :recent, -> { order('id desc') }
   scope :unprocessed, -> { where(processed: false) }
@@ -28,6 +49,6 @@ class FeedbackRequest < ApplicationRecord
   end
 
   def self.creation_parameters
-    %i(comment consent email name phone)
+    %i[comment consent email name phone]
   end
 end

data/app/models/metric.rb

@@ -1,6 +1,23 @@
+# frozen_string_literal: true
+
+# Metric
+# 
+# Attributes:
+#   biovision_component_id [BiovisionComponent], optional
+#   created_at [DateTime]
+#   default_period [integer]
+#   incremental [boolean]
+#   name [string]
+#   previous_value [integer]
+#   start_with_zero [boolean]
+#   show_on_dashboard [boolean]
+#   updated_at [DateTime]
+#   value [integer]
 class Metric < ApplicationRecord
   include RequiredUniqueName
+  include Toggleable
 
+  NAME_LIMIT = 255
   PERIOD_RANGE = (1..365).freeze
 
   METRIC_HTTP_400 = 'errors.http.bad_request.hit'
@@ -11,9 +28,15 @@ class Metric < ApplicationRecord
   METRIC_HTTP_500 = 'errors.http.internal_server_error.hit'
   METRIC_HTTP_503 = 'errors.http.service_unavailable.hit'
 
+  toggleable :start_with_zero, :show_on_dashboard
+
+  belongs_to :biovision_component, optional: true
   has_many :metric_values, dependent: :destroy
 
   before_validation :normalize_period
+  validates_length_of :name, maximum: NAME_LIMIT
+
+  scope :list_for_administration, -> { ordered_by_name }
 
   def self.page_for_administration
     order('name asc')
@@ -26,11 +49,23 @@ class Metric < ApplicationRecord
   # @param [String] name
   # @param [Integer] quantity
   def self.register(name, quantity = 1)
-    instance = Metric.find_by(name: name) || create(name: name, incremental: !(name =~ /\.hit\z/).nil?)
-    instance.metric_values.create(time: Time.now, quantity: quantity)
-    value = instance.incremental? ? instance.metric_values.sum(:quantity) : quantity
+    instance = Metric.find_by(name: name)
+    if instance.nil?
+      instance = create(name: name, incremental: !name.end_with?('.hit'))
+    end
+
+    instance << quantity
+  end
+
+  def quantity
+    metric_values.sum(:quantity)
+  end
+
+  # @param [Integer] input
+  def <<(input)
+    metric_values.create(time: Time.now, quantity: input)
 
-    instance.update(value: value, previous_value: instance.value)
+    update(value: incremental? ? quantity : input, previous_value: value)
   end
 
   # @param [Integer] period

data/app/models/metric_value.rb

@@ -1,15 +1,22 @@
+# frozen_string_literal: true
+
+# Metric value
+#
+# Attributes:
+#   metric_id [Metric]
+#   time [DateTime]
+#   quantity [Integer]
 class MetricValue < ApplicationRecord
   belongs_to :metric
 
   validates_presence_of :time, :quantity
 
   scope :recent, -> { order('id desc') }
-  scope :since, -> (time) { where('time >= ?', time) }
+  scope :since, ->(time) { where('time >= ?', time) }
   scope :ordered_by_time, -> { order('time asc') }
 
-  # @param [Integer] resolution hour count per chunk
-  def time_for_graph(resolution = 4)
-    rounded = time - time.sec - time.min * 60 - (time.hour % resolution * 3600)
-    rounded + resolution.hours
+  # @param [Integer] hours hour count per chunk
+  def time_for_graph(hours = 4)
+    time - time.sec - time.min * 60 - (time.hour % hours * 3600) + hours.hours
   end
 end

data/app/models/user.rb

@@ -5,7 +5,6 @@ class User < ApplicationRecord
   include Checkable
   include Toggleable
 
-  METRIC_REGISTRATION            = 'users.registration.hit'
   METRIC_AUTHENTICATION_SUCCESS  = 'users.authentication.success.hit'
   METRIC_AUTHENTICATION_FAILURE  = 'users.authentication.failure.hit'
   METRIC_AUTHENTICATION_EXTERNAL = 'users.authentication.external.hit'
@@ -118,7 +117,7 @@ class User < ApplicationRecord
     data.dig('profile', 'name').blank? ? profile_name : data['profile']['name']
   end
 
-  # @param [Boolean] include_patronymic
+  # @param [TrueClass|FalseClass] include_patronymic
   def full_name(include_patronymic = false)
     result = [name_for_letter]
     result << data.dig('profile', 'patronymic').to_s.strip if include_patronymic