lint

app/views/layouts/rails_admin/application.html.erb

@@ -53,14 +53,14 @@
 
     <div class="govuk-width-container">
       <main class="govuk-main-wrapper govuk-main-wrapper--auto-spacing" id="main-content" role="main">
-        <%= render template: 'layouts/rails_admin/content' %>
+        <%= render template: "layouts/rails_admin/content" %>
       </main>
     </div>
     <%= render partial: "layouts/feedback" %>
     <%= render partial: "layouts/footer", locals: {
         accessibility_statement_path: Rails.application.routes.url_helpers.accessibility_statement_path,
         privacy_notice_path: Rails.application.routes.url_helpers.privacy_notice_path,
-        cookies_path: Rails.application.routes.url_helpers.cookies_path
+        cookies_path: Rails.application.routes.url_helpers.cookies_path,
         } %>
   </body>
 </html>

app/views/rails_admin/main/dashboard.html.erb

@@ -18,7 +18,7 @@
       <% @abstract_models.each do |abstract_model| %>
         <% if authorized? :index, abstract_model %>
           <% index_path = index_path(model_name: abstract_model.to_param) %>
-          <% row_class = "#{cycle("odd", "even")}#{" link" if index_path} #{abstract_model.param_key}_links" %>
+          <% row_class = "#{cycle('odd', 'even')}#{' link' if index_path} #{abstract_model.param_key}_links" %>
           <tr class="<%= row_class %>" data-link="<%= index_path %>">
             <% last_created = @most_recent_created[abstract_model.model.name] %>
             <% active = last_created.try(:today?) %>
@@ -29,13 +29,17 @@
             </td>
             <td>
               <% if last_created %>
-                <%= t "admin.misc.time_ago", time: time_ago_in_words(last_created), default: "#{time_ago_in_words(last_created)} #{t("admin.misc.ago")}" %>
+                <%= t "admin.misc.time_ago", time: time_ago_in_words(last_created), default: "#{time_ago_in_words(last_created)} #{t('admin.misc.ago')}" %>
               <% end %>
             </td>
             <td>
               <% count = @count[abstract_model.model.name] %>
-              <% percent = count > 0 ? (@max <= 1 ? count : ((Math.log(count+1) * 100.0) / Math.log(@max+1)).to_i) : -1 %>
-              <div class="<%= active ? 'active progress-bar-striped ' : '' %>progress" style="margin-bottom:0px">
+              <% percent = if count.positive?
+                             @max <= 1 ? count : ((Math.log(count + 1) * 100.0) / Math.log(@max + 1)).to_i
+                           else
+                             -1
+                           end %>
+              <div class="<%= active ? "active progress-bar-striped " : "" %>progress" style="margin-bottom:0px">
                 <div class="bg-<%= get_indicator(percent) %> progress-bar animate-width-to" data-animate-length="<%= ([1.0, percent].max.to_i * 20) %>" data-animate-width-to="<%= [2.0, percent].max.to_i %>%" style="width:2%">
                   <%= @count[abstract_model.model.name] %>
                 </div>
@@ -58,7 +62,7 @@
       <h2>
         <%= t("admin.actions.history_index.menu") %>
       </h2>
-      <%= render partial: 'rails_admin/main/dashboard_history' %>
+      <%= render partial: "rails_admin/main/dashboard_history" %>
     </div>
   </div>
 <% end %>

app/views/rails_admin/main/index.html.erb

@@ -1,19 +1,18 @@
-<%
 query = params[:query]
   params = request.params.except(:authenticity_token, :action, :controller, :utf8, :bulk_export)
   params.delete(:query) if params[:query].blank?
-  params.delete(:sort_reverse) unless params[:sort_reverse] == 'true'
+  params.delete(:sort_reverse) unless params[:sort_reverse] == "true"
   sort_reverse = params[:sort_reverse]
   sort = params[:sort]
   params.delete(:sort) if params[:sort] == @model_config.list.sort_by.to_s
-  export_action = RailsAdmin::Config::Actions.find(:export, { controller: self.controller, abstract_model: @abstract_model })
+  export_action = RailsAdmin::Config::Actions.find(:export, { controller: controller, abstract_model: @abstract_model })
   export_action = nil unless export_action && authorized?(export_action.authorization_key, @abstract_model)
   description = RailsAdmin.config(@abstract_model.model_name).description
