biovision 0.3.210504.0 → 0.4.210512.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a682ae1c69e46f123d36b657ad1ebc715b5dc5bce649cf60d84c59fcc3999655
-  data.tar.gz: 1b4414bb33c19ad803dd256fdcc7a60ca3c4d069400426648350664e3ace6345
+  metadata.gz: 55cbc88385aa6b6d41aa35620a597b0b410fa99d6681c69c9302ba04a09d696f
+  data.tar.gz: 5025b158f1afa936b8a6c9b872245379cd79a97ef4f502b180e9666121c6fdc4
 SHA512:
-  metadata.gz: 6a4f2e672b7234fb8b7c928d5014feec672a5fdbfe534c010edad2e331d4f630d253b10f697429fff8b5454f63db1905e317ea3ca93f1bc9eaa7a02064f14c98
-  data.tar.gz: 674321c7eaa0df820c0df3b07b8adbc89e3391e81412845022757a6a8311670f1f2b10f0106d963c927b206df2409356719299c488b45e1cb3e5ba94a6f2c6ed
+  metadata.gz: 1a7e516295a56d2a48fba52ab0775f461ab4990b3ac5df6f137eb232b57be5c2cea4051ffc88f38d562f50dbe20a1a7b869c3dc38f3ac385a91de427bdf62802
+  data.tar.gz: 1c688393349578d1ff591574bb12becfa0d4dde7fe7a334f9cfa2e3a9d1c59607767042ff55f16a02e77cef2a022c94aed8729467f5865c2afa13fc77a940acf

data/README.md

