Merge branch 'main' into dependabot/bundler/rspec-rails-8.0.2

Author: rsmithlal

Gemfile

@@ -98,6 +98,8 @@ group :test do
   # Capybara for integration testing
   gem 'capybara', '>= 2.15'
   gem 'capybara-screenshot'
+  # WebMock for stubbing external HTTP requests in specs
+  gem 'webmock'
   # Coveralls for test coverage reporting
   gem 'coveralls_reborn', require: false
   # Database cleaner for test database cleaning

Gemfile.lock

@@ -57,6 +57,7 @@ PATH
       reform-rails (>= 0.2, < 0.4)
       rswag (>= 2.3.1, < 2.17.0)
       ruby-openai
+      sidekiq-scheduler
       simple_calendar
       sprockets-rails
       stackprof
@@ -229,6 +230,9 @@ GEM
       term-ansicolor (~> 1.7)
       thor (~> 1.2)
       tins (~> 1.32)
+    crack (1.0.0)
+      bigdecimal
+      rexml
     crass (1.0.6)
     css_parser (1.21.1)
       addressable
@@ -297,6 +301,8 @@ GEM
       multi_json
     erb (5.0.2)
     erubi (1.13.1)
+    et-orbi (1.3.0)
+      tzinfo
     event_stream_parser (1.0.0)
     excon (1.2.8)
       logger
@@ -343,6 +349,9 @@ GEM
     friendly_id-mobility (1.0.4)
       friendly_id (>= 5.0.0, < 5.5)
       mobility (>= 1.0.1, < 2.0)
+    fugit (1.11.2)
+      et-orbi (~> 1, >= 1.2.11)
+      raabro (~> 1.4)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -362,6 +371,7 @@ GEM
       rake (>= 13)
     groupdate (6.7.0)
       activesupport (>= 7.1)
+    hashdiff (1.2.0)
     hashie (5.0.0)
     highline (3.1.2)
       reline
@@ -521,6 +531,7 @@ GEM
       nio4r (~> 2.0)
     pundit (2.5.0)
       activesupport (>= 3.0.0)
+    raabro (1.4.0)
     racc (1.8.1)
     rack (3.1.16)
     rack-attack (6.7.0)
@@ -699,6 +710,8 @@ GEM
       ffi (~> 1.12)
       logger
     rubyzip (3.0.1)
+    rufus-scheduler (3.9.2)
+      fugit (~> 1.1, >= 1.11.1)
     sass-embedded (1.86.3-aarch64-linux-gnu)
       google-protobuf (~> 4.30)
     sass-embedded (1.86.3-arm64-darwin)
@@ -732,6 +745,9 @@ GEM
       logger (>= 1.6.2)
       rack (>= 3.1.0)
       redis-client (>= 0.23.2)
+    sidekiq-scheduler (6.0.1)
+      rufus-scheduler (~> 3.2)
+      sidekiq (>= 7.3, < 9)
     simple_calendar (3.1.0)
       rails (>= 6.1)
     simplecov (0.22.0)
