biovision 0.0.200518.1 → 0.1.210414.0

data/db/migrate/20200224000010_create_users_component.rb

@@ -8,24 +8,17 @@ class CreateUsersComponent < ActiveRecord::Migration[6.0]
     create_tokens unless Token.table_exists?
     create_login_attempts unless LoginAttempt.table_exists?
     create_user_languages unless UserLanguage.table_exists?
-    create_foreign_sites unless ForeignSite.table_exists?
-    create_foreign_users unless ForeignUser.table_exists?
     create_component_links unless BiovisionComponentUser.table_exists?
     create_codes unless Code.table_exists?
     create_notifications unless Notification.table_exists?
   end
 
   def down
-    drop_table :notifications if Notification.table_exists?
-    drop_table :codes if Code.table_exists?
-    drop_table :biovision_component_users if BiovisionComponentUser.table_exists?
-    drop_table :foreign_users if ForeignUser.table_exists?
-    drop_table :foreign_sites if ForeignSite.table_exists?
-    drop_table :user_languages if UserLanguage.table_exists?
-    drop_table :login_attempts if LoginAttempt.table_exists?
-    drop_table :tokens if Token.table_exists?
-    drop_table :users if User.table_exists?
-    BiovisionComponent[Biovision::Components::UsersComponent.slug]&.destroy
+    Biovision::Components::UsersComponent.dependent_models.each do |model|
+      drop_table model.table_name if model.table_exists?
+    end
+
+    BiovisionComponent[Biovision::Components::UsersComponent]&.destroy
   end
 
   private
@@ -36,13 +29,17 @@ class CreateUsersComponent < ActiveRecord::Migration[6.0]
     settings = {
       registration_open: true,
       email_as_login: false,
+      phone_as_login: false,
       confirm_email: false,
       require_email: false,
+      confirm_phone: false,
+      require_phone: false,
       invite_only: false,
       use_invites: false,
       invite_count: 5,
       bounce_count: 10,
-      bounce_timeout: 15
+      bounce_timeout: 3,
+      use_phone: false
     }
 
     BiovisionComponent.create(slug: slug, settings: settings)
@@ -57,12 +54,10 @@ class CreateUsersComponent < ActiveRecord::Migration[6.0]
       t.timestamps
       t.integer :primary_id, index: true
       t.integer :inviter_id, index: true
-      t.integer :balance, default: 0, null: false
       t.boolean :super_user, default: false, null: false
       t.boolean :banned, default: false, null: false
       t.boolean :bot, default: false, null: false
       t.boolean :deleted, default: false, null: false
-      t.boolean :consent, default: false, null: false
       t.boolean :email_confirmed, default: false, null: false
       t.boolean :phone_confirmed, default: false, null: false
       t.boolean :allow_mail, default: true, null: false
@@ -76,7 +71,8 @@ class CreateUsersComponent < ActiveRecord::Migration[6.0]
       t.string :image
       t.string :notice
       t.string :referral_link
-      t.jsonb :data, default: { profile: {} }, null: false
+      t.jsonb :data, default: {}, null: false
+      t.jsonb :profile, default: {}, null: false
     end
 
     add_foreign_key :users, :users, column: :inviter_id, on_update: :cascade, on_delete: :nullify
@@ -85,6 +81,7 @@ class CreateUsersComponent < ActiveRecord::Migration[6.0]
     add_index :users, :uuid, unique: true
     add_index :users, :slug, unique: true
     add_index :users, :data, using: :gin
+    add_index :users, :profile, using: :gin
     add_index :users, :referral_link, unique: true
   end
 
@@ -120,30 +117,6 @@ class CreateUsersComponent < ActiveRecord::Migration[6.0]
     end
   end
 
-  def create_foreign_sites
-    create_table :foreign_sites, comment: 'Sites for external authentication' do |t|
-      t.string :slug, null: false
-      t.string :name, null: false
-      t.integer :foreign_users_count, default: 0, null: false
-    end
-
-    add_index :foreign_sites, :slug, unique: true
-  end
-
-  def create_foreign_users
-    create_table :foreign_users, comment: 'Users from external sites' do |t|
-      t.references :foreign_site, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
-      t.references :user, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
-      t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
-      t.references :ip_address, foreign_key: { on_update: :cascade, on_delete: :nullify }
-      t.string :slug, null: false
-      t.timestamps
-      t.jsonb :data, default: {}, null: false
-    end
-
-    add_index :foreign_users, :data, using: :gin
-  end
-
   def create_component_links
     create_table :biovision_component_users, comment: 'Privileges and settings for users in components' do |t|
       t.references :biovision_component, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
@@ -159,16 +132,15 @@ class CreateUsersComponent < ActiveRecord::Migration[6.0]
   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 }
