Merge pull request #2387 from tf/fix-lint-ci

Make CI lint checks block on errors

Author: tf

.github/workflows/lint.yml

@@ -62,19 +62,10 @@ jobs:
       # Lint
 
       - name: Run RuboCop
-        shell: bash
-        continue-on-error: true
-        run: |
-          bundle exec rubocop --format github | sed 's/::error/::warning/g'
+        run: bundle exec rubocop
 
       - name: Run ESLint in pageflow package
-        shell: bash
-        continue-on-error: true
-        run: |
-          yarn --cwd package lint . --format @jamesacarr/github-actions
+        run: yarn --cwd package lint .
 
       - name: Run ESLint in pageflow-scrolled
-        shell: bash
-        continue-on-error: true
-        run: |
-          yarn --cwd entry_types/scrolled/package lint . --format @jamesacarr/github-actions
+        run: yarn --cwd entry_types/scrolled/package lint .

admins/pageflow/accounts.rb

@@ -21,8 +21,8 @@ module Pageflow
         account.memberships.size if authorized?(:read, account)
       end
       account_memberships = current_user.memberships.on_accounts
-      account_roles = account_memberships.each_with_object({}) do |membership, roles|
-        roles[membership.entity_id] = membership.role
+      account_roles = account_memberships.to_h do |membership|
+        [membership.entity_id, membership.role]
       end
       if authorized?(:see_own_role_on, :accounts)
         column :own_role do |account|
@@ -43,16 +43,16 @@ module Pageflow
     searchable_select_options(text_attribute: :name,
                               scope: lambda do
                                 Account
-                                  .accessible_by(current_ability, :read)
-                                  .order(:name)
+                                .accessible_by(current_ability, :read)
+                                .order(:name)
                               end)
 
     searchable_select_options(name: :member_addable,
                               text_attribute: :name,
                               scope: lambda do
                                 AccountPolicy::Scope.new(current_user, Account)
-                                  .member_addable
-                                  .order(:name)
+                                .member_addable
+                                .order(:name)
                               end)
 
     form partial: 'form'

admins/pageflow/entry.rb

@@ -101,18 +101,18 @@ module Pageflow
                               text_attribute: :name,
                               scope: lambda do
                                 AccountPolicy::Scope
