biovision 0.4.210512.0 → 0.12.211124.0

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

@@ -206,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,15 +2,12 @@
 
 # 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
@@ -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
@@ -107,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/links/_base.html.erb

@@ -1 +1 @@
-<li>:)</li>
+<li><%= render 'admin/biovision_components/nav_item' %></li>

data/app/views/admin/dynamic_blocks/_form.html.erb

@@ -4,7 +4,7 @@
   <dl class="fields">
     <%= render partial: 'shared/forms/text_field', locals: { f: f, field: :slug } %>
     <%= render partial: 'shared/forms/text_area', locals: { f: f, field: :body } %>
-    <%= render partial: 'shared/forms/entity_flags', locals: { f: f } %>
+    <%= entity_form_block(f, :entity_flags) %>
   </dl>
 
   <%= render 'shared/forms/state_container' %>

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

@@ -1,7 +1,7 @@
 <div class="data">
   <div><%= admin_entity_link(entity, handler: local_assigns[:handler]) %></div>
 
-  <%= render(partial: 'shared/admin/toggle', locals: { entity: entity }) %>
+  <%= entity_toggle(entity) %>
 
   <% if local_assigns[:handler]&.permit?('edit', entity) %>
     <div class="entity-actions">

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

@@ -13,5 +13,5 @@
     </nav>
   <% end %>
 
-  <%= render partial: 'shared/admin/list', locals: { collection: @collection } %>
+  <%= entity_list(@collection) %>
 </article>

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

@@ -16,10 +16,10 @@
   <% end %>
 
   <dl class="fields">
-    <%= render partial: 'shared/entity/slug', locals: { entity: @entity } %>
+    <%= entity_partial_block(@entity, :slug) %>
     <%= render partial: 'shared/entity/text_field', locals: { entity: @entity, field: :body } %>
-    <%= render partial: 'shared/entity/timestamps', locals: { entity: @entity } %>
+    <%= entity_partial_block(@entity, :timestamps) %>
   </dl>
 
-  <%= render(partial: 'shared/admin/toggle', locals: { entity: @entity }) %>
+  <%= entity_toggle(@entity) %>
 </article>

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

@@ -5,7 +5,7 @@
     <div class="info"><%= entity.name %></div>
   <% end %>
 
-  <%= render(partial: 'shared/admin/toggle', locals: { entity: entity }) %>
+  <%= entity_toggle(entity) %>
 
   <div class="entity-actions">
     <%= world_icon(entity) unless entity.url.blank? %>

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

@@ -13,10 +13,5 @@
     </nav>
   <% end %>
 
-  <%=
-    render(
-      partial: 'shared/admin/list',
-      locals: { collection: @collection, handler: component_handler }
-    )
-  %>
+  <%= entity_list(@collection) %>
 </article>

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

@@ -24,5 +24,5 @@
     <%= render partial: 'shared/entity/timestamps', locals: { entity: @entity } %>
   </dl>
 
-  <%= render(partial: 'shared/admin/toggle', locals: { entity: @entity }) %>
+  <%= entity_toggle(@entity) %>
 </article>

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

@@ -8,7 +8,7 @@
       render(
         partial: 'admin/components/list',
         locals: {
-          collection: BiovisionComponent.list_for_administration
+          collection: BiovisionComponent.active.list_for_administration
         }
       )
     %>

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

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

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

@@ -13,10 +13,5 @@
     </nav>
   <% end %>
 
-  <%=
-    render(
-      partial: 'shared/admin/list',
-      locals: { collection: @collection, handler: component_handler }
-    )
-  %>
+  <%= entity_list(@collection) %>
 </article>

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

@@ -16,7 +16,7 @@
     <% end %>
   </div>
 
-  <%= render(partial: 'shared/admin/toggle', locals: { entity: entity }) %>
+  <%= entity_toggle(entity) %>
 
   <% if local_assigns[:handler]&.permit?('edit', entity) %>
     <div class="entity-actions">

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

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

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

@@ -22,5 +22,5 @@
     <%= render partial: 'shared/entity/track', locals: { entity: @entity } %>
   </dl>
 
-  <%= render(partial: 'shared/admin/toggle', locals: { entity: @entity }) %>
+  <%= entity_toggle(@entity) %>
 </article>

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

@@ -29,12 +29,10 @@
     )
   %>
 
-  <%= render(partial: 'shared/admin/toggle', locals: { entity: entity }) %>
+  <%= entity_toggle(entity) %>
 
   <div class="entity-actions">
-    <% if local_assigns[:handler] %>
-      <%= edit_icon(entity) if handler.permit?('edit', entity) %>
-    <% end %>
+    <%= edit_icon(entity) if local_assigns[:handler]&.permit?('edit', entity) %>
     <%= world_icon(entity) %>
   </div>
 </div>

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

@@ -20,5 +20,5 @@
     )
   %>
 
