Browse Source

Various fixes and improvements (#12878)

* Fix unused role routes being generated

* Remove unused JavaScript code

* Refactor filters code to be DRYer

* Fix `.count == 0` comparisons to `.empty?` in views

* Fix filters in views
closed-social-v3
Eugen Rochko 4 years ago
committed by GitHub
parent
commit
6feafb8802
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 92 additions and 64 deletions
  1. +1
    -15
      app/controllers/admin/accounts_controller.rb
  2. +1
    -1
      app/controllers/admin/custom_emojis_controller.rb
  3. +1
    -1
      app/controllers/admin/instances_controller.rb
  4. +1
    -1
      app/controllers/admin/invites_controller.rb
  5. +1
    -6
      app/controllers/admin/reports_controller.rb
  6. +1
    -1
      app/controllers/admin/tags_controller.rb
  7. +1
    -1
      app/controllers/relationships_controller.rb
  8. +9
    -9
      app/helpers/admin/filter_helper.rb
  9. +0
    -9
      app/javascript/packs/public.js
  10. +15
    -0
      app/models/account_filter.rb
  11. +7
    -0
      app/models/custom_emoji_filter.rb
  12. +5
    -0
      app/models/instance_filter.rb
  13. +5
    -0
      app/models/invite_filter.rb
  14. +11
    -0
      app/models/relationship_filter.rb
  15. +7
    -0
      app/models/report_filter.rb
  16. +10
    -0
      app/models/tag_filter.rb
  17. +1
    -1
      app/views/admin/accounts/index.html.haml
  18. +2
    -2
      app/views/admin/custom_emojis/index.html.haml
  19. +1
    -1
      app/views/admin/email_domain_blocks/index.html.haml
  20. +2
    -3
      app/views/admin/instances/index.html.haml
  21. +2
    -3
      app/views/admin/reports/index.html.haml
  22. +2
    -3
      app/views/admin/tags/index.html.haml
  23. +1
    -1
      app/views/filters/index.html.haml
  24. +3
    -4
      app/views/relationships/show.html.haml
  25. +1
    -1
      app/views/settings/applications/index.html.haml
  26. +1
    -1
      config/routes.rb

+ 1
- 15
app/controllers/admin/accounts_controller.rb View File

@ -109,21 +109,7 @@ module Admin
end
def filter_params
params.permit(
:local,
:remote,
:by_domain,
:active,
:pending,
:disabled,
:silenced,
:suspended,
:username,
:display_name,
:email,
:ip,
:staff
)
params.slice(*AccountFilter::KEYS).permit(*AccountFilter::KEYS)
end
end
end

+ 1
- 1
app/controllers/admin/custom_emojis_controller.rb View File

@ -48,7 +48,7 @@ module Admin
end
def filter_params
params.slice(:local, :remote, :by_domain, :shortcode, :page).permit(:local, :remote, :by_domain, :shortcode, :page)
params.slice(:page, *CustomEmojiFilter::KEYS).permit(:page, *CustomEmojiFilter::KEYS)
end
def action_from_button

+ 1
- 1
app/controllers/admin/instances_controller.rb View File

@ -62,7 +62,7 @@ module Admin
end
def filter_params
params.permit(:limited, :by_domain)
params.slice(*InstanceFilter::KEYS).permit(*InstanceFilter::KEYS)
end
end
end

+ 1
- 1
app/controllers/admin/invites_controller.rb View File

@ -47,7 +47,7 @@ module Admin
end
def filter_params
params.permit(:available, :expired)
params.slice(*InviteFilter::KEYS).permit(*InviteFilter::KEYS)
end
end
end

+ 1
- 6
app/controllers/admin/reports_controller.rb View File

@ -52,12 +52,7 @@ module Admin
end
def filter_params
params.permit(
:account_id,
:resolved,
:target_account_id,
:by_target_domain
)
params.slice(*ReportFilter::KEYS).permit(*ReportFilter::KEYS)
end
def set_report

+ 1
- 1
app/controllers/admin/tags_controller.rb View File

@ -73,7 +73,7 @@ module Admin
end
def filter_params
params.slice(:directory, :reviewed, :unreviewed, :pending_review, :page, :popular, :active, :name).permit(:directory, :reviewed, :unreviewed, :pending_review, :page, :popular, :active, :name)
params.slice(:page, *TagFilter::KEYS).permit(:page, *TagFilter::KEYS)
end
def tag_params

+ 1
- 1
app/controllers/relationships_controller.rb View File

@ -85,7 +85,7 @@ class RelationshipsController < ApplicationController
end
def current_params
params.slice(:page, :status, :relationship, :by_domain, :activity, :order).permit(:page, :status, :relationship, :by_domain, :activity, :order)
params.slice(:page, *RelationshipFilter::KEYS).permit(:page, *RelationshipFilter::KEYS)
end
def action_from_button

+ 9
- 9
app/helpers/admin/filter_helper.rb View File

@ -1,15 +1,15 @@
# frozen_string_literal: true
module Admin::FilterHelper
ACCOUNT_FILTERS = %i(local remote by_domain active pending silenced suspended username display_name email ip staff).freeze
REPORT_FILTERS = %i(resolved account_id target_account_id by_target_domain).freeze
INVITE_FILTER = %i(available expired).freeze
CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze
TAGS_FILTERS = %i(directory reviewed unreviewed pending_review popular active name).freeze
INSTANCES_FILTERS = %i(limited by_domain).freeze
FOLLOWERS_FILTERS = %i(relationship status by_domain activity order).freeze
FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS + INSTANCES_FILTERS + FOLLOWERS_FILTERS
FILTERS = [
AccountFilter::KEYS,
CustomEmojiFilter::KEYS,
ReportFilter::KEYS,
TagFilter::KEYS,
InstanceFilter::KEYS,
InviteFilter::KEYS,
RelationshipFilter::KEYS,
].flatten.freeze
def filter_link_to(text, link_to_params, link_class_params = link_to_params)
new_url = filtered_url_for(link_to_params)

+ 0
- 9
app/javascript/packs/public.js View File

@ -142,15 +142,6 @@ function main() {
return false;
});
delegate(document, '.blocks-table button.icon-button', 'click', function(e) {
e.preventDefault();
const classList = this.firstElementChild.classList;
classList.toggle('fa-chevron-down');
classList.toggle('fa-chevron-up');
this.parentElement.parentElement.nextElementSibling.classList.toggle('hidden');
});
delegate(document, '.modal-button', 'click', e => {
e.preventDefault();

+ 15
- 0
app/models/account_filter.rb View File

@ -1,6 +1,21 @@
# frozen_string_literal: true
class AccountFilter
KEYS = %i(
local
remote
by_domain
active
pending
silenced
suspended
username
display_name
email
ip
staff
).freeze
attr_reader :params
def initialize(params)

+ 7
- 0
app/models/custom_emoji_filter.rb View File

@ -1,6 +1,13 @@
# frozen_string_literal: true
class CustomEmojiFilter
KEYS = %i(
local
remote
by_domain
shortcode
).freeze
attr_reader :params
def initialize(params)

+ 5
- 0
app/models/instance_filter.rb View File

@ -1,6 +1,11 @@
# frozen_string_literal: true
class InstanceFilter
KEYS = %i(
limited
by_domain
).freeze
attr_reader :params
def initialize(params)

+ 5
- 0
app/models/invite_filter.rb View File

@ -1,6 +1,11 @@
# frozen_string_literal: true
class InviteFilter
KEYS = %i(
available
expired
).freeze
attr_reader :params
def initialize(params)

+ 11
- 0
app/models/relationship_filter.rb View File

@ -0,0 +1,11 @@
# frozen_string_literal: true
class RelationshipFilter
KEYS = %i(
relationship
status
by_domain
activity
order
).freeze
end

+ 7
- 0
app/models/report_filter.rb View File

@ -1,6 +1,13 @@
# frozen_string_literal: true
class ReportFilter
KEYS = %i(
resolved
account_id
target_account_id
by_target_domain
).freeze
attr_reader :params
def initialize(params)

+ 10
- 0
app/models/tag_filter.rb View File

@ -1,6 +1,16 @@
# frozen_string_literal: true
class TagFilter
KEYS = %i(
directory
reviewed
unreviewed
pending_review
popular
active
name
).freeze
attr_reader :params
def initialize(params)

+ 1
- 1
app/views/admin/accounts/index.html.haml View File

@ -22,7 +22,7 @@
= form_tag admin_accounts_url, method: 'GET', class: 'simple_form' do
.fields-group
- Admin::FilterHelper::ACCOUNT_FILTERS.each do |key|
- AccountFilter::KEYS.each do |key|
- if params[key].present?
= hidden_field_tag key, params[key]

+ 2
- 2
app/views/admin/custom_emojis/index.html.haml View File

@ -25,7 +25,7 @@
= form_tag admin_custom_emojis_url, method: 'GET', class: 'simple_form' do
.fields-group
- Admin::FilterHelper::CUSTOM_EMOJI_FILTERS.each do |key|
- CustomEmojiFilter::KEYS.each do |key|
= hidden_field_tag key, params[key] if params[key].present?
- %i(shortcode by_domain).each do |key|
@ -39,7 +39,7 @@
= form_for(@form, url: batch_admin_custom_emojis_path) do |f|
= hidden_field_tag :page, params[:page] || 1
- Admin::FilterHelper::CUSTOM_EMOJI_FILTERS.each do |key|
- CustomEmojiFilter::KEYS.each do |key|
= hidden_field_tag key, params[key] if params[key].present?
.batch-table

+ 1
- 1
app/views/admin/email_domain_blocks/index.html.haml View File

@ -4,7 +4,7 @@
- content_for :heading_actions do
= link_to t('admin.email_domain_blocks.add_new'), new_admin_email_domain_block_path, class: 'button'
- if @email_domain_blocks.count == 0
- if @email_domain_blocks.empty?
%div.muted-hint.center-text=t 'admin.email_domain_blocks.empty'
- else
.table-wrapper

+ 2
- 3
app/views/admin/instances/index.html.haml View File

@ -19,9 +19,8 @@
- unless whitelist_mode?
= form_tag admin_instances_url, method: 'GET', class: 'simple_form' do
.fields-group
- Admin::FilterHelper::INSTANCES_FILTERS.each do |key|
- if params[key].present?
= hidden_field_tag key, params[key]
- InstanceFilter::KEYS.each do |key|
= hidden_field_tag key, params[key] if params[key].present?
- %i(by_domain).each do |key|
.input.string.optional

+ 2
- 3
app/views/admin/reports/index.html.haml View File

@ -10,9 +10,8 @@
= form_tag admin_reports_url, method: 'GET', class: 'simple_form' do
.fields-group
- Admin::FilterHelper::REPORT_FILTERS.each do |key|
- if params[key].present?
= hidden_field_tag key, params[key]
- ReportFilter::KEYS.each do |key|
= hidden_field_tag key, params[key] if params[key].present?
- %i(by_target_domain).each do |key|
.input.string.optional

+ 2
- 3
app/views/admin/tags/index.html.haml View File

@ -28,7 +28,7 @@
= form_tag admin_tags_url, method: 'GET', class: 'simple_form' do
.fields-group
- Admin::FilterHelper::TAGS_FILTERS.each do |key|
- TagFilter::KEYS.each do |key|
= hidden_field_tag key, params[key] if params[key].present?
- %i(name).each do |key|
@ -43,9 +43,8 @@
= form_for(@form, url: batch_admin_tags_path) do |f|
= hidden_field_tag :page, params[:page] || 1
= hidden_field_tag :name, params[:name] if params[:name].present?
- Admin::FilterHelper::TAGS_FILTERS.each do |key|
- TagFilter::KEYS.each do |key|
= hidden_field_tag key, params[key] if params[key].present?
.batch-table.optional

+ 1
- 1
app/views/filters/index.html.haml View File

@ -4,7 +4,7 @@
- content_for :heading_actions do
= link_to t('filters.new.title'), new_filter_path, class: 'button'
- if @filters.count == 0
- if @filters.empty?
%div.muted-hint.center-text= t 'filters.index.empty'
- else
.table-wrapper

+ 3
- 4
app/views/relationships/show.html.haml View File

@ -33,10 +33,9 @@
= form_for(@form, url: relationships_path, method: :patch) do |f|
= hidden_field_tag :page, params[:page] || 1
= hidden_field_tag :relationship, params[:relationship]
= hidden_field_tag :status, params[:status]
= hidden_field_tag :activity, params[:activity]
= hidden_field_tag :order, params[:order]
- RelationshipFilter::KEYS.each do |key|
= hidden_field_tag key, params[key] if params[key].present?
.batch-table
.batch-table__toolbar

+ 1
- 1
app/views/settings/applications/index.html.haml View File

@ -4,7 +4,7 @@
- content_for :heading_actions do
= link_to t('doorkeeper.applications.index.new'), new_settings_application_path, class: 'button'
- if @applications.count == 0
- if @applications.empty?
%div.muted-hint.center-text=t 'doorkeeper.applications.index.empty'
- else
.table-wrapper

+ 1
- 1
config/routes.rb View File

@ -231,7 +231,7 @@ Rails.application.routes.draw do
end
end
resource :role do
resource :role, only: [] do
member do
post :promote
post :demote

Loading…
Cancel
Save