diff --git a/.rubocop.yml b/.rubocop.yml index 50a37133e..65336f2f3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -367,6 +367,9 @@ Rails/ActiveRecordCallbacksOrder: Rails/AddColumnIndex: Enabled: true +Rails/CompactBlank: + Enabled: true + Rails/CreateTableWithTimestamps: Enabled: true Exclude: diff --git a/app/components/concerns/header.rb b/app/components/concerns/header.rb index 25ca5b3ae..24b8a9216 100644 --- a/app/components/concerns/header.rb +++ b/app/components/concerns/header.rb @@ -7,7 +7,7 @@ module Header (t("#{namespace}.header.title", default: "") unless skip_section_title), strip_tags(title), setting["org_name"] - ].reject(&:blank?).join(" - ") + ].compact_blank.join(" - ") end heading_tag = if %w[admin management moderation sdg_management valuation].include?(namespace) diff --git a/app/components/sdg/goals/plain_tag_list_component.rb b/app/components/sdg/goals/plain_tag_list_component.rb index 5e8b4ff53..3cfa29868 100644 --- a/app/components/sdg/goals/plain_tag_list_component.rb +++ b/app/components/sdg/goals/plain_tag_list_component.rb @@ -4,7 +4,7 @@ class SDG::Goals::PlainTagListComponent < ApplicationComponent private def tags - [*goal_tags, see_more_link].select(&:present?) + [*goal_tags, see_more_link].compact_blank end def goal_tags diff --git a/app/components/sdg/targets/plain_tag_list_component.rb b/app/components/sdg/targets/plain_tag_list_component.rb index 78ccc4b42..46acd8e94 100644 --- a/app/components/sdg/targets/plain_tag_list_component.rb +++ b/app/components/sdg/targets/plain_tag_list_component.rb @@ -4,7 +4,7 @@ class SDG::Targets::PlainTagListComponent < ApplicationComponent private def tags - [*target_tags, see_more_link].select(&:present?) + [*target_tags, see_more_link].compact_blank end def target_tags diff --git a/app/components/shared/link_list_component.rb b/app/components/shared/link_list_component.rb index ccfc97b69..8009b5c4f 100644 --- a/app/components/shared/link_list_component.rb +++ b/app/components/shared/link_list_component.rb @@ -13,7 +13,7 @@ class Shared::LinkListComponent < ApplicationComponent private def present_links - links.select(&:present?) + links.compact_blank end def list_items