-  <%= render partial: 'shared/admin/list', locals: { collection: @collection, handler: component_handler } %>
+  <%= entity_list(@collection) %>
 </article>

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

@@ -18,8 +18,8 @@
     <%= destroy_icon(@entity) if component_handler.permit?('edit', @entity) %>
   </nav>
 
-  <% if current_user.super_user? %>
-    <nav>
+  <nav>
+    <% if current_user.super_user? %>
       <%=
         link_to(
           "#{t('admin.users.roles.nav_text')} (#{@entity.role_ids.count})",
@@ -27,27 +27,33 @@
           class: 'button button-ghost'
         )
       %>
-    </nav>
-  <% end %>
+    <% end %>
+    <% if component_handler.permit?('log_in', @entity) && @entity != current_user && !@entity.super_user? %>
+      <%=
+        link_to(
+          t('admin.users.authenticate.nav_text'),
+          authenticate_admin_user_path(id: @entity.id),
+          method: :post,
+          class: 'button button-secondary'
+        )
+      %>
+    <% end %>
+  </nav>
 
   <%= render partial: 'admin/users/entity/fields', locals: { entity: @entity } %>
 
-  <%=
-    render(
-      partial: 'shared/admin/toggle',
-      locals: { entity: @entity }
-    )
-  %>
+  <%= entity_toggle(@entity) %>
 
   <% prefix = 'admin/users/entity/components/' %>
   <% BiovisionComponent.list_for_administration.each do |component| %>
     <% if lookup_context.exists?("#{prefix}_#{component.slug}") %>
+      <% handler = Biovision::Components::BaseComponent.handler(component, @entity) %>
       <section>
-        <h2><%= component.name %></h2>
+        <h2><%= handler.name %></h2>
         <%=
           render(
             partial: "#{prefix}#{component.slug}",
-            locals: { user: @entity }
+            locals: { user: @entity, handler: handler }
           )
         %>
       </section>

data/app/views/admin/widgets/_filters.html.erb

@@ -3,8 +3,13 @@
     <legend><%= t('.heading') %></legend>
     <div class="list">
       <% fields.each do |key, type| %>
-        <% if type == :flag %>
-          <%= render partial: 'admin/widgets/filters/flag', locals: { f: f, key: key, scope: scope, value: filter[key] } %>
+        <% if lookup_context.exists?("admin/widgets/filters/_#{type}") %>
+          <%=
+            render(
+              partial: "admin/widgets/filters/#{type}",
+              locals: { f: f, key: key, scope: scope, value: filter[key] }
+            )
+          %>
         <% end %>
       <% end %>
     </div>

data/app/views/admin/widgets/filters/_text.html.erb

@@ -0,0 +1,7 @@
+<% placeholder = t("filters.#{scope}.#{key}", default: key.to_s) %>
+<div class="text">
+  <label class="floating-label">
+    <%= f.text_field(key, value: value, class: 'input-text', placeholder: placeholder) %>
+    <span><%= placeholder %></span>
+  </label>
+</div>

data/app/views/errors/error.html.erb

@@ -0,0 +1 @@
+<div class="message-box error"><%= @message %></div>

data/app/views/layouts/admin/_header.html.erb

@@ -2,8 +2,13 @@
   <%= render 'layouts/admin/header/logo' %>
   <nav>
     <% unless current_user.nil? %>
