Merge branch 'main' into dependabot/bundler/rubocop-1.75.4

Author: rsmithlal

Gemfile

@@ -106,7 +106,11 @@ group :test do
   # # Easy installation and use of chromedriver to run system tests with Chrome
   # gem 'webdrivers'
   # RuboCop RSpec for RSpec-specific code analysis
+  gem 'rubocop-capybara'
+  gem 'rubocop-factory_bot'
+  gem 'rubocop-rails'
   gem 'rubocop-rspec'
+  gem 'rubocop-rspec_rails'
   # RSpec for unit testing
   gem 'rspec'
   # RSpec Rails integration

Gemfile.lock

@@ -49,6 +49,7 @@ PATH
       premailer-rails
       pundit (>= 2.1, < 2.6)
       pundit-resources
+      rack-attack
       rack-cors (>= 1.1.1, < 2.1.0)
       rack-mini-profiler
       rails (>= 5.2.2, < 7.2.0)
@@ -165,18 +166,18 @@ GEM
       unf
     ast (2.4.3)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1093.0)
-    aws-sdk-core (3.222.3)
+    aws-partitions (1.1103.0)
+    aws-sdk-core (3.224.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.99.0)
+    aws-sdk-kms (1.101.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.184.0)
+    aws-sdk-s3 (1.186.1)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -197,7 +198,7 @@ GEM
     bindex (0.8.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
-    bootsnap (1.18.4)
+    bootsnap (1.18.6)
       msgpack (~> 1.2)
     bootstrap (5.3.5)
       popper_js (>= 2.11.8, < 3)
@@ -226,7 +227,7 @@ GEM
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.2)
+    connection_pool (2.5.3)
     coveralls_reborn (0.28.0)
       simplecov (~> 0.22.0)
       term-ansicolor (~> 1.7)
@@ -244,7 +245,7 @@ GEM
       tilt
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.2.0)
+    database_cleaner-active_record (2.2.1)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
@@ -354,8 +355,8 @@ GEM
     google-protobuf (4.30.2-x86_64-linux)
       bigdecimal
       rake (>= 13)
-    groupdate (6.5.1)
-      activesupport (>= 7)
+    groupdate (6.6.0)
+      activesupport (>= 7.1)
     hashie (5.0.0)
     highline (3.1.2)
       reline
@@ -427,7 +428,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -454,7 +455,7 @@ GEM
     mobility-actiontext (1.1.1)
       actiontext (>= 6.0)
       mobility (~> 1.2)
-    msgpack (1.7.2)
+    msgpack (1.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
@@ -497,7 +498,7 @@ GEM
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.2.3)
+    psych (5.2.6)
       date
       stringio
     public_suffix (6.0.1)
@@ -506,7 +507,9 @@ GEM
     pundit (2.5.0)
       activesupport (>= 3.0.0)
     racc (1.8.1)
-    rack (3.1.13)
+    rack (3.1.14)
+    rack-attack (6.7.0)
+      rack (>= 1.0, < 4)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-mini-profiler (3.3.1)
@@ -515,7 +518,7 @@ GEM
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-session (2.1.0)
+    rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
@@ -645,9 +648,25 @@ GEM
     rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rails (2.30.3)
