biovision 0.1.210414.0 → 0.3.210504.0

data/app/models/simple_image.rb

@@ -43,7 +43,7 @@ class SimpleImage < ApplicationRecord
   scope :filtered, ->(v) { where('image ilike ? or caption ilike ?', "%#{v}%", "%#{v}%") unless v.blank? }
   scope :list_for_administration, -> { order('image asc') }
 
-  def self.entity_parameters(*)
+  def self.entity_parameters
     %i[caption image image_alt_text source_link source_name]
   end
 

data/app/models/simple_image_tag.rb

@@ -18,7 +18,7 @@ class SimpleImageTag < ApplicationRecord
 
   scope :list_for_administration, -> { order('name asc') }
 
-  def self.entity_parameters(*)
+  def self.entity_parameters
     %i[name]
   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/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

data/app/uploaders/simple_file_uploader.rb

@@ -5,7 +5,7 @@ class SimpleFileUploader < CarrierWave::Uploader::Base
   storage :file
 
   def store_dir
-    slug = "#{model.id / 100}/#{model.id}"
+    slug = "#{model.&id / 100}/#{model&.id}"
 
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{slug}"
   end

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>:)</li>

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

@@ -13,7 +13,8 @@
         partial: 'admin/components/settings/settings',
         locals: {
             handler: @handler,
-            settings: @handler.component.settings
+            settings: @handler.component.settings,
+            keys: @handler.class.default_settings.keys
         }
     )
   %>

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]
                 }
             )
           %>

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

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

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

@@ -7,9 +7,11 @@
 <article>
   <h1><%= t('.heading') %></h1>
 
-  <nav class="entity-actions">
-    <%= create_icon(new_admin_dynamic_block_path) %>
-  </nav>
+  <% if component_handler.permit?("#{controller_name}.create") %>
+    <nav class="entity-actions">
+      <%= create_icon(new_admin_dynamic_block_path) %>
+    </nav>
+  <% end %>
 
   <%= render partial: 'shared/admin/list', locals: { collection: @collection } %>
 </article>

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

@@ -8,10 +8,12 @@
 <article>
   <h1><%= @entity.class.model_name.human %> <q><%= @entity.slug %></q></h1>
 
-  <nav class="entity-actions">
-    <%= edit_icon(@entity) %>
-    <%= destroy_icon(@entity) %>
-  </nav>
+  <% if component_handler.permit?('edit', @entity) %>
+    <nav class="entity-actions">
+      <%= edit_icon(@entity) %>
+      <%= destroy_icon(@entity) %>
+    </nav>
+  <% end %>
 
   <dl class="fields">
     <%= render partial: 'shared/entity/slug', locals: { entity: @entity } %>

data/app/views/admin/dynamic_pages/_dynamic_page.jbuilder

@@ -0,0 +1,18 @@
+json.id dynamic_page.id
+json.type dynamic_page.class.table_name
+json.attributes do
+  json.call(dynamic_page, :slug, :url)
+end
+json.meta do
+  json.text_for_link dynamic_page.text_for_link
+  json.html(
+    render(
+      partial: 'admin/dynamic_pages/entity/in_search',
+      locals: { entity: dynamic_page },
+      formats: [:html]
+    )
+  )
+end
+json.links do
+  json.self admin_dynamic_page_path(id: dynamic_page.id)
+end

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

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

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

@@ -0,0 +1,7 @@
+<figure class="image"><%= simple_image_preview(entity) %></figure>
+<div class="data">
+  <div><%= admin_entity_link(entity) %></div>
+  <% unless entity.name.blank? %>
+    <div class="info"><%= entity.name %></div>
+  <% end %>
+</div>

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

@@ -7,9 +7,16 @@
 <article>
   <h1><%= t('.heading') %></h1>
 
-  <nav class="entity-actions">
-    <%= create_icon(new_admin_dynamic_page_path) %>
-  </nav>
+  <% if component_handler.permit?("#{controller_name}.edit") %>
+    <nav class="entity-actions">
+      <%= create_icon(new_admin_dynamic_page_path) %>
+    </nav>
+  <% end %>
 
-  <%= render partial: 'shared/admin/list', locals: { collection: @collection } %>
+  <%=
+    render(
+      partial: 'shared/admin/list',
+      locals: { collection: @collection, handler: component_handler }
+    )
+  %>
 </article>

data/app/views/admin/dynamic_pages/search.jbuilder

@@ -0,0 +1,4 @@
+json.data @collection do |entity|
+  json.partial! entity
+end
+json.partial! 'shared/pagination', locals: { collection: @collection }

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

@@ -10,7 +10,7 @@
 
   <nav class="entity-actions">
     <%= world_icon(@entity) unless @entity.url.blank? %>
-    <%= edit_icon(@entity) %>
+    <%= edit_icon(@entity) if component_handler.permit?('edit', @entity) %>
   </nav>
 
   <dl class="fields">

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

@@ -3,12 +3,14 @@
 <article>
   <h1><%= t('.heading') %></h1>
 
-  <%=
-    render(
+  <% if component_handler.permit?('components.view') %>
+    <%=
+      render(
         partial: 'admin/components/list',
         locals: {
-            collection: BiovisionComponent.list_for_administration
+          collection: BiovisionComponent.list_for_administration
         }
-    )
-  %>
+      )
+    %>
+  <% end %>
 </article>

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

@@ -0,0 +1,26 @@
+<div class="data">
+  <div><%= admin_entity_link(entity.dynamic_page) %></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) %>
+    <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 %>">
+        <button data-delta="-1" type="button">&uarr;</button>
+        <button data-delta="1" type="button">&darr;</button>
+      </div>
+
+      <%=
+        button_tag(
+          '',
+          class: 'danger destroy',
+          data: {
+            url: dynamic_page_admin_navigation_group_path(id: entity.navigation_group_id, page_id: entity.id)
+          },
+          type: 'button'
+        )
+      %>
+    </div>
+  <% end %>
+</div>