-                                  .new(current_user, Account)
-                                  .entry_movable
-                                  .order(:name)
+                                .new(current_user, Account)
+                                .entry_movable
+                                .order(:name)
                               end)
 
     searchable_select_options(name: :eligible_sites,
                               text_attribute: :name_with_account_prefix,
                               scope: lambda do |params|
                                 account = Account.find(params[:account_id])
                                 SitePolicy::Scope
-                                  .new(current_user, Site)
-                                  .sites_allowed_for(account)
+                                .new(current_user, Site)
+                                .sites_allowed_for(account)
                               end,
                               filter: lambda do |term, scope|
                                 scope.ransack(account_name_cont: term).result
@@ -318,7 +318,7 @@ def site_policy_scope
       end
 
       # rubocop:todo Metrics/PerceivedComplexity
-      def permitted_attributes # rubocop:todo Metrics/AbcSize
+      def permitted_attributes # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity
         result = [:title, :type_name, {permalink_attributes: [:slug, :directory_id]}]
         target = if !params[:id] && current_user.admin?
                    Account.first
@@ -331,7 +331,7 @@ def permitted_attributes # rubocop:todo Metrics/AbcSize
         result += permitted_account_attributes
 
         result << :folder_id if create_or_new_action? ||
-                                  (params[:id] && authorized?(:configure_folder_for, resource))
+                                (params[:id] && authorized?(:configure_folder_for, resource))
 
         accounts = if params[:id]
                      resource.account

admins/pageflow/membership.rb

@@ -12,9 +12,9 @@ module Pageflow
                                 user = User.find(params[:parent_id])
 
                                 PotentialMemberships
-                                  .creatable_by(current_user)
-                                  .accounts_for_user(user)
-                                  .order(:name)
+                                .creatable_by(current_user)
+                                .accounts_for_user(user)
+                                .order(:name)
                               end)
 
     searchable_select_options(name: :potential_entries_for_user,
@@ -24,8 +24,8 @@ module Pageflow
                               scope: lambda do |params|
                                 user = User.find(params[:parent_id])
                                 entries = PotentialMemberships
-                                  .creatable_by(current_user)
-                                  .entries_for_user(user)
+                                          .creatable_by(current_user)
+                                          .entries_for_user(user)
 
                                 if can?(:see, :accounts)
                                   entries.include_account_name.order('account_name', :title)
@@ -42,9 +42,9 @@ module Pageflow
                               scope: lambda do |params|
                                 account = Account.find(params[:parent_id])
                                 PotentialMemberships
-                                  .creatable_by(current_user)
-                                  .users_for_account(account)
-                                  .order(:last_name, :first_name)
+                                .creatable_by(current_user)
+                                .users_for_account(account)
+                                .order(:last_name, :first_name)
                               end,
                               filter: lambda do |term, scope|
                                 UserNameQuery::Scope.new(term, scope).resolve
@@ -55,9 +55,9 @@ module Pageflow
                               scope: lambda do |params|
                                 entry = Entry.find(params[:parent_id])
                                 PotentialMemberships
-                                  .creatable_by(current_user)
-                                  .users_for_entry(entry)
-                                  .order(:last_name, :first_name)
+                                .creatable_by(current_user)
+                                .users_for_entry(entry)
+                                .order(:last_name, :first_name)
                               end,
                               filter: lambda do |term, scope|
                                 UserNameQuery::Scope.new(term, scope).resolve

admins/pageflow/translations.rb

@@ -14,11 +14,11 @@ module Pageflow
                               display_text: lambda do |entry|
                                 if entry.translation_group
                                   entry.translation_group
-                                    .entries
-                                    .order('title ASC')
-                                    .map(&:title)
-                                    .join(' / ')
-                                    .presence
+                                  .entries
+                                  .order('title ASC')
+                                  .map(&:title)
+                                  .join(' / ')
+                                  .presence
                                 else
                                   entry.title
                                 end

app/helpers/pageflow/admin/widgets_helper.rb

@@ -9,8 +9,8 @@ def admin_widgets_fields(form, config)
       end
 
       def admin_widget_types_collection_for_role(config, role)
-        config.widget_types.find_all_by_role(role).each_with_object({}) do |widget_type, result|
-          result[I18n.t(widget_type.translation_key)] = widget_type.name
+        config.widget_types.find_all_by_role(role).to_h do |widget_type|
+          [I18n.t(widget_type.translation_key), widget_type.name]
         end
       end
     end

app/helpers/pageflow/common_entry_seed_helper.rb

@@ -26,8 +26,8 @@ def initialize(config)
       end
 
       def as_json
-        config.page_types.each_with_object({}) do |page_type, result|
-          result[page_type.name.to_sym] = page_type_seed(page_type)
+        config.page_types.to_h do |page_type|
+          [page_type.name.to_sym, page_type_seed(page_type)]
         end
       end
 

app/helpers/pageflow/entry_json_seed_helper.rb

@@ -51,14 +51,14 @@ def entry_widgets_seed(entry)
     end
 
     def entry_file_ids_seed(entry)
-      Pageflow.config.file_types.with_thumbnail_support.each_with_object({}) do |file_type, result|
-        result[file_type.collection_name] = entry.find_files(file_type.model).map(&:perma_id)
+      Pageflow.config.file_types.with_thumbnail_support.to_h do |file_type|
+        [file_type.collection_name, entry.find_files(file_type.model).map(&:perma_id)]
       end
     end
 
     def entry_audio_files_json_seed(entry)
-      seed = entry.find_files(AudioFile).each_with_object({}) do |audio_file, result|
-        result[audio_file.perma_id] = audio_file_sources(audio_file)
+      seed = entry.find_files(AudioFile).to_h do |audio_file|
+        [audio_file.perma_id, audio_file_sources(audio_file)]
       end
 
       sanitize_json(seed.to_json).html_safe

app/helpers/pageflow/public_i18n_helper.rb

@@ -14,7 +14,7 @@ def public_i18n_translations(entry)
       {
         pageflow: {
           public: I18n.t('pageflow.public', locale: I18n.default_locale)
-                      .dup
+                  .dup
                       .deep_merge(I18n.t('pageflow.public', locale: entry.locale),
                                   &merge_ignoring_nil)
         }

app/helpers/pageflow/themes_helper.rb

@@ -3,9 +3,7 @@ module ThemesHelper # rubocop:todo Style/Documentation
     include RenderJsonHelper
 
     def themes_options_json_seed(config = Pageflow.config)
-      config.themes.each_with_object({}) { |theme, options|
-        options[theme.name] = theme.options
-      }.to_json.html_safe
+      config.themes.to_h { |theme| [theme.name, theme.options] }.to_json.html_safe
     end
 
     def theme_json_seeds(config)