biovision 0.1.210414.0 → 0.12.211128.0

data/app/models/role.rb

@@ -12,22 +12,25 @@ class Role < ApplicationRecord
   include Checkable
   include HasUuid
 
-  SLUG_LIMIT = 50
-  SLUG_PATTERN = /\A[a-z][_a-z]*[a-z]\z/.freeze
+  CACHE_KEY = 'role_cache'
 
   belongs_to :biovision_component
   has_many :role_groups, dependent: :destroy
-  has_many :user_groups, dependent: :destroy
+  has_many :user_roles, dependent: :destroy
 
   before_validation { self.slug = slug.to_s.downcase }
 
   validates_presence_of :slug
   validates_uniqueness_of :slug, scope: :biovision_component_id
-  validates_format_of :slug, with: SLUG_PATTERN
 
   # @param [String] slug
   def self.[](slug)
-    find_by(slug: slug)
+    parts = slug.to_s.split('.')
+    criteria = {
+      biovision_components: { slug: parts.shift },
+      slug: parts.join('.')
+    }
+    joins(:biovision_component).where(criteria).first
   end
 
   def groups
@@ -37,20 +40,47 @@ class Role < ApplicationRecord
   end
 
   def users
-    User.where(id: user_ids)
+    User.where("data->'role_cache' @> '[?]'::jsonb", id)
   end
 
   def user_ids
-    # direct_inclusive = user_roles.where(inclusive: true).pluck(:user_id).uniq
-    # direct_exclusive = user_roles.where(inclusive: false).pluck(:user_id).uniq
-    # group_inclusive = groups.map(&:user_ids).flatten
-    #
-    # group_inclusive + direct_inclusive - direct_exclusive
-    []
+    (user_roles.pluck(:user_id).uniq + groups.map(&:user_ids).flatten).uniq
   end
 
   def count_users!
     self.user_count = user_ids.count
     save
   end
+
+  # @param [User] user
+  def add_to_cache!(user)
+    return if user.nil?
+
+    ids = user.role_ids + [id]
+    user.data[CACHE_KEY] = ids.uniq
+    user.save
+  end
+
+  # @param [User] user
+  def remove_from_cache!(user)
+    return if user.nil?
+
+    new_ids = user.role_ids - [id]
+    user.data[CACHE_KEY] = new_ids
+    user.save
+  end
+
+  # @param [User] user
+  def add_user(user)
+    user_roles.create(user: user)
+    add_to_cache!(user)
+  end
+
+  # @param [User] user
+  def remove_user(user)
+    return if user.nil?
+
+    user_roles.where(user: user).destroy_all
+    remove_from_cache!(user)
+  end
 end

data/app/models/simple_image.rb

@@ -6,7 +6,9 @@
 #   agent_id [Agent], optional
 #   biovision_component_id [BiovisionComponent]
 #   caption [string], optional
+#   checksum [String], optional
 #   created_at [DateTime]
+#   data [jsonb]
 #   image [SimpleImageUploader]
 #   image_alt_text [string]
 #   ip_address_id [IpAddress], optional
@@ -16,7 +18,6 @@
 #   updated_at [DateTime]
 #   user_id [User], optional
 #   uuid [uuid]
-#   data [jsonb]
 class SimpleImage < ApplicationRecord
   include Checkable
   include HasOwner
@@ -24,6 +25,7 @@ class SimpleImage < ApplicationRecord
   include HasUuid
 
   META_LIMIT = 255
+  ORIGINAL_CHECKSUM = 'original_checksum'
 
   mount_uploader :image, SimpleImageUploader
 
@@ -33,6 +35,8 @@ class SimpleImage < ApplicationRecord
   has_many :simple_image_tag_images, dependent: :destroy
   has_many :simple_image_tags, through: :simple_image_tag_images
 
+  before_save :calculate_checksum
+
   validates_presence_of :image
   validates_length_of :caption, maximum: META_LIMIT
   validates_length_of :image_alt_text, maximum: META_LIMIT
@@ -41,12 +45,27 @@ class SimpleImage < ApplicationRecord
 
   scope :in_component, ->(v) { where(biovision_component: v) }
   scope :filtered, ->(v) { where('image ilike ? or caption ilike ?', "%#{v}%", "%#{v}%") unless v.blank? }
