Commit Graph

7496 Commits

Author SHA1 Message Date
Mike Dalessio 80de91417d Merge pull request #1115 from basecamp/flavorjones/rename-proprietary-columns
Rename the queenbee_id and signal_user_id columns
2025-09-15 14:05:06 -04:00
Mike Dalessio d5a4239d19 Rename the queenbee_id and signal_user_id columns
to be more generic for the open-source release.

Find the signal account via Account#external_account

Find the signal user via User#external_user
2025-09-15 13:57:53 -04:00
Andy Smith 60e515e462 Merge pull request #1098 from basecamp/collapsible-nav-sections
Collapsible nav sections
2025-09-15 12:54:21 -05:00
Mike Dalessio 46de946e25 Merge pull request #1113 from basecamp/flavorjones/dep-update-20250915
Update dependencies 2025-09-15
2025-09-15 12:37:03 -04:00
Mike Dalessio 3341479605 dep: remaining dependencies
except ruby_llm
2025-09-15 12:32:17 -04:00
Mike Dalessio 13db361aed dep: bump puma
also remove the incorrect on_worker_boot block and the needless
before_fork block
2025-09-15 12:31:57 -04:00
Mike Dalessio 6f7985b887 bump aws-sdk-s3 2025-09-15 12:21:07 -04:00
Mike Dalessio 7ff764d394 dep: bump sentry 2025-09-15 12:20:47 -04:00
Mike Dalessio 7bbb858d91 dep: update lexxy 2025-09-15 12:17:51 -04:00
Mike Dalessio 6a4c1a9f45 dep: update nokogiri 2025-09-15 12:17:23 -04:00
Mike Dalessio e33cd1f473 Merge pull request #1112 from basecamp/flavorjones/yabeda-puma
Introduce yabeda for puma metrics
2025-09-15 12:14:08 -04:00
Mike Dalessio f01e20f64b Introduce yabeda for puma metrics 2025-09-15 12:08:43 -04:00
Mike Dalessio ad1491a484 Merge pull request #1109 from basecamp/flavorjones/yabeda-solid-queue
Introduce yabeda for Solid Queue metrics
2025-09-15 11:19:08 -04:00
Jorge Manrubia b48e919274 Merge pull request #1110 from basecamp/filter-collections
Fix: the system to filter at the current view was broken after moving menu to turbo frame
2025-09-15 17:10:10 +02:00
Jorge Manrubia 48f7f914dc Fix: the system to filter at the current view was broken after moving menu to turbo frame
https://fizzy.37signals.com/5986089/cards/1723
2025-09-15 17:07:09 +02:00
Mike Dalessio 4442964408 Introduce yabeda for Solid Queue metrics 2025-09-15 11:05:04 -04:00
Jorge Manrubia 08b4e69d40 Merge pull request #1108 from basecamp/etag-session
Tie etag to sessions
2025-09-15 16:32:48 +02:00
Jorge Manrubia 2e4138b585 Tie etag to sessions
So that we don't get CSRF token issues if sharing sessions in the same browser
2025-09-15 16:31:01 +02:00
Jorge Manrubia 7bb7cb9f6e Merge pull request #1107 from basecamp/summary-size
Truncate summaries to keep within API limits
2025-09-15 16:19:24 +02:00
Jorge Manrubia 3d8437bd5f Truncate summaries to keep within API limits
https://fizzy.37signals.com/5986089/cards/1739
2025-09-15 16:14:29 +02:00
Jorge Manrubia e17000ad75 Merge pull request #1106 from basecamp/debug-overlapping-bundle
Debug the overlapping bundle
2025-09-15 14:28:59 +02:00
Jorge Manrubia 05ba0b703e Update VCR fixtures 2025-09-15 14:27:10 +02:00
Jorge Manrubia 0e3d25707c Debug the overlapping bundle 2025-09-15 14:01:57 +02:00
Mike Dalessio c1fcb9d098 Merge pull request #1105 from basecamp/flavorjones/split-proprietary-code-v4
Extract proprietary integrations into an engine
2025-09-13 16:44:38 -04:00
Mike Dalessio b1aa5bb5b9 Update Dockerfile to deploy the fizzy-saas gem 2025-09-13 16:36:53 -04:00
Mike Dalessio 04baaa9cd6 dep: pin Rails to my bugfix branch 2025-09-13 16:03:02 -04:00
Mike Dalessio 2630e4bd74 Extract 37id and QB controllers, models, and tests 2025-09-13 16:03:02 -04:00
Mike Dalessio f4e2fe31b4 dep: add refs to the fizzy-saas git dependencies
so that we can quickly switch the app between using the saas extension
and not. (Bundler will re-fetch the remote if the ref is not present.)

