diff --git a/.github/codecov.yml b/.github/codecov.yml index 5532c49618..9d6413a106 100644 --- a/.github/codecov.yml +++ b/.github/codecov.yml @@ -1,3 +1,4 @@ +comment: false # Do not leave PR comments coverage: status: project: @@ -8,6 +9,3 @@ coverage: default: # Github status check is not blocking informational: true -comment: - # Only write a comment in PR if there are changes - require_changes: true diff --git a/app/javascript/core/admin.ts b/app/javascript/core/admin.ts index 3b3fe76488..0642affef0 100644 --- a/app/javascript/core/admin.ts +++ b/app/javascript/core/admin.ts @@ -150,7 +150,7 @@ Rails.delegate( }, ); -const onDomainBlockSeverityChange = (target: HTMLInputElement) => { +const onDomainBlockSeverityChange = (target: HTMLSelectElement) => { const rejectMediaDiv = document.querySelector( '.input.with_label.domain_block_reject_media', ); @@ -170,7 +170,7 @@ const onDomainBlockSeverityChange = (target: HTMLInputElement) => { }; Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => { - if (target instanceof HTMLInputElement) onDomainBlockSeverityChange(target); + if (target instanceof HTMLSelectElement) onDomainBlockSeverityChange(target); }); const onEnableBootstrapTimelineAccountsChange = (target: HTMLInputElement) => { @@ -207,7 +207,7 @@ Rails.delegate( }, ); -const onChangeRegistrationMode = (target: HTMLInputElement) => { +const onChangeRegistrationMode = (target: HTMLSelectElement) => { const enabled = target.value === 'approved'; document @@ -257,16 +257,16 @@ Rails.delegate( '#form_admin_settings_registrations_mode', 'change', ({ target }) => { - if (target instanceof HTMLInputElement) onChangeRegistrationMode(target); + if (target instanceof HTMLSelectElement) onChangeRegistrationMode(target); }, ); ready(() => { - const domainBlockSeverityInput = document.querySelector( - 'input#domain_block_severity', + const domainBlockSeveritySelect = document.querySelector( + 'select#domain_block_severity', ); - if (domainBlockSeverityInput) - onDomainBlockSeverityChange(domainBlockSeverityInput); + if (domainBlockSeveritySelect) + onDomainBlockSeverityChange(domainBlockSeveritySelect); const enableBootstrapTimelineAccounts = document.querySelector( @@ -275,8 +275,8 @@ ready(() => { if (enableBootstrapTimelineAccounts) onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts); - const registrationMode = document.querySelector( - 'input#form_admin_settings_registrations_mode', + const registrationMode = document.querySelector( + 'select#form_admin_settings_registrations_mode', ); if (registrationMode) onChangeRegistrationMode(registrationMode); diff --git a/app/models/user_role.rb b/app/models/user_role.rb index 9115d91c24..23cc28b9b7 100644 --- a/app/models/user_role.rb +++ b/app/models/user_role.rb @@ -39,6 +39,7 @@ class UserRole < ApplicationRecord }.freeze EVERYONE_ROLE_ID = -99 + NOBODY_POSITION = -1 module Flags NONE = 0 @@ -104,7 +105,7 @@ class UserRole < ApplicationRecord has_many :users, inverse_of: :role, foreign_key: 'role_id', dependent: :nullify def self.nobody - @nobody ||= UserRole.new(permissions: Flags::NONE, position: -1) + @nobody ||= UserRole.new(permissions: Flags::NONE, position: NOBODY_POSITION) end def self.everyone @@ -173,7 +174,7 @@ class UserRole < ApplicationRecord end def set_position - self.position = -1 if everyone? + self.position = NOBODY_POSITION if everyone? end def validate_own_role_edition diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb index 9dd04a8172..96d12263ae 100644 --- a/spec/models/user_role_spec.rb +++ b/spec/models/user_role_spec.rb @@ -139,7 +139,7 @@ RSpec.describe UserRole do end it 'has negative position' do - expect(subject.position).to eq(-1) + expect(subject.position).to eq(described_class::NOBODY_POSITION) end end @@ -159,7 +159,7 @@ RSpec.describe UserRole do end it 'has negative position' do - expect(subject.position).to eq(-1) + expect(subject.position).to eq(described_class::NOBODY_POSITION) end end