-      t.references :user, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :user, foreign_key: { on_update: :cascade, on_delete: :cascade }
       t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
       t.references :ip_address, foreign_key: { on_update: :cascade, on_delete: :nullify }
       t.integer :quantity, default: 1, null: false
-      t.string :body, null: false
+      t.string :body, index: true, null: false
       t.timestamps
       t.jsonb :data, default: {}, null: false
     end
 
-    add_index :codes, :body, unique: true
     add_index :codes, :data, using: :gin
   end
 

data/db/migrate/20200404000000_create_simple_images.rb

@@ -9,9 +9,9 @@ class CreateSimpleImages < ActiveRecord::Migration[6.0]
   end
 
   def down
-    drop_table :simple_image_tag_images if SimpleImageTagImage.table_exists?
-    drop_table :simple_image_tags if SimpleImageTag.table_exists?
-    drop_table :simple_images if SimpleImage.table_exists?
+    [SimpleImageTagImage, SimpleImageTag, SimpleImage].each do |model|
+      drop_table model.table_name if model.table_exists?
+    end
   end
 
   private

data/db/migrate/20200529000000_create_content_component.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+# Create Content component and tables
+class CreateContentComponent < ActiveRecord::Migration[6.0]
+  def up
+    BiovisionComponent.create(slug: Biovision::Components::ContentComponent.slug)
+
+    create_dynamic_pages unless DynamicPage.table_exists?
+    create_navigation_groups unless NavigationGroup.table_exists?
+    create_pages_in_groups unless NavigationGroupPage.table_exists?
+    create_dynamic_blocks unless DynamicBlock.table_exists?
+  end
+
+  def down
+    Biovision::Components::ContentComponent.dependent_models.each do |model|
+      drop_table model.table_name if model.table_exists?
+    end
+
+    BiovisionComponent[Biovision::Components::ContentComponent]&.destroy
+  end
+
+  private
+
+  def create_navigation_groups
+    create_table :navigation_groups, comment: 'Navigation groups' do |t|
+      t.timestamps
+      t.integer :dynamic_pages_count, default: 0, null: false
+      t.string :slug, null: false
+      t.string :name, null: false
+    end
+
+    add_index :navigation_groups, :slug, unique: true
+  end
+
+  def create_dynamic_pages
+    create_table :dynamic_pages, comment: 'Dynamic pages' do |t|
+      t.uuid :uuid, null: false
+      t.references :simple_image, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.references :language, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.timestamps
+      t.boolean :visible, default: true, null: false
+      t.string :slug, null: false
+      t.string :url, index: true
+      t.string :name
+      t.text :body, default: '', null: false
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_index :dynamic_pages, :uuid, unique: true
+    add_index :dynamic_pages, :data, using: :gin
+  end
+
+  def create_pages_in_groups
+    create_table :navigation_group_pages, comment: 'Dynamic pages in navigation groups' do |t|
+      t.references :navigation_group, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :dynamic_page, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.integer :priority, limit: 2, default: 1, null: false
+      t.timestamps
+    end
+  end
+
+  def create_dynamic_blocks
+    create_table :dynamic_blocks, comment: 'Dynamic blocks' do |t|
+      t.string :slug, null: false
+      t.boolean :visible, default: true, null: false
+      t.timestamps
+      t.text :body
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_index :dynamic_blocks, :slug, unique: true
+    add_index :dynamic_blocks, :data, using: :gin
+  end
+end

data/db/migrate/20210401000000_create_contact_component.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+# Create tables for contact component
+class CreateContactComponent < ActiveRecord::Migration[6.1]
+  def up
+    create_component
+    create_feedback_messages unless FeedbackMessage.table_exists?
+    create_feedback_responses unless FeedbackResponse.table_exists?
+    create_contact_types unless ContactType.table_exists?
+    create_contact_methods unless ContactMethod.table_exists?
+  end
+
+  def down
+    Biovision::Components::ContactComponent.dependent_models.each do |model|
+      drop_table model.table_name if model.table_exists?
+    end
+
+    BiovisionComponent[Biovision::Components::ContactComponent]&.destroy
+  end
+
+  private
+
+  def create_component
+    settings = { feedback_email: '' }
+    slug = Biovision::Components::ContactComponent.slug
+
+    BiovisionComponent.create(slug: slug, settings: settings)
+  end
+
+  def create_feedback_messages
+    create_table :feedback_messages, comment: 'Feedback messages from visitors' do |t|
+      t.uuid :uuid, null: false
+      t.references :language, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.references :user, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.references :ip_address, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.timestamps
+      t.boolean :visible, default: false, null: false
+      t.boolean :processed, default: false, null: false
+      t.string :attachment
+      t.string :name
+      t.string :email
+      t.string :phone
+      t.text :comment
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_index :feedback_messages, :uuid, unique: true
+    add_index :feedback_messages, :data, using: :gin
+  end
+
+  def create_feedback_responses
+    create_table :feedback_responses, comment: 'Responses to feedback messages' do |t|
+      t.uuid :uuid, null: false
+      t.references :feedback_message, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :user, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.references :ip_address, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.timestamps
+      t.boolean :visible, default: true, null: false
+      t.text :body
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_index :feedback_responses, :uuid, unique: true
+    add_index :feedback_responses, :data, using: :gin
+  end
+
+  def create_contact_types
+    create_table :contact_types, comment: 'Types of contact methods' do |t|
+      t.string :slug, null: false
+    end
+
+    add_index :contact_types, :slug, unique: true
+
+    %w[email phone address].each { |slug| ContactType.create(slug: slug) }
+  end
+
+  def create_contact_methods
+    create_table :contact_methods, comment: 'Contact methods for visitors' do |t|
+      t.uuid :uuid, null: false
+      t.references :language, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.references :contact_type, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.timestamps
+      t.boolean :visible, default: true, null: false
+      t.integer :priority, limit: 2, default: 1, null: false
+      t.string :name
+      t.string :value
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_index :contact_methods, :uuid, unique: true
+    add_index :contact_methods, :data, using: :gin
+  end
+end