Also set the bundler config to auto-install missing dependencies.
2025-09-13 16:03:02 -04:00
Mike Dalessio e7dcefb25b Extract SignalUser and SignalAccount, and QB routes 2025-09-13 16:03:02 -04:00
Mike Dalessio 66075fc49e Extract signal_id and queenbee initialization 2025-09-13 16:03:00 -04:00
Mike Dalessio 8ad0c65997 Extract saas bin/setup 2025-09-13 15:21:01 -04:00
Mike Dalessio 8325059f5f Extract basecamp proprietary dependencies into fizzy-saas
and wire up the fizzy-saas gemspec and Gemfile
2025-09-13 15:21:01 -04:00
Mike Dalessio c21b6d824d Removing unnecessary test files 2025-09-13 15:21:01 -04:00
Mike Dalessio 3fe0a07cdc rails plugin new gems/fizzy-saas --mountable 2025-09-13 15:21:01 -04:00
Mike Dalessio 8f39c015ea Tests now pass with local authentication
This is the first step of a multi-step SaaS engine extraction.

Looking ahead to an open source release, we need to make sure that
local authentication is treated as an "official" option, and not just
a hack I added for Kevin to do load testing outside our DC. So this PR
gets to green, and adds a CI step in "local authentication" mode.

This all probably feels a little hacky to you, Reader, but the goal of
this change is to ease the next step, which will be extracting the
37id and Queenbee integrations into a proprietary "SaaS mode" engine.

In service of that goal, this commit simply wraps all of the dependent
code and tests with a conditional check on
`config.x.local_authentication`.
2025-09-13 15:21:00 -04:00
Mike Dalessio 424edb6291 Merge pull request #1104 from basecamp/flavorjones/introduce-system-tests
Introduce a few system tests
2025-09-13 13:54:53 -04:00
Mike Dalessio 5dec991d7c Introduce a few system tests
Primarily I'm trying to exercise active storage and action cable /
turbo streams, both of which have been brittle when making changes to
tenanting.
2025-09-13 13:18:32 -04:00
Mike Dalessio 1ffc2ee9b7 Merge pull request #1103 from basecamp/flavorjones/fix-vcr-user-highlights
Fix VCR cassettes for user highlights
2025-09-13 10:57:42 -04:00
Mike Dalessio 5c44a93172 Fix VCR cassettes for user highlights 2025-09-13 10:54:38 -04:00
Jason Zimdars 154c1a8a15 This was a debug value 2025-09-12 18:09:52 -05:00
Jason Zimdars b98734e275 Merge pull request #1102 from basecamp/jz/polish-9-12-25
JZ/polish 9 12 25
2025-09-12 17:30:16 -05:00
Jason Zimdars 25a6a63952 Give it a little more width 2025-09-12 17:28:08 -05:00
Jason Zimdars 36c3571848 Fix spacing, simplify layout 2025-09-12 16:08:24 -05:00
Jason Zimdars f0a2d50195 Move to constant, whitespace 2025-09-12 15:33:09 -05:00
Jason Zimdars 4579f759c9 Merge pull request #1099 from basecamp/watching-polish
Watching polish
2025-09-12 14:33:37 -05:00
Jason Zimdars 24d4bd2551 Limit to one row 2025-09-12 14:32:42 -05:00
Jason Zimdars e717875dfc Fix button style regression 2025-09-12 13:57:33 -05:00
Andy Smith cab6992555 Merge branch 'main' into collapsible-nav-sections
* main: (32 commits)
  Fix VCR fixtures
  Format
  Touch user on modification to invalidate cache
  Fix add card not working in the cards screen
  Submit and refresh results as you type terms
  Fix: When expanding filters, submitting filters should keep the filters expanded
  Invalidate cache when filter changes
  Switch to gpt-5-chat
  Reorded method and remove unnecessary param
  Add migration to convert accesses
  Handle filter toggles with JS
  Prevent glitch where you see the filter bar expanded when you clear it
  Remove unused templates
  Fix: all collections link not working after moving to turbo frame
  Restore cache I deleted by mistake
  Speed up filter expansion with turbo stream
  Fix: filtering collections not working after moving menu to turbo frame
  Respect params when loading the menu or they won't be reflected!
  Add HTTP cache for the menu
  Load main menu lazily with a turbo frame
  ...
2025-09-12 12:53:44 -05:00
Andy Smith 6924b86b23 Remove redundant vars 2025-09-12 12:36:49 -05:00
Andy Smith 373b139b9a Add collapsible nav sections 2025-09-12 12:32:32 -05:00