biovision 0.4.210512.0 → 0.12.211124.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55cbc88385aa6b6d41aa35620a597b0b410fa99d6681c69c9302ba04a09d696f
-  data.tar.gz: 5025b158f1afa936b8a6c9b872245379cd79a97ef4f502b180e9666121c6fdc4
+  metadata.gz: 15e12d204f5f1ae12b72abc285f96f67db06d5b8789a015e3a649e1bba06b263
+  data.tar.gz: 75b5e459c5f0b3a1f938cf08bcc97bb49dbae3cabdacb5a490ed807f8c2cfde1
 SHA512:
-  metadata.gz: 1a7e516295a56d2a48fba52ab0775f461ab4990b3ac5df6f137eb232b57be5c2cea4051ffc88f38d562f50dbe20a1a7b869c3dc38f3ac385a91de427bdf62802
-  data.tar.gz: 1c688393349578d1ff591574bb12becfa0d4dde7fe7a334f9cfa2e3a9d1c59607767042ff55f16a02e77cef2a022c94aed8729467f5865c2afa13fc77a940acf
+  metadata.gz: e09f7a61ec614d7f8cf213e352923af9e21c9a801bb54fb3ad315622dc00dada8a34959057291ad0a9fc5871be8a388741a6351b8cfe34518826414cd6850774
+  data.tar.gz: c8fa00223d9a133f0bb0afb64d6493172aa9f0f7d3ac73b01f2e462af9040e0a417a097b4dc8cf8cbcb28bcfad8e155560145d1d50be6cd24f8a66b7dd9ccbf9

data/README.md

@@ -29,12 +29,9 @@
 ## Добавления в `Gemfile`
 
 ```ruby
-gem 'dotenv-rails'
-
-# gem 'autoprefixer-rails', group: :production
-
-gem 'biovision', git: 'https://github.com/Biovision/biovision.git'
 # gem 'biovision', path: '/Users/maxim/Projects/Biovision/gems/biovision'
+gem 'biovision', git: 'https://github.com/Biovision/biovision.git'
+gem 'dotenv-rails'
 
 group :development, :test do
   gem 'database_cleaner'
@@ -136,6 +133,11 @@ concern :search do
   get :search, on: :collection
 end
 
+concern :stories do
+  post 'stories/:slug' => :collection_story, on: :collection, as: :story
+  post 'stories/:slug' => :member_story, on: :member, as: :story
+end
+
 root 'index#index'  
 ```
 

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

@@ -73,4 +73,38 @@ h2 {
   padding: var(--spacer-xs);
 }
 
+.breadcrumbs {
+  margin-bottom: var(--spacer-s);
+}
+
+.header-authentication {
+  align-items: center;
+  display: flex;
+  gap: var(--spacer-xxs);
+  margin: 0 0 0 auto;
+
+  .avatar {
+    border-radius: 50%;
+    box-shadow: var(--block-shadow);
+    display: inline-block;
+    height: 2.4rem;
+    overflow: hidden;
+    width: 2.4rem;
+
+    img {
+      height: 100%;
+      object-fit: cover;
+      width: 100%;
+    }
+  }
+
+  .current-user {
+    align-items: center;
+    color: inherit;
+    display: flex;
+    font-size: var(--font-size-decreased);
+    gap: var(--spacer-xs);
+  }
+}
+
 @import "biovision/admin/components";

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