-  scope :list_for_administration, -> { order('image asc') }
+  scope :list_for_administration, -> { order(:image) }
 
-  def self.entity_parameters(*)
+  # @param [String] input
+  def self.[](input)
+    case input
+    when /\A\h{8}-\h{4}-4\h{3}-[89ab]\h{3}-\h{12}\Z/i
+      find_by(uuid: input)
+    when /\A[a-f0-9]{64}\z/i
+      key = "data->>'#{ORIGINAL_CHECKSUM}'"
+      find_by(checksum: input) || find_by("#{key} = ?", input)
+    end
+  end
+
+  def self.entity_parameters
     %i[caption image image_alt_text source_link source_name]
   end
 
+  def self.json_attributes
+    %i[caption image_alt_text source_link source_name]
+  end
+
   def name
     File.basename(image.path)
   end
@@ -58,4 +77,12 @@ class SimpleImage < ApplicationRecord
   def image_slug
     "#{uuid[0..2]}/#{uuid[3..5]}/#{uuid}"
   end
+
+  private
+
+  def calculate_checksum
+    return if image&.path.blank?
+
+    self.checksum = Digest::SHA256.file(image.path).hexdigest
+  end
 end

data/app/models/simple_image_tag.rb

@@ -9,22 +9,7 @@
 #   updated_at [DateTime]
 class SimpleImageTag < ApplicationRecord
   include Checkable
-  NAME_LIMIT = 100
+  include SimpleTag
 
   has_many :simple_image_tag_images, dependent: :delete_all
-
-  before_validation :normalize_name
-  validates_uniqueness_of :name, case_sensitive: false
-
-  scope :list_for_administration, -> { order('name asc') }
-
-  def self.entity_parameters(*)
-    %i[name]
-  end
-
-  private
-
-  def normalize_name
-    self.name = name.to_s[0..NAME_LIMIT]
-  end
 end

data/app/models/token.rb

@@ -45,11 +45,11 @@ class Token < ApplicationRecord
     list_for_owner(user).page(page)
   end
 
-  def self.entity_parameters(*)
+  def self.entity_parameters
     %i[active]
   end
 
-  def self.creation_parameters(*)
+  def self.creation_parameters
     entity_parameters + %i[user_id]
   end
 
@@ -83,6 +83,10 @@ class Token < ApplicationRecord
     "[#{id}] #{user.profile_name}"
   end
 
+  def text_for_link
+    name
+  end
+
   # @param [User] user
   def editable_by?(user)
     return true if owned_by?(user)

data/app/models/uploaded_file.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+# Uploaded file
+#
+# Attributes:
+#   attachment [SimpleFileUploader]
+#   agent_id [Agent], optional
+#   biovision_component_id [BiovisionComponent]
+#   checksum [String]
+#   created_at [DateTime]
+#   data [jsonb]
+#   description [String], optional
+#   ip_address_id [IpAddress], optional
+#   object_count [Integer]
+#   updated_at [DateTime]
+#   user_id [User], optional
+#   uuid [uuid]
+class UploadedFile < ApplicationRecord
+  include Checkable
+  include HasOwner
+  include HasTrack
+  include HasUuid
+
+  META_LIMIT = 255
+
+  mount_uploader :attachment, SimpleFileUploader
+
+  belongs_to :agent, optional: true
+  belongs_to :biovision_component
+  belongs_to :user, optional: true
+  has_many :uploaded_file_tag_files, dependent: :destroy
+  has_many :uploaded_file_tags, through: :uploaded_file_tag_files
+
+  before_save :calculate_checksum
+
+  validates_presence_of :attachment
+  validates_length_of :description, maximum: META_LIMIT
+
+  scope :in_component, ->(v) { where(biovision_component: v) }
+  scope :filtered, ->(v) { where('description ilike ? or attachment ilike ?', "%#{v}%", "%#{v}%") unless v.blank? }
+  scope :list_for_administration, -> { order('attachment asc') }
+
+  def self.entity_parameters
+    %i[attachment description]
+  end
+
+  def name
+    File.basename(attachment.path)
+  end
+
+  def file_size
+    File.size(attachment.path)
+  end
+
+  private
+
+  def calculate_checksum
+    return if attachment&.path.blank?
+
+    self.checksum = Digest::SHA256.file(attachment.path).hexdigest
+  end
+end