data/db/migrate/20210405000000_create_acl.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+# Create tables for access control
+class CreateAcl < ActiveRecord::Migration[6.1]
+  def up
+    create_groups unless Group.table_exists?
+    create_roles unless Role.table_exists?
+    create_role_groups unless RoleGroup.table_exists?
+    create_user_groups unless UserGroup.table_exists?
+    create_user_roles unless UserRole.table_exists?
+  end
+
+  def down
+    [UserRole, UserGroup, RoleGroup, Role, Group].each do |model|
+      drop_table model.table_name if model.table_exists?
+    end
+  end
+
+  private
+
+  def create_groups
+    create_table :groups, comment: 'ACL groups' do |t|
+      t.uuid :uuid, null: false
+      t.references :biovision_component, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.integer :parent_id
+      t.integer :user_count, default: 0, null: false
+      t.string :slug, index: true, null: false
+      t.string :parents_cache, default: '', null: false
+      t.integer :children_cache, array: true, default: [], null: false
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_foreign_key :groups, :groups, column: :parent_id, on_update: :cascade, on_delete: :cascade
+    add_index :groups, :uuid, unique: true
+    add_index :groups, :data, using: :gin
+  end
+
+  def create_roles
+    create_table :roles, comment: 'ACL roles' do |t|
+      t.uuid :uuid, null: false
+      t.references :biovision_component, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.integer :user_count, default: 0, null: false
+      t.string :slug, index: true, null: false
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_index :roles, :uuid, unique: true
+    add_index :roles, :data, using: :gin
+  end
+
+  def create_role_groups
+    create_table :role_groups, comment: 'ACL: roles in groups' do |t|
+      t.references :role, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :group, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+    end
+  end
+
+  def create_user_groups
+    create_table :user_groups, comment: 'Users in ACL groups' do |t|
+      t.references :user, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :group, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.timestamps
+    end
+  end
+
+  def create_user_roles
+    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
+end

data/lib/biovision/base_methods.rb

@@ -2,16 +2,16 @@
 
 # Useful helper methods for application
 module Biovision
+  # Base additional methods for application controller
   module BaseMethods
     extend ActiveSupport::Concern
 
     included do
-      before_action :set_locale
-
       helper_method :visitor_slug
       helper_method :component_handler
       helper_method :current_page, :param_from_request
       helper_method :current_user, :current_language
+      helper_method :content_component
     end
 
     # Get current page number from request
@@ -46,6 +46,13 @@ module Biovision
       @current_language ||= Language[locale]
     end
 
+    # Get content component handler
+    #
+    # @return [Biovision::Components::ContentComponent]
+    def content_component
+      @content_component ||= Biovision::Components::ContentComponent[current_user]
+    end
+
     # @return [Agent]
     def agent
       @agent ||= Agent[request.user_agent || 'n/a']
@@ -60,11 +67,7 @@ module Biovision
       end
     end
 
-    def set_locale
-      I18n.locale = params[:locale] || I18n.default_locale
-    end
-
-    protected
+    private
 
     # Handle generic HTTP error without raising exception
     #
@@ -115,8 +118,9 @@ module Biovision
 
     # Restrict access for anonymous users
     def restrict_anonymous_access
-      error = t('application.errors.restricted_access')
-      handle_http_401(error) if current_user.nil?
+      return unless current_user.nil?
+
+      handle_http_401(t('application.errors.restricted_access'))
     end
 
     # Owner information for entity
@@ -144,14 +148,18 @@ module Biovision
     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
-    def form_processed_with_error(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