biovision-base 0.22.180920.0 → 0.34.190331.1

data/app/controllers/concerns/toggleable_entity.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Adds method for toggling entity flags
 module ToggleableEntity
   extend ActiveSupport::Concern
 
@@ -23,10 +26,6 @@ module ToggleableEntity
   end
 
   def entity_is_locked?
-    if @entity.respond_to?(:locked?)
-      @entity.locked?
-    else
-      false
-    end
+    @entity.respond_to?(:locked?) ? @entity.locked? : false
   end
 end

data/app/controllers/editable_pages_controller.rb

@@ -1,5 +1,15 @@
+# frozen_string_literal: true
+
+# Managing editable_pages
 class EditablePagesController < AdminController
-  before_action :set_entity, only: [:edit, :update, :destroy]
+  before_action :set_entity, only: %i[edit update destroy]
+
+  # post /editable_pages/check
+  def check
+    @entity = EditablePage.instance_for_check(params[:entity_id], entity_parameters)
+
+    render 'shared/forms/check'
+  end
 
   # get /editable_pages/new
   def new
@@ -23,7 +33,6 @@ class EditablePagesController < AdminController
   # patch /editable_pages/:id
   def update
     if @entity.update(entity_parameters)
-      flash[:notice] = t('editable_pages.update.success')
       form_processed_ok(admin_editable_page_path(id: @entity.id))
     else
       form_processed_with_error(:edit)
@@ -32,9 +41,8 @@ class EditablePagesController < AdminController
 
   # delete /editable_pages/:id
   def destroy
-    if @entity.destroy
-      flash[:notice] = t('editable_pages.destroy.success')
-    end
+    flash[:notice] = t('editable_pages.destroy.success') if @entity.destroy
+
     redirect_to(admin_editable_pages_path)
   end
 
@@ -46,9 +54,7 @@ class EditablePagesController < AdminController
 
   def set_entity
     @entity = EditablePage.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find editable_page')
-    end
+    handle_http_404('Cannot find editable_page') if @entity.nil?
   end
 
   def entity_parameters

data/app/controllers/fallback_controller.rb

@@ -1,7 +1,12 @@
+# frozen_string_literal: true
+
+# Fallback controller for the rest of URLs
+#
+# Tries to find and show editable page with given url
 class FallbackController < ApplicationController
-  # get (:editable_page_url)
+  # get (:slug)
   def show
-    url = params[:editable_page_url]
+    url = params[:slug]
 
     @editable_page = EditablePage.fallback_page("/#{url}", locale)
     if @editable_page.nil?

data/app/controllers/feedback_requests_controller.rb

@@ -1,24 +1,39 @@
+# frozen_string_literal: true
+
+# Processing feedback requests
 class FeedbackRequestsController < ApplicationController
   # post /feedback_requests
   def create
     @entity = FeedbackRequest.new(creation_parameters)
-    if @entity.save
-      respond_to do |format|
-        format.html { redirect_to root_path }
-        format.json { head :no_content }
-        format.js
-      end
+    if params[:agree]
+      show_result
+    else
+      save_entity
+    end
+  end
 
+  private
+
+  def save_entity
+    if @entity.save
+      show_result
       FeedbackMailer.new_feedback_request(@entity.id).deliver_later
     else
       redirect_to root_path
     end
   end
 
-  private
+  def show_result
+    respond_to do |format|
+      format.html { redirect_to root_path }
+      format.json { head :no_content }
+      format.js
+    end
+  end
 
   def creation_parameters
-    parameters = params.require(:feedback_request).permit(FeedbackRequest.creation_parameters)
+    permitted = FeedbackRequest.creation_parameters
+    parameters = params.require(:feedback_request).permit(permitted)
     parameters.merge(tracking_for_entity)
   end
 end

data/app/controllers/metrics_controller.rb

@@ -7,10 +7,10 @@ class MetricsController < AdminController
 
   # patch /metrics/:id
   def update
