biovision-base 0.22.180920.0 → 0.34.190331.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +5 -21
- data/app/assets/images/biovision/base/icons/apply.svg +4 -0
- data/app/assets/images/biovision/base/icons/components/contact.svg +26 -0
- data/app/assets/images/biovision/base/icons/components/registration.svg +17 -0
- data/app/assets/images/biovision/base/icons/destroy.svg +11 -8
- data/app/assets/images/biovision/base/icons/settings.svg +41 -0
- data/app/assets/images/biovision/base/icons/slider/arrow-left.svg +4 -0
- data/app/assets/images/biovision/base/icons/slider/arrow-right.svg +4 -0
- data/app/assets/images/biovision/base/placeholders/16x9.svg +10 -3
- data/app/assets/images/biovision/base/placeholders/1x1.svg +12 -0
- data/app/assets/images/biovision/base/placeholders/3x2.svg +10 -3
- data/app/assets/javascripts/biovision/base/biovision.js +780 -461
- data/app/assets/javascripts/biovision/base/components/carousel.js +123 -0
- data/app/assets/javascripts/biovision/base/polyfills.js +149 -0
- data/app/assets/stylesheets/biovision/base/admin.scss +85 -46
- data/app/assets/stylesheets/biovision/base/admin/components.scss +141 -0
- data/app/assets/stylesheets/biovision/base/biovision.scss +149 -33
- data/app/assets/stylesheets/biovision/base/buttons/buttons-common.scss +22 -0
- data/app/assets/stylesheets/biovision/base/default.scss +6 -6
- data/app/assets/stylesheets/biovision/base/default_admin.scss +25 -8
- data/app/assets/stylesheets/biovision/base/themes/simple-layout.scss +0 -3
- data/app/controllers/admin/editable_pages_controller.rb +6 -4
- data/app/controllers/admin/privileges_controller.rb +2 -3
- data/app/controllers/admin/settings_controller.rb +52 -0
- data/app/controllers/admin/simple_blocks_controller.rb +28 -0
- data/app/controllers/admin/users_controller.rb +1 -1
- data/app/controllers/agents_controller.rb +4 -4
- data/app/controllers/authentication_controller.rb +28 -6
- data/app/controllers/browsers_controller.rb +4 -4
- data/app/controllers/concerns/authentication.rb +8 -5
- data/app/controllers/concerns/entity_priority.rb +3 -0
- data/app/controllers/concerns/lockable_entity.rb +6 -3
- data/app/controllers/concerns/removable_image.rb +4 -5
- data/app/controllers/concerns/toggleable_entity.rb +4 -5
- data/app/controllers/editable_pages_controller.rb +14 -8
- data/app/controllers/fallback_controller.rb +7 -2
- data/app/controllers/feedback_requests_controller.rb +23 -8
- data/app/controllers/metrics_controller.rb +3 -3
- data/app/controllers/my/profiles_controller.rb +32 -15
- data/app/controllers/privilege_groups_controller.rb +4 -4
- data/app/controllers/privileges_controller.rb +7 -26
- data/app/controllers/simple_blocks_controller.rb +63 -0
- data/app/controllers/stored_values_controller.rb +4 -4
- data/app/controllers/tokens_controller.rb +4 -4
- data/app/controllers/users_controller.rb +8 -3
- data/app/helpers/biovision_users_helper.rb +60 -21
- data/app/helpers/editable_pages_helper.rb +22 -0
- data/app/helpers/languages_helper.rb +3 -0
- data/app/helpers/simple_image_helper.rb +66 -0
- data/app/mailers/application_mailer.rb +0 -2
- data/app/mailers/code_sender.rb +13 -2
- data/app/mailers/feedback_mailer.rb +5 -2
- data/app/mailers/user_mailer.rb +6 -1
- data/app/models/biovision_component.rb +43 -0
- data/app/models/biovision_parameter.rb +34 -0
- data/app/models/code.rb +22 -7
- data/app/models/code_type.rb +9 -1
- data/app/models/concerns/flat_priority.rb +50 -0
- data/app/models/concerns/nested_priority.rb +58 -0
- data/app/models/concerns/required_unique_slug.rb +5 -2
- data/app/models/editable_page.rb +49 -37
- data/app/models/foreign_site.rb +5 -3
- data/app/models/language.rb +15 -37
- data/app/models/metric.rb +2 -4
- data/app/models/privilege.rb +23 -45
- data/app/models/privilege_group.rb +6 -1
- data/app/models/simple_block.rb +66 -0
- data/app/models/user.rb +29 -26
- data/app/models/user_privilege.rb +1 -1
- data/app/services/biovision/components/base_component.rb +115 -0
- data/app/services/biovision/components/registration_component.rb +98 -0
- data/app/services/code_manager.rb +4 -1
- data/app/services/code_manager/confirmation.rb +8 -4
- data/app/services/code_manager/invitation.rb +9 -5
- data/app/services/code_manager/recovery.rb +9 -6
- data/app/services/user_manager.rb +5 -4
- data/app/services/user_profile_handler.rb +38 -11
- data/app/uploaders/avatar_uploader.rb +5 -1
- data/app/uploaders/editable_page_image_uploader.rb +4 -6
- data/app/uploaders/media_file_uploader.rb +6 -4
- data/app/uploaders/media_snapshot_uploader.rb +6 -2
- data/app/uploaders/simple_file_uploader.rb +12 -0
- data/app/uploaders/simple_image_uploader.rb +75 -0
- data/app/views/about/editable.html.erb +1 -1
- data/app/views/admin/agents/_filter.html.erb +1 -1
- data/app/views/admin/editable_pages/entity/_in_list.html.erb +16 -0
- data/app/views/admin/editable_pages/index.html.erb +8 -1
- data/app/views/admin/editable_pages/show.html.erb +21 -17
- data/app/views/admin/feedback_requests/entity/_in_list.html.erb +9 -1
- data/app/views/admin/index/_biovision_base.html.erb +5 -7
- data/app/views/admin/index/_components.html.erb +9 -0
- data/app/views/admin/index/dashboard/_editorial.html.erb +2 -2
- data/app/views/admin/index/dashboard/_settings.html.erb +2 -2
- data/app/views/admin/index/index.html.erb +2 -0
- data/app/views/admin/privileges/entity/_groups.html.erb +25 -25
- data/app/views/admin/privileges/entity/_in_list.html.erb +30 -9
- data/app/views/admin/privileges/index.html.erb +6 -1
- data/app/views/admin/privileges/show.html.erb +31 -18
- data/app/views/admin/settings/component/_new_parameter.html.erb +62 -0
- data/app/views/admin/settings/component/_parameters.html.erb +37 -0
- data/app/views/admin/settings/component/_setting.html.erb +18 -0
- data/app/views/admin/settings/component/_settings.html.erb +31 -0
- data/app/views/admin/settings/index.html.erb +27 -0
- data/app/views/admin/settings/show.html.erb +42 -0
- data/app/views/admin/simple_blocks/_nav_item.html.erb +6 -0
- data/app/views/admin/simple_blocks/entity/_in_list.html.erb +23 -0
- data/app/views/admin/simple_blocks/index.html.erb +21 -0
- data/app/views/admin/simple_blocks/show.html.erb +51 -0
- data/app/views/admin/tokens/_filter.html.erb +1 -1
- data/app/views/admin/users/_filter.html.erb +1 -1
- data/app/views/admin/users/entity/_privilege.html.erb +12 -21
- data/app/views/admin/users/entity/_privilege_tree.html.erb +17 -15
- data/app/views/admin/users/privileges.html.erb +9 -1
- data/app/views/admin/users/search.jbuilder +3 -3
- data/app/views/admin/users/show.html.erb +11 -6
- data/app/views/agents/_filter.html.erb +22 -22
- data/app/views/agents/_form.html.erb +25 -29
- data/app/views/application/forbidden.html.erb +9 -0
- data/app/views/application/forbidden.jbuilder +3 -0
- data/app/views/authentication/_form.html.erb +13 -13
- data/app/views/browsers/_form.html.erb +21 -25
- data/app/views/editable_blocks/_entity.html.erb +4 -1
- data/app/views/editable_pages/_form.html.erb +63 -62
- data/app/views/editable_pages/edit.html.erb +1 -1
- data/app/views/editable_pages/entity/_metadata.html.erb +4 -4
- data/app/views/editable_pages/new.html.erb +3 -3
- data/app/views/fallback/show.html.erb +8 -1
- data/app/views/feedback_requests/_form.html.erb +76 -52
- data/app/views/feedback_requests/create.js.erb +1 -10
- data/app/views/index/index/_editable.html.erb +0 -4
- data/app/views/metrics/_form.html.erb +38 -36
- data/app/views/my/confirmations/show.html.erb +5 -3
- data/app/views/my/profiles/closed.html.erb +7 -0
- data/app/views/my/profiles/edit/_form.html.erb +9 -9
- data/app/views/my/profiles/new.html.erb +9 -1
- data/app/views/my/profiles/new/_form.html.erb +22 -1
- data/app/views/my/recoveries/show.html.erb +2 -2
- data/app/views/privilege_groups/_form.html.erb +48 -21
- data/app/views/privileges/_form.html.erb +68 -36
- data/app/views/profiles/_profile.html.erb +3 -3
- data/app/views/shared/_pagination.jbuilder +7 -5
- data/app/views/shared/admin/_breadcrumbs.html.erb +1 -1
- data/app/views/shared/forms/_meta_texts.html.erb +3 -3
- data/app/views/shared/forms/_priority.html.erb +12 -0
- data/app/views/shared/forms/_state_container.html.erb +1 -0
- data/app/views/simple_blocks/_empty.html.erb +0 -0
- data/app/views/simple_blocks/_form.html.erb +120 -0
- data/app/views/simple_blocks/_simple_block.html.erb +26 -0
- data/app/views/simple_blocks/edit.html.erb +17 -0
- data/app/views/simple_blocks/new.html.erb +15 -0
- data/app/views/stored_values/_form.html.erb +57 -28
- data/app/views/tokens/_form.html.erb +31 -26
- data/app/views/users/_form.html.erb +1 -1
- data/config/initializers/carrierwave.rb +7 -2
- data/config/locales/common-ru.yml +5 -0
- data/config/locales/components-ru.yml +50 -0
- data/config/locales/editable-pages-en.yml +2 -0
- data/config/locales/editable-pages-ru.yml +50 -7
- data/config/locales/editable-pages-sv.yml +2 -0
- data/config/locales/feedback-ru.yml +1 -0
- data/config/locales/users-en.yml +0 -1
- data/config/locales/users-ru.yml +6 -1
- data/config/locales/users-sv.yml +0 -1
- data/config/routes.rb +32 -6
- data/db/migrate/20181217000000_create_biovision_components.rb +80 -0
- data/db/migrate/20181217000010_create_metrics.rb +40 -0
- data/db/migrate/20181217000015_create_browsers.rb +38 -0
- data/db/migrate/20181217000020_create_languages.rb +30 -0
- data/db/migrate/20181217000030_create_users.rb +118 -0
- data/db/migrate/20181217000035_create_codes.rb +51 -0
- data/db/migrate/20181217000040_create_privileges.rb +142 -0
- data/db/migrate/20181217000100_create_media_folders.rb +53 -0
- data/db/migrate/20181217000110_create_editable_pages.rb +90 -0
- data/db/migrate/20181217000200_create_feedback_requests.rb +27 -0
- data/db/migrate/20181217121211_add_uuid_to_users.rb +12 -0
- data/db/migrate/20181217121212_update_fields181217.rb +29 -0
- data/db/migrate/20190311121212_convert_json_columns.rb +47 -0
- data/db/migrate/20190324181818_add_data_to_feedback_requests.rb +14 -0
- data/db/migrate/20190326120000_create_simple_blocks.rb +31 -0
- data/db/{migrate → obsolete_migrations}/20171223333333_amend_foreign_keys.rb +0 -0
- data/db/{migrate → obsolete_migrations}/20180117151515_add_language_to_models.rb +0 -0
- data/db/{migrate → obsolete_migrations}/20180321000000_add_profile_data_to_users.rb +4 -4
- data/db/{migrate → obsolete_migrations}/20180405000000_add_consent_to_users.rb +0 -0
- data/db/{migrate → obsolete_migrations}/20180610222222_add_consent_to_feedback_requests.rb +0 -0
- data/db/{migrate → obsolete_migrations}/20180612111111_add_administrative_to_privilege.rb +0 -0
- data/db/{migrate → obsolete_migrations}/20180619121212_add_image_alt_text_to_editable_page.rb +0 -0
- data/db/{migrate → obsolete_migrations}/20180703111111_add_fields_to_editable_blocks.rb +0 -0
- data/db/{migrate → obsolete_migrations}/20180722222222_add_active_to_languages.rb +0 -0
- data/db/{migrate → obsolete_migrations}/20180725111111_add_referral_link_to_users.rb +0 -0
- data/db/obsolete_migrations/20181012222222_add_deletable_to_privileges.rb +19 -0
- data/db/obsolete_migrations/20181012222223_convert_stored_values.rb +13 -0
- data/db/obsolete_migrations/20181030080808_update_editable_pages_meta.rb +20 -0
- data/lib/biovision/base/base_methods.rb +19 -2
- data/lib/biovision/base/version.rb +3 -1
- data/lib/tasks/users.rake +19 -1
- metadata +75 -40
- data/app/views/admin/privileges/_list.html.erb +0 -15
- data/db/migrate/20170228000000_create_languages.rb +0 -23
- data/db/migrate/20170301000001_create_metrics.rb +0 -23
- data/db/migrate/20170301000002_create_metric_values.rb +0 -19
- data/db/migrate/20170301000101_create_browsers.rb +0 -22
- data/db/migrate/20170301000102_create_agents.rb +0 -22
- data/db/migrate/20170302000001_create_users.rb +0 -55
- data/db/migrate/20170302000003_create_tokens.rb +0 -23
- data/db/migrate/20170302000004_create_code_types.rb +0 -20
- data/db/migrate/20170302000005_create_codes.rb +0 -24
- data/db/migrate/20170302000101_create_privileges.rb +0 -41
- data/db/migrate/20170302000102_create_user_privileges.rb +0 -18
- data/db/migrate/20170302000103_create_privilege_groups.rb +0 -23
- data/db/migrate/20170302000104_create_privilege_group_privileges.rb +0 -24
- data/db/migrate/20170320000000_create_editable_pages.rb +0 -52
- data/db/migrate/20170425000001_create_foreign_sites.rb +0 -18
- data/db/migrate/20170425000002_create_foreign_users.rb +0 -23
- data/db/migrate/20170629120000_create_login_attempts.rb +0 -19
- data/db/migrate/20170823000001_create_stored_values.rb +0 -19
- data/db/migrate/20171202000000_create_media_folders.rb +0 -28
- data/db/migrate/20171202000001_create_media_files.rb +0 -27
- data/db/migrate/20171211000000_create_feedback_requests.rb +0 -33
- data/db/migrate/20180117160000_create_user_languages.rb +0 -17
- data/db/migrate/20180622140000_create_link_blocks.rb +0 -29
- data/db/migrate/20180622140001_create_link_block_items.rb +0 -23
- data/db/migrate/20180627190000_create_editable_blocks.rb +0 -39
@@ -1,4 +1,5 @@
|
|
1
1
|
class PrivilegeGroup < ApplicationRecord
|
2
|
+
include Checkable
|
2
3
|
include RequiredUniqueSlug
|
3
4
|
include RequiredUniqueName
|
4
5
|
|
@@ -13,6 +14,8 @@ class PrivilegeGroup < ApplicationRecord
|
|
13
14
|
validates_length_of :slug, maximum: SLUG_LIMIT
|
14
15
|
validates_length_of :description, maximum: DESCRIPTION_LIMIT
|
15
16
|
|
17
|
+
scope :list_for_administration, -> { ordered_by_name }
|
18
|
+
|
16
19
|
def self.page_for_administration
|
17
20
|
ordered_by_name
|
18
21
|
end
|
@@ -23,11 +26,12 @@ class PrivilegeGroup < ApplicationRecord
|
|
23
26
|
def self.ids(slug)
|
24
27
|
instance = find_by(slug: slug.to_s)
|
25
28
|
return [] if instance.nil?
|
29
|
+
|
26
30
|
instance.privileges.map(&:branch_ids).flatten.uniq
|
27
31
|
end
|
28
32
|
|
29
33
|
def self.entity_parameters
|
30
|
-
%i
|
34
|
+
%i[name slug description]
|
31
35
|
end
|
32
36
|
|
33
37
|
# @param [String] slug
|
@@ -44,6 +48,7 @@ class PrivilegeGroup < ApplicationRecord
|
|
44
48
|
def add_privilege(privilege)
|
45
49
|
criteria = { privilege_group: self, privilege: privilege }
|
46
50
|
return if PrivilegeGroupPrivilege.exists?(criteria)
|
51
|
+
|
47
52
|
PrivilegeGroupPrivilege.create(criteria)
|
48
53
|
end
|
49
54
|
|
@@ -0,0 +1,66 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# Model for simple editable block
|
4
|
+
#
|
5
|
+
# Attributes:
|
6
|
+
# background_image [Boolean]
|
7
|
+
# body [Text], optional
|
8
|
+
# created_at [DateTime]
|
9
|
+
# image [SimpleImageUploader], optional
|
10
|
+
# image_alt_text [String], optional
|
11
|
+
# name [String]
|
12
|
+
# slug [String]
|
13
|
+
# updated_at [DateTime]
|
14
|
+
# visible [Boolean]
|
15
|
+
class SimpleBlock < ApplicationRecord
|
16
|
+
include Checkable
|
17
|
+
include RequiredUniqueSlug
|
18
|
+
include RequiredUniqueName
|
19
|
+
include Toggleable
|
20
|
+
|
21
|
+
BODY_LIMIT = 65_535
|
22
|
+
META_LIMIT = 255
|
23
|
+
NAME_LIMIT = 100
|
24
|
+
SLUG_LIMIT = 30
|
25
|
+
SLUG_PATTERN = /\A[a-z][-_a-z0-9]*[a-z0-9]\z/.freeze
|
26
|
+
SLUG_PATTERN_HTML = '^[a-zA-Z][-_a-zA-Z0-9]*[a-zA-Z0-9]$'
|
27
|
+
|
28
|
+
toggleable :visible, :background_image
|
29
|
+
|
30
|
+
mount_uploader :image, SimpleImageUploader
|
31
|
+
|
32
|
+
before_validation { self.slug = slug.to_s.downcase }
|
33
|
+
|
34
|
+
validates_length_of :body, maximum: BODY_LIMIT
|
35
|
+
validates_length_of :image_alt_text, maximum: META_LIMIT
|
36
|
+
validates_length_of :name, maximum: NAME_LIMIT
|
37
|
+
validates_length_of :slug, maximum: SLUG_LIMIT
|
38
|
+
validates_format_of :slug, with: SLUG_PATTERN
|
39
|
+
|
40
|
+
scope :visible, -> { where(visible: true) }
|
41
|
+
scope :list_for_administration, -> { ordered_by_slug }
|
42
|
+
|
43
|
+
def self.entity_parameters
|
44
|
+
%i[body image image_alt_text name slug] + toggleable_attributes
|
45
|
+
end
|
46
|
+
|
47
|
+
# @param [String] slug
|
48
|
+
def self.partial(slug)
|
49
|
+
for_visitors(slug) || 'simple_blocks/empty'
|
50
|
+
end
|
51
|
+
|
52
|
+
# @param [String] slug
|
53
|
+
def self.for_visitors(slug)
|
54
|
+
visible.find_by(slug: slug)
|
55
|
+
end
|
56
|
+
|
57
|
+
# Get body of visible block with given slug or empty string
|
58
|
+
#
|
59
|
+
# Can be used in views for quick output
|
60
|
+
#
|
61
|
+
# @param [String] slug
|
62
|
+
# @return [String]
|
63
|
+
def self.[](slug)
|
64
|
+
SimpleBlock.visible.find_by(slug: slug)&.body.to_s
|
65
|
+
end
|
66
|
+
end
|
data/app/models/user.rb
CHANGED
@@ -1,4 +1,8 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# User
|
1
4
|
class User < ApplicationRecord
|
5
|
+
include Checkable
|
2
6
|
include Toggleable
|
3
7
|
|
4
8
|
METRIC_REGISTRATION = 'users.registration.hit'
|
@@ -6,19 +10,18 @@ class User < ApplicationRecord
|
|
6
10
|
METRIC_AUTHENTICATION_FAILURE = 'users.authentication.failure.hit'
|
7
11
|
METRIC_AUTHENTICATION_EXTERNAL = 'users.authentication.external.hit'
|
8
12
|
|
9
|
-
PER_PAGE = 20
|
10
|
-
|
11
|
-
SLUG_LIMIT = 250
|
12
13
|
EMAIL_LIMIT = 250
|
13
14
|
NOTICE_LIMIT = 255
|
14
15
|
PHONE_LIMIT = 50
|
16
|
+
SLUG_LIMIT = 250
|
17
|
+
|
18
|
+
EMAIL_PATTERN = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z0-9][-a-z0-9]+)\z/i.freeze
|
15
19
|
|
16
|
-
EMAIL_PATTERN = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z0-9][-a-z0-9]+)\z/i
|
17
20
|
SCREEN_NAME_LIMIT = 30
|
18
|
-
SCREEN_NAME_PATTERN = /\A[a-z0-9_]{1,30}\z/i
|
19
|
-
SCREEN_NAME_PATTERN_HTML = '^[a-zA-Z0-9_]{1,30}$'
|
21
|
+
SCREEN_NAME_PATTERN = /\A[-a-z0-9_]{1,30}\z/i.freeze
|
22
|
+
SCREEN_NAME_PATTERN_HTML = '^[-a-zA-Z0-9_]{1,30}$'
|
20
23
|
|
21
|
-
toggleable %i
|
24
|
+
toggleable %i[allow_login email_confirmed phone_confirmed allow_mail]
|
22
25
|
|
23
26
|
has_secure_password
|
24
27
|
|
@@ -36,7 +39,9 @@ class User < ApplicationRecord
|
|
36
39
|
has_many :login_attempts, dependent: :delete_all
|
37
40
|
has_many :user_languages, dependent: :delete_all
|
38
41
|
|
39
|
-
|
42
|
+
after_initialize { self.uuid = SecureRandom.uuid if uuid.nil? }
|
43
|
+
|
44
|
+
before_save { self.slug = (native_slug? ? screen_name : slug).downcase }
|
40
45
|
before_save :prepare_search_string
|
41
46
|
before_save { self.referral_link = SecureRandom.alphanumeric(12) if referral_link.blank? }
|
42
47
|
|
@@ -55,40 +60,42 @@ class User < ApplicationRecord
|
|
55
60
|
validates_length_of :notice, maximum: NOTICE_LIMIT
|
56
61
|
|
57
62
|
scope :with_privilege, ->(privilege) { joins(:user_privileges).where(user_privileges: { privilege_id: privilege.branch_ids }) }
|
58
|
-
scope :with_privilege_ids, ->
|
63
|
+
scope :with_privilege_ids, ->(privilege_ids) { joins(:user_privileges).where(user_privileges: { privilege_id: privilege_ids }) }
|
59
64
|
scope :ordered_by_screen_name, -> { order('screen_name asc') }
|
60
|
-
scope :bots, ->(flag) { where(bot: flag.to_i
|
61
|
-
scope :email_like, ->(
|
62
|
-
scope :with_email, ->(
|
63
|
-
scope :screen_name_like, ->(
|
65
|
+
scope :bots, ->(flag) { where(bot: flag.to_i.positive?) unless flag.blank? }
|
66
|
+
scope :email_like, ->(v) { where('email ilike ?', "%#{v}%") unless v.blank? }
|
67
|
+
scope :with_email, ->(v) { where('lower(email) = lower(?)', v) }
|
68
|
+
scope :screen_name_like, ->(v) { where('screen_name ilike ?', "%#{v}%") unless v.blank? }
|
64
69
|
scope :search, ->(q) { where('search_string like ?', "%#{q.downcase}%") unless q.blank? }
|
65
70
|
scope :filtered, ->(f) { email_like(f[:email]).screen_name_like(f[:screen_name]) }
|
66
71
|
scope :list_for_administration, -> { order('id desc') }
|
72
|
+
scope :created_after, ->(v) { where('created_at >= ?', v) unless v.blank? }
|
73
|
+
scope :created_before, ->(v) { where('created_at <= ?', v) unless v.blank? }
|
67
74
|
|
68
75
|
# @param [Integer] page
|
69
76
|
# @param [String] search_query
|
70
77
|
def self.page_for_administration(page, search_query = '')
|
71
|
-
list_for_administration.search(search_query).page(page)
|
78
|
+
list_for_administration.search(search_query).page(page)
|
72
79
|
end
|
73
80
|
|
74
81
|
def self.profile_parameters
|
75
|
-
%i
|
82
|
+
%i[image allow_mail birthday consent]
|
76
83
|
end
|
77
84
|
|
78
85
|
def self.sensitive_parameters
|
79
|
-
%i
|
86
|
+
%i[email phone password password_confirmation]
|
80
87
|
end
|
81
88
|
|
82
89
|
# Параметры при регистрации
|
83
90
|
def self.new_profile_parameters
|
84
|
-
profile_parameters + sensitive_parameters + %i
|
91
|
+
profile_parameters + sensitive_parameters + %i[screen_name]
|
85
92
|
end
|
86
93
|
|
87
94
|
# Параметры для администрирования
|
88
95
|
def self.entity_parameters
|
89
|
-
flags = %i
|
96
|
+
flags = %i[bot allow_login email_confirmed phone_confirmed foreign_slug]
|
90
97
|
|
91
|
-
new_profile_parameters + flags + %i
|
98
|
+
new_profile_parameters + flags + %i[screen_name notice balance]
|
92
99
|
end
|
93
100
|
|
94
101
|
def self.ids_range
|
@@ -108,14 +115,14 @@ class User < ApplicationRecord
|
|
108
115
|
end
|
109
116
|
|
110
117
|
def name_for_letter
|
111
|
-
|
118
|
+
data.dig('profile', 'name').blank? ? profile_name : data['profile']['name']
|
112
119
|
end
|
113
120
|
|
114
121
|
# @param [Boolean] include_patronymic
|
115
122
|
def full_name(include_patronymic = false)
|
116
123
|
result = [name_for_letter]
|
117
|
-
result <<
|
118
|
-
result <<
|
124
|
+
result << data.dig('profile', 'patronymic').to_s.strip if include_patronymic
|
125
|
+
result << data.dig('profile', 'surname').to_s.strip
|
119
126
|
result.compact.join(' ')
|
120
127
|
end
|
121
128
|
|
@@ -129,10 +136,6 @@ class User < ApplicationRecord
|
|
129
136
|
|
130
137
|
private
|
131
138
|
|
132
|
-
def normalize_slug
|
133
|
-
self.slug = (native_slug? ? screen_name : slug).downcase
|
134
|
-
end
|
135
|
-
|
136
139
|
def prepare_search_string
|
137
140
|
string = "#{slug} #{email} #{UserProfileHandler.search_string(self)}"
|
138
141
|
|
@@ -4,7 +4,7 @@ class UserPrivilege < ApplicationRecord
|
|
4
4
|
belongs_to :user
|
5
5
|
belongs_to :privilege, counter_cache: :users_count
|
6
6
|
|
7
|
-
validates_uniqueness_of :privilege_id, scope: [:user_id
|
7
|
+
validates_uniqueness_of :privilege_id, scope: [:user_id]
|
8
8
|
|
9
9
|
# @param [User] user
|
10
10
|
# @return [Array<Integer>]
|
@@ -0,0 +1,115 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Biovision
|
4
|
+
module Components
|
5
|
+
# Base biovision component
|
6
|
+
class BaseComponent
|
7
|
+
attr_reader :component, :slug, :name
|
8
|
+
|
9
|
+
# @param [BiovisionComponent] component
|
10
|
+
def initialize(component)
|
11
|
+
@component = component
|
12
|
+
@slug = component.slug
|
13
|
+
|
14
|
+
@name = I18n.t("biovision.components.#{@slug}.name", default: @slug)
|
15
|
+
end
|
16
|
+
|
17
|
+
# Receive component-specific handler by component slug
|
18
|
+
#
|
19
|
+
# @param [String] slug
|
20
|
+
# @return [BaseComponent]
|
21
|
+
def self.handler(slug)
|
22
|
+
entity = BiovisionComponent.find_by!(slug: slug)
|
23
|
+
|
24
|
+
handler_name = "biovision/components/#{slug}_component".classify
|
25
|
+
handler_class = handler_name.safe_constantize || BaseComponent
|
26
|
+
handler_class.new(entity)
|
27
|
+
end
|
28
|
+
|
29
|
+
# @param [Hash] data
|
30
|
+
def settings=(data)
|
31
|
+
@component.settings.merge!(normalize_settings(data))
|
32
|
+
@component.save!
|
33
|
+
end
|
34
|
+
|
35
|
+
def settings
|
36
|
+
@component.settings
|
37
|
+
end
|
38
|
+
|
39
|
+
def parameters
|
40
|
+
@component.biovision_parameters.list_for_administration
|
41
|
+
end
|
42
|
+
|
43
|
+
# Get instance of BiovisionParameter with given slug
|
44
|
+
#
|
45
|
+
# @param [String] slug
|
46
|
+
def parameter(slug)
|
47
|
+
@component.biovision_parameters.find_by(slug: slug)
|
48
|
+
end
|
49
|
+
|
50
|
+
# Create or update parameter values
|
51
|
+
#
|
52
|
+
# @param [String] slug
|
53
|
+
# @param [String] value
|
54
|
+
# @param [String] name
|
55
|
+
# @param [String] description
|
56
|
+
def set_parameter(slug, value, name = '', description = '')
|
57
|
+
@component[slug] = value
|
58
|
+
|
59
|
+
item = parameter(slug)
|
60
|
+
item.update(name: name, description: description) if item.deletable?
|
61
|
+
|
62
|
+
item
|
63
|
+
end
|
64
|
+
|
65
|
+
# Delete parameter with given slug (if it is deletable)
|
66
|
+
#
|
67
|
+
# @param [String] slug
|
68
|
+
def delete_parameter(slug)
|
69
|
+
item = parameter(slug)
|
70
|
+
|
71
|
+
return unless item&.deletable?
|
72
|
+
|
73
|
+
item.destroy
|
74
|
+
end
|
75
|
+
|
76
|
+
# Receive parameter value with default
|
77
|
+
#
|
78
|
+
# Returns value of component's parameter or default value
|
79
|
+
# when it's not found
|
80
|
+
#
|
81
|
+
# @param [String] key
|
82
|
+
# @param [String] default
|
83
|
+
# @return [String]
|
84
|
+
def receive(key, default = '')
|
85
|
+
@component.receive!(key, default)
|
86
|
+
end
|
87
|
+
|
88
|
+
# Receive parameter value or nil
|
89
|
+
#
|
90
|
+
# Returns value of component's parameter of nil when it's not found
|
91
|
+
#
|
92
|
+
# @param [String] key
|
93
|
+
# @return [String|nil]
|
94
|
+
def [](key)
|
95
|
+
@component.receive(key)
|
96
|
+
end
|
97
|
+
|
98
|
+
# Set parameter
|
99
|
+
#
|
100
|
+
# @param [String] key
|
101
|
+
# @param [String] value
|
102
|
+
def []=(key, value)
|
103
|
+
@component[key] = value
|
104
|
+
end
|
105
|
+
|
106
|
+
protected
|
107
|
+
|
108
|
+
# @param [Hash] data
|
109
|
+
# @return [Hash]
|
110
|
+
def normalize_settings(data)
|
111
|
+
data.to_h
|
112
|
+
end
|
113
|
+
end
|
114
|
+
end
|
115
|
+
end
|
@@ -0,0 +1,98 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Biovision
|
4
|
+
module Components
|
5
|
+
# Handler for registration component
|
6
|
+
class RegistrationComponent < BaseComponent
|
7
|
+
# @param [Hash] parameters
|
8
|
+
# @param [Code] code
|
9
|
+
def handle(parameters, code)
|
10
|
+
@user = User.new(parameters)
|
11
|
+
@manager = CodeManager::Invitation.new(code)
|
12
|
+
|
13
|
+
use_invites? ? use_code : persist_user
|
14
|
+
|
15
|
+
@user
|
16
|
+
end
|
17
|
+
|
18
|
+
def open?
|
19
|
+
@component.settings['open']
|
20
|
+
end
|
21
|
+
|
22
|
+
def invite_only?
|
23
|
+
@component.settings['invite_only']
|
24
|
+
end
|
25
|
+
|
26
|
+
def use_invites?
|
27
|
+
@component.settings['use_invites'] || invite_only?
|
28
|
+
end
|
29
|
+
|
30
|
+
def confirm_email?
|
31
|
+
@component.settings['confirm_email']
|
32
|
+
end
|
33
|
+
|
34
|
+
def require_email?
|
35
|
+
@component.settings['require_email']
|
36
|
+
end
|
37
|
+
|
38
|
+
protected
|
39
|
+
|
40
|
+
# @param [Hash] data
|
41
|
+
# @return [Hash]
|
42
|
+
def normalize_settings(data)
|
43
|
+
result = {}
|
44
|
+
flags = %w[open invite_only use_invites confirm_email require_email]
|
45
|
+
flags.each { |f| result[f] = data[f].to_i == 1 }
|
46
|
+
numbers = %w[invite_count]
|
47
|
+
numbers.each { |f| result[f] = data[f].to_i }
|
48
|
+
|
49
|
+
result
|
50
|
+
end
|
51
|
+
|
52
|
+
def persist_user
|
53
|
+
return unless @user.save
|
54
|
+
|
55
|
+
Metric.register(User::METRIC_REGISTRATION)
|
56
|
+
|
57
|
+
handle_codes
|
58
|
+
end
|
59
|
+
|
60
|
+
# Check invitation code and persist user if it's valid
|
61
|
+
def use_code
|
62
|
+
if @manager.code_is_valid? || (@manager.code.nil? && !invite_only?)
|
63
|
+
persist_user
|
64
|
+
else
|
65
|
+
error = I18n.t('biovision.components.registration.invalid_code')
|
66
|
+
|
67
|
+
# Add "invalid code" error to other model errors, if any
|
68
|
+
@user.valid?
|
69
|
+
@user.errors.add(:code, error)
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
def handle_codes
|
74
|
+
if confirm_email?
|
75
|
+
code = CodeManager::Confirmation.code_for_user(@user)
|
76
|
+
CodeSender.email(code.id).deliver_later
|
77
|
+
end
|
78
|
+
|
79
|
+
if use_invites?
|
80
|
+
@manager.activate(@user) if @manager.code_is_valid?
|
81
|
+
create_invitations(settings['invite_count'].to_i)
|
82
|
+
end
|
83
|
+
end
|
84
|
+
|
85
|
+
# @param [Integer] quantity
|
86
|
+
def create_invitations(quantity = 1)
|
87
|
+
return unless quantity.positive?
|
88
|
+
|
89
|
+
parameters = {
|
90
|
+
code_type: CodeManager::Invitation.code_type,
|
91
|
+
user: @user,
|
92
|
+
quantity: quantity,
|
93
|
+
}
|
94
|
+
Code.create(parameters)
|
95
|
+
end
|
96
|
+
end
|
97
|
+
end
|
98
|
+
end
|