biovision 0.4.210512.0 → 0.12.211124.0

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

@@ -19,5 +19,18 @@
     </nav>
 
     <%= render partial: 'users/profile', locals: { user: current_user } %>
+
+    <% prefix = 'my/profiles/components/' %>
+    <% BiovisionComponent.list_for_user.each do |component| %>
+      <% handler = Biovision::Components::BaseComponent.handler(component, current_user) %>
+      <% if lookup_context.exists?("#{prefix}_#{component.slug}") %>
+        <%=
+          render(
+            partial: "#{prefix}#{component.slug}",
+            locals: { handler: handler }
+          )
+        %>
+      <% end %>
+    <% end %>
   </div>
 </article>

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

@@ -1,19 +1,10 @@
-<% use_pagination = collection.respond_to?(:current_page) %>
-<%= paginate collection if use_pagination %>
-<% if collection.any? %>
-  <ul class="list-of-entities">
-    <% collection.each do |entity| %>
-      <li data-id="<%= entity.id %>">
-        <%=
-          render(
-              partial: "admin/#{entity.class.table_name}/entity/in_list",
-              locals: { entity: entity, handler: local_assigns[:handler] }
-          )
-        %>
-      </li>
-    <% end %>
-  </ul>
-  <%= paginate collection if use_pagination %>
-<% else %>
-  <%= render 'shared/nothing_found' %>
-<% end %>
+<%=
+  render(
+    partial: 'shared/entity/list',
+    locals: {
+      collection: collection,
+      handler: local_assigns[:handler],
+      scope: :admin
+    }
+  )
+%>

data/app/views/shared/admin/_list_with_priority.html.erb

@@ -1,19 +1,10 @@
-<% use_pagination = collection.respond_to?(:current_page) %>
-<%= paginate collection if use_pagination %>
-<% if collection.any? %>
-  <ol class="list-of-entities">
-    <% collection.each do |entity| %>
-      <li data-id="<%= entity.id %>" data-number="<%= entity.priority %>">
-        <%=
-          render(
-              partial: "admin/#{entity.class.table_name}/entity/in_list",
-              locals: { entity: entity, handler: local_assigns[:handler] }
-          )
-        %>
-      </li>
-    <% end %>
-  </ol>
-  <%= paginate collection if use_pagination %>
-<% else %>
-  <%= render 'shared/nothing_found' %>
-<% end %>
+<%=
+  render(
+    partial: 'shared/entity/list_with_priority',
+    locals: {
+      collection: collection,
+      handler: local_assigns[:handler],
+      scope: :admin
+    }
+  )
+%>

data/app/views/shared/admin/_priority.html.erb

@@ -1,5 +1,6 @@
-<% url = "/admin/#{entity.class.table_name}/#{entity.id}/priority" %>
-<div class="priority-changer" data-url="<%= url %>">
-  <button data-delta="-1" type="button">&uarr;</button>
-  <button data-delta="1" type="button">&darr;</button>
-</div>
+<%=
+  render(
+    partial: 'shared/entity/priority_icons',
+    locals: { entity: entity, scope: :admin }
+  )
+%>

data/app/views/shared/admin/_toggle.html.erb

@@ -1,11 +1,6 @@
-<%
-  model = entity.class
-  url = "/admin/#{model.table_name}/#{entity.id}/toggle"
+<%=
+  render(
+    partial: 'shared/entity/toggle',
+    locals: { entity: entity, scope: :admin }
+  )
 %>
-<div class="toggleable" data-url="<%= url %>">
-  <% model.toggleable_attributes.each do |flag| %>
-  <span class="<%= entity.attributes[flag.to_s] ? 'active' : 'inactive' %>" data-flag="<%= flag %>">
-    <%= model.human_attribute_name(flag) %>
-  </span>
-  <% end %>
-</div>

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

@@ -0,0 +1,6 @@
+<% unless entity.attributes[field.to_s].blank? %>
+  <div>
+    <dt><%= entity.class.human_attribute_name(field) %></dt>
+    <dd><%= time_tag(entity.attributes[field.to_s]) %></dd>
+  </div>
+<% end %>

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

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

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

@@ -0,0 +1,22 @@
+<%
+  view_scope = %i[admin my].include?(local_assigns[:scope].to_sym) ? "#{scope}/" : ''
+  use_pagination = collection.respond_to?(:current_page)
+%>
+<%= paginate collection if use_pagination %>
+<% if collection.any? %>
+  <ul class="list-of-entities">
+    <% collection.each do |entity| %>
+      <li data-id="<%= entity.id %>">
+        <%=
+          render(
+              partial: "#{view_scope}#{entity.class.table_name}/entity/in_list",
+              locals: { entity: entity, handler: local_assigns[:handler] }
+          )
+        %>
+      </li>
+    <% end %>
+  </ul>
+  <%= paginate collection if use_pagination %>
+<% else %>
+  <%= render 'shared/nothing_found' %>
+<% end %>

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