+      activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
+      rack (>= 1.1)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
     rubocop-rspec (3.6.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
     ruby-openai (8.1.0)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
@@ -664,16 +683,16 @@ GEM
     sassc-embedded (1.80.4)
       sass-embedded (~> 1.80)
     securerandom (0.4.1)
-    selenium-webdriver (4.31.0)
+    selenium-webdriver (4.32.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-rails (5.23.0)
+    sentry-rails (5.24.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.23.0)
-    sentry-ruby (5.23.0)
+      sentry-ruby (~> 5.24.0)
+    sentry-ruby (5.24.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shoulda-callback-matchers (1.1.4)
@@ -804,7 +823,11 @@ DEPENDENCIES
   rspec-rails
   rswag
   rubocop
+  rubocop-capybara
+  rubocop-factory_bot
+  rubocop-rails
   rubocop-rspec
+  rubocop-rspec_rails
   selenium-webdriver
   sentry-rails
   sentry-ruby

app/assets/stylesheets/better_together/forms.scss

@@ -110,3 +110,7 @@ input[type="range"]::-ms-thumb {
 trix-toolbar .trix-input--dialog {
   color: $light-background-text-color;
 }
+
+.ss-content.form-select {
+  overflow-y: auto;
+}

app/controllers/better_together/resource_controller.rb

@@ -74,6 +74,10 @@ def resource_instance(attrs = {})
       instance_variable_set("@#{resource_name}", @resource)
     end
 
+    def resource_instance_collection
+      resource_collection
+    end
+
     def resource_name(plural: false)
       name = resource_class.name.demodulize
       name = name.pluralize if plural
@@ -86,7 +90,7 @@ def resource_params
     end
 
     def set_resource_instance
-      @resource = resource_collection.find(id_param)
+      @resource = resource_instance_collection.find(id_param)
       instance_variable_set("@#{resource_name}", @resource)
     end
 

app/helpers/better_together/form_helper.rb

@@ -2,7 +2,53 @@
 
 module BetterTogether
   # Facilitates building forms by pulling out reusable components and logic
-  module FormHelper
+  module FormHelper # rubocop:todo Metrics/ModuleLength
+    def class_field_required(klass, field)
+      klass.validators_on(field).any? { |v| v.kind == :presence }
+    end
+
+    # rubocop:todo Metrics/MethodLength
+    def label_select_field(form) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:todo Metrics/BlockLength
+      content_tag(:div, class: 'label-select', data: { controller: 'better_together--dependent-fields' }) do
+        field_label = required_label(
+          form,
+          :label,
+          class: 'form-label'
+        )
+
+        label_select_id = dom_id(form.object, :label).split('-').first
+        select_field = form.select(
+          :select_label,
+          form.object.class.label_options,
+          { prompt: 'Select Label', required: true },
+          class: 'form-select',
+          id: label_select_id,
+          'data-better_together--dependent-fields-target' => 'controlField'
+        )
+
+        other_text_field = content_tag(
+          :div,
+          class: "other-label #{dom_class(form.object, :label_text_field)}",
+          data: {
+            'dependent-fields-control' => label_select_id
+          },
+          'data-better_together--dependent-fields-target' => 'dependentField',
+          "data-show-if-control_#{label_select_id}" => 'other'
+        ) do
+          form.text_field(
+            :text_label,
+            class: 'form-control mt-3',
+            placeholder: t('better_together.labelable.custom-label-placeholder')
+          )
+        end
+
+        field_label + select_field + other_text_field
+      end
+      # rubocop:enable Metrics/BlockLength
+    end
+    # rubocop:enable Metrics/MethodLength
+
     def language_select_field(form: nil, field_name: :locale, selected_locale: I18n.locale, options: {},
                               html_options: {})
       # Merge default options with the provided options
@@ -85,7 +131,7 @@ def required_label(form_or_object, field, **options) # rubocop:todo Metrics/AbcS
         # Use the provided class_name for validation check if present, otherwise use the object's class
       end
       klass = class_name ? class_name.constantize : object.class
-      is_required = klass.validators_on(field).any? { |v| v.kind == :presence }
+      is_required = class_field_required(klass, field)
 
       # Append asterisk for required fields
       label_text += " <span class='required-indicator'>*</span>" if is_required

app/helpers/better_together/navigation_items_helper.rb

@@ -109,7 +109,9 @@ def render_platform_header_nav_items
 
     def route_names_for_select(nav_item = nil)
       options_for_select(
-        BetterTogether::NavigationItem.route_names.map { |name, route| [I18n.t("route_names.#{name}"), route] },
+        BetterTogether::NavigationItem.route_names.map do |name, route|
+          [I18n.t("better_together.navigation_items.route_names.#{name}"), route]
+        end,
         (nav_item ? nav_item.route_name : nil)
       )
     end

app/javascript/controllers/better_together/tabs_controller.js

@@ -7,45 +7,10 @@ export default class extends Controller {
   static targets = ["tab"];
 
   connect() {
-    // this.initializeFirstTabs();
     this.activateTabFromHash();
     this.setupTabChangeListener();
   }
 
-  // initializeFirstTabs() {
-  //   // Ensure the first tab in each group is active and shown
-  //   const tabGroups = this.element.querySelectorAll('[data-bs-target]');
-  //   tabGroups.forEach((tab) => {
-  //     // Skip tabs inside the localized-fields class
-  //     if (tab.closest('.localized-fields')) return;
-
-  //     const tabPane = this.element.querySelector(tab.dataset.bsTarget);
-  //     if (tabPane) {
-  //       const nestedTabs = tabPane.querySelectorAll('[data-bs-target]');
-  //       if (nestedTabs.length > 0) {
-  //         const firstNestedTab = nestedTabs[0];
-  //         const firstNestedTabTarget = tabPane.querySelector(firstNestedTab.dataset.bsTarget);
-
-  //         nestedTabs.forEach((nestedTab) => {
-  //           nestedTab.classList.remove('active');
-  //         });
-  //         firstNestedTab.classList.add('active');
-
-  //         if (firstNestedTabTarget) {
-  //           const nestedTabPanes = tabPane.querySelectorAll('.tab-pane');
-  //           nestedTabPanes.forEach((nestedPane) => {
-  //             nestedPane.classList.remove('active');
-  //             nestedPane.classList.remove('show');
-  //           });
-
-  //           firstNestedTabTarget.classList.add('active');
-  //           firstNestedTabTarget.classList.add('show');
-  //         }
-  //       }
-  //     }
-  //   });
-  // }
-
   activateTabFromHash() {
     const hash = window.location.hash;
     if (hash) {
@@ -70,29 +35,6 @@ export default class extends Controller {
         if (tabTarget) {
           tabTarget.classList.add('active');
           tabTarget.classList.add('show');
-
-          // // Activate the first tab inside the activated tab pane
-          // const nestedTabs = tabTarget.querySelectorAll('[data-bs-target]');
-          // if (nestedTabs.length > 0) {
-          //   const firstNestedTab = nestedTabs[0];
-          //   const firstNestedTabTarget = tabTarget.querySelector(firstNestedTab.dataset.bsTarget);
-
-          //   nestedTabs.forEach((nestedTab) => {
-          //     nestedTab.classList.remove('active');
-          //   });
-          //   firstNestedTab.classList.add('active');
-
-          //   if (firstNestedTabTarget) {
-          //     const nestedTabPanes = tabTarget.querySelectorAll('.tab-pane');
-          //     nestedTabPanes.forEach((nestedPane) => {
-          //       nestedPane.classList.remove('active');
-          //       nestedPane.classList.remove('show');
-          //     });
-
-          //     firstNestedTabTarget.classList.add('active');
-          //     firstNestedTabTarget.classList.add('show');
-          //   }
-          // }
         }
 
         // Check if the selected tab is nested and activate its parent tab
@@ -108,13 +50,14 @@ export default class extends Controller {
   }
 
   setupTabChangeListener() {
-    const tabLinks = this.tabTargets;
-    tabLinks.forEach((link) => {
-      // Skip tabs inside the localized-fields class
+    this.tabTargets.forEach((link) => {
       if (link.closest('.localized-fields')) return;
 
       link.addEventListener("shown.bs.tab", (event) => {
-        history.pushState({}, "", event.target.getAttribute("data-bs-target"))
+        const targetHash = event.target.getAttribute("data-bs-target");
+        if (targetHash) {
+          history.pushState({}, "", targetHash); // Add the hash to the address bar
+        }
       });
     });
   }