Simplefin enhancements v2

app/controllers/accounts_controller.rb

@@ -3,11 +3,55 @@ class AccountsController < ApplicationController
   include Periodable
 
   def index
-    @manual_accounts = family.accounts.manual.alphabetically
+    @manual_accounts = family.accounts
+          .visible_manual
+          .order(:name)
     @plaid_items = family.plaid_items.ordered
-    @simplefin_items = family.simplefin_items.ordered
+    @simplefin_items = family.simplefin_items.ordered.includes(:syncs)
     @lunchflow_items = family.lunchflow_items.ordered
 
+    # Precompute per-item maps to avoid queries in the view
+    @simplefin_sync_stats_map = {}
+    @simplefin_has_unlinked_map = {}
+
+    @simplefin_items.each do |item|
+      latest_sync = item.syncs.ordered.first
+      @simplefin_sync_stats_map[item.id] = (latest_sync&.sync_stats || {})
+      @simplefin_has_unlinked_map[item.id] = item.family.accounts
+        .visible_manual
+        .exists?
+    end
+
+    # Count of SimpleFin accounts that are not linked (no legacy account and no AccountProvider)
+    @simplefin_unlinked_count_map = {}
+    @simplefin_items.each do |item|
+      count = item.simplefin_accounts
+        .left_joins(:account, :account_provider)
+        .where(accounts: { id: nil }, account_providers: { id: nil })
+        .count
+      @simplefin_unlinked_count_map[item.id] = count
+    end
+
+    # Compute CTA visibility map used by the simplefin_item partial
+    @simplefin_show_relink_map = {}
+    @simplefin_items.each do |item|
+      begin
+        unlinked_count = @simplefin_unlinked_count_map[item.id] || 0
+        manuals_exist = @simplefin_has_unlinked_map[item.id]
+        sfa_any = if item.simplefin_accounts.loaded?
+          item.simplefin_accounts.any?
+        else
+          item.simplefin_accounts.exists?
+        end
+        @simplefin_show_relink_map[item.id] = (unlinked_count.to_i == 0 && manuals_exist && sfa_any)
+      rescue => e
+        Rails.logger.warn("SimpleFin card: CTA computation failed for item #{item.id}: #{e.class} - #{e.message}")
+        @simplefin_show_relink_map[item.id] = false
+      end
+    end
+
+    # Prevent Turbo Drive from caching this page to ensure fresh account lists
+    expires_now
     render layout: "settings"
   end
 