-  properties = @model_config.list.with(controller: self.controller, view: self, object: @abstract_model.model.new).fields_for_table
+  properties = @model_config.list.with(controller: controller, view: self, object: @abstract_model.model.new).fields_for_table
   checkboxes = @model_config.list.checkboxes?
   table_table_header_count = begin
     count = checkboxes ? 1 : 0
-    count = count + properties.count
+    count += properties.count
   end
 %>
 
@@ -21,7 +20,7 @@
   <% if filterable_fields.present? %>
     <li class="nav-item dropdown">
       <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-        <%= t('admin.misc.add_filter') %>
+        <%= t("admin.misc.add_filter") %>
         <b class="caret"></b>
       </a>
       <ul class="dropdown-menu dropdown-menu-end" id="filters">
@@ -30,8 +29,7 @@
             <a
               href="#"
               class="dropdown-item"
-              data-options="<%= field.with(view: self).filter_options.to_json %>"
-            >
+              data-options="<%= field.with(view: self).filter_options.to_json %>">
               <%= field.label %>
             </a>
           </li>
@@ -55,16 +53,16 @@
   <%= form_tag(index_path(params.except(*%w[page f query])), method: :get) do %>
     <div class="card mb-3 p-3 bg-light">
       <div class="row" data-options="<%= ordered_filter_options.to_json %>" id="filters_box"></div>
-      <hr class="filters_box" style="display:<%= ordered_filters.empty? ? 'none' : 'block' %>"/>
+      <hr class="filters_box" style="display:<%= ordered_filters.empty? ? "none" : "block" %>">
       <div class="row">
         <div class="col-sm-6">
           <div class="input-group">
-            <input class="form-control" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>" />
-            <button class="btn btn-primary" data-disable-with="<%= '<i class="fas fa-sync"></i>' + t('admin.misc.refresh') %>" type="submit">
+            <input class="form-control" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>">
+            <button class="btn btn-primary" data-disable-with="<%= "<i class=\"fas fa-sync\"></i>#{t('admin.misc.refresh')}" %>" type="submit">
               <i class="fas fa-sync"></i>
-              <%= t('admin.misc.refresh') %>
+              <%= t("admin.misc.refresh") %>
             </button>
-            <button class="btn btn-info" id="remove_filter" title="<%= t('admin.misc.reset_filters') %>">
+            <button class="btn btn-info" id="remove_filter" title="<%= t("admin.misc.reset_filters") %>">
               <i class="fas fa-times"></i>
             </button>
           </div>
@@ -74,7 +72,7 @@
         </div>
         <div class="col-sm-6 text-end">
           <% if export_action %>
-            <%= govuk_link_to wording_for(:link, export_action), export_path(params.except('page')), class: 'btn btn-info' %>
+            <%= govuk_link_to wording_for(:link, export_action), export_path(params.except("page")), class: "btn btn-info" %>
           <% end %>
         </div>
       </div>
@@ -83,16 +81,16 @@
   <% unless @model_config.list.scopes.empty? %>
     <ul class="nav nav-tabs" id="scope_selector">
       <% @model_config.list.scopes.each_with_index do |scope, index| %>
-        <% scope = '_all' if scope.nil? %>
+        <% scope = "_all" if scope.nil? %>
         <li class="nav-item">
-          <a href="<%= index_path(params.merge(scope: scope, page: nil)) %>" class="nav-link <%= 'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0) %>">
+          <a href="<%= index_path(params.merge(scope:, page: nil)) %>" class="nav-link <%= "active" if scope.to_s == params[:scope] || (params[:scope].blank? && index.zero?) %>">
             <%= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize)) %>
           </a>
         </li>
       <% end %>
     </ul>
   <% end %>
-  <%= form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: ["form", "mb-3"] do %>
+  <%= form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: %w[form mb-3] do %>
     <%= hidden_field_tag :bulk_action %>
     <% if description.present? %>
       <p>
@@ -107,16 +105,18 @@
           <tr>
             <% if checkboxes %>
               <th class="shrink sticky">
-                <input class="toggle" type="checkbox" />
+                <input class="toggle" type="checkbox">
               </th>
             <% end %>
             <% properties.each do |property| %>
               <% selected = (sort == property.name.to_s) %>
               <% if property.sortable %>