@@ -801,6 +817,10 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
+    webmock (3.25.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
     websocket (1.2.11)
     websocket-driver (0.8.0)
       base64
@@ -873,6 +893,7 @@ DEPENDENCIES
   storext!
   uglifier (>= 1.3.0)
   web-console (>= 3.3.0)
+  webmock
 
 RUBY VERSION
    ruby 3.4.4p34

app/controllers/better_together/metrics/link_checker_reports_controller.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  module Metrics
+    # Controller for creating and downloading Link Checker reports
+    class LinkCheckerReportsController < ApplicationController
+      before_action :set_report, only: %i[download]
+
+      def index
+        @link_checker_reports = BetterTogether::Metrics::LinkCheckerReport.order(created_at: :desc)
+
+        if request.headers['Turbo-Frame'].present?
+          render partial: 'better_together/metrics/link_checker_reports/index',
+                 locals: { reports: @link_checker_reports },
+                 layout: false
+        else
+          render :index
+        end
+      end
+
+      def new
+        @link_checker_report = BetterTogether::Metrics::LinkCheckerReport.new
+      end
+
+      # rubocop:todo Metrics/AbcSize
+      # rubocop:todo Metrics/MethodLength
+      # rubocop:todo Metrics/BlockLength
+      def create
+        opts = {
+          from_date: params.dig(:metrics_link_checker_report, :filters, :from_date),
+          to_date: params.dig(:metrics_link_checker_report, :filters, :to_date),
+          file_format: params.dig(:metrics_link_checker_report, :file_format) || 'csv'
+        }
+
+        @link_checker_report = BetterTogether::Metrics::LinkCheckerReport.create_and_generate!(**opts)
+
+        respond_to do |format| # rubocop:todo Metrics/BlockLength
+          if @link_checker_report.persisted?
+            flash[:notice] = t('flash.generic.created', resource: t('resources.report'))
+            format.html { redirect_to metrics_link_checker_reports_path, notice: flash[:notice] }
+            format.turbo_stream do
+              render turbo_stream: [
+                turbo_stream.prepend(
+                  'link_checker_reports_table_body',
+                  partial: 'better_together/metrics/link_checker_reports/link_checker_report',
+                  locals: { link_checker_report: @link_checker_report }
+                ),
+                turbo_stream.replace(
+                  'flash_messages',
+                  partial: 'layouts/better_together/flash_messages',
+                  locals: { flash: flash }
+                ),
+                turbo_stream.replace('new_link_checker_report',
+                                     '<turbo-frame id="new_link_checker_report"></turbo-frame>')
+              ]
+            end
+          else
+            flash.now[:alert] = t('flash.generic.error_create', resource: t('resources.report'))
+            format.html { render :new, status: :unprocessable_content }
+            format.turbo_stream do
+              render turbo_stream: [
+                turbo_stream.update('form_errors', partial: 'layouts/errors', locals: { object: @link_checker_report }),
+                turbo_stream.replace(
+                  'flash_messages',
+                  partial: 'layouts/better_together/flash_messages',
+                  locals: { flash: flash }
+                )
+              ]
+            end
+          end
+        end
+      end
+      # rubocop:enable Metrics/BlockLength
+      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/AbcSize
+
+      # rubocop:todo Metrics/AbcSize
+      # rubocop:todo Metrics/MethodLength
+      def download
+        if @link_checker_report.report_file.attached?
+          BetterTogether::Metrics::TrackDownloadJob.perform_later(
+            @link_checker_report,
+            @link_checker_report.report_file.filename.to_s,
+            @link_checker_report.report_file.content_type,
+            @link_checker_report.report_file.byte_size,
+            I18n.locale.to_s
+          )
+
+          send_data @link_checker_report.report_file.download,
+                    filename: @link_checker_report.report_file.filename.to_s,
+                    type: @link_checker_report.report_file.content_type,
+                    disposition: 'attachment'
+
+          return
+        end
+
+        redirect_to metrics_link_checker_reports_path, alert: t('resources.download_failed')
+      end
+      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/AbcSize
+
+      private
+
+      def set_report
+        @link_checker_report = BetterTogether::Metrics::LinkCheckerReport.find(params[:id])
+      end
+    end
+  end
+end

app/controllers/better_together/metrics/reports_controller.rb

@@ -67,6 +67,12 @@ def index # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
             }
           end
         }
+
+        # Link Checker charts: aggregate data from stored links
+        links_scope = BetterTogether::Content::Link.all
+        @links_by_host = links_scope.group(:host).count
+        @invalid_by_host = links_scope.where(valid_link: false).group(:host).count
+        @failures_daily = links_scope.where(valid_link: false).group_by_day(:last_checked_at).count
       end
 
       # A helper method to generate a random color for each platform (this can be customized).

app/controllers/better_together/pages_controller.rb

@@ -4,6 +4,9 @@ module BetterTogether
   # Responds to requests for pages
   class PagesController < FriendlyResourceController # rubocop:todo Metrics/ClassLength
     before_action :set_page, only: %i[show edit update destroy]
+
+    skip_before_action :check_platform_setup, unless: -> { ::BetterTogether::Platform.where(host: true).any? }
+
     before_action only: %i[new edit], if: -> { Rails.env.development? } do
       # Make sure that all BLock subclasses are loaded in dev to generate new block buttons
       BetterTogether::Content::Block.load_all_subclasses

app/controllers/concerns/better_together/wizard_methods.rb

@@ -15,9 +15,8 @@ def determine_wizard_outcome # rubocop:todo Metrics/AbcSize
       raise StandardError, "Wizard #{wizard_identifier} was not found. Have you run the seeds?" unless wizard
 
       if wizard.completed?
-        flash[:notice] = wizard.success_message
-        # TODO: This needs to be adjusted for private platforms. Flash message is not retained after wizard completion
-        redirect_to wizard.success_path
+        flash.keep(:notice)
+        redirect_to wizard.success_path, notice: wizard.success_message
       else
         next_step_path, flash_key, message = wizard_next_step_info
         flash[flash_key] = message if message

app/helpers/better_together/content/blocks_helper.rb

@@ -17,8 +17,8 @@ def temp_id_for(model, temp_id: SecureRandom.uuid)
       # Sanitize HTML content for safe rendering in custom blocks
       def sanitize_block_html(html)
         allowed_tags = %w[p br strong em b i ul ol li a span h1 h2 h3 h4 h5 h6 img figure figcaption blockquote pre
-                          code]
-        allowed_attrs = %w[href src alt title class target rel]
+                          code iframe div]
+        allowed_attrs = %w[href src alt style title class target rel]
         sanitize(html.to_s, tags: allowed_tags, attributes: allowed_attrs)
       end
 