app/controllers/concerns/simplefin_items/maps_helper.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module SimplefinItems
+  module MapsHelper
+    extend ActiveSupport::Concern
+
+    # Build per-item maps consumed by the simplefin_item partial.
+    # Accepts a single SimplefinItem or a collection.
+    def build_simplefin_maps_for(items)
+      items = Array(items).compact
+      return if items.empty?
+
+      @simplefin_sync_stats_map ||= {}
+      @simplefin_has_unlinked_map ||= {}
+      @simplefin_unlinked_count_map ||= {}
+      @simplefin_duplicate_only_map ||= {}
+      @simplefin_show_relink_map ||= {}
+
+      # Batch-check if ANY family has manual accounts (same result for all items from same family)
+      family_ids = items.map { |i| i.family_id }.uniq
+      families_with_manuals = Account
+        .visible_manual
+        .where(family_id: family_ids)
+        .distinct
+        .pluck(:family_id)
+        .to_set
+
+      # Batch-fetch unlinked counts for all items in one query
+      unlinked_counts = SimplefinAccount
+        .where(simplefin_item_id: items.map(&:id))
+        .left_joins(:account, :account_provider)
+        .where(accounts: { id: nil }, account_providers: { id: nil })
+        .group(:simplefin_item_id)
+        .count
+
+      items.each do |item|
+        # Latest sync stats (avoid N+1; rely on includes(:syncs) where appropriate)
+        latest_sync = if item.syncs.loaded?
+          item.syncs.max_by(&:created_at)
+        else
+          item.syncs.ordered.first
+        end
+        stats = (latest_sync&.sync_stats || {})
+        @simplefin_sync_stats_map[item.id] = stats
+
+        # Whether the family has any manual accounts available to link (from batch query)
+        @simplefin_has_unlinked_map[item.id] = families_with_manuals.include?(item.family_id)
+
+        # Count from batch query (defaults to 0 if not found)
+        @simplefin_unlinked_count_map[item.id] = unlinked_counts[item.id] || 0
+
+        # Whether all reported errors for this item are duplicate-account warnings
+        @simplefin_duplicate_only_map[item.id] = compute_duplicate_only_flag(stats)
+
+        # Compute CTA visibility: show relink only when there are zero unlinked SFAs,
+        # there exist manual accounts to link, and the item has at least one SFA
+        begin
+          unlinked_count = @simplefin_unlinked_count_map[item.id] || 0
+          manuals_exist = @simplefin_has_unlinked_map[item.id]
+          sfa_any = if item.simplefin_accounts.loaded?
+            item.simplefin_accounts.any?
+          else
+            item.simplefin_accounts.exists?
+          end
+          @simplefin_show_relink_map[item.id] = (unlinked_count.to_i == 0 && manuals_exist && sfa_any)
+        rescue StandardError => e
+          Rails.logger.warn("SimpleFin card: CTA computation failed for item #{item.id}: #{e.class} - #{e.message}")
+          @simplefin_show_relink_map[item.id] = false
+        end
+      end
+
+      # Ensure maps are hashes even when items empty
+      @simplefin_sync_stats_map ||= {}
+      @simplefin_has_unlinked_map ||= {}
+      @simplefin_unlinked_count_map ||= {}
+      @simplefin_duplicate_only_map ||= {}
+      @simplefin_show_relink_map ||= {}
+    end
+
+    private
+      def compute_duplicate_only_flag(stats)
+        errs = Array(stats && stats["errors"]).map do |e|
+          if e.is_a?(Hash)
+            e["message"] || e[:message]
+          else
+            e.to_s
+          end
+        end
+        errs.present? && errs.all? { |m| m.to_s.downcase.include?("duplicate upstream account detected") }
+      rescue
+        false
+      end
+  end
+end

app/controllers/settings/bank_sync_controller.rb

@@ -18,9 +18,11 @@ def show
         rel: "noopener noreferrer"
       },
       {
-        name: "SimpleFin",
-        description: "US & Canada connections via SimpleFin protocol.",
-        path: simplefin_items_path
+        name: "SimpleFIN",
+        description: "US & Canada connections via SimpleFIN protocol.",
+        path: "https://beta-bridge.simplefin.org",
+        target: "_blank",
+        rel: "noopener noreferrer"
       }
     ]
   end

app/controllers/settings/providers_controller.rb

@@ -11,9 +11,7 @@ def show
       [ "Bank Sync Providers", nil ]
     ]
 
-    # Load all provider configurations
-    Provider::Factory.ensure_adapters_loaded
-    @provider_configurations = Provider::ConfigurationRegistry.all
+    prepare_show_context
   end
 
   def update
@@ -74,9 +72,7 @@ def update
   rescue => error
     Rails.logger.error("Failed to update provider settings: #{error.message}")
     flash.now[:alert] = "Failed to update provider settings: #{error.message}"
-    # Set @provider_configurations so the view can render properly
-    Provider::Factory.ensure_adapters_loaded
-    @provider_configurations = Provider::ConfigurationRegistry.all
+    prepare_show_context
     render :show, status: :unprocessable_entity
   end
 
@@ -121,4 +117,14 @@ def reload_provider_configs(updated_fields)
         adapter_class&.reload_configuration
       end
     end
+
+    # Prepares instance vars needed by the show view and partials
+    def prepare_show_context
+      # Load all provider configurations (exclude SimpleFin, which has its own unified panel below)
+      Provider::Factory.ensure_adapters_loaded
+      @provider_configurations = Provider::ConfigurationRegistry.all.reject { |config| config.provider_key.to_s.casecmp("simplefin").zero? }
+
+      # Providers page only needs to know whether any SimpleFin connections exist
+      @simplefin_items = Current.family.simplefin_items.ordered.select(:id)
+    end
 end