-                <% sort_location = index_path params.except('sort_reverse').except('page').merge(sort: property.name).merge(selected && sort_reverse != "true" ? {sort_reverse: "true"} : {}) %>
-                <% sort_direction = (sort_reverse == 'true' ? "headerSortUp" : "headerSortDown" if selected) %>
+                <% sort_location = index_path params.except("sort_reverse").except("page").merge(sort: property.name).merge(selected && sort_reverse != "true" ? { sort_reverse: "true" } : {}) %>
+                <% sort_direction = (if selected
+                                       sort_reverse == "true" ? "headerSortUp" : "headerSortDown"
+                                     end) %>
               <% end %>
-              <th class="<%= [property.sortable && "header", property.sortable && sort_direction, property.sticky? && 'sticky', property.css_class, property.type_css_class].select(&:present?).join(' ') %>" data-href="<%= property.sortable && sort_location %>" rel="tooltip" title="<%= property.hint %>">
+              <th class="<%= [property.sortable && "header", property.sortable && sort_direction, property.sticky? && "sticky", property.css_class, property.type_css_class].select(&:present?).join(" ") %>" data-href="<%= property.sortable && sort_location %>" rel="tooltip" title="<%= property.hint %>">
                 <%= property.label %>
               </th>
             <% end %>
@@ -125,7 +125,7 @@
         </thead>
         <tbody class="table-group-divider">
           <% @objects.each do |object| %>
-            <tr class="<%= @abstract_model.param_key %>_row <%= @model_config.list.with(object: object).row_css_class %>">
+            <tr class="<%= @abstract_model.param_key %>_row <%= @model_config.list.with(object:).row_css_class %>">
               <% if checkboxes %>
                 <td class="sticky">
                   <%= check_box_tag "bulk_ids[]", object.id.to_s, false %>
@@ -133,7 +133,7 @@
               <% end %>
               <% properties.map { |property| property.bind(:object, object) }.each do |property| %>
                 <% value = property.pretty_value %>
-                <%= content_tag(:td, class: [property.sticky? && 'sticky', property.css_class, property.type_css_class].select(&:present?).map {|x| "rails-admin-#{x}"}, title: strip_tags(value.to_s)) do %>
+                <%= content_tag(:td, class: [property.sticky? && "sticky", property.css_class, property.type_css_class].select(&:present?).map { |x| "rails-admin-#{x}" }, title: strip_tags(value.to_s)) do %>
                   <%= value %>
                 <% end %>
               <% end %>
@@ -147,7 +147,7 @@
           <% if @objects.empty? %>
             <tr class="empty_row">
               <td colspan="<%= table_table_header_count %>">
-                <%= I18n.t('admin.actions.index.no_records') %>
+                <%= I18n.t("admin.actions.index.no_records") %>
               </td>
             </tr>
           <% end %>
@@ -157,14 +157,14 @@
     <% if @model_config.list.limited_pagination %>
       <div class="row">
         <div class="col-md-6">
-          <%= paginate(@objects, theme: 'ra-twitter-bootstrap/without_count', total_pages: Float::INFINITY) %>
+          <%= paginate(@objects, theme: "ra-twitter-bootstrap/without_count", total_pages: Float::INFINITY) %>
         </div>
       </div>
     <% elsif @objects.respond_to?(:total_count) %>
       <% total_count = @objects.total_count.to_i %>
       <div class="row">
         <div class="col-md-6">
-          <%= paginate(@objects, theme: 'ra-twitter-bootstrap') %>
+          <%= paginate(@objects, theme: "ra-twitter-bootstrap") %>
         </div>
       </div>
       <div class="row">

config/initializers/assets.rb

@@ -6,4 +6,4 @@ Rails.application.config.assets.version = "1.0"
 # Add additional assets to the asset load path.
 Rails.application.config.assets.paths << Rails.root.join("node_modules/@fortawesome/fontawesome-free/webfonts")
 
-Rails.application.config.assets.precompile += %w( rails_admin/rails_admin.css rails_admin/rails_admin.js )
+Rails.application.config.assets.precompile += %w[rails_admin/rails_admin.css rails_admin/rails_admin.js]