Merge branch 'main' into dependabot/bundler/turbo-rails-2.0.11

Author: dorner

Gemfile.lock

@@ -162,9 +162,9 @@ GEM
       irb (~> 1.10)
       reline (>= 0.3.8)
     debug_inspector (1.2.0)
-    delayed_job (4.1.11)
+    delayed_job (4.1.12)
       activesupport (>= 3.0, < 8.0)
-    delayed_job_active_record (4.1.8)
+    delayed_job_active_record (4.1.10)
       activerecord (>= 3.0, < 8.0)
       delayed_job (>= 3.0, < 5)
     delayed_job_web (1.4.4)
@@ -209,15 +209,15 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    erb_lint (0.6.0)
+    erb_lint (0.7.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
       rainbow
       rubocop (>= 1)
       smart_properties
     erubi (1.13.0)
-    execjs (2.9.1)
+    execjs (2.10.0)
     factory_bot (6.4.5)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
@@ -259,14 +259,14 @@ GEM
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
     filterrific (5.2.5)
-    flipper (1.3.0)
+    flipper (1.3.1)
       concurrent-ruby (< 2)
     flipper-active_record (1.3.0)
       activerecord (>= 4.2, < 8)
       flipper (~> 1.3.0)
-    flipper-ui (1.3.0)
+    flipper-ui (1.3.1)
       erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 1.3.0)
+      flipper (~> 1.3.1)
       rack (>= 1.4, < 4)
       rack-protection (>= 1.5.3, < 5.0.0)
       rack-session (>= 1.0.2, < 3.0.0)
@@ -321,7 +321,7 @@ GEM
     jbuilder (2.13.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    json (2.7.2)
+    json (2.7.5)
     jwt (2.9.1)
       base64
     kaminari (1.2.2)
@@ -442,7 +442,7 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.4.2)
+    parser (3.3.5.1)
       ast (~> 2.4.1)
       racc
     pdf-core (0.9.0)
@@ -554,7 +554,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rolify (6.0.1)
     rouge (4.1.2)
     rspec (3.13.0)
@@ -589,9 +589,9 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.1)
+    rubocop-ast (1.33.0)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.25.1)
@@ -607,7 +607,7 @@ GEM
       ffi (~> 1.12)
       logger
     ruby2_keywords (0.0.5)
-    sanitize (6.1.0)
+    sanitize (6.1.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sass-rails (6.0.0)
@@ -659,15 +659,15 @@ GEM
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.4.0)
+    standard-performance (1.5.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.21.0)
+      rubocop-performance (~> 1.22.0)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.1)
     strong_migrations (1.8.0)
       activerecord (>= 5.2)
-    terser (1.2.3)
+    terser (1.2.4)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.2.0)
@@ -678,7 +678,7 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     uniform_notifier (1.16.0)
     version_gem (1.1.4)
     warden (1.2.9)

app/helpers/date_range_helper.rb

@@ -1,7 +1,7 @@
 # Encapsulates methods used on the Dashboard that need some business logic
 module DateRangeHelper
   def date_range_params
-    params.dig(:filters, :date_range).presence || this_year
+    params.dig(:filters, :date_range).presence || default_date
   end
 
   def date_range_label
@@ -23,8 +23,10 @@ def date_range_label
     end
   end
 
-  def this_year
-    "January 1, #{Time.zone.today.year} - December 31, #{Time.zone.today.year}"
+  def default_date
+    start_date = 2.months.ago.to_date
+    end_date = 1.month.from_now.to_date
+    "#{start_date.strftime("%B %d, %Y")} - #{end_date.strftime("%B %d, %Y")}"
   end
 
   def selected_interval

app/javascript/application.js

@@ -90,6 +90,7 @@ $(document).ready(function(){
       format: "MMMM D, YYYY",
       ranges: {
         customRanges: {
+          'Default': [today.minus({'months': 2}).toJSDate(), today.plus({'months': 1}).toJSDate()],
           'All Time': [today.minus({ 'years': 100 }).toJSDate(), today.plus({ 'years': 1 }).toJSDate()],
           'Today': [today.toJSDate(), today.toJSDate()],
           'Yesterday': [today.minus({'days': 1}).toJSDate(), today.minus({'days': 1}).toJSDate()],

spec/support/date_range_picker_shared_example.rb

@@ -20,11 +20,30 @@ def date_range_picker_select_range(range_name)
   let(:user) { create(:user, organization: organization) }
 
   let!(:very_old) { create(described_class.to_s.underscore.to_sym, date_field.to_sym => Time.zone.local(2000, 7, 31), :organization => organization) }
+  let!(:two_months_ago) { create(described_class.to_s.underscore.to_sym, date_field.to_sym => Time.zone.local(2019, 5, 31), :organization => organization) }
   let!(:recent) { create(described_class.to_s.underscore.to_sym, date_field.to_sym => Time.zone.local(2019, 7, 24), :organization => organization) }
   let!(:today) { create(described_class.to_s.underscore.to_sym, date_field.to_sym => Time.zone.local(2019, 7, 31), :organization => organization) }
+  let!(:one_month_ahead) { create(described_class.to_s.underscore.to_sym, date_field.to_sym => Time.zone.local(2019, 8, 31), :organization => organization) }
   let!(:one_year_ahead) { create(described_class.to_s.underscore.to_sym, date_field.to_sym => Time.zone.local(2020, 7, 31), :organization => organization) }
   let!(:two_years_ahead) { create(described_class.to_s.underscore.to_sym, date_field.to_sym => Time.zone.local(2021, 7, 31), :organization => organization) }
 
+  context "when choosing 'Default'" do
+    before do
+      sign_out user
+      travel_to Time.zone.local(2019, 7, 31)
+      sign_in user
+    end
+
+    after do
+      travel_back
+    end
+
+    it "shows only 4 records" do
+      visit subject
+      expect(page).to have_css("table tbody tr", count: 4)
+    end
+  end
+
   context "when choosing 'All Time'" do
     before do
       sign_out user
@@ -41,7 +60,7 @@ def date_range_picker_select_range(range_name)
       date_range = "#{Time.zone.local(1919, 7, 1).to_formatted_s(:date_picker)} - #{Time.zone.local(2020, 7, 31).to_formatted_s(:date_picker)}"
       fill_in "filters_date_range", with: date_range
       find(:id, 'filters_date_range').native.send_keys(:enter)
-      expect(page).to have_css("table tbody tr", count: 4)
+      expect(page).to have_css("table tbody tr", count: 6)
     end
   end
 

spec/system/product_drive_system_spec.rb

@@ -29,7 +29,7 @@
     it "Shows the expected filters with the expected values and in alphabetical order for name filter" do
       expect(page.find("select[name='filters[by_name]']").find(:xpath, 'option[2]').text).to eq "Alpha Test name 3"
       expect(page.has_select?('filters[by_name]', with_options: @product_drives.map(&:name))).to be true
-      expect(page.has_field?('filters_date_range', with: this_year))
+      expect(page.has_field?('filters_date_range', with: default_date))
     end
 
     it "shows the expected product drives" do