@@ -0,0 +1,22 @@
+<%
+  view_scope = %i[admin my].include?(local_assigns[:scope].to_sym) ? "#{scope}/" : ''
+  use_pagination = collection.respond_to?(:current_page)
+%>
+<%= paginate collection if use_pagination %>
+<% if collection.any? %>
+  <ol class="list-of-entities">
+    <% collection.each do |entity| %>
+      <li data-id="<%= entity.id %>" data-number="<%= entity.priority %>">
+        <%=
+          render(
+              partial: "#{view_scope}#{entity.class.table_name}/entity/in_list",
+              locals: { entity: entity, handler: local_assigns[:handler] }
+          )
+        %>
+      </li>
+    <% end %>
+  </ol>
+  <%= paginate collection if use_pagination %>
+<% else %>
+  <%= render 'shared/nothing_found' %>
+<% end %>

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

@@ -0,0 +1,8 @@
+<%
+  view_scope = %i[admin my].include?(local_assigns[:scope].to_sym) ? "#{scope}/" : ''
+  url = "/#{view_scope}#{entity.class.table_name}/#{entity.id}/priority"
+%>
+<div class="priority-changer" data-url="<%= url %>">
+  <button data-delta="-1" type="button">&uarr;</button>
+  <button data-delta="1" type="button">&darr;</button>
+</div>

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

@@ -0,0 +1,12 @@
+<%
+  view_scope = %i[admin my].include?(local_assigns[:scope].to_sym) ? "#{scope}/" : ''
+  model = entity.class
+  url = "/#{view_scope}#{model.table_name}/#{entity.id}/toggle"
+%>
+<div class="toggleable" data-url="<%= url %>">
+  <% model.toggleable_attributes.each do |flag| %>
+  <span class="<%= entity.attributes[flag.to_s] ? 'active' : 'inactive' %>" data-flag="<%= flag %>">
+    <%= model.human_attribute_name(flag) %>
+  </span>
+  <% end %>
+</div>

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

@@ -5,6 +5,7 @@
   validators = model.validators_on(field)
   length_options = validators.select { |v| v.kind == :length }.first&.options.to_h
   range_option = validators.select { |v| v.kind == :inclusion }.first&.options.to_h
+  # numericality = validators.select { |v| v.kind == :numericality }.first&.options.to_h
   options = {
     class: 'input-text',
     data: { check: field }.merge(local_assigns[:data].to_h),
@@ -13,7 +14,8 @@
     required: validators.select { |v| v.kind == :presence }.any?,
     size: nil
   }
-  guide_key = "#{controller_path.gsub('/', '.')}.form.guidelines.#{field}"
+  legacy_guide_key = "#{controller_path.gsub('/', '.')}.form.guidelines.#{field}"
+  guide_key = "guidelines.#{model.to_s.underscore}.#{field}"
 %>
 <div>
   <dt><%= f.label field %></dt>
@@ -41,6 +43,8 @@
     <div class="check-result-error" data-field="<%= field %>"></div>
     <% if I18n.exists?(guide_key) %>
       <div class="guideline"><%= t(guide_key) %></div>
+    <% elsif I18n.exists?(legacy_guide_key) %>
+      <div class="guideline"><%= t(legacy_guide_key) %></div>
     <% end %>
   </dd>
 </div>

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

@@ -0,0 +1,17 @@
+<% placeholder ||= t('.search') %>
+<div>
+  <dt><%= f.label field %></dt>
+  <dd class="js-searchable-list searchable-list" data-url="<%= endpoint %>">
+    <div class="current">
+      <%= f.hidden_field field %>
+      <span class="text"><%= local_assigns[:current] %></span>
+    </div>
+    <div class="search">
+      <label class="floating-label">
+        <input placeholder="<%= placeholder %>" type="search" class="input-text"/>
+        <span><%= placeholder %></span>
+      </label>
+      <ul class="results"></ul>
+    </div>
+  </dd>
+</div>

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

@@ -2,7 +2,7 @@
 <div>
   <dt><%= t('.name') %></dt>
   <dd>
-    <ul class="flags">
+    <ul class="meta-texts">
       <% entity.class.meta_keys.each do |key| %>
         <li>
           <label class="floating-label" title="<%= key %>">

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