data/app/models/uploaded_file_tag.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Tag for uploaded file
+#
+# Attributes:
+#   created_at [DateTime]
+#   name [string]
+#   uploaded_files_count [integer]
+#   updated_at [DateTime]
+class UploadedFileTag < ApplicationRecord
+  include Checkable
+  include SimpleTag
+
+  has_many :uploaded_file_tag_files, dependent: :delete_all
+end

data/app/models/uploaded_file_tag_file.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Link between simple image and tag
+#
+# Attributes:
+#   uploaded_file_id [UploadedFile]
+#   uploaded_file_tag_id [UploadedFileTag]
+class UploadedFileTagFile < ApplicationRecord
+  belongs_to :uploaded_file
+  belongs_to :uploaded_file_tag, counter_cache: :uploaded_files_count
+
+  validates_uniqueness_of :uploaded_file_tag_id, scope: :uploaded_file_id
+end

data/app/models/user.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # User
-# 
+#
 # Attributes:
 #   agent_id [Agent], optional
 #   allow_mail [boolean]
@@ -20,14 +20,14 @@
 #   last_seen [datetime], optional
 #   notice [string], optional
 #   password_digest [string]
+#   phone [string], optional
 #   phone_confirmed [boolean]
 #   primary_id [User], optional
 #   profile [Jsonb]
+#   referral_link [string]
 #   screen_name [string]
 #   slug [string]
 #   super_user [boolean]
-#   phone [string], optional
-#   referral_link [string]
 #   updated_at [DateTime]
 #   uuid [uuid]
 class User < ApplicationRecord
@@ -60,6 +60,8 @@ class User < ApplicationRecord
   has_many :foreign_users, dependent: :delete_all if Gem.loaded_specs.key?('biovision-oauth')
   has_many :login_attempts, dependent: :delete_all
   has_many :user_languages, dependent: :delete_all
+  has_many :user_roles, dependent: :destroy
+  has_many :user_groups, dependent: :destroy
 
   after_initialize :prepare_referral_link
 
@@ -71,7 +73,6 @@ class User < ApplicationRecord
     Biovision::Components::UsersComponent[entity].validate
   end
 
-  validates_acceptance_of :consent
   validates :screen_name, presence: true, uniqueness: { case_sensitive: false }
   validates :email, uniqueness: { case_sensitive: false }, allow_nil: true
   validates :phone, uniqueness: { case_sensitive: false }, allow_nil: true
@@ -82,6 +83,7 @@ class User < ApplicationRecord
   scope :email_like, ->(v) { where('email ilike ?', "%#{v}%") unless v.blank? }
   scope :with_email, ->(v) { where('lower(email) = lower(?)', v.to_s) }
   scope :list_for_administration, -> { order('id desc') }
+  scope :search, ->(q) { where('screen_name ilike ?', "%#{q}%") unless q.blank? }
 
   def self.[](login)
     find_by(slug: login) || find_by_contact(login)
@@ -93,7 +95,7 @@ class User < ApplicationRecord
   end
 
   def self.profile_parameters
-    %i[image allow_mail birthday consent]
+    %i[image allow_mail birthday]
   end
 
   def self.sensitive_parameters
@@ -110,12 +112,12 @@ class User < ApplicationRecord
   end
 
   # Parameters for registration
-  def self.new_profile_parameters(*)
+  def self.new_profile_parameters
     profile_parameters + sensitive_parameters + %i[screen_name]
   end
 
   # Administrative parameters
-  def self.entity_parameters(*)
+  def self.entity_parameters
     flags = %i[banned bot email_confirmed phone_confirmed]
 
     new_profile_parameters + flags + %i[notice screen_name slug]
@@ -131,9 +133,22 @@ class User < ApplicationRecord
   def role?(role_name)
     return true if super_user?
 
-    parts = role_name.split('.')
-    handler = Biovision::Components::BaseComponent.handler(parts.shift, self)
-    handler.role?(parts.join)
+    role = Role[role_name]
+    role_ids.include?(role&.id)
+  end
+
+  def role_ids
+    Array(data[Role::CACHE_KEY]).map(&:to_i)
+  end
+
+  # @param [Role] role
+  def add_role(role)
+    role&.add_user(self)
+  end
+
+  # @param [Role] role
+  def remove_role(role)
+    role&.remove_user(self)
   end
 
   # Name to be shown as profile