@@ -31,7 +31,7 @@
 ```ruby
 gem 'dotenv-rails'
 
-gem 'autoprefixer-rails', group: :production
+# gem 'autoprefixer-rails', group: :production
 
 gem 'biovision', git: 'https://github.com/Biovision/biovision.git'
 # gem 'biovision', path: '/Users/maxim/Projects/Biovision/gems/biovision'
@@ -237,7 +237,7 @@ invoke :'nvm:load'
 namespace :nvm do
   task :load do
     command 'echo "-----> Loading nvm"'
-    command %{source ~/.nvm/nvm.sh}
+    command %(source ~/.nvm/nvm.sh)
     command 'echo "-----> Now using nvm v.`nvm --version`"'
   end
 end

data/app/assets/stylesheets/biovision/themes/default_theme/components/users.scss

@@ -1,2 +1,3 @@
 @import "biovision/themes/default_theme/components/users/form_tabs";
 @import "biovision/themes/default_theme/components/users/profile";
+@import "biovision/themes/default_theme/components/users/dashboard";

data/app/assets/stylesheets/biovision/themes/default_theme/components/users/dashboard.scss

@@ -0,0 +1,4 @@
+.my__component {
+  border-top: var(--border-secondary);
+  margin: var(--spacer-m) auto;
+}

data/app/helpers/biovision_helper.rb

@@ -3,58 +3,42 @@
 # Helper methods for common cases
 module BiovisionHelper
   # @param [ApplicationRecord] entity
-  # @param [String] text
+  # @param [Biovision::Components::BaseComponent] handler
   # @param [Hash] options
-  def admin_entity_link(entity, text = nil, options = {})
+  def admin_entity_link(entity, handler: nil, **options)
     return '∅' if entity.nil?
 
-    if text.nil?
-      text = entity.respond_to?(:text_for_link) ? entity.text_for_link : entity.id
-    end
-
-    href = if entity.respond_to?(:admin_url)
-             entity.admin_url
-           else
-             "/admin/#{entity.class.table_name}/#{entity.id}"
-           end
+    component = (handler || Biovision::Components::BaseComponent[])
+    text = options.delete(:text) { component.text_for_link(entity) }
 
-    link_to(text, href, options)
+    if handler.nil? || handler.permit?('view', entity)
+      href = component.entity_link(entity, :admin)
+      link_to(text, href, options)
+    else
+      text
+    end
   end
 
   # @param [ApplicationRecord] entity
-  # @param [String] text
   # @param [Hash] options
-  def my_entity_link(entity, text = nil, options = {})
+  def my_entity_link(entity, **options)
     return '∅' if entity.nil?
 
-    if text.nil?
-      text = entity.respond_to?(:text_for_link) ? entity.text_for_link : entity.id
-    end
-
-    href = if entity.respond_to?(:my_url)
-             entity.my_url
-           else
-             "/my/#{entity.class.table_name}/#{entity.id}"
-           end
+    handler = Biovision::Components::BaseComponent[]
+    text = options.delete(:text) { handler.text_for_link(entity) }
+    href = handler.entity_link(entity, :my)
 
     link_to(text, href, options)
   end
 
   # @param [ApplicationRecord] entity
-  # @param [String] text
   # @param [Hash] options
-  def entity_link(entity, text = nil, options = {})
+  def entity_link(entity, **options)
     return '' if entity.nil?
 
-    if text.nil?
-      text = entity.respond_to?(:text_for_link) ? entity.text_for_link : entity.id
-    end
-
-    href = if entity.respond_to?(:world_url)
-             entity.world_url
-           else
-             "/#{entity.class.table_name}/#{entity.id}"
-           end
+    handler = Biovision::Components::BaseComponent[]
+    text = options.delete(:text) { handler.text_for_link(entity) }
+    href = handler.entity_link(entity)
 
     link_to(text, href, options)
   end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Biovision
+  module Components
+    module Base
+      # Links for entities in context of current user
+      module EntityLinks
+        # @param [ApplicationRecord] entity
+        def text_for_link(entity)
+          entity.respond_to?(:text_for_link) ? entity.text_for_link : entity.id
+        end
+
+        # @param [ApplicationRecord] entity
+        # @param [Symbol|String] scope
+        def entity_link(entity, scope = '')
+          default = "#{scope}/#{entity.class.table_name}/#{entity.id}"
+          prefix = %i[admin my].include?(scope.to_sym) ? scope : 'world'
+          message = "#{prefix}_url".to_sym
+          entity.respond_to?(message) ? entity.send(message) : "/#{default}"
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ module Biovision
       extend Base::ComponentSettings
       include Base::ComponentPrivileges
       include Base::ComponentParameters
+      include Base::EntityLinks
 
       attr_reader :component, :slug, :name, :user, :user_link
 
@@ -53,12 +54,6 @@ module Biovision
         handler_name.safe_constantize || BaseComponent
       end
 
-      # Privilege names for using in biovision_component_user.data
-      # @deprecated use roles instead
-      def self.privilege_names
-        []
-      end
-
       # Model list for automatic role creation
       def self.dependent_models
         []

data/app/uploaders/simple_image_uploader.rb

@@ -16,7 +16,7 @@ class SimpleImageUploader < CarrierWave::Uploader::Base
   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?
@@ -74,6 +74,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

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

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

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

@@ -1,6 +1,6 @@
 <figure class="image"><%= simple_image_preview(entity) %></figure>
 <div class="data">
-  <div><%= admin_entity_link(entity) %></div>
+  <div><%= admin_entity_link(entity, handler: local_assigns[:handler]) %></div>
   <% unless entity.name.blank? %>
     <div class="info"><%= entity.name %></div>
   <% end %>
@@ -9,7 +9,7 @@
 
   <div class="entity-actions">
     <%= world_icon(entity) unless entity.url.blank? %>
-    <% if local_assigns[:handler] && handler.permit?('edit', entity) %>
+    <% if local_assigns[:handler]&.permit?('edit', entity) %>
       <%= edit_icon(entity) %>
       <%= destroy_icon(entity) %>
     <% end %>

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

@@ -1,6 +1,6 @@
 <figure class="image"><%= simple_image_preview(entity) %></figure>
 <div class="data">
-  <div><%= admin_entity_link(entity) %></div>
+  <div><%= admin_entity_link(entity, handler: local_assigns[:handler]) %></div>
   <% unless entity.name.blank? %>
     <div class="info"><%= entity.name %></div>
   <% end %>

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

@@ -1,9 +1,9 @@
 <div class="data">
-  <div><%= admin_entity_link(entity.dynamic_page) %></div>
+  <div><%= admin_entity_link(entity.dynamic_page, handler: local_assigns[:handler]) %></div>
   <div class="info"><%= entity.dynamic_page.url %></div>
   <div class="secondary info"><%= entity.dynamic_page.name %></div>
 
-  <% if local_assigns[:handler] && handler.permit?('edit', entity.navigation_group) %>
+  <% if local_assigns[:handler]&.permit?('edit', entity.navigation_group) %>
     <div class="entity-actions">
       <% url = page_priority_admin_navigation_group_path(id: entity.navigation_group_id, page_id: entity.id) %>
       <div class="priority-changer" data-url="<%= url %>">

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

@@ -1,11 +1,11 @@
 <div class="data">
-  <div><%= admin_entity_link(entity) %></div>
+  <div><%= admin_entity_link(entity, handler: local_assigns[:handler]) %></div>
   <div class="info"><%= entity.slug %></div>
   <div class="secondary info">
     <%= t(:page_count, count: entity.dynamic_pages_count) %>
   </div>
 
-  <% if local_assigns[:handler] && handler.permit?('edit', entity) %>
+  <% if local_assigns[:handler]&.permit?('edit', entity) %>
     <div class="entity-actions">
       <%= edit_icon(entity) %>
       <%= destroy_icon(entity) %>

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

@@ -1,6 +1,6 @@
 <figure class="image"><%= simple_image_preview(entity.user) %></figure>
 <div class="data">
-  <div><%= admin_entity_link(entity) %></div>
+  <div><%= admin_entity_link(entity, handler: local_assigns[:handler]) %></div>
   <div class="info">
     <% unless entity.last_used.nil? %>
       <div>
@@ -18,7 +18,7 @@
 
   <%= render(partial: 'shared/admin/toggle', locals: { entity: entity }) %>
 
-  <% if local_assigns[:handler] && handler.permit?('edit', entity) %>
+  <% if local_assigns[:handler]&.permit?('edit', entity) %>
     <div class="entity-actions">
       <%= edit_icon(entity) %>
       <%= destroy_icon(entity) %>

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

@@ -7,7 +7,7 @@
   <% unless entity.inviter_id.nil? %>
     <div>
       <dt><%= model.human_attribute_name(:inviter) %></dt>
-      <dd><%= admin_entity_link(entity.inviter) %></dd>
+      <dd><%= admin_entity_link(entity.inviter, handler: local_assigns[:handler]) %></dd>
     </div>
   <% end %>
 

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

@@ -1,6 +1,6 @@
 <figure class="image"><%= simple_image_preview(entity) %></figure>
 <div class="data">
-  <div><%= admin_entity_link(entity) %></div>
+  <div><%= admin_entity_link(entity, handler: local_assigns[:handler]) %></div>
   <% unless entity.notice.blank? %>
     <div><%= entity.notice %></div>
   <% end %>

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

@@ -1,6 +1,6 @@
 <figure class="image"><%= simple_image_preview(entity) %></figure>
 <div class="data">
-  <div><%= admin_entity_link(entity) %></div>
+  <div><%= admin_entity_link(entity, handler: local_assigns[:handler]) %></div>
   <% unless entity.notice.blank? %>
     <div><%= entity.notice %></div>
   <% end %>

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

@@ -2,7 +2,7 @@
 <% content_for :breadcrumbs do %>
   <%= admin_biovision_component_link(component_handler.component) %>
   <%= link_to(t('admin.users.nav_item.text'), admin_users_path) %>
-  <%= admin_entity_link(@entity) %>
+  <%= admin_entity_link(@entity, handler: component_handler) %>
   <span><%= t('.nav_text') %></span>
 <% end %>
 

data/app/views/application/unauthorized.html.erb

@@ -9,7 +9,10 @@
     <%=
       render(
         partial: 'components/users/form_tabs',
-        locals: { current: 'login' }
+        locals: {
+          current: 'login',
+          from: url_for
+        }
       )
     %>
   </div>

data/app/views/components/users/_login_form.html.erb

@@ -33,6 +33,7 @@
     </div>
   </div>
   <div class="actions">
+    <%= hidden_field_tag(:from, local_assigns[:from], id: nil) %>
     <%= button_tag t('.log_in'), class: 'button button-primary', name: nil %>
     <%=
       link_to(

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

@@ -45,8 +45,8 @@
     <% handler = Biovision::Components::BaseComponent.handler(component, current_user) %>
     <% next unless handler&.permit?('default') %>
     <% if lookup_context.exists?("#{prefix}_#{component.slug}") %>
-      <section>
-        <h2><%= component.name %></h2>
+      <section class="my__component">
+        <h2><%= handler.name %></h2>
         <%=
           render(
             partial: "#{prefix}#{component.slug}",

data/app/views/shared/entity/_linked_entity.html.erb

@@ -1,6 +1,6 @@
 <% unless entity.nil? %>
   <div>
     <dt><%= entity.class.model_name.human %></dt>
-    <dd><%= admin_entity_link(entity) %></dd>
+    <dd><%= admin_entity_link(entity, handler: local_assigns[:handler]) %></dd>
   </div>
 <% end %>

data/app/views/shared/entity/_parent.html.erb

@@ -1,6 +1,6 @@
 <% unless entity.parent.blank? %>
   <div>
     <dt><%= entity.class.human_attribute_name(:parent) %></dt>
-    <dd><%= admin_entity_link(entity.parent) %></dd>
+    <dd><%= admin_entity_link(entity.parent, handler: local_assigns[:handler]) %></dd>
   </div>
 <% end %>

data/app/views/shared/entity/edit.html.erb

@@ -6,7 +6,7 @@
 <% content_for :breadcrumbs do %>
   <%= admin_biovision_component_link(component_handler.component) %>
   <%= link_to(t("#{prefix}.nav_item.text"), "/#{controller_path}") %>
-  <%= admin_entity_link(@entity) %>
+  <%= admin_entity_link(@entity, handler: component_handler) %>
   <span><%= t('.nav_text') %></span>
 <% end %>
 

data/app/views/shared/forms/_field.html.erb

@@ -28,7 +28,7 @@
     <% when :date %>
       <%= f.date_field(field, options.merge(local_assigns[:options].to_h)) %>
     <% when :datetime %>
-      <%= f.datetime_field(field, options.merge(local_assigns[:options].to_h)) %>
+      <%= f.datetime_field(field, options.merge(local_assigns[:options].to_h).merge(step: 1)) %>
     <% when :url %>
       <%= f.url_field(field, options.merge(local_assigns[:options].to_h)) %>
     <% when :email %>

data/app/views/shared/forms/_text_area.html.erb

@@ -5,7 +5,7 @@
   options = {
       class: 'input-text',
       data: { check: field }.merge(local_assigns[:data].to_h),
-      manlength: length_options[:maximum],
+      maxlength: length_options[:maximum],
       minlength: length_options[:minimum],
       required: validators.select { |v| v.kind == :presence }.any?,
       rows: 10,

data/app/views/shared/forms/_text_field.html.erb

@@ -5,7 +5,7 @@
   options = {
       class: 'input-text',
       data: { check: field }.merge(local_assigns[:data].to_h),
-      manlength: length_options[:maximum],
+      maxlength: length_options[:maximum],
       minlength: length_options[:minimum],
       required: validators.select { |v| v.kind == :presence }.any?,
       size: nil

data/lib/biovision/base_methods.rb

@@ -11,7 +11,7 @@ module Biovision
       helper_method :component_handler
       helper_method :current_page, :param_from_request
       helper_method :current_user, :current_language
-      helper_method :content_component
+      helper_method :content_component, :users_component
     end
 
     # Get current page number from request
@@ -53,6 +53,13 @@ module Biovision
       @content_component ||= Biovision::Components::ContentComponent[current_user]
     end
 
+    # Get users component handler
+    #
+    # @return [Biovision::Components::UsersComponent]
+    def users_component
+      @users_component ||= Biovision::Components::UsersComponent[current_user]
+    end
+
     # @return [Agent]
     def agent
       @agent ||= Agent[request.user_agent || 'n/a']

data/lib/biovision/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision
 version: !ruby/object:Gem::Version
-  version: 0.3.210504.0
+  version: 0.4.210512.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -265,6 +265,7 @@ files:
 - app/assets/stylesheets/biovision/themes/default_theme.scss
 - app/assets/stylesheets/biovision/themes/default_theme/components.scss
 - app/assets/stylesheets/biovision/themes/default_theme/components/users.scss
+- app/assets/stylesheets/biovision/themes/default_theme/components/users/dashboard.scss
 - app/assets/stylesheets/biovision/themes/default_theme/components/users/form_tabs.scss
 - app/assets/stylesheets/biovision/themes/default_theme/components/users/profile.scss
 - app/assets/stylesheets/biovision/themes/default_theme/layout.scss
@@ -305,6 +306,7 @@ 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/entity_links.rb
 - app/lib/biovision/components/base_component.rb
 - app/lib/biovision/components/contact_component.rb
 - app/lib/biovision/components/content_component.rb
@@ -477,6 +479,7 @@ files:
 - app/views/my/profiles/form/_sensitive_parameters.html.erb
 - app/views/my/profiles/new.html.erb
 - app/views/my/profiles/show.html.erb
+- app/views/my/recoveries/show.html.erb
 - app/views/shared/_breadcrumbs.html.erb
 - app/views/shared/_cookie_notification.html.erb
 - app/views/shared/_flash_messages.html.erb
@@ -572,7 +575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: Biovision CMS gem