@@ -91,45 +91,75 @@ textarea {
 .proportional-container {
   padding: 0;
   position: relative;
+}
 
-  > * {
-    bottom: 0;
-    display: block;
-    height: 100%;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    width: 100%;
-  }
-
-  &::before {
-    content: '\A';
-    display: block;
+@supports (aspect-ratio: 1 / 1) {
+  .r-1x1 {
+    aspect-ratio: 1 / 1;
   }
 
-  &.r-1x1::before {
-    padding-top: 100%;
+  .r-5x4 {
+    aspect-ratio: 5 / 4;
   }
 
-  &.r-5x4::before {
-    padding-top: 80%;
+  .r-4x3 {
+    aspect-ratio: 4 / 3;
   }
 
-  &.r-4x3::before {
-    padding-top: 75%;
+  .r-3x2 {
+    aspect-ratio: 3 / 2;
   }
 
-  &.r-3x2::before {
-    padding-top: 66.67%;
+  .r-16x9 {
+    aspect-ratio: 16 / 9;
   }
 
-  &.r-16x9::before {
-    padding-top: 56.25%;
+  .r-2x1 {
+    aspect-ratio: 2 / 1;
   }
+}
 
-  &.r-2x1::before {
-    padding-top: 50%;
+@supports not(aspect-ratio: 1/1) {
+  .proportional-container {
+    > * {
+      bottom: 0;
+      display: block;
+      height: 100%;
+      left: 0;
+      position: absolute;
+      right: 0;
+      top: 0;
+      width: 100%;
+    }
+
+    &::before {
+      content: '\A';
+      display: block;
+    }
+
+    &.r-1x1::before {
+      padding-top: 100%;
+    }
+
+    &.r-5x4::before {
+      padding-top: 80%;
+    }
+
+    &.r-4x3::before {
+      padding-top: 75%;
+    }
+
+    &.r-3x2::before {
+      padding-top: 66.67%;
+    }
+
+    &.r-16x9::before {
+      padding-top: 56.25%;
+    }
+
+    &.r-2x1::before {
+      padding-top: 50%;
+    }
   }
 }
 

data/app/assets/stylesheets/biovision/components/filters.scss

@@ -28,8 +28,6 @@
   }
 
   label {
-    padding: 0 var(--spacer-xxs);
-
     input:checked + span {
       text-decoration: underline;
     }

data/app/assets/stylesheets/biovision/components/forms.scss

@@ -2,6 +2,12 @@ $form-control-color: hsl(220, 75%, 75%) !default;
 $form-field-error: #f00 !default;
 $form-input-bg: #fff !default;
 
+:root {
+  --form-control-color: #{$form-control-color};
+  --form-field-error: #{$form-field-error};
+  --form-input-bg: #{$form-input-bg};
+}
+
 form {
   margin: 0;
   padding: 0;
@@ -18,7 +24,7 @@ form {
   }
 
   .check-result-error {
-    color: $form-field-error;
+    color: var(--form-field-error);
 
     &::before {
       content: '\261D';
@@ -50,8 +56,14 @@ form {
     margin: var(--spacer-xs) 0;
   }
 
+  .meta-texts {
+    label {
+      width: 100%;
+    }
+  }
+
   .errors {
-    color: $form-field-error;
+    color: var(--form-field-error);
     padding: var(--spacer-xxs) var(--spacer-xxs) 0 var(--spacer-s);
 
     li {
@@ -62,7 +74,7 @@ form {
       }
 
       &:last-of-type {
-        border-bottom: .1rem solid $form-field-error;
+        border-bottom: .1rem solid var(--form-field-error);
         padding-bottom: var(--spacer-xs);
       }
     }
@@ -151,7 +163,7 @@ form {
 
 .input-select,
 .input-text {
-  background-color: #{$form-input-bg};
+  background-color: var(--form-input-bg);
   border: .1rem solid var(--input-border);
   border-radius: var(--spacer-xxs);
   font-size: var(--font-size-normal);
@@ -169,12 +181,12 @@ form {
   -moz-appearance: none;
   -webkit-appearance: none;
   appearance: none;
-  background: #{$form-input-bg} image_url('biovision/icons/dropdown.svg') no-repeat center right var(--spacer-xs) / 1.1rem auto;
+  background: var(--form-input-bg) image_url('biovision/icons/dropdown.svg') no-repeat center right var(--spacer-xs) / 1.1rem auto;
   padding-right: 3.2rem;
 }
 
 .floating-label {
-  display: block;
+  display: inline-block;
   padding: 1.4rem 0 0 0;
   position: relative;
 
@@ -198,17 +210,17 @@ form {
 
 .flag-label {
   align-items: flex-start;
-  display: flex;
+  display: inline-flex;
+  gap: var(--spacer-xxs);
 
   input {
     -moz-appearance: none;
     -webkit-appearance: none;
     appearance: none;
-    border: .2rem solid $form-control-color;
+    border: .2rem solid var(--form-control-color);
     border-radius: .2rem;
     display: inline-block;
     height: 1.6rem;
-    margin-right: var(--spacer-xxs);
     outline: none;
     width: 1.6rem;
 
@@ -221,7 +233,7 @@ form {
     }
 
     &:checked {
-      background: radial-gradient(#fff, #fff 25%, $form-control-color 25%, $form-control-color);
+      background: radial-gradient(#fff, #fff 25%, var(--form-control-color) 25%, var(--form-control-color));
     }
 
     &:disabled {
@@ -260,3 +272,21 @@ form {
     padding: 0;
   }
 }
+
+.searchable-list {
+  .current {
+    margin: var(--spacer-xs) 0;
+  }
+
+  ul {
+    list-style: none;
+  }
+
+  .text {
+    display: inline-block;
+
+    &:empty {
+      display: none;
+    }
+  }
+}

data/app/assets/stylesheets/biovision/themes/default_theme/layout/header.scss

@@ -25,11 +25,13 @@
 .header-authentication {
   align-items: center;
   display: flex;
+  gap: var(--spacer-xxs);
   margin: 0 0 0 auto;
 
   .avatar {
     display: inline-block;
     height: 2.4rem;
+    overflow: hidden;
     width: 2.4rem;
 
     img {
@@ -38,4 +40,12 @@
       width: 100%;
     }
   }
+
+  .current-user {
+    align-items: center;
+    color: inherit;
+    display: flex;
+    font-size: var(--font-size-decreased);
+    gap: var(--spacer-xs);
+  }
 }

data/app/controllers/admin/biovision_components_controller.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Managing component list
+class Admin::BiovisionComponentsController < AdminController
+  include CrudEntities
+  include EntityPriority
+  include ToggleableEntity
+
+  before_action :set_entity, except: %i[index]
+end

data/app/controllers/admin/components_controller.rb

@@ -2,12 +2,14 @@
 
 # Handling components
 class Admin::ComponentsController < AdminController
+  include ProcessedForms
+
   # skip_before_action :restrict_access, only: :index
   skip_before_action :verify_authenticity_token, only: :ckeditor
 
   # get /admin/components
   def index
-    @collection = BiovisionComponent.list_for_administration
+    @collection = BiovisionComponent.active.list_for_administration
   end
 
   # get /admin/components/:slug
@@ -52,10 +54,11 @@ class Admin::ComponentsController < AdminController
     @collection = list.page(current_page)
   end
 
+  # post /admin/components/:slug/images
   def create_image
     if @handler.permit?('simple_images.create')
-      @entity = @handler.component.simple_images.new(image_parameters)
-      if @entity.save
+      @entity = @handler.upload_image(image_parameters)
+      if @entity
         render 'image', formats: :json
       else
         form_processed_with_error(:new_image)
@@ -72,7 +75,7 @@ class Admin::ComponentsController < AdminController
       biovision_component: @handler.component
     }.merge(owner_for_entity(true))
 
-    @entity = SimpleImage.create!(parameters)
+    @entity = @handler.upload_image(parameters)
 
     render json: {
       uploaded: 1,
@@ -104,7 +107,8 @@ class Admin::ComponentsController < AdminController
       %w[images] => 'simple_images.view',
       %w[create_image ckeditor] => 'simple_images.create',
       %w[settings] => 'settings.view',
-      %w[update_settings update_parameter delete_parameter] => 'settings.edit'
+      %w[update_settings update_parameter delete_parameter] => 'settings.edit',
+      %w[show] => 'view'
     )
   end
 end

data/app/controllers/admin/users_controller.rb

@@ -4,6 +4,7 @@
 class Admin::UsersController < AdminController
   include Authentication
   include CrudEntities
+  include ProcessedForms
   include ToggleableEntity
 
   before_action :set_entity, except: %i[check create index new search]
@@ -29,7 +30,7 @@ class Admin::UsersController < AdminController
 
   # post /admin/users/:id/authenticate
   def authenticate
-    unless @entity.super_user?
+    if component_handler.permit?('log_in', @entity) && !@entity.super_user?
       cookies['pt'] = {
         value: cookies['token'],
         expires: 1.year.from_now,

data/app/controllers/admin_controller.rb

@@ -2,27 +2,7 @@
 
 # Common administrative controller
 class AdminController < ApplicationController
-  before_action :restrict_access
-
-  private
-
-  def restrict_access
-    user_action = "#{controller_name}.#{role_end_from_action}"
-    role_name = "#{component_handler.slug}.#{user_action}"
-    error = t('admin.errors.unauthorized.missing_role', role: role_name)
+  include RestrictedAccess
 
-    handle_http_401(error) unless component_handler.permit?(user_action)
-  end
-
-  def role_end_from_action
-    role = action_to_role_map.select { |k| k.include?(action_name) }.values.last
-    role || 'default'
-  end
-
-  def action_to_role_map
-    {
-      %w[index show search] => 'view',
-      %w[create destroy edit new priority toggle update] => 'edit'
-    }
-  end
+  before_action :restrict_access
 end

data/app/controllers/concerns/component_stories.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# Adds method for working with component stories
+module ComponentStories
+  extend ActiveSupport::Concern
+
+  # Perform story
+  #
+  # Parameters:
+  #   slug: story slug app/lib/biovision/components/.../stories/<slug>_story.rb
+  #   entity_id: optional parameter for setting entity context
+  #
+  # post [...]/stories/:slug
+  def story
+    story_parameters = params[:parameters]&.permit!.to_h
+    entity_id = param_from_request(:entity_id)
+    story_handler = component_handler.story(params[:slug], entity_id)
+    result = story_handler.perform(story_parameters)
+
+    render json: { meta: { result: result } }
+  end
+end

data/app/controllers/concerns/crud_entities.rb

@@ -3,6 +3,7 @@
 # Adds method for CRUD
 module CrudEntities
   extend ActiveSupport::Concern
+  include ProcessedForms
 
   # get [scope]/[table_name]/search?q=
   def search
@@ -13,8 +14,8 @@ module CrudEntities
   # get [scope]/[table_name]
   def index
     @filter = params[:filter]&.permit!.to_h
-    data_helper = Biovision::Helpers::DataHelper.new(model_class)
-    @collection = data_helper.administrative_collection(current_page, @filter)
+    data_helper = Biovision::Helpers::DataHelper.new(model_class, @filter)
+    @collection = data_helper.administrative_collection(current_page)
   end
 
   # get [scope]/[table_name]/:id
@@ -108,7 +109,7 @@ module CrudEntities
     if model_class.respond_to?(:creation_parameters)
       explicit_creation_parameters
     else
-      entity_parameters
+      implicit_creation_parameters
     end
   end
 
@@ -120,13 +121,20 @@ module CrudEntities
     parameters
   end
 
+  def implicit_creation_parameters
+    parameters = entity_parameters
+    parameters.merge!(tracking_for_entity) if model_class.include?(HasTrack)
+    parameters.merge!(owner_for_entity) if model_class.include?(HasOwner)
+    parameters
+  end
+
   def entity_parameters
     permitted = model_class.entity_parameters
     params.require(model_key).permit(permitted)
   end
 
   def apply_meta
-    new_data = params[:meta].permit!
+    new_data = params[:meta]&.permit!.to_h
     @entity.meta = new_data
   end
 end

data/app/controllers/concerns/my_crud_entities.rb

@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+# Adds methods for CRUD in My namespace
+module MyCrudEntities
+  extend ActiveSupport::Concern
+  included ProcessedForms
+
+  # get [scope]/[table_name]/search?q=
+  def search
+    q = param_from_request(:q)
+    @collection = model_class.search(q).list_for_owner(current_user).page(current_page)
+  end
+
+  # get [scope]/[table_name]
+  def index
+    @filter = params[:filter]&.permit!.to_h
+    data_helper = Biovision::Helpers::DataHelper.new(model_class, @filter)
+    @collection = data_helper.personal_collection(current_user, current_page)
+  end
+
+  # get [scope]/[table_name]/:id
+  def show
+  end
+
+  # post [scope]/[table_name]/check
+  def check
+    @entity = model_class.instance_for_check(params[:entity_id], entity_parameters)
+
+    render 'shared/forms/check'
+  end
+
+  # get [scope]/[table_name]/new
+  def new
+    @entity = model_class.new
+    render view_for_new
+  end
+
+  # post [scope]/[table_name]
+  def create
+    @entity = component_handler.new_entity(model_class, creation_parameters)
+    apply_meta if @entity.respond_to?(:meta=)
+    if @entity.save
+      form_processed_ok(path_after_save)
+    else
+      form_processed_with_error(view_for_new)
+    end
+  end
+
+  # get [scope]/[table_name]/:id/edit
+  def edit
+    render view_for_edit
+  end
+
+  # patch [scope]/[table_name]/:id
+  def update
+    apply_meta if @entity.respond_to?(:meta=)
+
+    if component_handler.update_entity(@entity, entity_parameters)
+      form_processed_ok(path_after_save)
+    else
+      form_processed_with_error(view_for_edit)
+    end
+  end
+
+  # delete [scope]/[table_name]/:id
+  def destroy
+    flash[:notice] = t('.success') if @entity.destroy
+    redirect_to path_after_destroy
+  end
+
+  private
+
+  def view_for_new
+    default_view = "#{controller_path}/new"
+    lookup_context.exists?(default_view) ? default_view : 'shared/my/entity/new'
+  end
+
+  def view_for_edit
+    default_view = "#{controller_path}/edit"
+    lookup_context.exists?(default_view) ? default_view : 'shared/my/entity/edit'
+  end
+
+  def model_class
+    @model_class ||= controller_name.classify.constantize
+  end
+
+  def model_key
+    model_class.model_name.to_s.underscore
+  end
+
+  def path_after_save
+    if @entity.respond_to?(:my_url)
+      @entity.my_url
+    else
+      scope = self.class.module_parent.to_s.downcase
+      prefix = scope.blank? ? '' : "/#{scope}"
+      key = model_class.column_names.include?('uuid') ? @entity.uuid : @entity.id
+      "#{prefix}/#{model_class.table_name}/#{key}"
+    end
+  end
+
+  def path_after_destroy
+    scope = self.class.module_parent.to_s.downcase
+    prefix = scope.blank? ? '' : "/#{scope}"
+    "#{prefix}/#{model_class.table_name}"
+  end
+
+  def set_entity
+    id = params[:id].to_s
+    has_uuid = model_class.column_names.include?('uuid')
+    key = id.include?('-') && has_uuid ? :uuid : :id
+    @entity = model_class.owned_by(current_user).find_by(key => params[:id])
+    handle_http_404("Cannot find #{model_class.model_name}") if @entity.nil?
+  end
+
+  def creation_parameters
+    if model_class.respond_to?(:creation_parameters)
+      explicit_creation_parameters
+    else
+      implicit_creation_parameters
+    end
+  end
+
+  def explicit_creation_parameters
+    permitted = model_class.creation_parameters
+    parameters = params.require(model_key).permit(permitted)
+    parameters.merge!(tracking_for_entity) if model_class.include?(HasTrack)
+    parameters.merge(owner_for_entity)
+  end
+
+  def implicit_creation_parameters
+    parameters = entity_parameters
+    parameters.merge!(tracking_for_entity) if model_class.include?(HasTrack)
+    parameters.merge(owner_for_entity)
+  end
+
+  def entity_parameters
+    permitted = model_class.entity_parameters
+    params.require(model_key).permit(permitted)
+  end
+
+  def apply_meta
+    new_data = params[:meta].permit!
+    @entity.meta = new_data
+  end
+end

data/app/controllers/concerns/processed_forms.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Adds method for redirects after processed forms
+module ProcessedForms
+  extend ActiveSupport::Concern
+
+  private
+
+  # @param [String] next_page
+  def form_processed_ok(next_page)
+    respond_to do |format|
+      format.js { render(js: "document.location.href = '#{next_page}'") }
+      format.json { render(json: { links: { next: next_page } }) }
+      format.html { redirect_to(next_page) }
+    end
+  end
+
+  # @param [Symbol|String] view_to_render
+  # @param [Array] errors
+  def form_processed_with_error(view_to_render, errors = [])
+    @errors = errors
+    respond_to do |format|
+      format.js { render('shared/forms/errors', status: :bad_request) }
+      format.json { render('shared/forms/errors', status: :bad_request) }
+      format.html { render(view_to_render, status: :bad_request) }
+    end
+  end
+end