@@ -0,0 +1,14 @@
+<% preset = local_assigns[:blank] ? [[t(:not_set), '']] : [] %>
+<div>
+  <dt><%= f.label(field) %></dt>
+  <dd>
+    <%=
+      f.select(
+        field,
+        preset + linked_model.list_for_administration.map { |e| [e.text_for_link, e.id ]},
+        class: 'input-select',
+        required: local_assigns[:required]
+      )
+    %>
+  </dd>
+</div>

data/app/views/shared/my/_list.html.erb

@@ -1,19 +1,10 @@
-<% use_pagination = collection.respond_to?(:current_page) %>
-<%= paginate collection if use_pagination %>
-<% if collection.any? %>
-  <ul class="list-of-entities">
-    <% collection.each do |entity| %>
-      <li data-id="<%= entity.id %>">
-        <%=
-          render(
-              partial: "my/#{entity.class.table_name}/entity/in_list",
-              locals: { entity: entity, handler: local_assigns[:handler] }
-          )
-        %>
-      </li>
-    <% end %>
-  </ul>
-  <%= paginate collection if use_pagination %>
-<% else %>
-  <%= render 'shared/nothing_found' %>
-<% end %>
+<%=
+  render(
+    partial: 'shared/entity/list',
+    locals: {
+      collection: collection,
+      handler: local_assigns[:handler],
+      scope: :my
+    }
+  )
+%>

data/app/views/shared/my/_list_with_priority.html.erb

@@ -1,19 +1,10 @@
-<% use_pagination = collection.respond_to?(:current_page) %>
-<%= paginate collection if use_pagination %>
-<% if collection.any? %>
-  <ol class="list-of-entities">
-    <% collection.each do |entity| %>
-      <li data-id="<%= entity.id %>" data-number="<%= entity.priority %>">
-        <%=
-          render(
-              partial: "my/#{entity.class.table_name}/entity/in_list",
-              locals: { entity: entity, handler: local_assigns[:handler] }
-          )
-        %>
-      </li>
-    <% end %>
-  </ol>
-  <%= paginate collection if use_pagination %>
-<% else %>
-  <%= render 'shared/nothing_found' %>
-<% end %>
+<%=
+  render(
+    partial: 'shared/entity/list_with_priority',
+    locals: {
+      collection: collection,
+      handler: local_assigns[:handler],
+      scope: :my
+    }
+  )
+%>

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

@@ -0,0 +1,25 @@
+<%
+  prefix = controller_path.gsub('/', '.')
+  default_title = "#{@entity.class.model_name.human}: #{t('shared.entity.edit.nav_text')}"
+%>
+<% content_for :meta_title, t("#{prefix}.edit.title", default: default_title) %>
+<% content_for :breadcrumbs do %>
+  <%= my_home_link %>
+  <%= link_to(t("#{prefix}.index.nav_text"), "/#{controller_path}") %>
+  <%= my_entity_link(@entity, handler: component_handler) %>
+  <span><%= t('shared.entity.edit.nav_text') %></span>
+<% end %>
+
+<article>
+  <div class="content-wrapper">
+    <h1><%= t("#{prefix}.edit.heading", default: default_title) %></h1>
+
+    <% if component_handler.permit?('edit', @entity) %>
+      <nav class="entity-actions">
+        <%= destroy_icon(@entity) %>
+      </nav>
+    <% end %>
+
+    <%= render partial: "#{controller_path}/form", locals: { entity: @entity } %>
+  </div>
+</article>

data/app/views/shared/my/entity/new.html.erb

@@ -0,0 +1,18 @@
+<%
+  prefix = controller_path.gsub('/', '.')
+  default_title = "#{@entity.class.model_name.human}: #{t('shared.entity.new.nav_text')}"
+%>
+<% content_for :meta_title, t("#{prefix}.new.title", default: default_title) %>
+<% content_for :breadcrumbs do %>
+  <%= my_home_link %>
+  <%= link_to(t("#{prefix}.index.nav_text"), "/#{controller_path}") %>
+  <span><%= t('shared.entity.new.nav_text') %></span>
+<% end %>
+
+<article>
+  <div class="content-wrapper">
+    <h1><%= t("#{prefix}.new.heading", default: default_title) %></h1>
+
+    <%= render partial: "#{controller_path}/form", locals: { entity: @entity } %>
+  </div>
+</article>

data/app/views/simple_images/_simple_image.jbuilder