-    if @entity.update entity_parameters
-      redirect_to admin_metric_path(id: @entity.id), notice: t('metrics.update.success')
+    if @entity.update(entity_parameters)
+      form_processed_ok(admin_metric_path(id: @entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 

data/app/controllers/my/profiles_controller.rb

@@ -1,10 +1,14 @@
+# frozen_string_literal: true
+
+# Controller for registration and profile management
 class My::ProfilesController < ApplicationController
   include Authentication
 
-  before_action :redirect_authorized_user, only: [:new, :create]
-  before_action :restrict_anonymous_access, except: [:check, :new, :create]
+  before_action :redirect_authorized_user, only: %i[new create]
+  before_action :restrict_anonymous_access, except: %i[check new create]
+  before_action :set_handler
 
-  layout 'profile', only: [:show, :edit]
+  layout 'profile', only: %i[show edit]
 
   # post /my/profile/check
   def check
@@ -14,6 +18,8 @@ class My::ProfilesController < ApplicationController
   # get /my/profile/new
   def new
     @entity = User.new
+
+    render :closed unless @handler.open?
   end
 
   # post /my/profile
@@ -47,15 +53,17 @@ class My::ProfilesController < ApplicationController
   protected
 
   def redirect_authorized_user
-    redirect_to my_path if current_user.is_a? User
+    redirect_to my_path if current_user.is_a?(User)
   end
 
   def create_user
-    @entity = User.new(creation_parameters)
-    if @entity.save
-      Metric.register(User::METRIC_REGISTRATION)
+    code    = Code.active.find_by(body: param_from_request(:code))
+    @entity = @handler.handle(creation_parameters, code)
+
+    if @entity.persisted?
       create_token_for_user(@entity)
       cookies.delete('r', domain: :all)
+
       redirect_after_creation
     else
       form_processed_with_error(:new)
@@ -65,7 +73,7 @@ class My::ProfilesController < ApplicationController
   def creation_parameters
     parameters = params.require(:user).permit(User.new_profile_parameters)
     parameters.merge!(tracking_for_entity)
-    parameters.merge!({ super_user: User.count < 1 })
+    parameters[:super_user] = User.count < 1
     if cookies['r']
       parameters[:inviter] = User.find_by(referral_link: cookies['r'])
     end
@@ -77,7 +85,9 @@ class My::ProfilesController < ApplicationController
     sensitive  = sensitive_parameters
     editable   = User.profile_parameters + sensitive
     parameters = params.require(:user).permit(editable)
-    filter_parameters parameters.merge(profile_parameters), sensitive
+    new_data   = @entity.data.merge(profile: profile_parameters)
+
+    filter_parameters(parameters.merge(data: new_data), sensitive)
   end
 
   def sensitive_parameters
@@ -91,15 +101,20 @@ class My::ProfilesController < ApplicationController
   def profile_parameters
     permitted = UserProfileHandler.allowed_parameters
     dirty     = params.require(:user_profile).permit(permitted)
-    { profile_data: UserProfileHandler.clean_parameters(dirty) }
+    UserProfileHandler.clean_parameters(dirty)
   end
 
   # @param [Hash] parameters
   # @param [Hash] sensitive
   def filter_parameters(parameters, sensitive)
-    sensitive.each { |parameter| parameters.except! parameter if parameter.blank? }
-    parameters[:email_confirmed] = false if parameters[:email] && parameters[:email] != current_user.email
-    parameters[:phone_confirmed] = false if parameters[:phone] && parameters[:phone] != current_user.phone
+    sensitive.each { |sp| parameters.except! sp if sp.blank? }
+    if parameters.key?(:email) && parameters[:email] != current_user.email
+      parameters[:email_confirmed] = false
+    end
+    if parameters.key?(:phone) && parameters[:phone] != current_user.phone
+      parameters[:phone_confirmed] = false
+    end
+
     parameters
   end
 
@@ -108,8 +123,10 @@ class My::ProfilesController < ApplicationController
     return_path = my_profile_path unless return_path[0] == '/'
     cookies.delete 'return_path', domain: :all
 
-    flash[:notice] = t('my.profiles.create.success')
-
     form_processed_ok(return_path)
   end
+
+  def set_handler
+    @handler = Biovision::Components::BaseComponent.handler('registration')
+  end
 end

data/app/controllers/privilege_groups_controller.rb

@@ -11,9 +11,9 @@ class PrivilegeGroupsController < AdminController
   def create
     @entity = PrivilegeGroup.new entity_parameters
     if @entity.save
-      redirect_to admin_privilege_group_path(id: @entity.id)
+      form_processed_ok(admin_privilege_group_path(id: @entity.id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
     end
   end
 
@@ -24,9 +24,9 @@ class PrivilegeGroupsController < AdminController
   # patch /privilege_groups/:id
   def update
     if @entity.update entity_parameters
-      redirect_to admin_privilege_group_path(id: @entity.id), notice: t('privilege_groups.update.success')
+      form_processed_ok(admin_privilege_group_path(id: @entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 

data/app/controllers/privileges_controller.rb

@@ -1,16 +1,13 @@
 class PrivilegesController < AdminController
-  before_action :restrict_access
   before_action :set_entity, only: [:edit, :update, :destroy]
-  before_action :restrict_editing, only: [:edit, :update, :destroy]
 
   # post /privileges
   def create
     @entity = Privilege.new(creation_parameters)
     if @entity.save
-      cache_relatives
-      redirect_to admin_privilege_path(id: @entity.id)
+      form_processed_ok(admin_privilege_path(id: @entity.id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
     end
   end
 
@@ -21,16 +18,15 @@ class PrivilegesController < AdminController
   # patch /privileges/:id
   def update
     if @entity.update(entity_parameters)
-      cache_relatives
-      redirect_to admin_privilege_path(id: @entity.id), notice: t('privileges.update.success')
+      form_processed_ok(admin_privilege_path(id: @entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 
   # delete /privileges/:id
   def destroy
-    if @entity.update deleted: true
+    if @entity.deletable? && @entity.destroy
       flash[:notice] = t('privileges.destroy.success')
     end
     redirect_to admin_privileges_path
@@ -43,15 +39,9 @@ class PrivilegesController < AdminController
   end
 
   def set_entity
-    @entity = Privilege.find_by(id: params[:id], deleted: false)
+    @entity = Privilege.find_by(id: params[:id])
     if @entity.nil?
-      handle_http_404("Cannot find non-deleted privilege #{params[:id]}")
-    end
-  end
-
-  def restrict_editing
-    if @entity.locked?
-      redirect_to admin_privilege_path(id: @entity.id), alert: t('privileges.edit.forbidden')
+      handle_http_404("Cannot find privilege #{params[:id]}")
     end
   end
 
@@ -62,13 +52,4 @@ class PrivilegesController < AdminController
   def creation_parameters
     params.require(:privilege).permit(Privilege.creation_parameters)
   end
-
-  def cache_relatives
-    @entity.cache_parents!
-    unless @entity.parent.blank?
-      parent = @entity.parent
-      parent.cache_children!
-      parent.save
-    end
-  end
 end

data/app/controllers/simple_blocks_controller.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+# Managing simple_blocks
+class SimpleBlocksController < AdminController
+  before_action :set_entity, only: %i[edit update destroy]
+
+  # post /simple_blocks/check
+  def check
+    @entity = SimpleBlock.instance_for_check(params[:entity_id], entity_parameters)
+
+    render 'shared/forms/check'
+  end
+
+  # get /simple_blocks/new
+  def new
+    @entity = SimpleBlock.new
+  end
+
+  # post /simple_blocks
+  def create
+    @entity = SimpleBlock.new(entity_parameters)
+    if @entity.save
+      form_processed_ok(admin_simple_block_path(id: @entity.id))
+    else
+      form_processed_with_error(:new)
+    end
+  end
+
+  # get /simple_blocks/:id/edit
+  def edit
+  end
+
+  # patch /simple_blocks/:id
+  def update
+    if @entity.update(entity_parameters)
+      form_processed_ok(admin_simple_block_path(id: @entity.id))
+    else
+      form_processed_with_error(:edit)
+    end
+  end
+
+  # delete /simple_blocks/:id
+  def destroy
+    flash[:notice] = t('simple_blocks.destroy.success') if @entity.destroy
+
+    redirect_to(admin_simple_blocks_path)
+  end
+
+  protected
+
+  def restrict_access
+    require_privilege :content_manager
+  end
+
+  def set_entity
+    @entity = SimpleBlock.find_by(id: params[:id])
+    handle_http_404('Cannot find simple_block') if @entity.nil?
+  end
+
+  def entity_parameters
+    params.require(:simple_block).permit(SimpleBlock.entity_parameters)
+  end
+end

data/app/controllers/stored_values_controller.rb

@@ -10,9 +10,9 @@ class StoredValuesController < AdminController
   def create
     @entity = StoredValue.new(entity_parameters)
     if @entity.save
-      redirect_to admin_stored_value_path(id: @entity.id)
+      form_processed_ok(admin_stored_value_path(id: @entity.id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
     end
   end
 
@@ -23,9 +23,9 @@ class StoredValuesController < AdminController
   # patch /stored_values/:id
   def update
     if @entity.update(entity_parameters)
-      redirect_to admin_stored_value_path(id: @entity.id), notice: t('stored_values.update.success')
+      form_processed_ok(admin_stored_value_path(id: @entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 

data/app/controllers/tokens_controller.rb

@@ -10,9 +10,9 @@ class TokensController < AdminController
   def create
     @entity = Token.new(creation_parameters)
     if @entity.save
-      redirect_to admin_token_path(id: @entity.id)
+      form_processed_ok(admin_token_path(id: @entity.id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
     end
   end
 
@@ -23,9 +23,9 @@ class TokensController < AdminController
   # patch /tokens/:id
   def update
     if @entity.update(entity_parameters)
-      redirect_to admin_token_path(id: @entity.id), notice: t('tokens.update.success')
+      form_processed_ok(admin_token_path(id: @entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end