-      <ul>
-        <li><%= current_user.screen_name %></li>
+      <ul class="header-authentication">
+        <li>
+          <a href="<%= my_path %>" class="current-user">
+            <span class="avatar"><%= simple_image_tiny(current_user) %></span>
+            <span><%= current_user.screen_name %></span>
+          </a>
+        </li>
         <li>
           <%=
             link_to(

data/app/views/layouts/application/header/_authentication.html.erb

@@ -2,7 +2,10 @@
   <% if current_user.nil? %>
     <%= link_to(image_tag('biovision/icons/log_in.svg', alt: t(:log_in)), login_path) %>
   <% else %>
-    <%= link_to(simple_image_tiny(current_user), my_path, class: 'avatar') %>
+    <a href="<%= my_path %>" class="current-user">
+      <span class="avatar"><%= simple_image_tiny(current_user) %></span>
+      <span><%= current_user.screen_name %></span>
+    </a>
     <%=
       link_to(
           image_tag('biovision/icons/log_out.svg', alt: t(:log_out)),

data/app/views/my/components/index.html.erb

@@ -0,0 +1,25 @@
+<% content_for :meta_title, t('.title') %>
+<% content_for :breadcrumbs do %>
+  <%= my_home_link %>
+  <span><%= t('.nav_text') %></span>
+<% end %>
+
+<article>
+  <div class="content-wrapper">
+    <h1><%= t('.heading') %></h1>
+  </div>
+
+  <% prefix = 'my/components/' %>
+  <% @collection.each do |component| %>
+    <% handler = Biovision::Components::BaseComponent.handler(component, current_user) %>
+    <% next unless handler&.permit?('default') %>
+    <% if lookup_context.exists?("#{prefix}#{component.slug}/_dashboard") %>
+      <%=
+        render(
+          partial: "#{prefix}#{component.slug}/dashboard",
+          locals: { handler: handler }
+        )
+      %>
+    <% end %>
+  <% end %>
+</article>

data/app/views/my/components/show.html.erb

@@ -0,0 +1,21 @@
+<% content_for :meta_title, t('.title', component: @handler.name) %>
+<% content_for :breadcrumbs do %>
+  <%= link_to(t('my.components.index.nav_text'), my_dashboard_path) %>
+  <span><%= @handler.name %></span>
+<% end %>
+
+<% prefix = "my/components/#{@handler.slug}/" %>
+<% if lookup_context.exists?("#{prefix}_section") %>
+  <%=
+    render(
+      partial: "#{prefix}#{component.slug}",
+      locals: { handler: @handler }
+    )
+  %>
+<% else %>
+  <article class="content-wrapper">
+    <h1><%= @handler.name %></h1>
+
+    <div class="message-box warning"><%= t('.no_view') %></div>
+  </article>
+<% end %>

data/app/views/my/index/_cards.html.erb

@@ -0,0 +1,15 @@
+<section class="my__component-cards">
+  <% prefix = 'my/components/' %>
+  <% BiovisionComponent.list_for_user.each do |component| %>
+    <% handler = Biovision::Components::BaseComponent.handler(component, current_user) %>
+    <% next unless handler&.permit?('default') %>
+    <% if lookup_context.exists?("#{prefix}_#{component.slug}") %>
+      <%=
+        render(
+          partial: "#{prefix}#{component.slug}",
+          locals: { user: @entity, handler: handler }
+        )
+      %>
+    <% end %>
+  <% end %>
+</section>

data/app/views/my/index/_email.html.erb

@@ -0,0 +1,14 @@
+<% if handler.needs_email_confirmation? %>
+  <div class="message-box warning">
+    <p><%= t('.email_is_not_confirmed') %></p>
+    <p>
+      <%=
+        link_to(
+          t('my.confirmations.show.nav_text'),
+          my_confirmation_path,
+          class: 'button button-secondary'
+        )
+      %>
+    </p>
+  </div>
+<% end %>

data/app/views/my/index/_navigation.html.erb

@@ -0,0 +1,33 @@
+<nav>
+  <%=
+    link_to(
+      t('my.profiles.show.nav_text'),
+      my_profile_path,
+      class: 'button button-ghost'
+    )
+  %>
+  <%=
+    link_to(
+      t('my.components.index.nav_text'),
+      my_dashboard_path,
+      class: 'button button-ghost'
+    )
+  %>
+  <% if current_user.role?('base.admin') %>
+    <%=
+      link_to(
+        t('admin.index.index.nav_text'),
+        admin_path,
+        class: 'button button-secondary'
+      )
+    %>
+  <% end %>
+  <%=
+    link_to(
+      t(:log_out),
+      logout_path,
+      class: 'button button-secondary',
+      method: :delete
+    )
+  %>
+</nav>

data/app/views/my/index/index.html.erb

@@ -6,54 +6,7 @@
 <article class="content-wrapper">
   <h1><%= t('.heading') %></h1>
 
-  <% if component_handler.needs_email_confirmation? %>
-    <div class="message-box warning">
-      <p><%= t('.email_is_not_confirmed') %></p>
-      <p>
-        <%=
-          link_to(
-            t('my.confirmations.show.nav_text'),
-            my_confirmation_path,
-            class: 'button button-secondary'
-          )
-        %>
-      </p>
-    </div>
-  <% end %>
-
-  <nav>
-    <%=
-      link_to(
-        t('my.profiles.show.nav_text'),
-        my_profile_path,
-        class: 'button button-ghost'
-      )
-    %>
-    <% if current_user.role?('base.admin') %>
-      <%=
-        link_to(
-          t('admin.index.index.nav_text'),
-          admin_path,
-          class: 'button button-secondary'
-        )
-      %>
-    <% end %>
-  </nav>
-
-  <% prefix = 'my/components/' %>
-  <% BiovisionComponent.list_for_user.each do |component| %>
-    <% handler = Biovision::Components::BaseComponent.handler(component, current_user) %>
-    <% next unless handler&.permit?('default') %>
-    <% if lookup_context.exists?("#{prefix}_#{component.slug}") %>
-      <section class="my__component">
-        <h2><%= handler.name %></h2>
-        <%=
-          render(
-            partial: "#{prefix}#{component.slug}",
-            locals: { user: @entity, handler: handler }
-          )
-        %>
-      </section>
-    <% end %>
-  <% end %>
+  <%= render partial: 'my/index/email', locals: { handler: component_handler } %>
+  <%= render 'my/index/navigation' %>
+  <%= render 'my/index/cards' %>
 </article>