Merge branch 'main' into rluodev/4992-invoice-fix-state-management-migrate

Author: rluodev

Gemfile

@@ -108,9 +108,7 @@ gem "reverse_markdown" # public activity to discord
 gem "namae" # multi-cultural human name parser
 gem "premailer-rails" # css to inline styles for emails
 gem "safely_block"
-gem "strong_migrations", "~> 1" # protects against risky migrations
-# [@garyhtou] ^ We still use Postgres 11 in dev (not in prod). Strong Migrations
-#               2.x is incompatible with Postgres 11.
+gem "strong_migrations", "~> 2" # protects against risky migrations
 gem "xxhash" # fast hashing
 gem "memo_wise"
 

Gemfile.lock

@@ -129,7 +129,7 @@ GEM
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     api-pagination (6.0.0)
-    appsignal (4.5.4)
+    appsignal (4.7.5)
       logger
       rack (>= 2.0.0)
     argon2-kdf (0.3.0)
@@ -825,8 +825,8 @@ GEM
     statsd-instrument (3.9.9)
     stringio (3.1.7)
     stripe (11.7.0)
-    strong_migrations (1.8.0)
-      activerecord (>= 5.2)
+    strong_migrations (2.5.1)
+      activerecord (>= 7.1)
     terser (1.2.6)
       execjs (>= 0.3.0, < 3)
     thor (1.4.0)
@@ -1030,7 +1030,7 @@ DEPENDENCIES
   stackprof
   statsd-instrument (~> 3.9)
   stripe (= 11.7.0)
-  strong_migrations (~> 1)
+  strong_migrations (~> 2)
   suo!
   terser (~> 1.2)
   turbo-rails (~> 2.0.17)

app/assets/images/receipt_status_upload.png

@@ -2,6 +2,8 @@
 
 module Admin
   class BaseController < ApplicationController
+    include RedirectToUi3
+
     skip_after_action :verify_authorized # do not force pundit
     before_action :signed_in_admin
 

app/assets/images/receipt_status_uploaded.png

@@ -161,7 +161,7 @@ def card_designs
           set_api_event
           authorize @event, :create_stripe_card?, policy_class: EventPolicy
 
-          @designs = [event.stripe_card_personalization_designs&.available, StripeCard::PersonalizationDesign.common.available].flatten.compact
+          @designs = [@event.stripe_card_personalization_designs&.available, StripeCard::PersonalizationDesign.common.available].flatten.compact
         else
           skip_authorization
           @designs = StripeCard::PersonalizationDesign.common.available

app/controllers/admin/base_controller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ApplicationController < ActionController::Base
+  include RedirectToUi3
+
   include Pundit::Authorization
   include SessionsHelper
   include ToursHelper

app/controllers/api/v4/stripe_cards_controller.rb

@@ -6,8 +6,33 @@ class CardGrantsController < ApplicationController
   skip_before_action :signed_in_user, only: [:show, :spending]
   skip_after_action :verify_authorized, only: [:show, :spending]
 
-  before_action :set_event, only: %i[new create]
-  before_action :set_card_grant, except: %i[new create]
+  before_action :set_event, only: [:new, :create, :index, :card_index, :transaction_index]
+  before_action :set_card_grant, except: [:new, :create, :index, :card_index, :transaction_index]
+
+  def index
+    authorize @event, :card_grant_overview?
+  end
+
+  def card_index
+    authorize @event, :card_grant_overview?
+
+    card_grants_page = (params[:page] || 1).to_i
+    card_grants_per_page = (params[:per] || 20).to_i
+
+    @card_grants = @event.card_grants.includes(:disbursement, :user, :stripe_card).order(created_at: :desc)
+    @paginated_card_grants = @card_grants.page(card_grants_page).per(card_grants_per_page)
+  end
+
+  def transaction_index
+    authorize @event, :card_grant_overview?
+
+    transactions_page = (params[:page] || 1).to_i
+    transactions_per_page = (params[:per] || 20).to_i
+
+    @all_stripe_cards = @event.stripe_cards.where.associated(:card_grant)
+    @hcb_codes = HcbCode.where(hcb_code: @all_stripe_cards.flat_map(&:all_hcb_codes)).order(created_at: :desc)
+    @paginated_hcb_codes = @hcb_codes.page(transactions_page).per(transactions_per_page)
+  end
 
   def new
     @card_grant = @event.card_grants.build(email: params[:email])
@@ -49,7 +74,7 @@ def create
     end
 
     flash[:success] = "Successfully sent a grant to #{@card_grant.email}!"
-    redirect_to event_transfers_path(@event)
+    redirect_back_or_to event_transfers_path(@event)
   end
 
   def edit_overview

app/controllers/application_controller.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module RedirectToUi3
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :redirect_to_ui3_if_needed
+  end
+
+  private
+
+  def redirect_to_ui3_if_needed
+    return if current_user.nil?
+
+    # return unless request.get? || request.head?
+
+    if Flipper.enabled?(:redirect_to_ui3_2025_11_03, current_user) && request.host == "hcb.hackclub.com"
+      redirect_to "https://ui3.hcb.hackclub.com#{request.fullpath}", allow_other_host: true
+    end
+  end
+end

app/controllers/card_grants_controller.rb

@@ -1344,20 +1344,21 @@ def show_running_balance?
   end
 
   def set_cacheable
-    return false unless params[:q].blank? &&
-                        params[:page].blank? &&
-                        params[:per].blank? &&
-                        @user.nil? &&
-                        @tag.blank? &&
-                        @type.blank? &&
-                        @start_date.blank? &&
-                        @end_date.blank? &&
-                        @minimum_amount.nil? &&
-                        @maximum_amount.nil? &&
-                        !@missing_receipts
-    return false if organizer_signed_in?
-
-    true
+    has_filters = !(
+      params[:q].blank? &&
+        params[:page].blank? &&
+        params[:per].blank? &&
+        @user.nil? &&
+        @tag.blank? &&
+        @type.blank? &&
+        @start_date.blank? &&
+        @end_date.blank? &&
+        @minimum_amount.nil? &&
+        @maximum_amount.nil? &&
+        !@missing_receipts
+    )
+
+    @cacheable = !(organizer_signed_in? || has_filters)
   end
 
   def set_mock_data