app/javascript/controllers/better_together/metrics_charts_controller.js

@@ -58,7 +58,7 @@ const platformBorderColors = {
 };
 
 export default class extends Controller {
-  static targets = ["pageViewsChart", "dailyPageViewsChart", "linkClicksChart", "dailyLinkClicksChart", "downloadsChart", "sharesChart", "sharesPerUrlPerPlatformChart"]
+  static targets = ["pageViewsChart", "dailyPageViewsChart", "linkClicksChart", "dailyLinkClicksChart", "downloadsChart", "sharesChart", "sharesPerUrlPerPlatformChart", "linksByHostChart", "invalidByHostChart", "failuresDailyChart"]
 
   connect() {
     this.renderPageViewsChart()
@@ -68,6 +68,9 @@ export default class extends Controller {
     this.renderDownloadsChart()
     this.renderSharesChart()
     this.renderSharesPerUrlPerPlatformChart()
+  this.renderLinksByHostChart()
+  this.renderInvalidByHostChart()
+  this.renderFailuresDailyChart()
   }
 
   renderPageViewsChart() {
@@ -203,4 +206,58 @@ export default class extends Controller {
       })
     })
   }
+
+  renderLinksByHostChart() {
+    const data = JSON.parse(this.linksByHostChartTarget.dataset.chartData)
+    new Chart(this.linksByHostChartTarget, {
+      type: 'bar',
+      data: {
+        labels: data.labels,
+        datasets: [{
+          label: 'Links by Host',
+          data: data.values,
+          backgroundColor: 'rgba(99, 132, 255, 0.2)',
+          borderColor: 'rgba(99, 132, 255, 1)',
+          borderWidth: 1
+        }]
+      },
+      options: Object.assign({}, sharedChartOptions)
+    })
+  }
+
+  renderInvalidByHostChart() {
+    const data = JSON.parse(this.invalidByHostChartTarget.dataset.chartData)
+    new Chart(this.invalidByHostChartTarget, {
+      type: 'bar',
+      data: {
+        labels: data.labels,
+        datasets: [{
+          label: 'Invalid Links by Host',
+          data: data.values,
+          backgroundColor: 'rgba(255, 159, 64, 0.2)',
+          borderColor: 'rgba(255, 159, 64, 1)',
+          borderWidth: 1
+        }]
+      },
+      options: Object.assign({}, sharedChartOptions)
+    })
+  }
+
+  renderFailuresDailyChart() {
+    const data = JSON.parse(this.failuresDailyChartTarget.dataset.chartData)
+    new Chart(this.failuresDailyChartTarget, {
+      type: 'line',
+      data: {
+        labels: data.labels,
+        datasets: [{
+          label: 'Invalid Links Over Time',
+          data: data.values,
+          backgroundColor: 'rgba(255, 99, 132, 0.2)',
+          borderColor: 'rgba(255, 99, 132, 1)',
+          borderWidth: 1
+        }]
+      },
+      options: Object.assign({}, sharedChartOptions)
+    })
+  }
 }

app/javascript/controllers/better_together/time_zone_controller.js

@@ -0,0 +1,20 @@
+import { Controller } from "stimulus"
+
+export default class extends Controller {
+  static targets = [ "select" ]
+
+  connect() {
+    // Called when the controller is initialized and the element is in the DOM
+    const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+    if (this.hasSelectTarget) {
+      const options = this.selectTarget.options;
+      for (let i = 0; i < options.length; i++) {
+        if (options[i].value === userTimeZone) {
+          this.selectTarget.selectedIndex = i;
+          break;
+        }
+      }
+    }
+  }
+}

app/jobs/better_together/event_reminder_scan_job.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  # Scans upcoming events and schedules per-event reminders via
+  # BetterTogether::EventReminderSchedulerJob. This job is intended to be run
+  # periodically by the scheduler (sidekiq-scheduler / sidekiq-cron).
+  class EventReminderScanJob < ApplicationJob
+    queue_as :notifications
+
+    # Keep lightweight: find events starting in the near future and enqueue the
+    # existing per-event scheduler job which handles cancellation/rescheduling.
+    # default: next 7 days
+    def perform(window_hours: 168)
+      cutoff = Time.current + window_hours.hours
+
+      BetterTogether::Event.where('starts_at <= ? AND starts_at >= ?', cutoff, Time.current).find_each do |event|
+        # Use the id to avoid serializing AR objects into the job payload
+        BetterTogether::EventReminderSchedulerJob.perform_later(event.id)
+      rescue StandardError => e
+        Rails.logger.error "Failed to enqueue reminder scheduler for event #{event&.id}: #{e.message}"
+      end
+    end
+  end
+end