@@ -191,6 +206,16 @@ class User < ApplicationRecord
     "/u/#{CGI.escape(key)}"
   end
 
+  def age
+    return if birthday.blank?
+
+    now = Time.now.utc.to_date
+    next_month = now.month > birthday.month
+    next_day = (now.month == birthday.month && now.day >= birthday.day)
+    delta = next_month || next_day ? 0 : 1
+    now.year - birthday.year - delta
+  end
+
   private
 
   def prepare_referral_link

data/app/models/user_role.rb

@@ -4,7 +4,6 @@
 #
 # Attributes:
 #   created_at [DateTime]
-#   inclusive [Boolean]
 #   role_id [Role]
 #   updated_at [DateTime]
 #   user_id [User]

data/app/uploaders/simple_file_uploader.rb

@@ -2,13 +2,9 @@
 
 # Simple file uploader without any processing
 class SimpleFileUploader < CarrierWave::Uploader::Base
-  storage :file
-
-  def store_dir
-    slug = "#{model.id / 100}/#{model.id}"
+  include Uploaders::PathSlug
 
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{slug}"
-  end
+  storage :file
 
   def extension_blacklist
     %w[

data/app/uploaders/simple_image_uploader.rb

@@ -2,21 +2,18 @@
 
 # Uploader for universal simple images
 class SimpleImageUploader < CarrierWave::Uploader::Base
+  include Uploaders::PathSlug
   include CarrierWave::ImageOptim
   include CarrierWave::MiniMagick
 
   storage :file
 
-  def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{path_slug}"
-  end
-
   def default_url(*)
     ActionController::Base.helpers.asset_path('biovision/placeholders/1x1.svg')
   end
 
   process :auto_orient
-  process optimize: [{ jpegoptim: true, optipng: true, svgo: true }]
+  process optimize: [{ jpegoptim: true, optipng: true, svgo: true }], if: :optimize_images?
 
   def auto_orient
     return unless raster?
@@ -50,10 +47,8 @@ class SimpleImageUploader < CarrierWave::Uploader::Base
     resize_to_fit(48, 48)
   end
 
-  # Add a white list of extensions which are allowed to be uploaded.
-  # For images you might use something like this:
-  def extension_whitelist
-    %w[jpg jpeg png svg svgz]
+  def extension_allowlist
+    [/jpe?g/, 'png', /svgz?/]
   end
 
   # Text for image alt attribute
@@ -74,6 +69,12 @@ class SimpleImageUploader < CarrierWave::Uploader::Base
     !new_file.extension.match?(/svgz?\z/i)
   end
 
+  def optimize_images?(*)
+    return false unless Rails.application.config.respond_to? :optimize_images
+
+    Rails.application.config.optimize_images
+  end
+
   def raster?
     !File.extname(path).match?(/\.svgz?\z/i)
   end
@@ -101,16 +102,4 @@ class SimpleImageUploader < CarrierWave::Uploader::Base
   def hd_url
     raster? ? hd.url : url
   end
-
-  private
-
-  def path_slug
-    if model.respond_to?(:uuid)
-      uuid = model&.uuid.to_s
-      "#{uuid[0..2]}/#{uuid[3..5]}/#{uuid[6..7]}/#{uuid}"
-    else
-      id = model&.id.to_i
-      "#{id / 1000}/#{id}"
-    end
-  end
 end

data/app/uploaders/uploaders/path_slug.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Uploaders
+  # Using UUID in file path when available
+  module PathSlug
+    def store_dir
+      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{path_slug}"
+    end
+
+    private
+
+    def path_slug
+      if model.respond_to?(:uuid)
+        uuid = model.uuid.to_s
+        "#{uuid[0..2]}/#{uuid[3..5]}/#{uuid[6..7]}/#{uuid}"
+      else
+        id = model&.id.to_i
+        "#{id / 1000}/#{id}"
+      end
+    end
+  end
+end

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

@@ -7,5 +7,5 @@
 <article>
   <h1><%= t('.heading') %></h1>
   
-  <%= render partial: 'shared/admin/list', locals: { collection: @collection } %>
+  <%= entity_list(@collection) %>
 </article>

data/app/views/admin/biovision_components/_nav_item.html.erb

@@ -0,0 +1,6 @@
+<div>
+  <%= link_to t('.text'), admin_biovision_components_path %>
+</div>
+<div class="description">
+  <%= t('.description') %>
+</div>

data/app/views/admin/biovision_components/entity/_in_list.html.erb

@@ -0,0 +1,12 @@
+<div class="data">
+  <div><%= admin_entity_link(entity) %></div>
+  <div class="info"><%= entity.slug %></div>
+
+  <% if local_assigns[:handler]&.permit?('edit', entity) %>
+    <%= entity_toggle(entity) %>
+
+    <div class="entity-actions">
+      <%= entity_priority_icons(entity) %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,11 @@
+<% content_for :meta_title, t('.title') %>
+<% content_for :breadcrumbs do %>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <span><%= t('admin.biovision_components.nav_item.text') %></span>
+<% end %>
+
+<article>
+  <h1><%= t('.heading') %></h1>
+
+  <%= entity_list(@collection, with_priority: true) %>
+</article>

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

@@ -1,7 +1,7 @@
 <% collection.each do |component| %>
   <%
     handler = Biovision::Components::BaseComponent.handler(component, current_user)
-    next if handler.component.nil? || !handler.permit?
+    next if handler.component.nil? || !handler.permit?('view')
   %>
   <%=
     render(

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

@@ -1,35 +1,45 @@
 <nav class="biovision-component-nav">
-  <% if handler.permit?('settings') %>
-    <% if handler.use_parameters? || handler.component.settings.any? %>
-      <%=
-        link_to(
-            t('admin.components.settings.nav_text'),
-            admin_component_settings_path(slug: handler.slug),
-            class: 'settings'
-        )
-      %>
-    <% end %>
-  <% end %>
-
-  <% if handler.administrator? %>
+  <% if handler.manage_settings? && handler.permit?('settings.view') %>
     <%=
       link_to(
-          t('admin.components.privileges.nav_text'),
-          admin_component_privileges_path(slug: handler.slug),
-          class: 'privileges'
+        t('admin.components.settings.nav_text'),
+        admin_component_settings_path(slug: handler.slug),
+        class: 'settings'
       )
     %>
   <% end %>
 
   <% prefix = 'admin/components/links/' %>
-  <% if lookup_context.exists?("#{prefix}_#{handler.slug}") %>
-    <ul class="biovision-component-links">
+  <ul class="biovision-component-links">
+    <% if lookup_context.exists?("#{prefix}_#{handler.slug}") %>
+      <%=
+        render(
+          partial: "#{prefix}#{handler.slug}",
+          locals: { handler: handler }
+        )
+      %>
+    <% else %>
+      <% handler.administrative_parts.each do |part| %>
+        <% context = "admin/#{part}/_nav_item" %>
+        <% if handler.permit?("#{part}.view") && lookup_context.exists?(context) %>
+          <li>
+            <%=
+              render(
+                partial: "admin/#{part}/nav_item",
+                locals: { handler: handler }
+              )
+            %>
+          </li>
+        <% end %>
+      <% end %>
+    <% end %>
+    <% if lookup_context.exists?("admin/components/links/extra/_#{handler.slug}") %>
       <%=
         render(
-            partial: "#{prefix}#{handler.slug}",
-            locals: { handler: handler }
+          partial: "admin/components/links/extra/#{handler.slug}",
+          locals: { handler: handler }
         )
       %>
-    </ul>
   <% end %>
+  </ul>
 </nav>

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

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

data/app/views/admin/components/settings/_settings.html.erb

@@ -1,4 +1,4 @@
-<% if settings.any? %>
+<% if keys.any? %>
   <section class="biovision-component-settings">
     <h2><%= t('.heading') %></h2>
 
@@ -10,14 +10,14 @@
       ) do
     %>
       <div class="fields">
-        <% settings.each do |key, value| %>
+        <% keys.each do |key| %>
           <%=
             render(
                 partial: 'admin/components/settings/setting',
                 locals: {
                     slug: handler.slug,
                     key: key,
-                    value: value
+                    value: settings[key.to_s]
                 }
             )
           %>