@@ -0,0 +1,13 @@
+json.id simple_image.uuid
+json.type SimpleImage.table_name
+json.attributes do
+  json.call(simple_image, *SimpleImage.json_attributes)
+end
+json.meta do
+  json.hd_url simple_image.image.hd_url
+  json.large_url simple_image.image.large_url
+  json.medium_url simple_image.image.medium_url
+  json.small_url simple_image.image.small_url
+  json.preview_url simple_image.image.preview_url
+  json.tiny_url simple_image.image.tiny_url
+end

data/config/locales/biovision-ru.yml

@@ -74,12 +74,14 @@ ru:
   home: "Главная"
   application:
     errors:
+      bad_request: "Плохой запрос (400)."
       forbidden: "Запрещено (403)."
       internal_server_error: "Внутренняя ошибка сервера (500)."
       not_found: "Страница не найдена (404)."
       restricted_access: "Доступ к странице ограничен (401)."
       service_unavailable: "Сервис временно недоступен (503)."
       unauthorized: "Не хватает прав для просмотра страницы (401)."
+      unprocessable_entity: "Сущность нельзя обработать (422)."
     unauthorized:
       title: "Доступ ограничен"
       heading: "Доступ ограничен"
@@ -143,6 +145,8 @@ ru:
         saving: "Сохранение…"
       meta_texts:
         name: "Метаданные"
+      field_with_search:
+        search: "Поиск"
     entity:
       edit:
         nav_text: "Редактировать"

data/config/locales/components-ru.yml

@@ -17,6 +17,9 @@ ru:
       simple_image: "Простое изображение"
       simple_image_tag: "Метка простого изображения"
       simple_image_tag_image: "Связь метки и простого изображения"
+      uploaded_file: "Загруженный файл"
+      uploaded_file_tag: "Метка загруженного файла"
+      uploaded_file_tag_file: "Связь метки и загруженного файла"
       user_group: "Пользователь в группе доступа"
       user_role: "Роль доступа для пользователя"
     attributes:
@@ -52,8 +55,8 @@ ru:
       simple_image_tag_image:
         simple_image_tag: "Метка"
         simple_image_tag_id: "Метка"
-      user_role:
-        inclusive: "Инклюзивно"
+      uploaded_file:
+        attachment: "Приложение"
   attributes:
     biovision_component: "Компонент"
     biovision_component_id: "Компонент"
@@ -63,6 +66,8 @@ ru:
     role_id: "Роль доступа"
     simple_image: "Изображение"
     simple_image_id: "Изображение"
+    uploaded_file: "Загруженный файл"
+    uploaded_file_id: "Загруженный файл"
   languages:
     english: "Английский"
     russian: "Русский"
@@ -93,6 +98,13 @@ ru:
         heading: "Компоненты"
       show:
         title: "Компонент «%{slug}»"
+    biovision_components:
+      index:
+        title: "Компоненты CMS"
+        heading: "Компоненты"
+      nav_item:
+        text: "Компоненты CMS"
+        description: "Управление списком компонентов CMS"
   shared:
     forms:
       simple_image:
@@ -109,3 +121,12 @@ ru:
     components:
       base:
         name: "Базовый компонент"
+  my:
+    components:
+      index:
+        title: "Сводка"
+        nav_text: "Сводка"
+        heading: "Сводка"
+      show:
+        title: "%{component}: сводка"
+        no_view: "Для этого компонента нет представления"

data/config/locales/content-ru.yml

@@ -11,6 +11,9 @@ ru:
       dynamic_page: "Динамическая страница"
       navigation_group: "Группа навигации"
       navigation_group_page: "Страница в группе навигации"
+      oembed_domain: "Домен для ссылок OEmbed"
+      oembed_link: "Ссылка в oembed"
+      oembed_receiver: "Обработчик ссылок oembed"
     attributes:
       dynamic_block:
         body: "Содержимое"
@@ -24,6 +27,11 @@ ru:
       navigation_group_page:
         navigation_group: "Группа навигации"
         dynamic_page: "Динамическая страница"
+      oembed_domain:
+        oembed_receiver_id: "Обработчик"
+      oembed_link:
+        code: "Код для вставки"
+        url: "URL"
   admin:
     dynamic_blocks:
       destroy:

data/config/locales/users-ru.yml

@@ -166,11 +166,12 @@ ru:
           sensitive_parameters_require_password: "Это связанные с безопасностью параметры. Для их изменения нужно ввести текущий пароль."
           new_password: "Новый пароль"
     index:
+      email:
+        email_is_not_confirmed: "Ваш адрес электронной почты не подтверждён."
       index:
         title: "Личный кабинет"
         nav_text: "Личный кабинет"
         heading: "Личный кабинет"
-        email_is_not_confirmed: "Ваш адрес электронной почты не подтверждён."
     confirmations:
       show:
         nav_text: "Подтвердить email"
@@ -258,6 +259,8 @@ ru:
         nav_text: "Жетоны"
         title: "Жетоны доступа пользователя %{user}"
         heading: "Жетоны доступа"
+      authenticate:
+        nav_text: "Войти как этот пользователь"
   users:
     profile:
       registration_date: "Дата регистрации"

data/config/routes.rb

@@ -17,6 +17,10 @@ Rails.application.routes.draw do
     get :search, on: :collection
   end
 
+  concern :stories do
+    post 'stories/:slug' => :story, on: :collection, as: :story
+  end
+
   # Handling errors
   match '/400' => 'errors#bad_request', via: :all
   match '/401' => 'errors#unauthorized', via: :all
@@ -55,6 +59,8 @@ Rails.application.routes.draw do
   namespace :admin do
     get '/' => 'index#index'
 
+    resources :biovision_components, only: :index, concerns: %i[priority toggle]
+
     scope :components, controller: :components do
       get '/' => :index, as: :components
       scope ':slug' do
@@ -89,6 +95,7 @@ Rails.application.routes.draw do
         get 'roles'
         put 'roles/:role_id' => :add_role, as: :role
         delete 'roles/:role_id' => :remove_role
+        post 'authenticate'
       end
     end
     resources :tokens, concerns: %i[toggle]
@@ -99,7 +106,21 @@ Rails.application.routes.draw do
 
     resource :profile, except: :destroy, concerns: :check
     resource :confirmation, :recovery, only: %i[show create update]
+
+    scope :components, controller: :components do
+      get '/' => :index, as: :components
+      scope ':slug' do
+        get '/' => :show, as: :component
+        get 'images' => :images, as: :component_images
+        post 'images' => :create_image, as: nil
+        post 'ckeditor'
+      end
+    end
+    get 'dashboard' => 'components#index'
+    get 'dashboard/:slug' => 'components#show', as: :component_dashboard
   end
 
+  post 'oembed' => 'oembed#code'
+
   get ':slug' => 'fallback#show', constraints: { slug: /.+/ }
 end

data/db/migrate/20200224000010_create_users_component.rb

@@ -88,17 +88,6 @@ class CreateUsersComponent < ActiveRecord::Migration[6.1]
     end
   end
 
-  def create_biovision_component_users
-    create_table :biovision_component_users, comment: 'Settings for users in components' do |t|
-      t.references :biovision_component, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
-      t.references :user, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
-      t.timestamps
-      t.jsonb :data, default: {}, null: false
-    end
-
-    add_index :biovision_component_users, :data, using: :gin
-  end
-
   def create_codes
     create_table :codes, comment: 'Codes for different purposes' do |t|
       t.references :biovision_component, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }

data/db/migrate/20200404000000_create_simple_images.rb

@@ -30,6 +30,7 @@ class CreateSimpleImages < ActiveRecord::Migration[6.0]
       t.string :caption
       t.string :source_name
       t.string :source_link
+      t.string :checksum, index: true
       t.jsonb :data, default: {}, null: false
     end
 

data/db/migrate/20210405000000_create_acl.rb

@@ -69,7 +69,6 @@ class CreateAcl < ActiveRecord::Migration[6.1]
     create_table :user_roles, comment: 'Users with (and without) ACL roles' do |t|
       t.references :user, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
       t.references :role, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
-      t.boolean :inclusive, default: true, null: false
       t.timestamps
     end
   end

data/db/migrate/20210421000000_create_content_component.rb

@@ -56,4 +56,25 @@ class CreateContentComponent < ActiveRecord::Migration[6.1]
     add_index :dynamic_blocks, :slug, unique: true
     add_index :dynamic_blocks, :data, using: :gin
   end
+
+  def create_oembed_receivers
+    create_table :oembed_receivers, comment: 'Receivers for OEmbed content' do |t|
+      t.string :slug, null: false, index: true
+    end
+  end
+
+  def create_oembed_domains
+    create_table :oembed_domains, comment: 'Supported domains for OEmbed' do |t|
+      t.references :oembed_receiver, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.string :name, null: false, index: true
+    end
+  end
+
+  def create_oembed_links
+    create_table :oembed_links, comment: 'Embedded links' do |t|
+      t.string :url, null: false
+      t.text :code
+      t.timestamps
+    end
+  end
 end