From 4ecb5db6a9520d6c253504dd031f0615cbf0a692 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 4 Apr 2025 15:17:48 -0500 Subject: [PATCH 001/104] Fix misalignment --- app/assets/stylesheets/cards.css | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 64cc87118..92d0369fa 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -350,7 +350,6 @@ margin-inline-start: var(--inline-space-double); strong { - font-size: 1.1em; font-weight: 900; } From a4cccb70a77074a3ae0590f267f1847899e2eb11 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Fri, 4 Apr 2025 15:21:33 -0500 Subject: [PATCH 002/104] Make sure the picture-add icon is square so it doesn't get clipped --- app/assets/images/picture-add.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/images/picture-add.svg b/app/assets/images/picture-add.svg index 610d32901..a64cf38d6 100644 --- a/app/assets/images/picture-add.svg +++ b/app/assets/images/picture-add.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 0a7c7e7889f294ba80f95558124c6c758b63c9ad Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 4 Apr 2025 16:06:13 -0500 Subject: [PATCH 003/104] Use a variant of the bubble color for the perma surround --- app/assets/stylesheets/cards.css | 2 +- app/views/bubbles/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 92d0369fa..32b69c7c8 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -205,7 +205,7 @@ --padding-inline: calc(var(--block-space-double) + var(--block-space)); --padding-block: var(--block-space-double) calc(var(--block-space-double) + var(--block-space-half)); - background-color: var(--color-container); + background-color: color-mix(in lch, var(--bubble-color) 33%, var(--color-bg)); border-radius: 0.2em; display: inline-flex; padding-block: var(--padding-block); diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb index 1d83162c9..9b54be37e 100644 --- a/app/views/bubbles/show.html.erb +++ b/app/views/bubbles/show.html.erb @@ -33,7 +33,7 @@ <% end %>
-
"> +
" style="--bubble-color: <%= @bubble.color %>;"> <%= render "bubbles/cards/perma", bubble: @bubble %>
From d2d8c2121ffa5868b972a66ee8c62e0688c4817c Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 4 Apr 2025 16:14:38 -0500 Subject: [PATCH 004/104] Crisp edges --- app/assets/stylesheets/cards.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 32b69c7c8..e678e2085 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -72,7 +72,9 @@ } .card { + --border-color: transparent; --border-radius: 0.2em; + --border-size: 0; aspect-ratio: 2/0.95; background-color: color-mix(in srgb, var(--bubble-color) 4%, var(--color-bg)); @@ -83,6 +85,11 @@ .card__container & { inline-size: calc(100dvw - var(--actions-inline-inset) * 2 - var(--btn-size) * 2); } + + @media (prefers-color-scheme: dark) { + --border-color: var(--color-subtle-dark); + --border-size: 1px; + } } .card__actions { From 90d67654ead41f4ea98031e8ca264ae4826bf8a3 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 4 Apr 2025 16:16:47 -0500 Subject: [PATCH 005/104] This is a bit narrow --- app/assets/stylesheets/comments.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css index 75cf2012d..8fb6f5bb4 100644 --- a/app/assets/stylesheets/comments.css +++ b/app/assets/stylesheets/comments.css @@ -10,7 +10,7 @@ place-items: center; text-align: center; - @media (min-width: 150ch) { + @media (min-width: 160ch) { padding-inline: calc(var(--tray-size) + var(--inline-space) * 1.5); } } From 1f31ca597f27493b2be7b01c39eb242dc9330596 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 4 Apr 2025 16:19:04 -0500 Subject: [PATCH 006/104] Reset value here --- app/assets/stylesheets/cards.css | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index e678e2085..445f28503 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -352,6 +352,7 @@ .card__meta { --border-color: var(--bubble-color); + --border-size: 1px; --row-gap: 0.25em; margin-inline-start: var(--inline-space-double); From 0d6b9b751910c41df4108b9224ac388993d0a441 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 4 Apr 2025 16:34:25 -0500 Subject: [PATCH 007/104] Stub star feature --- app/assets/images/star.svg | 1 + app/assets/stylesheets/cards.css | 6 ++++++ app/assets/stylesheets/icons.css | 1 + app/views/bubbles/show.html.erb | 6 ++++++ 4 files changed, 14 insertions(+) create mode 100644 app/assets/images/star.svg diff --git a/app/assets/images/star.svg b/app/assets/images/star.svg new file mode 100644 index 000000000..281a18051 --- /dev/null +++ b/app/assets/images/star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 445f28503..7fc52c6e2 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -217,6 +217,12 @@ display: inline-flex; padding-block: var(--padding-block); padding-inline: var(--padding-inline); + + &:has(.card__star-input:checked) { + .card { + outline: 4px solid var(--color-negative); + } + } } .card__container--pointing { diff --git a/app/assets/stylesheets/icons.css b/app/assets/stylesheets/icons.css index 3b2d8467e..5f8052bff 100644 --- a/app/assets/stylesheets/icons.css +++ b/app/assets/stylesheets/icons.css @@ -75,6 +75,7 @@ img.icon { .icon--share { --svg: url("share.svg "); } .icon--sort-ascending { --svg: url("sort-ascending.svg "); } .icon--sort-descending { --svg: url("sort-descending.svg "); } +.icon--star { --svg: url("star.svg "); } .icon--tag { --svg: url("tag.svg "); } .icon--temperature { --svg: url("temperature.svg "); } .icon--thumb-up { --svg: url("thumb-up.svg "); } diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb index 9b54be37e..580635528 100644 --- a/app/views/bubbles/show.html.erb +++ b/app/views/bubbles/show.html.erb @@ -37,6 +37,12 @@ <%= render "bubbles/cards/perma", bubble: @bubble %>
+ + <%= render "bubbles/color", bubble: @bubble %> <%= render "bubbles/image", bubble: @bubble %> <%= button_to bucket_bubble_path(@bubble.bucket, @bubble), From 43c4ff55b4c46d7a92f86fcf61ecddfc6eaeac5d Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 4 Apr 2025 17:20:22 -0500 Subject: [PATCH 008/104] Try a switch control for considering||doing --- app/assets/stylesheets/cards.css | 15 +++++++++++++++ app/views/bubbles/_pop_toggle.html.erb | 7 ------- app/views/bubbles/cards/_perma.html.erb | 7 ------- app/views/bubbles/show.html.erb | 23 +++++++++++++++++++++++ 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 7fc52c6e2..78f01f192 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -133,6 +133,21 @@ } } +.card__actions-container--top { + margin: var(--block-space-half) auto calc(var(--block-space) * -2); + padding: var(--block-space) 3ch; + + #header:has(&) { + position: relative; + z-index: 1; + } + + .switch__input:checked + .switch__btn { + background-color: var(--bubble-color) !important; + } +} + + .cards .card__assignees:not(:has(.avatar)) { .txt-uppercase { display: none; diff --git a/app/views/bubbles/_pop_toggle.html.erb b/app/views/bubbles/_pop_toggle.html.erb index d55fbbdab..bf1ab0b2d 100644 --- a/app/views/bubbles/_pop_toggle.html.erb +++ b/app/views/bubbles/_pop_toggle.html.erb @@ -20,13 +20,6 @@ <%= label %> <% end %> <% end %> - - <% if bubble.doing? %> - - <%= button_to bucket_bubble_engagement_path(bubble.bucket, bubble), method: :delete, class: "btn popup__item full-width" do %> - Move back to Considering - <% end %> - <% end %>
diff --git a/app/views/bubbles/cards/_perma.html.erb b/app/views/bubbles/cards/_perma.html.erb index 830e48c87..996eeab03 100644 --- a/app/views/bubbles/cards/_perma.html.erb +++ b/app/views/bubbles/cards/_perma.html.erb @@ -32,13 +32,6 @@ <%= render "bubbles/stagings/stages", bubble: bubble %> <% end %> <% end %> - - <% if bubble.considering? %> - <%= button_to bucket_bubble_engagement_path(bubble.bucket, bubble), method: :post, class: "card__move-button card__hide-on-index btn btn--reversed" do %> - Move to Doing - <%= icon_tag "assigned" %> - <% end %> - <% end %>
diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb index 580635528..c88a0f625 100644 --- a/app/views/bubbles/show.html.erb +++ b/app/views/bubbles/show.html.erb @@ -27,6 +27,29 @@ Go Back <% end %> + +
+ Considering + <% if @bubble.doing? %> + <%= form_with url: bucket_bubble_engagement_path(@bubble.bucket, @bubble), method: :delete, data: { controller: "form" }, class: "flex" do %> + + <% end %> + <% else %> + <%= form_with url: bucket_bubble_engagement_path(@bubble.bucket, @bubble), method: :post, data: { controller: "form" }, class: "flex" do %> + + <% end %> + <% end %> + Doing +
+
From adb04bf4dfc2e2e5c8abc3df2041ccb847bade26 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 4 Apr 2025 17:20:32 -0500 Subject: [PATCH 009/104] No need for special case here --- app/assets/stylesheets/layout.css | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/layout.css b/app/assets/stylesheets/layout.css index cd27f6305..b2b3c2356 100644 --- a/app/assets/stylesheets/layout.css +++ b/app/assets/stylesheets/layout.css @@ -36,7 +36,6 @@ body { view-transition-name: header; > nav { - font-size: var(--text-small); view-transition-name: nav; header { From 9cae6bb75af130c2d54878ac5942ba0ae51db4fc Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 4 Apr 2025 17:22:01 -0500 Subject: [PATCH 010/104] Some browsers can't do this --- app/assets/stylesheets/cards.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 78f01f192..83d137151 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -227,7 +227,7 @@ --padding-inline: calc(var(--block-space-double) + var(--block-space)); --padding-block: var(--block-space-double) calc(var(--block-space-double) + var(--block-space-half)); - background-color: color-mix(in lch, var(--bubble-color) 33%, var(--color-bg)); + background-color: color-mix(in srgb, var(--bubble-color) 33%, var(--color-bg)); border-radius: 0.2em; display: inline-flex; padding-block: var(--padding-block); From 4c344d2c3603ef64264eed34858ac433ead75513 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 12:34:02 +0200 Subject: [PATCH 011/104] Use Rails 8.1 defaults Avoids deprecation warnings during test runs --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index 2f544b5a0..ae36b65d4 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,7 +9,7 @@ Bundler.require(*Rails.groups) module Fizzy class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 8.0 + config.load_defaults 8.1 # Include the `lib` directory in autoload paths. Use the `ignore:` option # to list subdirectories that don't contain `.rb` files or that shouldn't From 92ce80cc327e2df5838ae1c331a98a0701030d8f Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 12:34:39 +0200 Subject: [PATCH 012/104] Extract User::Accessor concern Our User model is getting overloaded --- app/models/user.rb | 11 +---------- app/models/user/accessor.rb | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 app/models/user/accessor.rb diff --git a/app/models/user.rb b/app/models/user.rb index 2eb87913f..0fec0faed 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,15 +1,11 @@ class User < ApplicationRecord - include Avatar, Role, Transferable + include Accessor, Avatar, Role, Transferable belongs_to :account has_many :sessions, dependent: :destroy has_secure_password validations: false - has_many :accesses, dependent: :destroy - has_many :buckets, through: :accesses - has_many :accessible_bubbles, through: :buckets, source: :bubbles - has_many :filters, foreign_key: :creator_id, inverse_of: :creator, dependent: :destroy has_many :pops, dependent: :nullify @@ -27,8 +23,6 @@ class User < ApplicationRecord normalizes :email_address, with: ->(value) { value.strip.downcase } - after_create_commit :grant_access_to_buckets - scope :alphabetically, -> { order("lower(name)") } scope :sorted_with_user_first, ->(user) { order(Arel.sql("users.id != ?, lower(name)", user.id)) } @@ -53,7 +47,4 @@ class User < ApplicationRecord email_address.sub(/@/, "-deactivated-#{SecureRandom.uuid}@") end - def grant_access_to_buckets - Access.insert_all account.buckets.all_access.pluck(:id).collect { |bucket_id| { bucket_id: bucket_id, user_id: id } } - end end diff --git a/app/models/user/accessor.rb b/app/models/user/accessor.rb new file mode 100644 index 000000000..5615f9976 --- /dev/null +++ b/app/models/user/accessor.rb @@ -0,0 +1,16 @@ +module User::Accessor + extend ActiveSupport::Concern + + included do + has_many :accesses, dependent: :destroy + has_many :buckets, through: :accesses + has_many :accessible_bubbles, through: :buckets, source: :bubbles + + after_create_commit :grant_access_to_buckets + end + + private + def grant_access_to_buckets + Access.insert_all account.buckets.all_access.pluck(:id).collect { |bucket_id| { bucket_id: bucket_id, user_id: id } } + end +end From 17bdfb5df534a0befdbc6523308c6c23e92213ea Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 12:35:41 +0200 Subject: [PATCH 013/104] Already included in the Avatar concern --- app/models/user.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 0fec0faed..6dae4820f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -16,8 +16,6 @@ class User < ApplicationRecord has_many :notifications, dependent: :destroy - has_one_attached :avatar - has_many :pins, dependent: :destroy has_many :pinned_bubbles, through: :pins, source: :bubble From d237885bd45a8ebc999adb654090187ba79fea65 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 12:37:18 +0200 Subject: [PATCH 014/104] Extract User::Assignee role Keep slimming down that User --- app/models/user.rb | 6 +----- app/models/user/assignee.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 app/models/user/assignee.rb diff --git a/app/models/user.rb b/app/models/user.rb index 6dae4820f..e16518bee 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ class User < ApplicationRecord - include Accessor, Avatar, Role, Transferable + include Accessor, Assignee, Avatar, Role, Transferable belongs_to :account @@ -10,10 +10,6 @@ class User < ApplicationRecord has_many :pops, dependent: :nullify - has_many :assignments, foreign_key: :assignee_id, dependent: :destroy - has_many :assignings, foreign_key: :assigner_id, class_name: "Assignment" - has_many :assigned_bubbles, through: :assignments, source: :bubble - has_many :notifications, dependent: :destroy has_many :pins, dependent: :destroy diff --git a/app/models/user/assignee.rb b/app/models/user/assignee.rb new file mode 100644 index 000000000..730158164 --- /dev/null +++ b/app/models/user/assignee.rb @@ -0,0 +1,9 @@ +module User::Assignee + extend ActiveSupport::Concern + + included do + has_many :assignments, foreign_key: :assignee_id, dependent: :destroy + has_many :assignings, foreign_key: :assigner_id, class_name: "Assignment" + has_many :assigned_bubbles, through: :assignments, source: :bubble + end +end From 8ff017fc5b20034adb595ddcb36ede8663e3d147 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 12:40:08 +0200 Subject: [PATCH 015/104] Only one invocation of this, not carrying the worth of its indirection Generally I am wary of including global state checks in the belly of models. It is one thing to do it as a default parameter, but I think it is too far to do it inside an actual method. --- app/controllers/comments_controller.rb | 2 +- app/models/user.rb | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index c0a9c9d34..d8b0231ac 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -38,6 +38,6 @@ class CommentsController < ApplicationController end def require_own_comment - head :forbidden unless @comment.creator.current? + head :forbidden unless Current.user == @comment.creator end end diff --git a/app/models/user.rb b/app/models/user.rb index e16518bee..5661afe8e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -32,10 +32,6 @@ class User < ApplicationRecord end end - def current? - Current.user == self - end - private def deactived_email_address email_address.sub(/@/, "-deactivated-#{SecureRandom.uuid}@") From 1463fa68f4b57542aaa6cb43ae61d6c2c215f8b9 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 12:48:52 +0200 Subject: [PATCH 016/104] Sessions only depend on user and have no callback, so use the faster delete_all --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 5661afe8e..de0fba814 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -26,7 +26,7 @@ class User < ApplicationRecord def deactivate transaction do - sessions.destroy_all + sessions.delete_all accesses.destroy_all update! active: false, email_address: deactived_email_address end From 821f4c43d808c48a95ebee5a131de8afa6c1e969 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 12:49:19 +0200 Subject: [PATCH 017/104] Excess CR --- app/models/user.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index de0fba814..b4d36c032 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -36,5 +36,4 @@ class User < ApplicationRecord def deactived_email_address email_address.sub(/@/, "-deactivated-#{SecureRandom.uuid}@") end - end From 61dfa5eccea4503efc5f16012d6c8b7bf7370466 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 12:58:56 +0200 Subject: [PATCH 018/104] Spacing --- app/views/bubbles/_messages.html.erb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/bubbles/_messages.html.erb b/app/views/bubbles/_messages.html.erb index c28e26eae..3bc0610d0 100644 --- a/app/views/bubbles/_messages.html.erb +++ b/app/views/bubbles/_messages.html.erb @@ -3,9 +3,14 @@ <%# Template Dependency: event_summaries/event_summary %> <%= render bubble.messages, cached: true %> <%= render "comments/new", bubble: bubble, cached: true %> +
Subscribers -

<%= pluralize(@bubble.watchers.count, "person") %> will be notified when someone comments on this.

+ +

+ <%= pluralize(@bubble.watchers.count, "person") %> will be notified when someone comments on this. +

+
<%= render partial: "bubbles/watches/watcher", collection: @bubble.watchers.sorted_with_user_first(Current.user) %>
From aefbac9c142e6bfefb81e4c7d1a69e9a60a536ab Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 13:17:42 +0200 Subject: [PATCH 019/104] Get rid of single-use and slight awkward model scope Really dont like that raw Arel.sql wrapping that is required. --- app/helpers/users_helper.rb | 5 +++++ app/models/user.rb | 1 - app/views/bubbles/_messages.html.erb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 app/helpers/users_helper.rb diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 000000000..58b3e12d6 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,5 @@ +module UsersHelper + def prepend_current_user_to(users_scope) + users_scope.to_a.prepend(Current.user).uniq + end +end diff --git a/app/models/user.rb b/app/models/user.rb index b4d36c032..5b5137ae1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,7 +18,6 @@ class User < ApplicationRecord normalizes :email_address, with: ->(value) { value.strip.downcase } scope :alphabetically, -> { order("lower(name)") } - scope :sorted_with_user_first, ->(user) { order(Arel.sql("users.id != ?, lower(name)", user.id)) } def initials name.to_s.scan(/\b\p{L}/).join.upcase diff --git a/app/views/bubbles/_messages.html.erb b/app/views/bubbles/_messages.html.erb index 3bc0610d0..85ea86c05 100644 --- a/app/views/bubbles/_messages.html.erb +++ b/app/views/bubbles/_messages.html.erb @@ -12,7 +12,7 @@

- <%= render partial: "bubbles/watches/watcher", collection: @bubble.watchers.sorted_with_user_first(Current.user) %> + <%= render partial: "bubbles/watches/watcher", collection: prepend_current_user_to(@bubble.watchers.alphabetically) %>
<% end %> From f063116df41d3ea360b000c141aa48b12f74ce7e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 13:19:30 +0200 Subject: [PATCH 020/104] Group related associations together --- app/models/user.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 5b5137ae1..88bf2b8ec 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -6,12 +6,10 @@ class User < ApplicationRecord has_many :sessions, dependent: :destroy has_secure_password validations: false - has_many :filters, foreign_key: :creator_id, inverse_of: :creator, dependent: :destroy - - has_many :pops, dependent: :nullify - has_many :notifications, dependent: :destroy + has_many :filters, foreign_key: :creator_id, inverse_of: :creator, dependent: :destroy + has_many :pops, dependent: :nullify has_many :pins, dependent: :destroy has_many :pinned_bubbles, through: :pins, source: :bubble From 384de241328b04dec5e14bcdf225a4598aef52e9 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 14:16:04 +0200 Subject: [PATCH 021/104] Get rid of odd toggles concept This is just assignments. --- ...ontroller.rb => assignments_controller.rb} | 2 +- app/views/bubbles/_assignment.html.erb | 2 +- .../bubbles/cards/perma/_assignees.html.erb | 2 +- config/routes.rb | 4 +-- .../assignments/toggles_controller_test.rb | 25 ------------------- .../assignments_controller_test.rb | 25 +++++++++++++++++++ 6 files changed, 29 insertions(+), 31 deletions(-) rename app/controllers/{assignments/toggles_controller.rb => assignments_controller.rb} (93%) delete mode 100644 test/controllers/assignments/toggles_controller_test.rb create mode 100644 test/controllers/assignments_controller_test.rb diff --git a/app/controllers/assignments/toggles_controller.rb b/app/controllers/assignments_controller.rb similarity index 93% rename from app/controllers/assignments/toggles_controller.rb rename to app/controllers/assignments_controller.rb index 96d510baa..554d86850 100644 --- a/app/controllers/assignments/toggles_controller.rb +++ b/app/controllers/assignments_controller.rb @@ -1,4 +1,4 @@ -class Assignments::TogglesController < ApplicationController +class AssignmentsController < ApplicationController include BubbleScoped, BucketScoped def new diff --git a/app/views/bubbles/_assignment.html.erb b/app/views/bubbles/_assignment.html.erb index 2d6914591..7c6071a25 100644 --- a/app/views/bubbles/_assignment.html.erb +++ b/app/views/bubbles/_assignment.html.erb @@ -3,7 +3,7 @@ Assign this to… - <%= form_with url: bucket_bubble_assignment_toggles_path(bubble.bucket, bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> + <%= form_with url: bucket_bubble_assignments_path(bubble.bucket, bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> <% bubble.bucket.users.active.sort_by(&:name).each do |user| %>
<%= form.check_box "assignee_id[]", { diff --git a/app/views/bubbles/cards/perma/_assignees.html.erb b/app/views/bubbles/cards/perma/_assignees.html.erb index b9ef3d6db..91f3612a6 100644 --- a/app/views/bubbles/cards/perma/_assignees.html.erb +++ b/app/views/bubbles/cards/perma/_assignees.html.erb @@ -1,3 +1,3 @@ <%= render "bubbles/cards/common/assignees", bubble: bubble do %> - <%= turbo_frame_tag bubble, :assignment, src: new_bucket_bubble_assignment_toggle_path(bubble.bucket, bubble) %> + <%= turbo_frame_tag bubble, :assignment, src: new_bucket_bubble_assignment_path(bubble.bucket, bubble) %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index eeac71f81..bd3e3b4d3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -57,9 +57,7 @@ Rails.application.routes.draw do resource :pin, only: [ :show, :create, :destroy ] end - namespace :assignments, as: :assignment do - resources :toggles - end + resources :assignments namespace :taggings, as: :tagging do resources :toggles diff --git a/test/controllers/assignments/toggles_controller_test.rb b/test/controllers/assignments/toggles_controller_test.rb deleted file mode 100644 index 3a1d4fcdb..000000000 --- a/test/controllers/assignments/toggles_controller_test.rb +++ /dev/null @@ -1,25 +0,0 @@ -require "test_helper" - -class Assignments::TogglesControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - end - - test "new" do - get new_bucket_bubble_assignment_toggle_url(buckets(:writebook), bubbles(:logo)) - - assert_response :success - end - - test "create" do - assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: false, to: true do - post bucket_bubble_assignment_toggles_url(buckets(:writebook), bubbles(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream - end - assert_response :success - - assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: true, to: false do - post bucket_bubble_assignment_toggles_url(buckets(:writebook), bubbles(:logo)), params: { assignee_id: users(:kevin).id }, as: :turbo_stream - end - assert_response :success - end -end diff --git a/test/controllers/assignments_controller_test.rb b/test/controllers/assignments_controller_test.rb new file mode 100644 index 000000000..4bec58298 --- /dev/null +++ b/test/controllers/assignments_controller_test.rb @@ -0,0 +1,25 @@ +require "test_helper" + +class AssignmentsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + end + + test "new" do + get new_bucket_bubble_assignment_url(buckets(:writebook), bubbles(:logo)) + + assert_response :success + end + + test "create" do + assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: false, to: true do + post bucket_bubble_assignments_url(buckets(:writebook), bubbles(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream + end + assert_response :success + + assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: true, to: false do + post bucket_bubble_assignments_url(buckets(:writebook), bubbles(:logo)), params: { assignee_id: users(:kevin).id }, as: :turbo_stream + end + assert_response :success + end +end From 7494dad91ed57663c64b529574ff485f5a040dc5 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 14:20:06 +0200 Subject: [PATCH 022/104] Drop the toggles scope for taggings as well --- .../toggles_controller.rb => taggings_controller.rb} | 2 +- app/views/bubbles/_tagging.html.erb | 4 ++-- app/views/bubbles/cards/perma/_tags.html.erb | 2 +- config/routes.rb | 5 +---- ...es_controller_test.rb => taggings_controller_test.rb} | 9 ++++----- 5 files changed, 9 insertions(+), 13 deletions(-) rename app/controllers/{taggings/toggles_controller.rb => taggings_controller.rb} (94%) rename test/controllers/{taggings/toggles_controller_test.rb => taggings_controller_test.rb} (53%) diff --git a/app/controllers/taggings/toggles_controller.rb b/app/controllers/taggings_controller.rb similarity index 94% rename from app/controllers/taggings/toggles_controller.rb rename to app/controllers/taggings_controller.rb index d768c4cc7..629f4fb7a 100644 --- a/app/controllers/taggings/toggles_controller.rb +++ b/app/controllers/taggings_controller.rb @@ -1,4 +1,4 @@ -class Taggings::TogglesController < ApplicationController +class TaggingsController < ApplicationController include BubbleScoped, BucketScoped def new diff --git a/app/views/bubbles/_tagging.html.erb b/app/views/bubbles/_tagging.html.erb index e37696cc2..466f46121 100644 --- a/app/views/bubbles/_tagging.html.erb +++ b/app/views/bubbles/_tagging.html.erb @@ -3,7 +3,7 @@ Tag this… - <%= form_with url: bucket_bubble_tagging_toggles_path(bubble.bucket, bubble), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %> + <%= form_with url: bucket_bubble_taggings_path(bubble.bucket, bubble), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %> <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width" %> <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %> <%= icon_tag "add" %> @@ -11,7 +11,7 @@ <% end %> <% end %> - <%= form_with url: bucket_bubble_tagging_toggles_path(bubble.bucket, bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> + <%= form_with url: bucket_bubble_taggings_path(bubble.bucket, bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> <% tags.sort_by { |tag| tag.hashtag.downcase }.each do |tag| %>
<%= form.check_box "tag_id[]", { diff --git a/app/views/bubbles/cards/perma/_tags.html.erb b/app/views/bubbles/cards/perma/_tags.html.erb index 9903f9af5..a1f6ed044 100644 --- a/app/views/bubbles/cards/perma/_tags.html.erb +++ b/app/views/bubbles/cards/perma/_tags.html.erb @@ -18,7 +18,7 @@ Add a tag - <%= turbo_frame_tag bubble, :tagging, src: new_bucket_bubble_tagging_toggle_path(bubble.bucket, bubble) %> + <%= turbo_frame_tag bubble, :tagging, src: new_bucket_bubble_tagging_path(bubble.bucket, bubble) %>
<% end %> diff --git a/config/routes.rb b/config/routes.rb index bd3e3b4d3..b4099406f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -58,10 +58,7 @@ Rails.application.routes.draw do end resources :assignments - - namespace :taggings, as: :tagging do - resources :toggles - end + resources :taggings end end diff --git a/test/controllers/taggings/toggles_controller_test.rb b/test/controllers/taggings_controller_test.rb similarity index 53% rename from test/controllers/taggings/toggles_controller_test.rb rename to test/controllers/taggings_controller_test.rb index 4d54086ad..547a137be 100644 --- a/test/controllers/taggings/toggles_controller_test.rb +++ b/test/controllers/taggings_controller_test.rb @@ -1,25 +1,24 @@ require "test_helper" -class Taggings::TogglesControllerTest < ActionDispatch::IntegrationTest +class TaggingsControllerTest < ActionDispatch::IntegrationTest setup do sign_in_as :kevin end test "new" do - get new_bucket_bubble_tagging_toggle_url(buckets(:writebook), bubbles(:logo)) - + get new_bucket_bubble_tagging_url(buckets(:writebook), bubbles(:logo)) assert_response :success end test "create" do assert_changes "bubbles(:logo).tagged_with?(tags(:mobile))", from: false, to: true do - post bucket_bubble_tagging_toggles_url(buckets(:writebook), bubbles(:logo)), params: { tag_id: tags(:mobile).id }, as: :turbo_stream + post bucket_bubble_taggings_url(buckets(:writebook), bubbles(:logo)), params: { tag_id: tags(:mobile).id }, as: :turbo_stream end assert_response :success assert_changes "bubbles(:logo).tagged_with?(tags(:web))", from: false, to: true do assert_changes "bubbles(:logo).tagged_with?(tags(:mobile))", from: true, to: false do - post bucket_bubble_tagging_toggles_url(buckets(:writebook), bubbles(:logo)), params: { tag_id: tags(:web).id }, as: :turbo_stream + post bucket_bubble_taggings_url(buckets(:writebook), bubbles(:logo)), params: { tag_id: tags(:web).id }, as: :turbo_stream end end assert_response :success From bfb7ed1216464f9f757b4eae0b4089f600c305e1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 14:57:24 +0200 Subject: [PATCH 023/104] Move pins to my space We used the my/ space in HEY to reflect anything that was primarily hinged off Current.user. Good to use here too. --- .../trays_controller.rb => my/pins_controller.rb} | 4 ++-- app/views/bubbles/pins/trays/show.html.erb | 3 --- app/views/bubbles/pins_trays/show.html.erb | 3 --- app/views/layouts/application.html.erb | 2 +- app/views/{bubbles => my}/pins/_pin.html.erb | 0 app/views/{bubbles => my}/pins/_tray.html.erb | 4 ++-- app/views/my/pins/index.html.erb | 3 +++ config/routes.rb | 7 ++----- test/controllers/my/pins_controller_test.rb | 15 +++++++++++++++ 9 files changed, 25 insertions(+), 16 deletions(-) rename app/controllers/{bubbles/pins/trays_controller.rb => my/pins_controller.rb} (51%) delete mode 100644 app/views/bubbles/pins/trays/show.html.erb delete mode 100644 app/views/bubbles/pins_trays/show.html.erb rename app/views/{bubbles => my}/pins/_pin.html.erb (100%) rename app/views/{bubbles => my}/pins/_tray.html.erb (89%) create mode 100644 app/views/my/pins/index.html.erb create mode 100644 test/controllers/my/pins_controller_test.rb diff --git a/app/controllers/bubbles/pins/trays_controller.rb b/app/controllers/my/pins_controller.rb similarity index 51% rename from app/controllers/bubbles/pins/trays_controller.rb rename to app/controllers/my/pins_controller.rb index ef79beae2..c7f222d33 100644 --- a/app/controllers/bubbles/pins/trays_controller.rb +++ b/app/controllers/my/pins_controller.rb @@ -1,5 +1,5 @@ -class Bubbles::Pins::TraysController < ApplicationController - def show +class My::PinsController < ApplicationController + def index @pins = Current.user.pins.includes(:bubble).ordered.limit(20) end end diff --git a/app/views/bubbles/pins/trays/show.html.erb b/app/views/bubbles/pins/trays/show.html.erb deleted file mode 100644 index 1e155e3c5..000000000 --- a/app/views/bubbles/pins/trays/show.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= turbo_frame_tag "pins" do %> - <%= render collection: @pins, partial: "bubbles/pins/pin" %> -<% end %> \ No newline at end of file diff --git a/app/views/bubbles/pins_trays/show.html.erb b/app/views/bubbles/pins_trays/show.html.erb deleted file mode 100644 index 1e155e3c5..000000000 --- a/app/views/bubbles/pins_trays/show.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= turbo_frame_tag "pins" do %> - <%= render collection: @pins, partial: "bubbles/pins/pin" %> -<% end %> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 57f76180a..1e6afa890 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -48,7 +48,7 @@ <% if Current.user %> <%= render "notifications/tray" %> - <%= render "bubbles/pins/tray" %> + <%= render "my/pins/tray" %> <%= turbo_frame_tag "terminal", src: terminal_path, data: { turbo_permanent: true } %> <% end %>
diff --git a/app/views/bubbles/pins/_pin.html.erb b/app/views/my/pins/_pin.html.erb similarity index 100% rename from app/views/bubbles/pins/_pin.html.erb rename to app/views/my/pins/_pin.html.erb diff --git a/app/views/bubbles/pins/_tray.html.erb b/app/views/my/pins/_tray.html.erb similarity index 89% rename from app/views/bubbles/pins/_tray.html.erb rename to app/views/my/pins/_tray.html.erb index 7551f3781..70c1d5a16 100644 --- a/app/views/bubbles/pins/_tray.html.erb +++ b/app/views/my/pins/_tray.html.erb @@ -2,7 +2,7 @@ <%= tag.dialog id: "pin-tray", class: "tray pin-tray", data: { controller: "dialog", turbo_permanent: true, dialog_modal_value: false, dialog_target: "dialog", action: "keydown.esc->dialog#close:stop click@document->dialog#closeOnClickOutside" } do %> - <%= turbo_frame_tag "pins", src: bubbles_pins_tray_path %> + <%= turbo_frame_tag "pins", src: my_pins_path %>
@@ -10,4 +10,4 @@ -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/my/pins/index.html.erb b/app/views/my/pins/index.html.erb new file mode 100644 index 000000000..d4c176587 --- /dev/null +++ b/app/views/my/pins/index.html.erb @@ -0,0 +1,3 @@ +<%= turbo_frame_tag "pins" do %> + <%= render collection: @pins, partial: "my/pins/pin" %> +<% end %> diff --git a/config/routes.rb b/config/routes.rb index b4099406f..2b9b15d91 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -95,11 +95,8 @@ Rails.application.routes.draw do get "up", to: "rails/health#show", as: :rails_health_check get "manifest" => "rails/pwa#manifest", as: :pwa_manifest - namespace :bubbles do - namespace :pins do - resource :tray, only: :show - end - resources :pins, only: :index + namespace :my do + resources :pins end resource :terminal, only: [ :show, :edit ] diff --git a/test/controllers/my/pins_controller_test.rb b/test/controllers/my/pins_controller_test.rb new file mode 100644 index 000000000..cb6b9f9c0 --- /dev/null +++ b/test/controllers/my/pins_controller_test.rb @@ -0,0 +1,15 @@ +require "test_helper" + +class My::PinsControllerTest < ActionDispatch::IntegrationTest + setup do + sign_in_as :kevin + end + + test "index" do + get my_pins_url + + assert_response :success + assert_select "div", text: /#{users(:kevin).pins.first.bubble.title}/ + end +end + From e4c6fe4b559a07873f533cad0e0e00839f94b13f Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 15:15:48 +0200 Subject: [PATCH 024/104] Shape up pinning API and broadcast in the controller --- app/controllers/bubbles/pins_controller.rb | 17 +++++++++++++++-- app/models/bubble/pinnable.rb | 12 ++++++------ app/models/pin.rb | 6 ------ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/controllers/bubbles/pins_controller.rb b/app/controllers/bubbles/pins_controller.rb index a28526dea..d93eba759 100644 --- a/app/controllers/bubbles/pins_controller.rb +++ b/app/controllers/bubbles/pins_controller.rb @@ -5,12 +5,25 @@ class Bubbles::PinsController < ApplicationController end def create - @bubble.set_pinned(Current.user, true) + pin = @bubble.pin_by Current.user + + broadcast_new pin redirect_to bucket_bubble_pin_path(@bucket, @bubble) end def destroy - @bubble.set_pinned(Current.user, false) + pin = @bubble.unpin_by Current.user + + broadcast_removed pin redirect_to bucket_bubble_pin_path(@bucket, @bubble) end + + private + def broadcast_new(pin) + pin.broadcast_prepend_later_to [ Current.user, :pins ], target: "pins", partial: "my/pins/pin" + end + + def broadcast_removed(pin) + pin.broadcast_remove_to [ Current.user, :pins ] + end end diff --git a/app/models/bubble/pinnable.rb b/app/models/bubble/pinnable.rb index 2452fadfe..044125eae 100644 --- a/app/models/bubble/pinnable.rb +++ b/app/models/bubble/pinnable.rb @@ -9,11 +9,11 @@ module Bubble::Pinnable pins.exists?(user: user) end - def set_pinned(user, pinned) - if pinned - pins.find_or_create_by!(user: user) - else - pins.find_by(user: user)&.destroy - end + def pin_by(user) + pins.find_or_create_by!(user: user) + end + + def unpin_by(user) + pins.find_by(user: user).tap { it.destroy } end end diff --git a/app/models/pin.rb b/app/models/pin.rb index 5bf4635c8..86913023c 100644 --- a/app/models/pin.rb +++ b/app/models/pin.rb @@ -3,10 +3,4 @@ class Pin < ApplicationRecord belongs_to :user scope :ordered, -> { order(created_at: :desc) } - - after_create_commit -> { broadcast_prepend_later_to [ user, :pins ], - target: "pins", - partial: "bubbles/pins/pin" - } - after_destroy_commit -> { broadcast_remove_to [ user, :pins ] } end From 866a80e133d8ba3464fc95d0f146e6f94ebbe361 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 15:26:49 +0200 Subject: [PATCH 025/104] Fix up the tests --- test/controllers/bubbles/pins_controller_test.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/controllers/bubbles/pins_controller_test.rb b/test/controllers/bubbles/pins_controller_test.rb index 7deee667e..cdde4e7f2 100644 --- a/test/controllers/bubbles/pins_controller_test.rb +++ b/test/controllers/bubbles/pins_controller_test.rb @@ -7,17 +7,25 @@ class Bubbles::PinsControllerTest < ActionDispatch::IntegrationTest test "create" do assert_changes -> { bubbles(:layout).pinned_by?(users(:kevin)) }, from: false, to: true do - post bucket_bubble_pin_url(buckets(:writebook), bubbles(:layout)) + perform_enqueued_jobs do + assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do + post bucket_bubble_pin_path(buckets(:writebook), bubbles(:layout)) + end + end end - assert_redirected_to bucket_bubble_pin_url(buckets(:writebook), bubbles(:layout)) + assert_redirected_to bucket_bubble_pin_path(buckets(:writebook), bubbles(:layout)) end test "destroy" do assert_changes -> { bubbles(:shipping).pinned_by?(users(:kevin)) }, from: true, to: false do - delete bucket_bubble_pin_url(buckets(:writebook), bubbles(:shipping)) + perform_enqueued_jobs do + assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do + delete bucket_bubble_pin_path(buckets(:writebook), bubbles(:shipping)) + end + end end - assert_redirected_to bucket_bubble_pin_url(buckets(:writebook), bubbles(:shipping)) + assert_redirected_to bucket_bubble_pin_path(buckets(:writebook), bubbles(:shipping)) end end From 8708ff04c1e0836bea73dc0d3365cbfca8e91038 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 15:27:40 +0200 Subject: [PATCH 026/104] Fix indention --- app/views/bubbles/pins/show.html.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/bubbles/pins/show.html.erb b/app/views/bubbles/pins/show.html.erb index 9039cc92f..cbd2b75a0 100644 --- a/app/views/bubbles/pins/show.html.erb +++ b/app/views/bubbles/pins/show.html.erb @@ -1,13 +1,13 @@ <%= turbo_frame_tag dom_id(@bubble, :pin) do %> <% if @bubble.pinned_by? Current.user %> - <%= button_to bucket_bubble_pin_path(@bubble.bucket, @bubble), method: :delete, class: "btn btn--reversed" do %> - <%= icon_tag "pinned" %> - Un-pin this card - <% end %> + <%= button_to bucket_bubble_pin_path(@bubble.bucket, @bubble), method: :delete, class: "btn btn--reversed" do %> + <%= icon_tag "pinned" %> + Un-pin this card + <% end %> <% else %> - <%= button_to bucket_bubble_pin_path(@bubble.bucket, @bubble), class: "btn" do %> - <%= icon_tag "unpinned" %> - Pin this card - <% end %> + <%= button_to bucket_bubble_pin_path(@bubble.bucket, @bubble), class: "btn" do %> + <%= icon_tag "unpinned" %> + Pin this card + <% end %> <% end %> <% end %> From f725a69dee3a3b1c1d6bdc5afbe12ade44166e75 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 15:43:58 +0200 Subject: [PATCH 027/104] Let BubbleScoped find its own bucket Then it will be easier to break things that are double nested out of that nesting. --- app/controllers/assignments_controller.rb | 2 +- app/controllers/boosts_controller.rb | 2 +- app/controllers/bubbles/engagements_controller.rb | 2 +- app/controllers/bubbles/images_controller.rb | 2 +- app/controllers/bubbles/pins_controller.rb | 2 +- app/controllers/bubbles/pops_controller.rb | 2 +- app/controllers/bubbles/publishes_controller.rb | 2 +- app/controllers/bubbles/recovers_controller.rb | 2 +- app/controllers/bubbles/stagings_controller.rb | 2 +- app/controllers/bubbles/watches_controller.rb | 2 +- app/controllers/comments_controller.rb | 2 +- app/controllers/concerns/bubble_scoped.rb | 8 ++++++-- app/controllers/readings_controller.rb | 2 +- app/controllers/taggings_controller.rb | 2 +- 14 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb index 554d86850..eb9c4e74f 100644 --- a/app/controllers/assignments_controller.rb +++ b/app/controllers/assignments_controller.rb @@ -1,5 +1,5 @@ class AssignmentsController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def new render partial: "bubbles/assignment", locals: { bubble: @bubble } diff --git a/app/controllers/boosts_controller.rb b/app/controllers/boosts_controller.rb index 0a6f34f78..48400cc10 100644 --- a/app/controllers/boosts_controller.rb +++ b/app/controllers/boosts_controller.rb @@ -1,5 +1,5 @@ class BoostsController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def create count = if params[:boost_count].to_i == @bubble.boosts_count diff --git a/app/controllers/bubbles/engagements_controller.rb b/app/controllers/bubbles/engagements_controller.rb index e13d6679c..5599b7381 100644 --- a/app/controllers/bubbles/engagements_controller.rb +++ b/app/controllers/bubbles/engagements_controller.rb @@ -1,5 +1,5 @@ class Bubbles::EngagementsController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def create @bubble.engage diff --git a/app/controllers/bubbles/images_controller.rb b/app/controllers/bubbles/images_controller.rb index 005eb967d..b7dc7da97 100644 --- a/app/controllers/bubbles/images_controller.rb +++ b/app/controllers/bubbles/images_controller.rb @@ -1,5 +1,5 @@ class Bubbles::ImagesController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def destroy @bubble.image.purge_later diff --git a/app/controllers/bubbles/pins_controller.rb b/app/controllers/bubbles/pins_controller.rb index d93eba759..fda94c937 100644 --- a/app/controllers/bubbles/pins_controller.rb +++ b/app/controllers/bubbles/pins_controller.rb @@ -1,5 +1,5 @@ class Bubbles::PinsController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def show end diff --git a/app/controllers/bubbles/pops_controller.rb b/app/controllers/bubbles/pops_controller.rb index 395f241e2..5421428ca 100644 --- a/app/controllers/bubbles/pops_controller.rb +++ b/app/controllers/bubbles/pops_controller.rb @@ -1,5 +1,5 @@ class Bubbles::PopsController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def create @bubble.pop!(user: Current.user, reason: params[:reason]) diff --git a/app/controllers/bubbles/publishes_controller.rb b/app/controllers/bubbles/publishes_controller.rb index 8064e7c68..bcc75eb27 100644 --- a/app/controllers/bubbles/publishes_controller.rb +++ b/app/controllers/bubbles/publishes_controller.rb @@ -1,5 +1,5 @@ class Bubbles::PublishesController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def create @bubble.publish diff --git a/app/controllers/bubbles/recovers_controller.rb b/app/controllers/bubbles/recovers_controller.rb index 530592762..c94fd6ccf 100644 --- a/app/controllers/bubbles/recovers_controller.rb +++ b/app/controllers/bubbles/recovers_controller.rb @@ -1,5 +1,5 @@ class Bubbles::RecoversController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def create redirect_to @bubble.recover_abandoned_creation diff --git a/app/controllers/bubbles/stagings_controller.rb b/app/controllers/bubbles/stagings_controller.rb index 2f2ea68cc..28f7af26e 100644 --- a/app/controllers/bubbles/stagings_controller.rb +++ b/app/controllers/bubbles/stagings_controller.rb @@ -1,5 +1,5 @@ class Bubbles::StagingsController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def create if params[:stage_id].present? diff --git a/app/controllers/bubbles/watches_controller.rb b/app/controllers/bubbles/watches_controller.rb index cecd292b5..221f51405 100644 --- a/app/controllers/bubbles/watches_controller.rb +++ b/app/controllers/bubbles/watches_controller.rb @@ -1,5 +1,5 @@ class Bubbles::WatchesController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def create set_watching_and_redirect(true) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index d8b0231ac..4708af0e1 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -1,5 +1,5 @@ class CommentsController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped before_action :set_comment, only: [ :show, :edit, :update, :destroy ] before_action :require_own_comment, only: [ :edit, :update, :destroy ] diff --git a/app/controllers/concerns/bubble_scoped.rb b/app/controllers/concerns/bubble_scoped.rb index bf123910c..5805b58ec 100644 --- a/app/controllers/concerns/bubble_scoped.rb +++ b/app/controllers/concerns/bubble_scoped.rb @@ -2,11 +2,15 @@ module BubbleScoped extend ActiveSupport::Concern included do - before_action :set_bubble + before_action :set_bubble, :set_bucket end private def set_bubble - @bubble = @bucket.bubbles.find(params[:bubble_id]) + @bubble = Bubble.find(params[:bubble_id]) + end + + def set_bucket + @bucket = Current.user.buckets.find(@bubble.bucket_id) end end diff --git a/app/controllers/readings_controller.rb b/app/controllers/readings_controller.rb index 6482cd7c9..fe0761831 100644 --- a/app/controllers/readings_controller.rb +++ b/app/controllers/readings_controller.rb @@ -1,5 +1,5 @@ class ReadingsController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def create mark_bubble_notifications_read diff --git a/app/controllers/taggings_controller.rb b/app/controllers/taggings_controller.rb index 629f4fb7a..e35db0b2f 100644 --- a/app/controllers/taggings_controller.rb +++ b/app/controllers/taggings_controller.rb @@ -1,5 +1,5 @@ class TaggingsController < ApplicationController - include BubbleScoped, BucketScoped + include BubbleScoped def new render partial: "bubbles/tagging", locals: { bubble: @bubble, tags: Current.account.tags } From e69c1bd0a1d0859217021bc05e4e1e260e67f1f1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 15:45:16 +0200 Subject: [PATCH 028/104] Break pins out of the double nesting Its cumbersome and needless --- app/controllers/bubbles/pins_controller.rb | 4 ++-- app/views/bubbles/pins/show.html.erb | 4 ++-- app/views/bubbles/show.html.erb | 2 +- config/routes.rb | 8 ++++++-- test/controllers/bubbles/pins_controller_test.rb | 8 ++++---- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/controllers/bubbles/pins_controller.rb b/app/controllers/bubbles/pins_controller.rb index fda94c937..09ac6b9c1 100644 --- a/app/controllers/bubbles/pins_controller.rb +++ b/app/controllers/bubbles/pins_controller.rb @@ -8,14 +8,14 @@ class Bubbles::PinsController < ApplicationController pin = @bubble.pin_by Current.user broadcast_new pin - redirect_to bucket_bubble_pin_path(@bucket, @bubble) + redirect_to bubble_pin_path(@bubble) end def destroy pin = @bubble.unpin_by Current.user broadcast_removed pin - redirect_to bucket_bubble_pin_path(@bucket, @bubble) + redirect_to bubble_pin_path(@bubble) end private diff --git a/app/views/bubbles/pins/show.html.erb b/app/views/bubbles/pins/show.html.erb index cbd2b75a0..5a8852a03 100644 --- a/app/views/bubbles/pins/show.html.erb +++ b/app/views/bubbles/pins/show.html.erb @@ -1,11 +1,11 @@ <%= turbo_frame_tag dom_id(@bubble, :pin) do %> <% if @bubble.pinned_by? Current.user %> - <%= button_to bucket_bubble_pin_path(@bubble.bucket, @bubble), method: :delete, class: "btn btn--reversed" do %> + <%= button_to bubble_pin_path(@bubble), method: :delete, class: "btn btn--reversed" do %> <%= icon_tag "pinned" %> Un-pin this card <% end %> <% else %> - <%= button_to bucket_bubble_pin_path(@bubble.bucket, @bubble), class: "btn" do %> + <%= button_to bubble_pin_path(@bubble), class: "btn" do %> <%= icon_tag "unpinned" %> Pin this card <% end %> diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb index c88a0f625..b7d62b740 100644 --- a/app/views/bubbles/show.html.erb +++ b/app/views/bubbles/show.html.erb @@ -81,7 +81,7 @@ <% if @bubble.published? %>
<%= turbo_frame_tag dom_id(@bubble, :watch), src: bucket_bubble_watch_path(@bubble.bucket, @bubble), refresh: :morph %> - <%= turbo_frame_tag dom_id(@bubble, :pin), src: bucket_bubble_pin_path(@bubble.bucket, @bubble), refresh: :morph %> + <%= turbo_frame_tag dom_id(@bubble, :pin), src: bubble_pin_path(@bubble), refresh: :morph %>
<% end %>
diff --git a/config/routes.rb b/config/routes.rb index 2b9b15d91..3433bc802 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,7 +17,12 @@ Rails.application.routes.draw do route_for :bucket_bubble, comment.bubble.bucket, comment.bubble, options end - resources :bubbles + resources :bubbles do + scope module: :bubbles do + resource :pin + end + end + resources :notifications, only: :index namespace :notifications do resource :tray, only: :show @@ -54,7 +59,6 @@ Rails.application.routes.draw do resource :recover resources :stagings resource :watch - resource :pin, only: [ :show, :create, :destroy ] end resources :assignments diff --git a/test/controllers/bubbles/pins_controller_test.rb b/test/controllers/bubbles/pins_controller_test.rb index cdde4e7f2..c4a6c3c0e 100644 --- a/test/controllers/bubbles/pins_controller_test.rb +++ b/test/controllers/bubbles/pins_controller_test.rb @@ -9,23 +9,23 @@ class Bubbles::PinsControllerTest < ActionDispatch::IntegrationTest assert_changes -> { bubbles(:layout).pinned_by?(users(:kevin)) }, from: false, to: true do perform_enqueued_jobs do assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do - post bucket_bubble_pin_path(buckets(:writebook), bubbles(:layout)) + post bubble_pin_path(bubbles(:layout)) end end end - assert_redirected_to bucket_bubble_pin_path(buckets(:writebook), bubbles(:layout)) + assert_redirected_to bubble_pin_path(bubbles(:layout)) end test "destroy" do assert_changes -> { bubbles(:shipping).pinned_by?(users(:kevin)) }, from: true, to: false do perform_enqueued_jobs do assert_turbo_stream_broadcasts([ users(:kevin), :pins ], count: 1) do - delete bucket_bubble_pin_path(buckets(:writebook), bubbles(:shipping)) + delete bubble_pin_path(bubbles(:shipping)) end end end - assert_redirected_to bucket_bubble_pin_path(buckets(:writebook), bubbles(:shipping)) + assert_redirected_to bubble_pin_path(bubbles(:shipping)) end end From b4c0fec7a6980fbaf7fb8f73ccbcc803f4fa2d01 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 15:51:53 +0200 Subject: [PATCH 029/104] Move Assignments under Bubble Since that what we are assigning --- app/controllers/{ => bubbles}/assignments_controller.rb | 2 +- config/routes.rb | 2 +- test/controllers/{ => bubbles}/assignments_controller_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename app/controllers/{ => bubbles}/assignments_controller.rb (93%) rename test/controllers/{ => bubbles}/assignments_controller_test.rb (90%) diff --git a/app/controllers/assignments_controller.rb b/app/controllers/bubbles/assignments_controller.rb similarity index 93% rename from app/controllers/assignments_controller.rb rename to app/controllers/bubbles/assignments_controller.rb index eb9c4e74f..f7cada259 100644 --- a/app/controllers/assignments_controller.rb +++ b/app/controllers/bubbles/assignments_controller.rb @@ -1,4 +1,4 @@ -class AssignmentsController < ApplicationController +class Bubbles::AssignmentsController < ApplicationController include BubbleScoped def new diff --git a/config/routes.rb b/config/routes.rb index 3433bc802..a3ac2ee4a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -59,9 +59,9 @@ Rails.application.routes.draw do resource :recover resources :stagings resource :watch + resources :assignments end - resources :assignments resources :taggings end end diff --git a/test/controllers/assignments_controller_test.rb b/test/controllers/bubbles/assignments_controller_test.rb similarity index 90% rename from test/controllers/assignments_controller_test.rb rename to test/controllers/bubbles/assignments_controller_test.rb index 4bec58298..81156b23e 100644 --- a/test/controllers/assignments_controller_test.rb +++ b/test/controllers/bubbles/assignments_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class AssignmentsControllerTest < ActionDispatch::IntegrationTest +class Bubbles::AssignmentsControllerTest < ActionDispatch::IntegrationTest setup do sign_in_as :kevin end From ec36e52b251836485f507f16a024f01abeddb10b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 15:52:15 +0200 Subject: [PATCH 030/104] No longer used --- app/views/bubbles/_bubble.html.erb | 48 ------------------------------ 1 file changed, 48 deletions(-) delete mode 100644 app/views/bubbles/_bubble.html.erb diff --git a/app/views/bubbles/_bubble.html.erb b/app/views/bubbles/_bubble.html.erb deleted file mode 100644 index d22a7f701..000000000 --- a/app/views/bubbles/_bubble.html.erb +++ /dev/null @@ -1,48 +0,0 @@ -<% cache bubble do %> - <%= tag.div class: [ "bubble", drafted: bubble.drafted?, popped: bubble.popped? ], - style: "view-transition-name: bubble-#{bubble.id}; --bubble-color: #{bubble.color}; #{bubble_rotation(bubble)}", - role: "group", aria: { label: bubble_title(bubble) }, - data: { - bubble_size_target: "bubble", - activity_score: bubble.activity_score, - activity_score_at: bubble.activity_score_at.to_i, - controller: "animation upload-preview", - animation_play_class: "bubble--wobble", - animation_play_on_load_value: true, - action: "mouseover->animation#play" } do %> -
-

- <% if bubble.published? %> - <%= turbo_frame_tag bubble, :edit do %> - <%= link_to bubble_title(bubble), edit_bucket_bubble_path(bubble.bucket, bubble), - class: "txt-undecorated bubble__title-rendered", - role: "button", aria: { label: "Edit name: #{bubble_title(bubble)}" } %> - <% end %> - <% else %> - <%= form_with model: bubble, url: bucket_bubble_path(bubble.bucket, bubble), id: "bubble_form", data: { controller: "auto-save" } do |form| %> - <%= form.text_area :title, placeholder: "Name it…", class: "input full-width borderless txt-align-start card__title-field", autofocus: bubble.title.blank?, data: { action: "auto-save#change blur->auto-save#submit keydown.enter->auto-save#submit:prevent keydown.ctrl+enter->auto-save#submit:prevent" } %> - <% end %> - <% end %> - -
- <%= render "bubbles/tags", bubble: bubble %> -
-

-
- -
- - -

- <%= link_to bucket_bubble_path(bubble.bucket, bubble), class: "bubble__link" do %> - <%= bubble_title(bubble) %> - <% end %> -

- - <%= render "bubbles/assignments", bubble: bubble %> - <%= render "bubbles/boosts", bubble: bubble %> - <%= render "bubbles/comments", bubble: bubble %> - <%= render "bubbles/date", bubble: bubble %> - <%= render "bubbles/image", bubble: bubble %> - <% end %> -<% end %> From 851be126aba76cd450148a541e84d7d91697e4c1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 15:55:11 +0200 Subject: [PATCH 031/104] Emphasize where this pin is showing up --- app/controllers/bubbles/pins_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/bubbles/pins_controller.rb b/app/controllers/bubbles/pins_controller.rb index 09ac6b9c1..d75d2b10d 100644 --- a/app/controllers/bubbles/pins_controller.rb +++ b/app/controllers/bubbles/pins_controller.rb @@ -7,23 +7,23 @@ class Bubbles::PinsController < ApplicationController def create pin = @bubble.pin_by Current.user - broadcast_new pin + broadcast_my_new pin redirect_to bubble_pin_path(@bubble) end def destroy pin = @bubble.unpin_by Current.user - broadcast_removed pin + broadcast_my_removed pin redirect_to bubble_pin_path(@bubble) end private - def broadcast_new(pin) + def broadcast_my_new(pin) pin.broadcast_prepend_later_to [ Current.user, :pins ], target: "pins", partial: "my/pins/pin" end - def broadcast_removed(pin) + def broadcast_my_removed(pin) pin.broadcast_remove_to [ Current.user, :pins ] end end From 3b5f8c2e6aeaeccdce12e91eb152fac15818f4b1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 15:56:12 +0200 Subject: [PATCH 032/104] Note the security oddity of finding straight off root --- app/controllers/concerns/bubble_scoped.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/concerns/bubble_scoped.rb b/app/controllers/concerns/bubble_scoped.rb index 5805b58ec..2f422727c 100644 --- a/app/controllers/concerns/bubble_scoped.rb +++ b/app/controllers/concerns/bubble_scoped.rb @@ -7,6 +7,7 @@ module BubbleScoped private def set_bubble + # Finding the bubble on the root depends on checking permission by finding its bucket via Current.user @bubble = Bubble.find(params[:bubble_id]) end From d0953d6f8778067e3db7bbf5f31fc9f0b7efe7b1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 15:59:51 +0200 Subject: [PATCH 033/104] Pull assignments out of the double nesting --- app/views/bubbles/_assignment.html.erb | 2 +- app/views/bubbles/cards/perma/_assignees.html.erb | 2 +- config/routes.rb | 2 +- test/controllers/bubbles/assignments_controller_test.rb | 7 +++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/views/bubbles/_assignment.html.erb b/app/views/bubbles/_assignment.html.erb index 7c6071a25..d28298c02 100644 --- a/app/views/bubbles/_assignment.html.erb +++ b/app/views/bubbles/_assignment.html.erb @@ -3,7 +3,7 @@ Assign this to… - <%= form_with url: bucket_bubble_assignments_path(bubble.bucket, bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> + <%= form_with url: bubble_assignments_path(bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> <% bubble.bucket.users.active.sort_by(&:name).each do |user| %>
<%= form.check_box "assignee_id[]", { diff --git a/app/views/bubbles/cards/perma/_assignees.html.erb b/app/views/bubbles/cards/perma/_assignees.html.erb index 91f3612a6..8733e969e 100644 --- a/app/views/bubbles/cards/perma/_assignees.html.erb +++ b/app/views/bubbles/cards/perma/_assignees.html.erb @@ -1,3 +1,3 @@ <%= render "bubbles/cards/common/assignees", bubble: bubble do %> - <%= turbo_frame_tag bubble, :assignment, src: new_bucket_bubble_assignment_path(bubble.bucket, bubble) %> + <%= turbo_frame_tag bubble, :assignment, src: new_bubble_assignment_path(bubble) %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index a3ac2ee4a..5157ce9a2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,6 +20,7 @@ Rails.application.routes.draw do resources :bubbles do scope module: :bubbles do resource :pin + resources :assignments end end @@ -59,7 +60,6 @@ Rails.application.routes.draw do resource :recover resources :stagings resource :watch - resources :assignments end resources :taggings diff --git a/test/controllers/bubbles/assignments_controller_test.rb b/test/controllers/bubbles/assignments_controller_test.rb index 81156b23e..92583ecc4 100644 --- a/test/controllers/bubbles/assignments_controller_test.rb +++ b/test/controllers/bubbles/assignments_controller_test.rb @@ -6,19 +6,18 @@ class Bubbles::AssignmentsControllerTest < ActionDispatch::IntegrationTest end test "new" do - get new_bucket_bubble_assignment_url(buckets(:writebook), bubbles(:logo)) - + get new_bubble_assignment_url(bubbles(:logo)) assert_response :success end test "create" do assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: false, to: true do - post bucket_bubble_assignments_url(buckets(:writebook), bubbles(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream + post bubble_assignments_url(bubbles(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream end assert_response :success assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: true, to: false do - post bucket_bubble_assignments_url(buckets(:writebook), bubbles(:logo)), params: { assignee_id: users(:kevin).id }, as: :turbo_stream + post bubble_assignments_url(bubbles(:logo)), params: { assignee_id: users(:kevin).id }, as: :turbo_stream end assert_response :success end From e825f1d33f8ba89cb8749a45d42c4e75f4c8fd88 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 16:06:44 +0200 Subject: [PATCH 034/104] No need for the partial indirection --- app/controllers/bubbles/assignments_controller.rb | 1 - .../{_assignment.html.erb => assignments/new.html.erb} | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) rename app/views/bubbles/{_assignment.html.erb => assignments/new.html.erb} (67%) diff --git a/app/controllers/bubbles/assignments_controller.rb b/app/controllers/bubbles/assignments_controller.rb index f7cada259..cb8e0d677 100644 --- a/app/controllers/bubbles/assignments_controller.rb +++ b/app/controllers/bubbles/assignments_controller.rb @@ -2,7 +2,6 @@ class Bubbles::AssignmentsController < ApplicationController include BubbleScoped def new - render partial: "bubbles/assignment", locals: { bubble: @bubble } end def create diff --git a/app/views/bubbles/_assignment.html.erb b/app/views/bubbles/assignments/new.html.erb similarity index 67% rename from app/views/bubbles/_assignment.html.erb rename to app/views/bubbles/assignments/new.html.erb index d28298c02..992c0b3c4 100644 --- a/app/views/bubbles/_assignment.html.erb +++ b/app/views/bubbles/assignments/new.html.erb @@ -1,13 +1,13 @@ -<% cache [ bubble, bubble.bucket ] do %> - <%= turbo_frame_tag bubble, :assignment do %> +<% cache [ @bubble ] do %> + <%= turbo_frame_tag @bubble, :assignment do %> Assign this to… - <%= form_with url: bubble_assignments_path(bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> - <% bubble.bucket.users.active.sort_by(&:name).each do |user| %> + <%= form_with url: bubble_assignments_path(@bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> + <% @bubble.bucket.users.active.sort_by(&:name).each do |user| %>
<%= form.check_box "assignee_id[]", { - checked: bubble.assigned_to?(user), + checked: @bubble.assigned_to?(user), data: { action: "change->form#submit" }, id: dom_id(user, :assign), include_hidden: false, From 233538c722fd9b3563eb8ba2fca12052949e387c Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 16:07:42 +0200 Subject: [PATCH 035/104] Going to remove Hotwire Spark for a second It does not work well with turbo frames that error out during development, since it changes the URL on the error to the location of the frame. Find that more annoying than I find Spark helpful. --- Gemfile | 4 ---- Gemfile.lock | 21 --------------------- 2 files changed, 25 deletions(-) diff --git a/Gemfile b/Gemfile index 19e7f2d5e..b60a0908f 100644 --- a/Gemfile +++ b/Gemfile @@ -40,10 +40,6 @@ group :development, :test do gem "rubocop-rails-omakase", require: false end -group :development do - gem "hotwire-spark" -end - group :test do gem "capybara" gem "selenium-webdriver" diff --git a/Gemfile.lock b/Gemfile.lock index 0e1eddfb2..640dd5fb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,16 +154,6 @@ GEM erubi (1.13.1) et-orbi (1.2.11) tzinfo - ffi (1.17.1-aarch64-linux-gnu) - ffi (1.17.1-aarch64-linux-musl) - ffi (1.17.1-arm-linux-gnu) - ffi (1.17.1-arm-linux-musl) - ffi (1.17.1-arm64-darwin) - ffi (1.17.1-x86-linux-gnu) - ffi (1.17.1-x86-linux-musl) - ffi (1.17.1-x86_64-darwin) - ffi (1.17.1-x86_64-linux-gnu) - ffi (1.17.1-x86_64-linux-musl) fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) @@ -172,10 +162,6 @@ GEM addressable (>= 2.5.0) globalid (1.2.1) activesupport (>= 6.1) - hotwire-spark (0.1.13) - listen - rails (>= 7.0.0) - zeitwerk i18n (1.14.7) concurrent-ruby (~> 1.0) importmap-rails (2.1.0) @@ -204,9 +190,6 @@ GEM zeitwerk (>= 2.6.18, < 3.0) language_server-protocol (3.17.0.4) lint_roller (1.1.0) - listen (3.9.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) logger (1.7.0) loofah (2.24.0) crass (~> 1.0.2) @@ -297,9 +280,6 @@ GEM nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) rainbow (3.1.1) rake (13.2.1) - rb-fsevent (0.11.2) - rb-inotify (0.11.1) - ffi (~> 1.0) rdoc (6.13.1) psych (>= 4.0.0) redcarpet (3.6.1) @@ -441,7 +421,6 @@ DEPENDENCIES capybara debug geared_pagination (~> 1.2) - hotwire-spark importmap-rails jbuilder kamal From 6166c917591e271c531862746c83a7551764f6c4 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 16:09:45 +0200 Subject: [PATCH 036/104] Not needed The Dockerfile enforces the Ruby version in production, and mise does so in development. --- Gemfile | 1 - Gemfile.lock | 3 --- 2 files changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index b60a0908f..213822917 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ source "https://rubygems.org" git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" } -ruby file: ".ruby-version" gem "rails", github: "rails/rails", branch: "main" gem "active_record-tenanted", bc: "active_record-tenanted" diff --git a/Gemfile.lock b/Gemfile.lock index 640dd5fb7..9e079fe3f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -443,8 +443,5 @@ DEPENDENCIES thruster turbo-rails -RUBY VERSION - ruby 3.4.2p28 - BUNDLED WITH 2.5.21 From 64c00aea30fd9e2231e0a48539bbdfe105fad551 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 16:20:31 +0200 Subject: [PATCH 037/104] Extract helper for bubble_assignee_checkbox --- app/helpers/bubbles/assignments_helper.rb | 8 ++++++++ app/views/bubbles/assignments/new.html.erb | 11 ++--------- 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 app/helpers/bubbles/assignments_helper.rb diff --git a/app/helpers/bubbles/assignments_helper.rb b/app/helpers/bubbles/assignments_helper.rb new file mode 100644 index 000000000..9bd6630fc --- /dev/null +++ b/app/helpers/bubbles/assignments_helper.rb @@ -0,0 +1,8 @@ +module Bubbles::AssignmentsHelper + def bubble_assignee_checkbox(form, bubble, user) + form.check_box("assignee_id[]", { + checked: bubble.assigned_to?(user), data: { action: "change->form#submit" }, id: dom_id(user, :assign), include_hidden: false + }, user.id + ) + form.label("assignee_id[]", user.name, for: dom_id(user, :assign), class: "overflow-ellipsis") + end +end diff --git a/app/views/bubbles/assignments/new.html.erb b/app/views/bubbles/assignments/new.html.erb index 992c0b3c4..cea4d9815 100644 --- a/app/views/bubbles/assignments/new.html.erb +++ b/app/views/bubbles/assignments/new.html.erb @@ -4,16 +4,9 @@ Assign this to… <%= form_with url: bubble_assignments_path(@bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> - <% @bubble.bucket.users.active.sort_by(&:name).each do |user| %> + <% @bubble.bucket.users.active.alphabetically.each do |user| %>
- <%= form.check_box "assignee_id[]", { - checked: @bubble.assigned_to?(user), - data: { action: "change->form#submit" }, - id: dom_id(user, :assign), - include_hidden: false, - }, user.id %> - - <%= form.label "assignee_id[]", user.name, for: dom_id(user, :assign), class: "overflow-ellipsis" %> + <%= bubble_assignee_checkbox(form, @bubble, user) %> <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %>
<% end %> From 77f412f875f9558c1f1502a9f5275e87823f825a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 16:23:47 +0200 Subject: [PATCH 038/104] Cache is going to churn too frequently to matter Anything that touches the bucket, and thats almost everything, will churn the cache. This is already hidden behind a turbo frame, so thats enough to get it out of the rendering hot path. --- app/views/bubbles/assignments/new.html.erb | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/app/views/bubbles/assignments/new.html.erb b/app/views/bubbles/assignments/new.html.erb index cea4d9815..5a6695f91 100644 --- a/app/views/bubbles/assignments/new.html.erb +++ b/app/views/bubbles/assignments/new.html.erb @@ -1,16 +1,14 @@ -<% cache [ @bubble ] do %> - <%= turbo_frame_tag @bubble, :assignment do %> - - Assign this to… +<%= turbo_frame_tag @bubble, :assignment do %> + + Assign this to… - <%= form_with url: bubble_assignments_path(@bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> - <% @bubble.bucket.users.active.alphabetically.each do |user| %> -
- <%= bubble_assignee_checkbox(form, @bubble, user) %> - <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %> -
- <% end %> + <%= form_with url: bubble_assignments_path(@bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> + <% @bubble.bucket.users.active.alphabetically.each do |user| %> +
+ <%= bubble_assignee_checkbox(form, @bubble, user) %> + <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %> +
<% end %> - - <% end %> + <% end %> + <% end %> From 6990f1eb05a453ac62f08ec918b26820e53d4b6b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 16:27:22 +0200 Subject: [PATCH 039/104] Alpha sort regardless of capitalization --- app/models/bucket.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/bucket.rb b/app/models/bucket.rb index 20a7f0336..ce6ec4154 100644 --- a/app/models/bucket.rb +++ b/app/models/bucket.rb @@ -12,7 +12,7 @@ class Bucket < ApplicationRecord after_save :update_bubbles_workflow, if: :saved_change_to_workflow_id? - scope :alphabetically, -> { order(name: :asc) } + scope :alphabetically, -> { order("lower(name)") } private def update_bubbles_workflow From 5134985418d84566a067cfc23d06fd51ee44df82 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 17:14:57 +0200 Subject: [PATCH 040/104] Simplify the assignments flow We now submit on every selection, so we dont need a whole form and checkboxes to do it. This needs some design tune-up after the change, though. cc @jzimdars --- .../bubbles/assignments_controller.rb | 25 +------------------ app/helpers/bubbles/assignments_helper.rb | 8 ------ .../assignments/create.turbo_stream.erb | 1 + app/views/bubbles/assignments/new.html.erb | 8 +++--- .../bubbles/cards/common/_assignees.html.erb | 24 ++++++++---------- .../bubbles/assignments_controller_test.rb | 2 +- 6 files changed, 18 insertions(+), 50 deletions(-) delete mode 100644 app/helpers/bubbles/assignments_helper.rb create mode 100644 app/views/bubbles/assignments/create.turbo_stream.erb diff --git a/app/controllers/bubbles/assignments_controller.rb b/app/controllers/bubbles/assignments_controller.rb index cb8e0d677..7fd9186aa 100644 --- a/app/controllers/bubbles/assignments_controller.rb +++ b/app/controllers/bubbles/assignments_controller.rb @@ -5,29 +5,6 @@ class Bubbles::AssignmentsController < ApplicationController end def create - new_assignee_ids = Array(params[:assignee_id]) - current_assignees = @bubble.assignees - - current_assignees.each do |assignee| - @bubble.toggle_assignment(assignee) unless new_assignee_ids.include?(assignee.id.to_s) - end - - new_assignee_ids.each do |id| - assignee = @bucket.users.active.find(id) - @bubble.toggle_assignment(assignee) unless current_assignees.include?(assignee) - end - - @bubble.assignees.reload - - respond_to do |format| - format.turbo_stream do - render turbo_stream: turbo_stream.replace([ @bubble, :assignees ], partial: "bubbles/cards/perma/assignees", locals: { bubble: @bubble }) - end - end + @bubble.toggle_assignment @bucket.users.active.find(params[:assignee_id]) end - - private - def assignee - @bucket.users.active.find params[:assignee_id] - end end diff --git a/app/helpers/bubbles/assignments_helper.rb b/app/helpers/bubbles/assignments_helper.rb deleted file mode 100644 index 9bd6630fc..000000000 --- a/app/helpers/bubbles/assignments_helper.rb +++ /dev/null @@ -1,8 +0,0 @@ -module Bubbles::AssignmentsHelper - def bubble_assignee_checkbox(form, bubble, user) - form.check_box("assignee_id[]", { - checked: bubble.assigned_to?(user), data: { action: "change->form#submit" }, id: dom_id(user, :assign), include_hidden: false - }, user.id - ) + form.label("assignee_id[]", user.name, for: dom_id(user, :assign), class: "overflow-ellipsis") - end -end diff --git a/app/views/bubbles/assignments/create.turbo_stream.erb b/app/views/bubbles/assignments/create.turbo_stream.erb new file mode 100644 index 000000000..67f41c898 --- /dev/null +++ b/app/views/bubbles/assignments/create.turbo_stream.erb @@ -0,0 +1 @@ +<%= turbo_stream.replace([ @bubble, :assignees ], partial: "bubbles/cards/perma/assignees", locals: { bubble: @bubble }) %> diff --git a/app/views/bubbles/assignments/new.html.erb b/app/views/bubbles/assignments/new.html.erb index 5a6695f91..e130994ae 100644 --- a/app/views/bubbles/assignments/new.html.erb +++ b/app/views/bubbles/assignments/new.html.erb @@ -2,13 +2,13 @@ Assign this to… - <%= form_with url: bubble_assignments_path(@bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> +
<% @bubble.bucket.users.active.alphabetically.each do |user| %>
- <%= bubble_assignee_checkbox(form, @bubble, user) %> - <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %> + <%= button_to user.name, bubble_assignments_path(@bubble, params: { assignee_id: user.id }), method: :post %> + <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.assignees.include?(user) %>
<% end %> - <% end %> +
<% end %> diff --git a/app/views/bubbles/cards/common/_assignees.html.erb b/app/views/bubbles/cards/common/_assignees.html.erb index 70cefba5d..5c38b8c3d 100644 --- a/app/views/bubbles/cards/common/_assignees.html.erb +++ b/app/views/bubbles/cards/common/_assignees.html.erb @@ -1,16 +1,14 @@ -<%= turbo_frame_tag bubble, :assignees do %> -
- <% bubble.assignees.each do |assignee| %> - <%= avatar_tag assignee, loading: :lazy, class: "avatar" %> - <% end %> +
+ <% bubble.assignees.each do |assignee| %> + <%= avatar_tag assignee, loading: :lazy, class: "avatar" %> + <% end %> -
- +
+ - <%= yield %> -
+ <%= yield %>
-<% end %> +
diff --git a/test/controllers/bubbles/assignments_controller_test.rb b/test/controllers/bubbles/assignments_controller_test.rb index 92583ecc4..6fd1b3e95 100644 --- a/test/controllers/bubbles/assignments_controller_test.rb +++ b/test/controllers/bubbles/assignments_controller_test.rb @@ -17,7 +17,7 @@ class Bubbles::AssignmentsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: true, to: false do - post bubble_assignments_url(bubbles(:logo)), params: { assignee_id: users(:kevin).id }, as: :turbo_stream + post bubble_assignments_url(bubbles(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream end assert_response :success end From 338ff496da66420553f178bda64316f5ea8c710a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 17:15:47 +0200 Subject: [PATCH 041/104] No system tests yet --- bin/ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ci b/bin/ci index d46727e8d..b41a93ed0 100755 --- a/bin/ci +++ b/bin/ci @@ -8,5 +8,5 @@ ActiveSupport::ContinuousIntegration.run do step "Security: JS", "bin/importmap audit" step "Style: Ruby", "bin/rubocop" step "Test: Unit", "bin/rails test" - step "Test: System", "bin/rails test:system" + # step "Test: System", "bin/rails test:system" end From 25b89ce8a9c29b09ec4d5d71065da530a4640886 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 17:18:18 +0200 Subject: [PATCH 042/104] Trailing CR --- test/controllers/my/pins_controller_test.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/controllers/my/pins_controller_test.rb b/test/controllers/my/pins_controller_test.rb index cb6b9f9c0..0ea9e7435 100644 --- a/test/controllers/my/pins_controller_test.rb +++ b/test/controllers/my/pins_controller_test.rb @@ -12,4 +12,3 @@ class My::PinsControllerTest < ActionDispatch::IntegrationTest assert_select "div", text: /#{users(:kevin).pins.first.bubble.title}/ end end - From aaa4dd2967737cf0d489a48645eeb89c314fdbd6 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 17:18:26 +0200 Subject: [PATCH 043/104] Use modern CI setup --- bin/ci | 10 ++-------- config/ci.rb | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 config/ci.rb diff --git a/bin/ci b/bin/ci index b41a93ed0..4137ad5bb 100755 --- a/bin/ci +++ b/bin/ci @@ -1,12 +1,6 @@ #!/usr/bin/env ruby - require_relative "../config/boot" require "active_support/continuous_integration" -ActiveSupport::ContinuousIntegration.run do - step "Security: Ruby", "bin/brakeman -q" - step "Security: JS", "bin/importmap audit" - step "Style: Ruby", "bin/rubocop" - step "Test: Unit", "bin/rails test" - # step "Test: System", "bin/rails test:system" -end +CI = ActiveSupport::ContinuousIntegration +require_relative "../config/ci.rb" diff --git a/config/ci.rb b/config/ci.rb new file mode 100644 index 000000000..1a22e3e33 --- /dev/null +++ b/config/ci.rb @@ -0,0 +1,19 @@ +# Run using bin/ci + +CI.run do + step "Setup", "bin/setup" + + step "Style: Ruby", "bin/rubocop" + + step "Security: Gem audit", "bin/bundler-audit check --update" + step "Security: Importmap vulnerability audit", "bin/importmap audit" + step "Security: Brakeman code analysis", "bin/brakeman --quiet --no-pager --exit-on-warn --exit-on-error" + + step "Tests: Rails", "bin/rails test" + + if success? + step "Signoff: All systems go. Ready for merge and deploy.", "gh signoff" + else + failure "Signoff: CI failed. Do not merge or deploy.", "Fix the issues and try again." + end +end From 5316a6b821d604a3776f8321e096eef886d44396 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 17:18:54 +0200 Subject: [PATCH 044/104] It is Local CI now --- .github/workflows/ci.yml | 93 ---------------------------------------- 1 file changed, 93 deletions(-) delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 05bc28d35..000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: CI - -on: - pull_request: - push: - branches: [ main ] - -env: - BUNDLE_GITHUB__COM: x-access-token:${{ secrets.GH_TOKEN }} - -jobs: - scan_ruby: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: .ruby-version - bundler-cache: true - - - name: Scan for security vulnerabilities in Ruby dependencies - run: bin/brakeman --no-pager - - scan_js: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: .ruby-version - bundler-cache: true - - - name: Scan for security vulnerabilities in JavaScript dependencies - run: bin/importmap audit - - lint: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: .ruby-version - bundler-cache: true - - - name: Lint code for consistent style - run: bin/rubocop -f github - - test: - runs-on: ubuntu-latest - - # services: - # redis: - # image: redis - # ports: - # - 6379:6379 - # options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5 - steps: - - name: Install packages - run: sudo apt-get update && sudo apt-get install --no-install-recommends -y google-chrome-stable curl libjemalloc2 libsqlite3-0 libvips - - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: .ruby-version - bundler-cache: true - - - name: Run tests - env: - RAILS_ENV: test - # REDIS_URL: redis://localhost:6379/0 - run: bin/rails db:setup test test:system - - - name: Keep screenshots from failed system tests - uses: actions/upload-artifact@v4 - if: failure() - with: - name: screenshots - path: ${{ github.workspace }}/tmp/screenshots - if-no-files-found: ignore From 537cb7680ef1695307048968f9d71dbf2a589a71 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 17:20:51 +0200 Subject: [PATCH 045/104] Add Bundler Audit for Local CI --- Gemfile | 1 + Gemfile.lock | 4 ++++ bin/bundler-audit | 7 +++++++ 3 files changed, 12 insertions(+) create mode 100755 bin/bundler-audit diff --git a/Gemfile b/Gemfile index 213822917..edb02dcf8 100644 --- a/Gemfile +++ b/Gemfile @@ -35,6 +35,7 @@ gem "rails_structured_logging", bc: "rails-structured-logging" group :development, :test do gem "debug" + gem "bundler-audit", require: false gem "brakeman", require: false gem "rubocop-rails-omakase", require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 9e079fe3f..449ed4982 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,6 +131,9 @@ GEM brakeman (7.0.0) racc builder (3.3.0) + bundler-audit (0.9.2) + bundler (>= 1.2.0, < 3) + thor (~> 1.0) capybara (3.40.0) addressable matrix @@ -418,6 +421,7 @@ DEPENDENCIES bcrypt (~> 3.1.7) bootsnap brakeman + bundler-audit capybara debug geared_pagination (~> 1.2) diff --git a/bin/bundler-audit b/bin/bundler-audit new file mode 100755 index 000000000..3cd830e53 --- /dev/null +++ b/bin/bundler-audit @@ -0,0 +1,7 @@ +#!/usr/bin/env ruby +require_relative "../config/boot" +require "bundler/audit/cli" + +ARGV.concat %w[ --config config/bundler-audit.yml ] if ARGV.empty? || ARGV.include?("check") +Bundler::Audit::CLI.start + From d2e4b0e9a369c6828f190f62ceba2e6733b0491f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Apr 2025 15:23:15 +0000 Subject: [PATCH 046/104] Bump the development-dependencies group across 1 directory with 2 updates Bumps the development-dependencies group with 2 updates in the / directory: [brakeman](https://github.com/presidentbeef/brakeman) and [selenium-webdriver](https://github.com/SeleniumHQ/selenium). Updates `brakeman` from 7.0.0 to 7.0.2 - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v7.0.0...v7.0.2) Updates `selenium-webdriver` from 4.30.1 to 4.31.0 - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES) - [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-4.31.0) --- updated-dependencies: - dependency-name: brakeman dependency-version: 7.0.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies - dependency-name: selenium-webdriver dependency-version: 4.31.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: development-dependencies ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 449ed4982..7ff9562e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,7 +128,7 @@ GEM bigdecimal (3.1.9) bootsnap (1.18.4) msgpack (~> 1.2) - brakeman (7.0.0) + brakeman (7.0.2) racc builder (3.3.0) bundler-audit (0.9.2) @@ -326,7 +326,7 @@ GEM ruby-progressbar (1.13.0) rubyzip (2.4.1) securerandom (0.4.1) - selenium-webdriver (4.30.1) + selenium-webdriver (4.31.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) From 0866eb69487df2e399a1ea29dd9a359426a51616 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 17:33:37 +0200 Subject: [PATCH 047/104] Excess CR --- bin/bundler-audit | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/bundler-audit b/bin/bundler-audit index 3cd830e53..e2ef22690 100755 --- a/bin/bundler-audit +++ b/bin/bundler-audit @@ -4,4 +4,3 @@ require "bundler/audit/cli" ARGV.concat %w[ --config config/bundler-audit.yml ] if ARGV.empty? || ARGV.include?("check") Bundler::Audit::CLI.start - From 18419c52b86d1618e4ae74b4adb4f30932b304a6 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 21:46:50 +0200 Subject: [PATCH 048/104] Latest schema --- db/schema.rb | 2 +- db/schema_cache.yml | 92 ++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 69418c7d5..d93de5dac 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -113,7 +113,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_04_133310) do t.datetime "created_at", null: false t.integer "creator_id", null: false t.date "due_on" - t.datetime "last_active_at" + t.datetime "last_active_at", null: false t.integer "stage_id" t.text "status", default: "creating", null: false t.string "title" diff --git a/db/schema_cache.yml b/db/schema_cache.yml index 6e2c00371..a0107d289 100644 --- a/db/schema_cache.yml +++ b/db/schema_cache.yml @@ -50,26 +50,6 @@ columns: default_function: collation: comment: - - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column - auto_increment: - name: involvement - cast_type: &7 !ruby/object:ActiveModel::Type::String - true: t - false: f - precision: - scale: - limit: - sql_type_metadata: &8 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata - sql_type: varchar - type: :string - limit: - precision: - scale: - 'null': false - default: watching - default_function: - collation: - comment: - &9 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: updated_at @@ -90,6 +70,26 @@ columns: default_function: collation: comment: + - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + auto_increment: + name: involvement + cast_type: &7 !ruby/object:ActiveModel::Type::String + true: t + false: f + precision: + scale: + limit: + sql_type_metadata: &8 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata + sql_type: varchar + type: :string + limit: + precision: + scale: + 'null': false + default: watching + default_function: + collation: + comment: accounts: - *5 - *6 @@ -468,16 +468,6 @@ columns: default_function: collation: comment: - - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column - auto_increment: - name: last_active_at - cast_type: *3 - sql_type_metadata: *4 - 'null': true - default: - default_function: - collation: - comment: - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: stage_id @@ -509,6 +499,16 @@ columns: collation: comment: - *9 + - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + auto_increment: + name: last_active_at + cast_type: *3 + sql_type_metadata: *4 + 'null': false + default: + default_function: + collation: + comment: buckets: - *5 - &32 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column @@ -760,7 +760,6 @@ columns: default_function: collation: comment: - - *6 - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: label @@ -771,21 +770,12 @@ columns: default_function: collation: comment: + - *6 - *9 pops: - *5 - *25 - *6 - - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column - auto_increment: - name: reason - cast_type: *7 - sql_type_metadata: *8 - 'null': false - default: - default_function: - collation: - comment: - *9 - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: @@ -797,6 +787,16 @@ columns: default_function: collation: comment: + - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + auto_increment: + name: reason + cast_type: *7 + sql_type_metadata: *8 + 'null': false + default: + default_function: + collation: + comment: reactions: - *5 - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column @@ -1354,10 +1354,11 @@ indexes: bubbles: - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: bubbles - name: index_bubbles_on_stage_id + name: index_bubbles_on_last_active_at_and_status unique: false columns: - - stage_id + - last_active_at + - status lengths: {} orders: {} opclasses: {} @@ -1370,11 +1371,10 @@ indexes: valid: true - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: bubbles - name: index_bubbles_on_last_active_at_and_status + name: index_bubbles_on_stage_id unique: false columns: - - last_active_at - - status + - stage_id lengths: {} orders: {} opclasses: {} From 540316e639e9fef957c76be28d14fa4c01e39d95 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 21:54:48 +0200 Subject: [PATCH 049/104] Move taggings under bubbles --- app/controllers/{ => bubbles}/taggings_controller.rb | 2 +- app/views/bubbles/_tagging.html.erb | 4 ++-- app/views/bubbles/cards/perma/_tags.html.erb | 2 +- config/routes.rb | 3 +-- .../controllers/{ => bubbles}/taggings_controller_test.rb | 8 ++++---- 5 files changed, 9 insertions(+), 10 deletions(-) rename app/controllers/{ => bubbles}/taggings_controller.rb (94%) rename test/controllers/{ => bubbles}/taggings_controller_test.rb (55%) diff --git a/app/controllers/taggings_controller.rb b/app/controllers/bubbles/taggings_controller.rb similarity index 94% rename from app/controllers/taggings_controller.rb rename to app/controllers/bubbles/taggings_controller.rb index e35db0b2f..4672898af 100644 --- a/app/controllers/taggings_controller.rb +++ b/app/controllers/bubbles/taggings_controller.rb @@ -1,4 +1,4 @@ -class TaggingsController < ApplicationController +class Bubbles::TaggingsController < ApplicationController include BubbleScoped def new diff --git a/app/views/bubbles/_tagging.html.erb b/app/views/bubbles/_tagging.html.erb index 466f46121..b76c4bd3e 100644 --- a/app/views/bubbles/_tagging.html.erb +++ b/app/views/bubbles/_tagging.html.erb @@ -3,7 +3,7 @@ Tag this… - <%= form_with url: bucket_bubble_taggings_path(bubble.bucket, bubble), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %> + <%= form_with url: bubble_taggings_path(bubble), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %> <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width" %> <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %> <%= icon_tag "add" %> @@ -11,7 +11,7 @@ <% end %> <% end %> - <%= form_with url: bucket_bubble_taggings_path(bubble.bucket, bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> + <%= form_with url: bubble_taggings_path(bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> <% tags.sort_by { |tag| tag.hashtag.downcase }.each do |tag| %>
<%= form.check_box "tag_id[]", { diff --git a/app/views/bubbles/cards/perma/_tags.html.erb b/app/views/bubbles/cards/perma/_tags.html.erb index a1f6ed044..1114ec300 100644 --- a/app/views/bubbles/cards/perma/_tags.html.erb +++ b/app/views/bubbles/cards/perma/_tags.html.erb @@ -18,7 +18,7 @@ Add a tag - <%= turbo_frame_tag bubble, :tagging, src: new_bucket_bubble_tagging_path(bubble.bucket, bubble) %> + <%= turbo_frame_tag bubble, :tagging, src: new_bubble_tagging_path(bubble) %>
<% end %> diff --git a/config/routes.rb b/config/routes.rb index 5157ce9a2..e890920b5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,6 +21,7 @@ Rails.application.routes.draw do scope module: :bubbles do resource :pin resources :assignments + resources :taggings end end @@ -61,8 +62,6 @@ Rails.application.routes.draw do resources :stagings resource :watch end - - resources :taggings end end diff --git a/test/controllers/taggings_controller_test.rb b/test/controllers/bubbles/taggings_controller_test.rb similarity index 55% rename from test/controllers/taggings_controller_test.rb rename to test/controllers/bubbles/taggings_controller_test.rb index 547a137be..34a666fa3 100644 --- a/test/controllers/taggings_controller_test.rb +++ b/test/controllers/bubbles/taggings_controller_test.rb @@ -1,24 +1,24 @@ require "test_helper" -class TaggingsControllerTest < ActionDispatch::IntegrationTest +class Bubbles::TaggingsControllerTest < ActionDispatch::IntegrationTest setup do sign_in_as :kevin end test "new" do - get new_bucket_bubble_tagging_url(buckets(:writebook), bubbles(:logo)) + get new_bubble_tagging_url(bubbles(:logo)) assert_response :success end test "create" do assert_changes "bubbles(:logo).tagged_with?(tags(:mobile))", from: false, to: true do - post bucket_bubble_taggings_url(buckets(:writebook), bubbles(:logo)), params: { tag_id: tags(:mobile).id }, as: :turbo_stream + post bubble_taggings_url(bubbles(:logo)), params: { tag_id: tags(:mobile).id }, as: :turbo_stream end assert_response :success assert_changes "bubbles(:logo).tagged_with?(tags(:web))", from: false, to: true do assert_changes "bubbles(:logo).tagged_with?(tags(:mobile))", from: true, to: false do - post bucket_bubble_taggings_url(buckets(:writebook), bubbles(:logo)), params: { tag_id: tags(:web).id }, as: :turbo_stream + post bubble_taggings_url(bubbles(:logo)), params: { tag_id: tags(:web).id }, as: :turbo_stream end end assert_response :success From ee22e69e6e6a1c9540d8bce0da19202069318116 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 5 Apr 2025 22:19:12 +0200 Subject: [PATCH 050/104] Move taggings to bubbles --- .../bubbles/taggings_controller.rb | 33 ++++--------------- app/models/bubble/taggable.rb | 19 +++++++---- app/models/tag.rb | 2 ++ app/views/bubbles/_tagging.html.erb | 31 ----------------- .../bubbles/taggings/create.turbo_stream.erb | 1 + app/views/bubbles/taggings/new.html.erb | 24 ++++++++++++++ test/models/bubble_test.rb | 12 +++---- 7 files changed, 52 insertions(+), 70 deletions(-) delete mode 100644 app/views/bubbles/_tagging.html.erb create mode 100644 app/views/bubbles/taggings/create.turbo_stream.erb create mode 100644 app/views/bubbles/taggings/new.html.erb diff --git a/app/controllers/bubbles/taggings_controller.rb b/app/controllers/bubbles/taggings_controller.rb index 4672898af..5dc971773 100644 --- a/app/controllers/bubbles/taggings_controller.rb +++ b/app/controllers/bubbles/taggings_controller.rb @@ -2,34 +2,15 @@ class Bubbles::TaggingsController < ApplicationController include BubbleScoped def new - render partial: "bubbles/tagging", locals: { bubble: @bubble, tags: Current.account.tags } + @tags = Current.account.tags.alphabetically end def create - if params[:tag_title].present? - sanitized_title = params[:tag_title].strip.gsub(/\A#/, "") - tag = Current.account.tags.find_or_create_by!(title: sanitized_title) - @bubble.toggle_tag(tag) - else - new_tag_ids = Array(params[:tag_id]) - current_tags = @bubble.tags - - current_tags.each do |tag| - @bubble.toggle_tag(tag) unless new_tag_ids.include?(tag.id.to_s) - end - - new_tag_ids.each do |id| - tag = Current.account.tags.find(id) - @bubble.toggle_tag(tag) unless current_tags.include?(tag) - end - end - - @bubble.tags.reload - - respond_to do |format| - format.turbo_stream do - render turbo_stream: turbo_stream.replace([ @bubble, :tags ], partial: "bubbles/cards/perma/tags", locals: { bubble: @bubble }) - end - end + @bubble.toggle_tag(tag_title_param) end + + private + def tag_title_param + params.required(:tag_title).strip.gsub(/\A#/, "") + end end diff --git a/app/models/bubble/taggable.rb b/app/models/bubble/taggable.rb index 6b6462e9b..14a762407 100644 --- a/app/models/bubble/taggable.rb +++ b/app/models/bubble/taggable.rb @@ -8,8 +8,11 @@ module Bubble::Taggable scope :tagged_with, ->(tags) { joins(:taggings).where(taggings: { tag: tags }) } end - def toggle_tag(tag) - tagged_with?(tag) ? untag(tag) : tag(tag) + def toggle_tag(title) + transaction do + tag = find_or_create_tag_with_title(title) + tagged_with?(tag) ? untag_with(tag) : tag_with(tag) + end end def tagged_with?(tag) @@ -17,13 +20,15 @@ module Bubble::Taggable end private - def tag(tag) - taggings.create! tag: tag - rescue ActiveRecord::RecordNotUnique - # Already tagged + def find_or_create_tag_with_title(title) + bucket.account.tags.find_or_create_by!(title: title) end - def untag(tag) + def tag_with(tag) + taggings.create tag: tag + end + + def untag_with(tag) taggings.destroy_by tag: tag end end diff --git a/app/models/tag.rb b/app/models/tag.rb index 51e27c30f..742dfcfea 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -8,6 +8,8 @@ class Tag < ApplicationRecord validates :title, format: { without: /\A#/ } + scope :alphabetically, -> { order("lower(title)") } + def hashtag "#" + title end diff --git a/app/views/bubbles/_tagging.html.erb b/app/views/bubbles/_tagging.html.erb deleted file mode 100644 index b76c4bd3e..000000000 --- a/app/views/bubbles/_tagging.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -<% cache [ bubble, Current.account ] do %> - <%= turbo_frame_tag bubble, :tagging do %> - - Tag this… - - <%= form_with url: bubble_taggings_path(bubble), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %> - <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width" %> - <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %> - <%= icon_tag "add" %> - Add a tag - <% end %> - <% end %> - - <%= form_with url: bubble_taggings_path(bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %> - <% tags.sort_by { |tag| tag.hashtag.downcase }.each do |tag| %> -
- <%= form.check_box "tag_id[]", { - checked: bubble.tagged_with?(tag), - data: { action: "change->form#submit" }, - id: dom_id(tag, :tag), - include_hidden: false, - }, tag.id %> - - <%= form.label "tag_id[]", tag.hashtag, for: dom_id(tag, :tag), class: "overflow-ellipsis" %> - <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" %> -
- <% end %> - <% end %> - - <% end %> -<% end %> diff --git a/app/views/bubbles/taggings/create.turbo_stream.erb b/app/views/bubbles/taggings/create.turbo_stream.erb new file mode 100644 index 000000000..b261c7f0b --- /dev/null +++ b/app/views/bubbles/taggings/create.turbo_stream.erb @@ -0,0 +1 @@ +<%= turbo_stream.replace([ @bubble, :tags ], partial: "bubbles/cards/perma/tags", locals: { bubble: @bubble }) %> diff --git a/app/views/bubbles/taggings/new.html.erb b/app/views/bubbles/taggings/new.html.erb new file mode 100644 index 000000000..c6272f9b3 --- /dev/null +++ b/app/views/bubbles/taggings/new.html.erb @@ -0,0 +1,24 @@ +<% cache [ @bubble, Current.account ] do %> + <%= turbo_frame_tag @bubble, :tagging do %> + + Tag this… + + <%= form_with url: bubble_taggings_path(@bubble), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %> + <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width" %> + <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %> + <%= icon_tag "add" %> + Add a tag + <% end %> + <% end %> + +
+ <% @tags.each do |tag| %> +
+ <%= button_to tag.hashtag, bubble_taggings_path(@bubble, params: { tag_title: tag.title }), method: :post %> + <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.tagged_with?(tag) %> +
+ <% end %> +
+ + <% end %> +<% end %> diff --git a/test/models/bubble_test.rb b/test/models/bubble_test.rb index 6aed88b09..40473a3c4 100644 --- a/test/models/bubble_test.rb +++ b/test/models/bubble_test.rb @@ -50,20 +50,20 @@ class BubbleTest < ActiveSupport::TestCase end test "tag toggling" do - assert bubbles(:logo).tagged_with?(tags(:web)) + assert bubbles(:logo).tagged_with?(tags(:web).title) assert_difference "bubbles(:logo).taggings.count", -1 do - bubbles(:logo).toggle_tag tags(:web) + bubbles(:logo).toggle_tag tags(:web).title end - assert_not bubbles(:logo).tagged_with?(tags(:web)) + assert_not bubbles(:logo).tagged_with?(tags(:web).title) assert_difference "bubbles(:logo).taggings.count", +1 do - bubbles(:logo).toggle_tag tags(:web) + bubbles(:logo).toggle_tag tags(:web).title end - assert bubbles(:logo).tagged_with?(tags(:web)) + assert bubbles(:logo).tagged_with?(tags(:web).title) assert_difference %w[ bubbles(:logo).taggings.count accounts("37s").tags.count ], +1 do - bubbles(:logo).toggle_tag Tag.new(title: "prioritized") + bubbles(:logo).toggle_tag "prioritized" end assert_equal "prioritized", bubbles(:logo).taggings.last.tag.title end From cdd78b41eede8a2009d31f85f1f48600f2d9a1b2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 13:19:22 +0200 Subject: [PATCH 051/104] Tag exclusively by title --- app/models/bubble/taggable.rb | 14 +++++++++----- .../bubbles/taggings_controller_test.rb | 14 +++++++------- test/models/bubble_test.rb | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/models/bubble/taggable.rb b/app/models/bubble/taggable.rb index 14a762407..9edf66708 100644 --- a/app/models/bubble/taggable.rb +++ b/app/models/bubble/taggable.rb @@ -11,12 +11,12 @@ module Bubble::Taggable def toggle_tag(title) transaction do tag = find_or_create_tag_with_title(title) - tagged_with?(tag) ? untag_with(tag) : tag_with(tag) + tagged_with?(title) ? untagging(tag) : tagging(tag) end end - def tagged_with?(tag) - tags.include? tag + def tagged_with?(title) + tags.exists?(title: title) end private @@ -24,11 +24,15 @@ module Bubble::Taggable bucket.account.tags.find_or_create_by!(title: title) end - def tag_with(tag) + def find_tag_by_title(title) + bucket.account.tags.find_by(title: title) + end + + def tagging(tag) taggings.create tag: tag end - def untag_with(tag) + def untagging(tag) taggings.destroy_by tag: tag end end diff --git a/test/controllers/bubbles/taggings_controller_test.rb b/test/controllers/bubbles/taggings_controller_test.rb index 34a666fa3..2f52c4e1b 100644 --- a/test/controllers/bubbles/taggings_controller_test.rb +++ b/test/controllers/bubbles/taggings_controller_test.rb @@ -10,16 +10,16 @@ class Bubbles::TaggingsControllerTest < ActionDispatch::IntegrationTest assert_response :success end - test "create" do - assert_changes "bubbles(:logo).tagged_with?(tags(:mobile))", from: false, to: true do - post bubble_taggings_url(bubbles(:logo)), params: { tag_id: tags(:mobile).id }, as: :turbo_stream + test "toggle tag on" do + assert_changes "bubbles(:logo).tagged_with?(tags(:mobile).title)", from: false, to: true do + post bubble_taggings_url(bubbles(:logo)), params: { tag_title: tags(:mobile).title }, as: :turbo_stream end assert_response :success + end - assert_changes "bubbles(:logo).tagged_with?(tags(:web))", from: false, to: true do - assert_changes "bubbles(:logo).tagged_with?(tags(:mobile))", from: true, to: false do - post bubble_taggings_url(bubbles(:logo)), params: { tag_id: tags(:web).id }, as: :turbo_stream - end + test "toggle tag off" do + assert_changes "bubbles(:logo).tagged_with?(tags(:web).title)", from: true, to: false do + post bubble_taggings_url(bubbles(:logo)), params: { tag_title: tags(:web).title }, as: :turbo_stream end assert_response :success end diff --git a/test/models/bubble_test.rb b/test/models/bubble_test.rb index 40473a3c4..27a42e846 100644 --- a/test/models/bubble_test.rb +++ b/test/models/bubble_test.rb @@ -45,8 +45,8 @@ class BubbleTest < ActiveSupport::TestCase end test "tagged states" do - assert bubbles(:logo).tagged_with?(tags(:web)) - assert_not bubbles(:logo).tagged_with?(tags(:mobile)) + assert bubbles(:logo).tagged_with?(tags(:web).title) + assert_not bubbles(:logo).tagged_with?(tags(:mobile).title) end test "tag toggling" do From a58fcd31239da089c98f68db705a2dc68acf7de0 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 13:26:10 +0200 Subject: [PATCH 052/104] Nicer API --- app/models/bubble/taggable.rb | 14 +++++--------- app/views/bubbles/tags/_listbox_option.html.erb | 5 +---- .../bubbles/taggings_controller_test.rb | 4 ++-- test/models/bubble_test.rb | 10 +++++----- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/app/models/bubble/taggable.rb b/app/models/bubble/taggable.rb index 9edf66708..91e039ccb 100644 --- a/app/models/bubble/taggable.rb +++ b/app/models/bubble/taggable.rb @@ -10,24 +10,20 @@ module Bubble::Taggable def toggle_tag(title) transaction do - tag = find_or_create_tag_with_title(title) - tagged_with?(title) ? untagging(tag) : tagging(tag) + tag = find_or_create_tag_by_title(title) + tagged_with?(tag) ? untagging(tag) : tagging(tag) end end - def tagged_with?(title) - tags.exists?(title: title) + def tagged_with?(tag) + tags.include?(tag) end private - def find_or_create_tag_with_title(title) + def find_or_create_tag_by_title(title) bucket.account.tags.find_or_create_by!(title: title) end - def find_tag_by_title(title) - bucket.account.tags.find_by(title: title) - end - def tagging(tag) taggings.create tag: tag end diff --git a/app/views/bubbles/tags/_listbox_option.html.erb b/app/views/bubbles/tags/_listbox_option.html.erb index cea797bf3..712b94022 100644 --- a/app/views/bubbles/tags/_listbox_option.html.erb +++ b/app/views/bubbles/tags/_listbox_option.html.erb @@ -1,7 +1,4 @@
<%= tag.hashtag %> - - <% if bubble.tagged_with?(tag) %> - <%= icon_tag "check" %> - <% end %> + <%= icon_tag "check" if bubble.tagged_with?(tag) %>
diff --git a/test/controllers/bubbles/taggings_controller_test.rb b/test/controllers/bubbles/taggings_controller_test.rb index 2f52c4e1b..2f12b18b4 100644 --- a/test/controllers/bubbles/taggings_controller_test.rb +++ b/test/controllers/bubbles/taggings_controller_test.rb @@ -11,14 +11,14 @@ class Bubbles::TaggingsControllerTest < ActionDispatch::IntegrationTest end test "toggle tag on" do - assert_changes "bubbles(:logo).tagged_with?(tags(:mobile).title)", from: false, to: true do + assert_changes "bubbles(:logo).tagged_with?(tags(:mobile))", from: false, to: true do post bubble_taggings_url(bubbles(:logo)), params: { tag_title: tags(:mobile).title }, as: :turbo_stream end assert_response :success end test "toggle tag off" do - assert_changes "bubbles(:logo).tagged_with?(tags(:web).title)", from: true, to: false do + assert_changes "bubbles(:logo).tagged_with?(tags(:web))", from: true, to: false do post bubble_taggings_url(bubbles(:logo)), params: { tag_title: tags(:web).title }, as: :turbo_stream end assert_response :success diff --git a/test/models/bubble_test.rb b/test/models/bubble_test.rb index 27a42e846..63f6a0753 100644 --- a/test/models/bubble_test.rb +++ b/test/models/bubble_test.rb @@ -45,22 +45,22 @@ class BubbleTest < ActiveSupport::TestCase end test "tagged states" do - assert bubbles(:logo).tagged_with?(tags(:web).title) - assert_not bubbles(:logo).tagged_with?(tags(:mobile).title) + assert bubbles(:logo).tagged_with?(tags(:web)) + assert_not bubbles(:logo).tagged_with?(tags(:mobile)) end test "tag toggling" do - assert bubbles(:logo).tagged_with?(tags(:web).title) + assert bubbles(:logo).tagged_with?(tags(:web)) assert_difference "bubbles(:logo).taggings.count", -1 do bubbles(:logo).toggle_tag tags(:web).title end - assert_not bubbles(:logo).tagged_with?(tags(:web).title) + assert_not bubbles(:logo).tagged_with?(tags(:web)) assert_difference "bubbles(:logo).taggings.count", +1 do bubbles(:logo).toggle_tag tags(:web).title end - assert bubbles(:logo).tagged_with?(tags(:web).title) + assert bubbles(:logo).tagged_with?(tags(:web)) assert_difference %w[ bubbles(:logo).taggings.count accounts("37s").tags.count ], +1 do bubbles(:logo).toggle_tag "prioritized" From 5e78a1dab19a5cb6ba0adc129293021a09325705 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 13:28:52 +0200 Subject: [PATCH 053/104] Make it clearer that this takes a title string not a tag object --- app/controllers/bubbles/taggings_controller.rb | 2 +- app/models/bubble/taggable.rb | 2 +- test/models/bubble_test.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/bubbles/taggings_controller.rb b/app/controllers/bubbles/taggings_controller.rb index 5dc971773..b6fb96df0 100644 --- a/app/controllers/bubbles/taggings_controller.rb +++ b/app/controllers/bubbles/taggings_controller.rb @@ -6,7 +6,7 @@ class Bubbles::TaggingsController < ApplicationController end def create - @bubble.toggle_tag(tag_title_param) + @bubble.toggle_tag_with(tag_title_param) end private diff --git a/app/models/bubble/taggable.rb b/app/models/bubble/taggable.rb index 91e039ccb..09ab1436b 100644 --- a/app/models/bubble/taggable.rb +++ b/app/models/bubble/taggable.rb @@ -8,7 +8,7 @@ module Bubble::Taggable scope :tagged_with, ->(tags) { joins(:taggings).where(taggings: { tag: tags }) } end - def toggle_tag(title) + def toggle_tag_with(title) transaction do tag = find_or_create_tag_by_title(title) tagged_with?(tag) ? untagging(tag) : tagging(tag) diff --git a/test/models/bubble_test.rb b/test/models/bubble_test.rb index 63f6a0753..80d8b2978 100644 --- a/test/models/bubble_test.rb +++ b/test/models/bubble_test.rb @@ -53,17 +53,17 @@ class BubbleTest < ActiveSupport::TestCase assert bubbles(:logo).tagged_with?(tags(:web)) assert_difference "bubbles(:logo).taggings.count", -1 do - bubbles(:logo).toggle_tag tags(:web).title + bubbles(:logo).toggle_tag_with tags(:web).title end assert_not bubbles(:logo).tagged_with?(tags(:web)) assert_difference "bubbles(:logo).taggings.count", +1 do - bubbles(:logo).toggle_tag tags(:web).title + bubbles(:logo).toggle_tag_with tags(:web).title end assert bubbles(:logo).tagged_with?(tags(:web)) assert_difference %w[ bubbles(:logo).taggings.count accounts("37s").tags.count ], +1 do - bubbles(:logo).toggle_tag "prioritized" + bubbles(:logo).toggle_tag_with "prioritized" end assert_equal "prioritized", bubbles(:logo).taggings.last.tag.title end From b8bcfdee407e3dfcc584cdbf9f04f36083973799 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 13:29:43 +0200 Subject: [PATCH 054/104] This is not just param extraction, we sanitize too --- app/controllers/bubbles/taggings_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/bubbles/taggings_controller.rb b/app/controllers/bubbles/taggings_controller.rb index b6fb96df0..44a1a1a71 100644 --- a/app/controllers/bubbles/taggings_controller.rb +++ b/app/controllers/bubbles/taggings_controller.rb @@ -6,11 +6,11 @@ class Bubbles::TaggingsController < ApplicationController end def create - @bubble.toggle_tag_with(tag_title_param) + @bubble.toggle_tag_with(sanitized_tag_title_param) end private - def tag_title_param + def sanitized_tag_title_param params.required(:tag_title).strip.gsub(/\A#/, "") end end From eb047aec4d6624499d2173928f2e9c515c0465c1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 13:30:20 +0200 Subject: [PATCH 055/104] Neater --- app/models/bubble/taggable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/bubble/taggable.rb b/app/models/bubble/taggable.rb index 09ab1436b..113b5ab93 100644 --- a/app/models/bubble/taggable.rb +++ b/app/models/bubble/taggable.rb @@ -16,7 +16,7 @@ module Bubble::Taggable end def tagged_with?(tag) - tags.include?(tag) + tags.include? tag end private From 7900c475e9e16b5e0b2205c40c0ded45171225c1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 13:32:30 +0200 Subject: [PATCH 056/104] This is going to churn too much Depends directly on the Current.account. If we need something like this, we need a much more narrow key. --- app/views/bubbles/taggings/new.html.erb | 38 ++++++++++++------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/app/views/bubbles/taggings/new.html.erb b/app/views/bubbles/taggings/new.html.erb index c6272f9b3..28ba578f7 100644 --- a/app/views/bubbles/taggings/new.html.erb +++ b/app/views/bubbles/taggings/new.html.erb @@ -1,24 +1,22 @@ -<% cache [ @bubble, Current.account ] do %> - <%= turbo_frame_tag @bubble, :tagging do %> - - Tag this… +<%= turbo_frame_tag @bubble, :tagging do %> + + Tag this… - <%= form_with url: bubble_taggings_path(@bubble), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %> - <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width" %> - <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %> - <%= icon_tag "add" %> - Add a tag - <% end %> + <%= form_with url: bubble_taggings_path(@bubble), class: "flex gap-half align-center full-width pad-inline-half margin-block-end" do |form| %> + <%= form.text_field :tag_title, placeholder: "New tag name...", class: "input txt-small full-width" %> + <%= form.button "Add a tag…", type: "submit", class: "btn txt-small" do %> + <%= icon_tag "add" %> + Add a tag <% end %> + <% end %> -
- <% @tags.each do |tag| %> -
- <%= button_to tag.hashtag, bubble_taggings_path(@bubble, params: { tag_title: tag.title }), method: :post %> - <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.tagged_with?(tag) %> -
- <% end %> -
- - <% end %> +
+ <% @tags.each do |tag| %> +
+ <%= button_to tag.hashtag, bubble_taggings_path(@bubble, params: { tag_title: tag.title }), method: :post %> + <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.tagged_with?(tag) %> +
+ <% end %> +
+ <% end %> From 7fe87bfce55c1c0947cd77f0a5504c847c037a19 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 13:47:27 +0200 Subject: [PATCH 057/104] This neednt be a turbo frame Just because we are targeting something with a stream update does not mean it needs to be a frame. The frame is only necessary when there is lazy loading or we are creating a closed update loop. --- app/views/bubbles/cards/perma/_tags.html.erb | 42 ++++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/app/views/bubbles/cards/perma/_tags.html.erb b/app/views/bubbles/cards/perma/_tags.html.erb index 1114ec300..3f670a61f 100644 --- a/app/views/bubbles/cards/perma/_tags.html.erb +++ b/app/views/bubbles/cards/perma/_tags.html.erb @@ -1,24 +1,22 @@ -<%= turbo_frame_tag bubble, :tags do %> -
-
- <% if bubble.tags.any? || bubble.creating? %> - # - <% bubble.tags.each_with_index do |tag, index| %> - <%= link_to bubbles_path(bucket_ids: [ bubble.bucket ], tag_ids: [ tag.id ]), - class: "card__tag btn btn--plain min-width txt-uppercase fill-transparent", data: { turbo_frame: "_top" } do %> - <%= tag.title %> - <% end %><%= ", " unless index == bubble.tags.size - 1 %> - <% end %> +
+
+ <% if bubble.tags.any? || bubble.creating? %> + # + <% bubble.tags.each_with_index do |tag, index| %> + <%= link_to bubbles_path(bucket_ids: [ bubble.bucket ], tag_ids: [ tag.id ]), + class: "card__tag btn btn--plain min-width txt-uppercase fill-transparent", data: { turbo_frame: "_top" } do %> + <%= tag.title %> + <% end %><%= ", " unless index == bubble.tags.size - 1 %> + <% end %> <% end %> -
- -
- - - <%= turbo_frame_tag bubble, :tagging, src: new_bubble_tagging_path(bubble) %> -
-<% end %> + +
+ + + <%= turbo_frame_tag bubble, :tagging, src: new_bubble_tagging_path(bubble) %> +
+
From 084c4d89481376acaf3108e661fb22d3bab4c2d3 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 13:50:15 +0200 Subject: [PATCH 058/104] Spacing and indention --- app/views/bubbles/cards/_mini.html.erb | 2 ++ app/views/bubbles/cards/_perma.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/bubbles/cards/_mini.html.erb b/app/views/bubbles/cards/_mini.html.erb index 234326793..f90fd167d 100644 --- a/app/views/bubbles/cards/_mini.html.erb +++ b/app/views/bubbles/cards/_mini.html.erb @@ -5,9 +5,11 @@

<%= bubble_title(bubble) %>

+
<%= "Added to #{bubble.bucket.name} by #{bubble.creator.name}" %> <%= local_datetime_tag(bubble.created_at, style: :daysAgo) %>
+
<%= render "bubbles/cards/mini/assignees", bubble: bubble %>
<%= render "bubbles/cards/mini/tags", bubble: bubble %>
diff --git a/app/views/bubbles/cards/_perma.html.erb b/app/views/bubbles/cards/_perma.html.erb index 996eeab03..85c338679 100644 --- a/app/views/bubbles/cards/_perma.html.erb +++ b/app/views/bubbles/cards/_perma.html.erb @@ -1,7 +1,7 @@ <% cache [bubble] do %>
+ style="--bubble-color: <%= bubble.color %>; view-transition-name: <%= dom_id(bubble, :ticket) %>;" + id="<%= dom_id(bubble, :ticket) %>">
<%= link_to bubble.bucket.name, bubbles_path(bucket_ids: [bubble.bucket]), class: "card__bucket txt-uppercase overflow-ellipsis txt-reversed" %> From cc0c88d999155770d54eeee1a184bdfd3df31cba Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 18:15:13 +0200 Subject: [PATCH 059/104] Remove anemic finder --- app/models/bubble/taggable.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/models/bubble/taggable.rb b/app/models/bubble/taggable.rb index 113b5ab93..55b70c076 100644 --- a/app/models/bubble/taggable.rb +++ b/app/models/bubble/taggable.rb @@ -9,10 +9,8 @@ module Bubble::Taggable end def toggle_tag_with(title) - transaction do - tag = find_or_create_tag_by_title(title) - tagged_with?(tag) ? untagging(tag) : tagging(tag) - end + tag = bucket.account.tags.find_or_create_by!(title: title) + transaction { tagged_with?(tag) ? untagging(tag) : tagging(tag) } end def tagged_with?(tag) @@ -20,10 +18,6 @@ module Bubble::Taggable end private - def find_or_create_tag_by_title(title) - bucket.account.tags.find_or_create_by!(title: title) - end - def tagging(tag) taggings.create tag: tag end From 21211cedcaff9f4d6a67da241d1bf1fac1530c42 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 18:16:47 +0200 Subject: [PATCH 060/104] These really are anemic too --- app/models/bubble/taggable.rb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/app/models/bubble/taggable.rb b/app/models/bubble/taggable.rb index 55b70c076..72b362976 100644 --- a/app/models/bubble/taggable.rb +++ b/app/models/bubble/taggable.rb @@ -10,19 +10,10 @@ module Bubble::Taggable def toggle_tag_with(title) tag = bucket.account.tags.find_or_create_by!(title: title) - transaction { tagged_with?(tag) ? untagging(tag) : tagging(tag) } + transaction { tagged_with?(tag) ? taggings.destroy_by(tag:) : taggings.create(tag:) } end def tagged_with?(tag) tags.include? tag end - - private - def tagging(tag) - taggings.create tag: tag - end - - def untagging(tag) - taggings.destroy_by tag: tag - end end From 78c82584cf4b56bd9ffa2d9b52f99906a0b89302 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 18:45:58 +0200 Subject: [PATCH 061/104] Reads nicer now that we are using long form operations --- app/models/bubble/taggable.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/models/bubble/taggable.rb b/app/models/bubble/taggable.rb index 72b362976..7fa4dee07 100644 --- a/app/models/bubble/taggable.rb +++ b/app/models/bubble/taggable.rb @@ -10,7 +10,14 @@ module Bubble::Taggable def toggle_tag_with(title) tag = bucket.account.tags.find_or_create_by!(title: title) - transaction { tagged_with?(tag) ? taggings.destroy_by(tag:) : taggings.create(tag:) } + + transaction do + if tagged_with?(tag) + taggings.destroy_by tag: tag + else + taggings.create tag: tag + end + end end def tagged_with?(tag) From 95cd60b9195798a9d6ac81211dde35c00dd279b2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 18:49:19 +0200 Subject: [PATCH 062/104] Style --- app/controllers/bubbles/taggings_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/bubbles/taggings_controller.rb b/app/controllers/bubbles/taggings_controller.rb index 44a1a1a71..156705a98 100644 --- a/app/controllers/bubbles/taggings_controller.rb +++ b/app/controllers/bubbles/taggings_controller.rb @@ -6,7 +6,7 @@ class Bubbles::TaggingsController < ApplicationController end def create - @bubble.toggle_tag_with(sanitized_tag_title_param) + @bubble.toggle_tag_with sanitized_tag_title_param end private From 9e1eba6bfb0470185c9d136a18278b736636a478 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 6 Apr 2025 13:13:16 -0400 Subject: [PATCH 063/104] Enable Active Record load_async Use of load_async was introduced in 49ef811d, but the feature has not been enabled until this change. --- config/application.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/application.rb b/config/application.rb index ae36b65d4..765a43731 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,5 +23,8 @@ module Fizzy # # config.time_zone = "Central Time (US & Canada)" # config.eager_load_paths << Rails.root.join("extras") + + # enable load_async + config.active_record.async_query_executor = :global_thread_pool end end From 352ba6e05e50baeb586bfd94a56a5ad2c11fb70f Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 18:52:34 +0200 Subject: [PATCH 064/104] No longer need the turbo frame designation as this isnt wrapped in a frame --- app/views/bubbles/cards/perma/_tags.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/bubbles/cards/perma/_tags.html.erb b/app/views/bubbles/cards/perma/_tags.html.erb index 3f670a61f..1f51d64db 100644 --- a/app/views/bubbles/cards/perma/_tags.html.erb +++ b/app/views/bubbles/cards/perma/_tags.html.erb @@ -4,7 +4,7 @@ # <% bubble.tags.each_with_index do |tag, index| %> <%= link_to bubbles_path(bucket_ids: [ bubble.bucket ], tag_ids: [ tag.id ]), - class: "card__tag btn btn--plain min-width txt-uppercase fill-transparent", data: { turbo_frame: "_top" } do %> + class: "card__tag btn btn--plain min-width txt-uppercase fill-transparent" do %> <%= tag.title %> <% end %><%= ", " unless index == bubble.tags.size - 1 %> <% end %> From eb0614c44f0e447d7a4ef0e68658d467783f3a26 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 19:17:24 +0200 Subject: [PATCH 065/104] Use a more ergonomic API for watching Passing a boolean vs using explicit on/off methods feel too low level and doesnt read right in most of these cases. --- app/controllers/bubbles/watches_controller.rb | 12 ++++-------- app/models/bubble/assignable.rb | 2 +- app/models/bubble/commentable.rb | 2 +- app/models/bubble/watchable.rb | 15 +++++++-------- .../bubbles/watches_controller_test.rb | 4 ++-- test/models/bubble/assignable_test.rb | 2 +- test/models/bubble/watchable_test.rb | 12 ++++++------ 7 files changed, 22 insertions(+), 27 deletions(-) diff --git a/app/controllers/bubbles/watches_controller.rb b/app/controllers/bubbles/watches_controller.rb index 221f51405..641564889 100644 --- a/app/controllers/bubbles/watches_controller.rb +++ b/app/controllers/bubbles/watches_controller.rb @@ -2,16 +2,12 @@ class Bubbles::WatchesController < ApplicationController include BubbleScoped def create - set_watching_and_redirect(true) + @bubble.watch_by Current.user + redirect_to bucket_bubble_watch_path(@bucket, @bubble) end def destroy - set_watching_and_redirect(false) + @bubble.unwatch_by Current.user + redirect_to bucket_bubble_watch_path(@bucket, @bubble) end - - private - def set_watching_and_redirect(watching) - @bubble.set_watching(Current.user, watching) - redirect_to bucket_bubble_watch_path(@bucket, @bubble) - end end diff --git a/app/models/bubble/assignable.rb b/app/models/bubble/assignable.rb index 98ea3d8ea..c0dd36ff4 100644 --- a/app/models/bubble/assignable.rb +++ b/app/models/bubble/assignable.rb @@ -21,7 +21,7 @@ module Bubble::Assignable private def assign(user) assignments.create! assignee: user, assigner: Current.user - set_watching(user, true) + watch_by user track_event :assigned, assignee_ids: [ user.id ] rescue ActiveRecord::RecordNotUnique diff --git a/app/models/bubble/commentable.rb b/app/models/bubble/commentable.rb index 5b8f630f5..ab1c72a74 100644 --- a/app/models/bubble/commentable.rb +++ b/app/models/bubble/commentable.rb @@ -7,7 +7,7 @@ module Bubble::Commentable def comment_created(comment) increment! :comments_count - set_watching comment.creator, true + watch_by comment.creator track_event :commented, comment_id: comment.id rescore diff --git a/app/models/bubble/watchable.rb b/app/models/bubble/watchable.rb index 8ad47554d..bc4a82ccf 100644 --- a/app/models/bubble/watchable.rb +++ b/app/models/bubble/watchable.rb @@ -5,15 +5,19 @@ module Bubble::Watchable has_many :watches, dependent: :destroy has_many :watchers, -> { merge(Watch.watching) }, through: :watches, source: :user - after_create :set_watching_for_creator + after_create -> { watch_by creator } end def watched_by?(user) watchers_and_subscribers(include_only_watching: true).include?(user) end - def set_watching(user, watching) - watches.where(user: user).first_or_create.update!(watching: watching) + def watch_by(user) + watches.where(user: user).first_or_create.update!(watching: true) + end + + def unwatch_by(user) + watches.where(user: user).first_or_create.update!(watching: false) end def watchers_and_subscribers(include_only_watching: false) @@ -23,9 +27,4 @@ module Bubble::Watchable User.where(id: subscribers.pluck(:id) + watches.watching.pluck(:user_id) - watches.not_watching.pluck(:user_id)) end - - private - def set_watching_for_creator - set_watching(creator, true) - end end diff --git a/test/controllers/bubbles/watches_controller_test.rb b/test/controllers/bubbles/watches_controller_test.rb index 4e1d02958..739149948 100644 --- a/test/controllers/bubbles/watches_controller_test.rb +++ b/test/controllers/bubbles/watches_controller_test.rb @@ -6,7 +6,7 @@ class Bubbles::WatchesControllerTest < ActionDispatch::IntegrationTest end test "create" do - bubbles(:logo).set_watching(users(:kevin), false) + bubbles(:logo).unwatch_by users(:kevin) assert_changes -> { bubbles(:logo).watched_by?(users(:kevin)) }, from: false, to: true do post bucket_bubble_watch_url(buckets(:writebook), bubbles(:logo)) @@ -16,7 +16,7 @@ class Bubbles::WatchesControllerTest < ActionDispatch::IntegrationTest end test "destroy" do - bubbles(:logo).set_watching(users(:kevin), true) + bubbles(:logo).watch_by users(:kevin) assert_changes -> { bubbles(:logo).watched_by?(users(:kevin)) }, from: true, to: false do delete bucket_bubble_watch_url(buckets(:writebook), bubbles(:logo)) diff --git a/test/models/bubble/assignable_test.rb b/test/models/bubble/assignable_test.rb index ae61906f8..56542544c 100644 --- a/test/models/bubble/assignable_test.rb +++ b/test/models/bubble/assignable_test.rb @@ -3,7 +3,7 @@ require "test_helper" class Bubble::AssignableTest < ActiveSupport::TestCase test "assigning a user makes them watch the bubble" do assert_not bubbles(:layout).assigned_to?(users(:kevin)) - bubbles(:layout).set_watching(users(:kevin), false) + bubbles(:layout).unwatch_by users(:kevin) with_current_user(:jz) do bubbles(:layout).toggle_assignment(users(:kevin)) diff --git a/test/models/bubble/watchable_test.rb b/test/models/bubble/watchable_test.rb index 267bbf2d8..aa33b75d2 100644 --- a/test/models/bubble/watchable_test.rb +++ b/test/models/bubble/watchable_test.rb @@ -9,10 +9,10 @@ class Bubble::WatchableTest < ActiveSupport::TestCase test "watched_by?" do assert_not bubbles(:logo).watched_by?(users(:kevin)) - bubbles(:logo).set_watching(users(:kevin), true) + bubbles(:logo).watch_by users(:kevin) assert bubbles(:logo).watched_by?(users(:kevin)) - bubbles(:logo).set_watching(users(:kevin), false) + bubbles(:logo).unwatch_by users(:kevin) assert_not bubbles(:logo).watched_by?(users(:kevin)) end @@ -20,7 +20,7 @@ class Bubble::WatchableTest < ActiveSupport::TestCase buckets(:writebook).access_for(users(:kevin)).watching! assert bubbles(:text).watched_by?(users(:kevin)) - bubbles(:logo).set_watching(users(:kevin), false) + bubbles(:logo).unwatch_by users(:kevin) assert_not bubbles(:logo).watched_by?(users(:kevin)) end @@ -34,9 +34,9 @@ class Bubble::WatchableTest < ActiveSupport::TestCase buckets(:writebook).access_for(users(:kevin)).watching! buckets(:writebook).access_for(users(:jz)).everything! - bubbles(:logo).set_watching(users(:kevin), true) - bubbles(:logo).set_watching(users(:jz), false) - bubbles(:logo).set_watching(users(:david), true) + bubbles(:logo).watch_by users(:kevin) + bubbles(:logo).unwatch_by users(:jz) + bubbles(:logo).watch_by users(:david) assert_equal [ users(:kevin), users(:david) ].sort, bubbles(:logo).watchers_and_subscribers.sort end From 4fd1472fae04239b7112411a81ed15c5ed72b81a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 19:22:40 +0200 Subject: [PATCH 066/104] Move bubble watch out from the needless bucket nesting --- app/controllers/bubbles/watches_controller.rb | 4 ++-- app/views/bubbles/show.html.erb | 2 +- app/views/bubbles/watches/show.html.erb | 4 ++-- config/routes.rb | 2 +- test/controllers/bubbles/watches_controller_test.rb | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/bubbles/watches_controller.rb b/app/controllers/bubbles/watches_controller.rb index 641564889..3b21acfa4 100644 --- a/app/controllers/bubbles/watches_controller.rb +++ b/app/controllers/bubbles/watches_controller.rb @@ -3,11 +3,11 @@ class Bubbles::WatchesController < ApplicationController def create @bubble.watch_by Current.user - redirect_to bucket_bubble_watch_path(@bucket, @bubble) + redirect_to bubble_watch_path(@bubble) end def destroy @bubble.unwatch_by Current.user - redirect_to bucket_bubble_watch_path(@bucket, @bubble) + redirect_to bubble_watch_path(@bubble) end end diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb index b7d62b740..cdd73d38f 100644 --- a/app/views/bubbles/show.html.erb +++ b/app/views/bubbles/show.html.erb @@ -80,7 +80,7 @@ <% if @bubble.published? %>
- <%= turbo_frame_tag dom_id(@bubble, :watch), src: bucket_bubble_watch_path(@bubble.bucket, @bubble), refresh: :morph %> + <%= turbo_frame_tag dom_id(@bubble, :watch), src: bubble_watch_path(@bubble), refresh: :morph %> <%= turbo_frame_tag dom_id(@bubble, :pin), src: bubble_pin_path(@bubble), refresh: :morph %>
<% end %> diff --git a/app/views/bubbles/watches/show.html.erb b/app/views/bubbles/watches/show.html.erb index 435cc030f..bd68ab801 100644 --- a/app/views/bubbles/watches/show.html.erb +++ b/app/views/bubbles/watches/show.html.erb @@ -1,11 +1,11 @@ <%= turbo_frame_tag dom_id(@bubble, :watch) do %> <% if @bubble.watched_by? Current.user %> - <%= button_to bucket_bubble_watch_path(@bubble.bucket, @bubble), method: :delete, class: "btn btn--reversed" do %> + <%= button_to bubble_watch_path(@bubble), method: :delete, class: "btn btn--reversed" do %> <%= icon_tag "bell" %> Stop watching <% end %> <% else %> - <%= button_to bucket_bubble_watch_path(@bubble.bucket, @bubble), class: "btn" do %> + <%= button_to bubble_watch_path(@bubble), class: "btn" do %> <%= icon_tag "bell-off" %> Watch this <% end %> diff --git a/config/routes.rb b/config/routes.rb index e890920b5..644066af2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,6 +20,7 @@ Rails.application.routes.draw do resources :bubbles do scope module: :bubbles do resource :pin + resource :watch resources :assignments resources :taggings end @@ -60,7 +61,6 @@ Rails.application.routes.draw do resource :publish resource :recover resources :stagings - resource :watch end end end diff --git a/test/controllers/bubbles/watches_controller_test.rb b/test/controllers/bubbles/watches_controller_test.rb index 739149948..42e72a8bd 100644 --- a/test/controllers/bubbles/watches_controller_test.rb +++ b/test/controllers/bubbles/watches_controller_test.rb @@ -9,19 +9,19 @@ class Bubbles::WatchesControllerTest < ActionDispatch::IntegrationTest bubbles(:logo).unwatch_by users(:kevin) assert_changes -> { bubbles(:logo).watched_by?(users(:kevin)) }, from: false, to: true do - post bucket_bubble_watch_url(buckets(:writebook), bubbles(:logo)) + post bubble_watch_path(bubbles(:logo)) end - assert_redirected_to bucket_bubble_watch_url(buckets(:writebook), bubbles(:logo)) + assert_redirected_to bubble_watch_path(bubbles(:logo)) end test "destroy" do bubbles(:logo).watch_by users(:kevin) assert_changes -> { bubbles(:logo).watched_by?(users(:kevin)) }, from: true, to: false do - delete bucket_bubble_watch_url(buckets(:writebook), bubbles(:logo)) + delete bubble_watch_path(bubbles(:logo)) end - assert_redirected_to bucket_bubble_watch_url(buckets(:writebook), bubbles(:logo)) + assert_redirected_to bubble_watch_path(bubbles(:logo)) end end From d925c64c59195af1a00e9e397ea924fda6bce679 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 20:07:21 +0200 Subject: [PATCH 067/104] Remove anemic partial --- app/views/bubbles/_messages.html.erb | 4 +++- app/views/bubbles/watches/_watcher.html.erb | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 app/views/bubbles/watches/_watcher.html.erb diff --git a/app/views/bubbles/_messages.html.erb b/app/views/bubbles/_messages.html.erb index 85ea86c05..c55e8a122 100644 --- a/app/views/bubbles/_messages.html.erb +++ b/app/views/bubbles/_messages.html.erb @@ -12,7 +12,9 @@

- <%= render partial: "bubbles/watches/watcher", collection: prepend_current_user_to(@bubble.watchers.alphabetically) %> + <% prepend_current_user_to(@bubble.watchers.alphabetically).each do |watcher| %> + <%= avatar_tag watcher, loading: :lazy %> + <% end %>
<% end %> diff --git a/app/views/bubbles/watches/_watcher.html.erb b/app/views/bubbles/watches/_watcher.html.erb deleted file mode 100644 index 35a1d3f91..000000000 --- a/app/views/bubbles/watches/_watcher.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= avatar_tag watcher, loading: :lazy %> From 5275394c2dbc826ae1842d6ac13fc68b23bb69b9 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 20:13:09 +0200 Subject: [PATCH 068/104] Move resolves to the bottom for a cleaner reading --- config/routes.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 644066af2..ed9ca8d7d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,15 +8,6 @@ Rails.application.routes.draw do end end - resolve "Bubble" do |bubble, options| - route_for :bucket_bubble, bubble.bucket, bubble, options - end - - resolve "Comment" do |comment, options| - options[:anchor] = ActionView::RecordIdentifier.dom_id(comment) - route_for :bucket_bubble, comment.bubble.bucket, comment.bubble, options - end - resources :bubbles do scope module: :bubbles do resource :pin @@ -100,7 +91,15 @@ Rails.application.routes.draw do namespace :my do resources :pins + resource :terminal, only: [ :show, :edit ] + + resolve "Bubble" do |bubble, options| + route_for :bucket_bubble, bubble.bucket, bubble, options + end + + resolve "Comment" do |comment, options| + options[:anchor] = ActionView::RecordIdentifier.dom_id(comment) + route_for :bucket_bubble, comment.bubble.bucket, comment.bubble, options end - resource :terminal, only: [ :show, :edit ] end From 5c9f630feecc4350047fe84d378873c2e1835194 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 20:13:20 +0200 Subject: [PATCH 069/104] Rearrange --- config/routes.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index ed9ca8d7d..8414ffab4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -65,6 +65,10 @@ Rails.application.routes.draw do resource :first_run resources :qr_codes + namespace :my do + resources :pins + end + resource :session do scope module: "sessions" do resources :transfers, only: %i[ show update ] @@ -89,8 +93,6 @@ Rails.application.routes.draw do get "up", to: "rails/health#show", as: :rails_health_check get "manifest" => "rails/pwa#manifest", as: :pwa_manifest - namespace :my do - resources :pins resource :terminal, only: [ :show, :edit ] resolve "Bubble" do |bubble, options| From c06802856eeac15a83177a5396a7597ba47b7272 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 21:04:28 +0200 Subject: [PATCH 070/104] Move boosts under bubbles But also remove the need for a bucket nesting --- app/controllers/{ => bubbles}/boosts_controller.rb | 2 +- app/views/bubbles/_messages.html.erb | 3 +-- app/views/{ => bubbles}/boosts/_boosts.html.erb | 7 ++++--- app/views/{ => bubbles}/boosts/create.turbo_stream.erb | 2 +- app/views/bubbles/cards/perma/_boosts.html.erb | 2 +- app/views/messages/_message.html.erb | 6 +++++- config/routes.rb | 2 +- test/controllers/{ => bubbles}/boosts_controller_test.rb | 6 +++--- test/integration/bubble_messages.rb | 2 +- 9 files changed, 18 insertions(+), 14 deletions(-) rename app/controllers/{ => bubbles}/boosts_controller.rb (83%) rename app/views/{ => bubbles}/boosts/_boosts.html.erb (62%) rename app/views/{ => bubbles}/boosts/create.turbo_stream.erb (76%) rename test/controllers/{ => bubbles}/boosts_controller_test.rb (61%) diff --git a/app/controllers/boosts_controller.rb b/app/controllers/bubbles/boosts_controller.rb similarity index 83% rename from app/controllers/boosts_controller.rb rename to app/controllers/bubbles/boosts_controller.rb index 48400cc10..038de5e46 100644 --- a/app/controllers/boosts_controller.rb +++ b/app/controllers/bubbles/boosts_controller.rb @@ -1,4 +1,4 @@ -class BoostsController < ApplicationController +class Bubbles::BoostsController < ApplicationController include BubbleScoped def create diff --git a/app/views/bubbles/_messages.html.erb b/app/views/bubbles/_messages.html.erb index c55e8a122..243136bbb 100644 --- a/app/views/bubbles/_messages.html.erb +++ b/app/views/bubbles/_messages.html.erb @@ -1,7 +1,6 @@ <%= messages_tag(bubble) do %> <%# Template Dependency: comments/comment %> - <%# Template Dependency: event_summaries/event_summary %> - <%= render bubble.messages, cached: true %> + <%= render partial: "messages/message", collection: bubble.messages, cached: true %> <%= render "comments/new", bubble: bubble, cached: true %>
diff --git a/app/views/boosts/_boosts.html.erb b/app/views/bubbles/boosts/_boosts.html.erb similarity index 62% rename from app/views/boosts/_boosts.html.erb rename to app/views/bubbles/boosts/_boosts.html.erb index 684ce110e..b741a89fb 100644 --- a/app/views/boosts/_boosts.html.erb +++ b/app/views/bubbles/boosts/_boosts.html.erb @@ -1,10 +1,11 @@ -<%= form_with url: bucket_bubble_boosts_path(bubble.bucket, bubble), class: "pad-inline flex align-center gap" do %> +
<%= text_field_tag :boost_count, bubble.boosts_count, min: 1, class: "boost__input input", autocomplete: "off" %> <%= bubble.boosts_count == 1 ? "boost" : "boosts" %> - <%= tag.button class: "btn", type: :submit, style: "font-size: 0.5em" do %> + + <%= button_to bubble_boosts_path(bubble), class: "btn", type: :submit, style: "font-size: 0.5em" do %> <%= icon_tag "add" %> Boost <% end %> -<% end %> +
diff --git a/app/views/boosts/create.turbo_stream.erb b/app/views/bubbles/boosts/create.turbo_stream.erb similarity index 76% rename from app/views/boosts/create.turbo_stream.erb rename to app/views/bubbles/boosts/create.turbo_stream.erb index e9dcee709..63d73d4a9 100644 --- a/app/views/boosts/create.turbo_stream.erb +++ b/app/views/bubbles/boosts/create.turbo_stream.erb @@ -1,5 +1,5 @@ <%= turbo_stream.update dom_id(@bubble, :boosts) do %> - <%= render "boosts/boosts", bubble: @bubble %> + <%= render "bubbles/boosts/boosts", bubble: @bubble %> <% end %> <%= turbo_stream.replace dom_id(@bubble, :messages) do %> diff --git a/app/views/bubbles/cards/perma/_boosts.html.erb b/app/views/bubbles/cards/perma/_boosts.html.erb index a465a7a53..10c18c79e 100644 --- a/app/views/bubbles/cards/perma/_boosts.html.erb +++ b/app/views/bubbles/cards/perma/_boosts.html.erb @@ -1,3 +1,3 @@ <%= turbo_frame_tag dom_id(bubble, :boosts) do %> - <%= render "boosts/boosts", bubble: bubble %> + <%= render "bubbles/boosts/boosts", bubble: bubble %> <% end %> diff --git a/app/views/messages/_message.html.erb b/app/views/messages/_message.html.erb index cd12237f6..e747f9d90 100644 --- a/app/views/messages/_message.html.erb +++ b/app/views/messages/_message.html.erb @@ -1 +1,5 @@ -<%= render message.messageable %> +<% cache message do %> + <%# Template Dependency: event_summaries/event_summary %> + <%# Template Dependency: comments/comment %> + <%= render partial: message.messageable.to_partial_path, object: message.messageable %> +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 8414ffab4..b54b55c31 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,6 +13,7 @@ Rails.application.routes.draw do resource :pin resource :watch resources :assignments + resources :boosts resources :taggings end end @@ -39,7 +40,6 @@ Rails.application.routes.draw do end resources :bubbles do - resources :boosts resources :comments do resources :reactions, module: :comments end diff --git a/test/controllers/boosts_controller_test.rb b/test/controllers/bubbles/boosts_controller_test.rb similarity index 61% rename from test/controllers/boosts_controller_test.rb rename to test/controllers/bubbles/boosts_controller_test.rb index d5bca1c16..540166de6 100644 --- a/test/controllers/boosts_controller_test.rb +++ b/test/controllers/bubbles/boosts_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class BoostsControllerTest < ActionDispatch::IntegrationTest +class Bubbles::BoostsControllerTest < ActionDispatch::IntegrationTest setup do sign_in_as :kevin end @@ -9,7 +9,7 @@ class BoostsControllerTest < ActionDispatch::IntegrationTest boost_count = bubbles(:logo).boosts_count assert_difference "bubbles(:logo).reload.boosts_count", +1 do - post bucket_bubble_boosts_url(buckets(:writebook), bubbles(:logo), params: { boost_count: boost_count }, format: :turbo_stream) + post bubble_boosts_path(bubbles(:logo), params: { boost_count: boost_count }, format: :turbo_stream) end assert_turbo_stream action: :update, target: dom_id(bubbles(:logo), :boosts) @@ -19,7 +19,7 @@ class BoostsControllerTest < ActionDispatch::IntegrationTest boost_count = 10 assert_changes "bubbles(:logo).reload.boosts_count", to: boost_count do - post bucket_bubble_boosts_url(buckets(:writebook), bubbles(:logo), params: { boost_count: boost_count }, format: :turbo_stream) + post bubble_boosts_path(bubbles(:logo), params: { boost_count: boost_count }, format: :turbo_stream) end assert_turbo_stream action: :update, target: dom_id(bubbles(:logo), :boosts) diff --git a/test/integration/bubble_messages.rb b/test/integration/bubble_messages.rb index 8b4ceea8c..803d1e98f 100644 --- a/test/integration/bubble_messages.rb +++ b/test/integration/bubble_messages.rb @@ -14,7 +14,7 @@ class BubbleMessagesTest < ActionDispatch::IntegrationTest assert_equal "created", bubble.messages.last.messageable.events.sole.action # Boost it - post bucket_bubble_boosts_url(buckets(:writebook), bubble, format: :turbo_stream) + post bubble_boosts_path(bubble, format: :turbo_stream) assert_equal 1, bubble.messages.count assert_predicate bubble.messages.last, :event_summary? assert_equal 2, bubble.messages.last.event_summary.events.count From 26c123c41c4e91dae75514031317f81c622b0ebb Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 21:05:28 +0200 Subject: [PATCH 071/104] Template dependency should be closest to direct use --- app/views/bubbles/_messages.html.erb | 1 - app/views/messages/_message.html.erb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/bubbles/_messages.html.erb b/app/views/bubbles/_messages.html.erb index 243136bbb..aa01571ef 100644 --- a/app/views/bubbles/_messages.html.erb +++ b/app/views/bubbles/_messages.html.erb @@ -1,5 +1,4 @@ <%= messages_tag(bubble) do %> - <%# Template Dependency: comments/comment %> <%= render partial: "messages/message", collection: bubble.messages, cached: true %> <%= render "comments/new", bubble: bubble, cached: true %> diff --git a/app/views/messages/_message.html.erb b/app/views/messages/_message.html.erb index e747f9d90..1a3b8e401 100644 --- a/app/views/messages/_message.html.erb +++ b/app/views/messages/_message.html.erb @@ -1,5 +1,5 @@ <% cache message do %> - <%# Template Dependency: event_summaries/event_summary %> <%# Template Dependency: comments/comment %> + <%# Template Dependency: event_summaries/event_summary %> <%= render partial: message.messageable.to_partial_path, object: message.messageable %> <% end %> From 565ee0f5486a4e00557a06b5b4ac61bb89a333cc Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 21:09:49 +0200 Subject: [PATCH 072/104] Dont have to spell this out when there are no other formats --- app/controllers/bubbles/boosts_controller.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/controllers/bubbles/boosts_controller.rb b/app/controllers/bubbles/boosts_controller.rb index 038de5e46..38970c40f 100644 --- a/app/controllers/bubbles/boosts_controller.rb +++ b/app/controllers/bubbles/boosts_controller.rb @@ -8,9 +8,5 @@ class Bubbles::BoostsController < ApplicationController params[:boost_count].to_i end @bubble.boost!(count) - - respond_to do |format| - format.turbo_stream - end end end From 8def7c5003cdb6b1044604d7775d638439304ecf Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Apr 2025 21:11:04 +0200 Subject: [PATCH 073/104] Excess CR --- config/routes.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index b54b55c31..845992f83 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -103,5 +103,4 @@ Rails.application.routes.draw do options[:anchor] = ActionView::RecordIdentifier.dom_id(comment) route_for :bucket_bubble, comment.bubble.bucket, comment.bubble, options end - end From 2e917b90a219596978310415e46b64f610e00683 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 6 Apr 2025 22:08:51 -0400 Subject: [PATCH 074/104] Fix the DaysAgoFormatter output to say "days ago" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and not "in N days" 😅 --- app/javascript/controllers/local_time_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/controllers/local_time_controller.js b/app/javascript/controllers/local_time_controller.js index 512169949..497fbd37b 100644 --- a/app/javascript/controllers/local_time_controller.js +++ b/app/javascript/controllers/local_time_controller.js @@ -104,7 +104,7 @@ class DaysAgoFormatter { if (dayDiff === 0) return "Today" if (dayDiff === 1) return "Yesterday" - return `in ${dayDiff} days` + return `${dayDiff} days ago` } } From 99584a17f4f9c84a7688456165126b348df1fa1e Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Mon, 7 Apr 2025 06:00:12 +0200 Subject: [PATCH 075/104] Ignore case when trying to match tags --- app/models/bubble/taggable.rb | 7 ++++++- test/models/bubble/taggable_test.rb | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 test/models/bubble/taggable_test.rb diff --git a/app/models/bubble/taggable.rb b/app/models/bubble/taggable.rb index 7fa4dee07..c296e0ff5 100644 --- a/app/models/bubble/taggable.rb +++ b/app/models/bubble/taggable.rb @@ -9,7 +9,7 @@ module Bubble::Taggable end def toggle_tag_with(title) - tag = bucket.account.tags.find_or_create_by!(title: title) + tag = find_or_create_tag_by_title(title) transaction do if tagged_with?(tag) @@ -23,4 +23,9 @@ module Bubble::Taggable def tagged_with?(tag) tags.include? tag end + + private + def find_or_create_tag_by_title(title) + bucket.account.tags.find_by("lower(title) = ?", title.downcase) || bucket.account.tags.create!(title: title) + end end diff --git a/test/models/bubble/taggable_test.rb b/test/models/bubble/taggable_test.rb new file mode 100644 index 000000000..c51e27e81 --- /dev/null +++ b/test/models/bubble/taggable_test.rb @@ -0,0 +1,27 @@ +require "test_helper" + +class Bubble::TaggableTest < ActiveSupport::TestCase + setup do + @bubble = bubbles(:logo) + end + + test "toggle tag" do + assert_difference -> { @bubble.tags.count }, 1 do + @bubble.toggle_tag_with "ruby" + end + + assert_equal "ruby", @bubble.tags.last.title + + assert_difference -> { @bubble.tags.count }, -1 do + @bubble.toggle_tag_with "ruby" + end + end + + test "ignore case when toggling tags" do + @bubble.toggle_tag_with "ruby" + + assert_difference -> { @bubble.tags.count }, -1 do + @bubble.toggle_tag_with "Ruby" + end + end +end From 950aebb409befc8dfdf6bcf81574a0eb333e4a52 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Mon, 7 Apr 2025 06:12:08 +0200 Subject: [PATCH 076/104] Script to merge duplicated tags --- script/remove_duplicated_tags.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 script/remove_duplicated_tags.rb diff --git a/script/remove_duplicated_tags.rb b/script/remove_duplicated_tags.rb new file mode 100755 index 000000000..31efade8e --- /dev/null +++ b/script/remove_duplicated_tags.rb @@ -0,0 +1,23 @@ +#!/usr/bin/env ruby + +require_relative "../config/environment" + +ApplicationRecord.with_each_tenant do |tenant| + Account.find_each do |account| + tags_grouped_by_title = account.tags.group_by { |tag| tag.title.downcase } + + tags_grouped_by_title.each do |title, tags| + if tags.length > 1 + to_keep, to_merge = tags.first, tags[1..] + + to_merge.each do |tag_to_merge| + tag_to_merge.bubbles.each do |bubble| + to_keep.bubbles << bubble unless to_keep.bubbles.include?(bubble) + end + + tag_to_merge.destroy + end + end + end + end +end From 40df93eed70a1f48a29adcc86f198b546180b381 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Mon, 7 Apr 2025 05:10:02 +0200 Subject: [PATCH 077/104] Max max age for your own avatar So that you don't get confused when you don't see it update after changing it. --- app/controllers/users/avatars_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/users/avatars_controller.rb b/app/controllers/users/avatars_controller.rb index f700a6825..e48a1f7f2 100644 --- a/app/controllers/users/avatars_controller.rb +++ b/app/controllers/users/avatars_controller.rb @@ -4,7 +4,7 @@ class Users::AvatarsController < ApplicationController before_action :set_user def show - if stale? @user, cache_control: { max_age: 30.minutes, stale_while_revalidate: 1.week } + if stale? @user, cache_control: { max_age: cache_max_age, stale_while_revalidate: 1.week } render_avatar_or_initials end end @@ -15,6 +15,14 @@ class Users::AvatarsController < ApplicationController end private + def cache_max_age + if Current.user == @user + 0 + else + 30.minutes + end + end + def set_user @user = Current.account.users.find(params[:user_id]) end From f403ed070c9f9dc3eda053ee9094921676f23968 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Mon, 7 Apr 2025 10:39:18 +0200 Subject: [PATCH 078/104] Downcase tag titles --- app/models/bubble/taggable.rb | 7 +------ app/models/tag.rb | 1 + test/fixtures/tags.yml | 4 ++-- test/models/filter_test.rb | 4 ++-- test/models/tag_test.rb | 18 ++++++++++++------ 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/models/bubble/taggable.rb b/app/models/bubble/taggable.rb index c296e0ff5..7fa4dee07 100644 --- a/app/models/bubble/taggable.rb +++ b/app/models/bubble/taggable.rb @@ -9,7 +9,7 @@ module Bubble::Taggable end def toggle_tag_with(title) - tag = find_or_create_tag_by_title(title) + tag = bucket.account.tags.find_or_create_by!(title: title) transaction do if tagged_with?(tag) @@ -23,9 +23,4 @@ module Bubble::Taggable def tagged_with?(tag) tags.include? tag end - - private - def find_or_create_tag_by_title(title) - bucket.account.tags.find_by("lower(title) = ?", title.downcase) || bucket.account.tags.create!(title: title) - end end diff --git a/app/models/tag.rb b/app/models/tag.rb index 742dfcfea..376e21bc0 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -7,6 +7,7 @@ class Tag < ApplicationRecord has_many :bubbles, through: :taggings validates :title, format: { without: /\A#/ } + normalizes :title, with: -> { it.downcase } scope :alphabetically, -> { order("lower(title)") } diff --git a/test/fixtures/tags.yml b/test/fixtures/tags.yml index 76fedd9a6..d6dbcf51c 100644 --- a/test/fixtures/tags.yml +++ b/test/fixtures/tags.yml @@ -1,7 +1,7 @@ web: account: 37s - title: Web + title: web mobile: account: 37s - title: Mobile + title: mobile diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb index 16b78eddd..1cf117dc4 100644 --- a/test/models/filter_test.rb +++ b/test/models/filter_test.rb @@ -104,10 +104,10 @@ class FilterTest < ActiveSupport::TestCase end test "summary" do - assert_equal "Most discussed, tagged #Mobile, and assigned to JZ ", filters(:jz_assignments).summary + assert_equal "Most discussed, tagged #mobile, and assigned to JZ ", filters(:jz_assignments).summary filters(:jz_assignments).update!(stages: workflow_stages(:qa_triage, :qa_in_progress)) - assert_equal "Most discussed, tagged #Mobile, assigned to JZ, and staged in Triage or In progress ", filters(:jz_assignments).summary + assert_equal "Most discussed, tagged #mobile, assigned to JZ, and staged in Triage or In progress ", filters(:jz_assignments).summary filters(:jz_assignments).update!(stages: [], assignees: [], tags: [], buckets: [ buckets(:writebook) ]) assert_equal "Most discussed in Writebook", filters(:jz_assignments).summary diff --git a/test/models/tag_test.rb b/test/models/tag_test.rb index 554056941..7fe171e3f 100644 --- a/test/models/tag_test.rb +++ b/test/models/tag_test.rb @@ -1,15 +1,21 @@ require "test_helper" class TagTest < ActiveSupport::TestCase - test "creating or deleting a tag touches the account, so tags dialog fragment cache is invalidated" do - account = accounts("37s") + setup do + @account = accounts("37s") + end - assert_changes -> { account.reload.updated_at } do - account.tags.create!(title: "ReleaseBlocker") + test "creating or deleting a tag touches the account, so tags dialog fragment cache is invalidated" do + assert_changes -> { @account.reload.updated_at } do + @account.tags.create!(title: "ReleaseBlocker") end - assert_changes -> { account.reload.updated_at } do - account.tags.find_by(title: "ReleaseBlocker").destroy + assert_changes -> { @account.reload.updated_at } do + @account.tags.find_by(title: "ReleaseBlocker").destroy end end + + test "downcase title" do + assert_equal "a tag", @account.tags.create!(title: "A TAG").title + end end From 8e01a277ad2afd0b704e2dabfe30ef355613ef00 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Sat, 5 Apr 2025 13:24:46 +0200 Subject: [PATCH 079/104] Add daysago formatter and extract common helper to reuse with indays formatter --- .../controllers/local_time_controller.js | 50 ++++++++----------- app/javascript/helpers/date_helpers.js | 7 +++ app/views/bubbles/cards/_mini.html.erb | 2 +- app/views/bubbles/cards/common/_meta.html.erb | 6 +-- 4 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 app/javascript/helpers/date_helpers.js diff --git a/app/javascript/controllers/local_time_controller.js b/app/javascript/controllers/local_time_controller.js index 497fbd37b..11c1bd923 100644 --- a/app/javascript/controllers/local_time_controller.js +++ b/app/javascript/controllers/local_time_controller.js @@ -1,7 +1,8 @@ import { Controller } from "@hotwired/stimulus" +import { differenceInDays } from "helpers/date_helpers"; export default class extends Controller { - static targets = [ "time", "date", "datetime", "shortdate", "ago", "indays" ] + static targets = [ "time", "date", "datetime", "shortdate", "ago", "indays", "daysago" ] #timer @@ -11,8 +12,8 @@ export default class extends Controller { this.shortDateFormatter = new Intl.DateTimeFormat(undefined, { month: "short", day: "numeric" }) this.dateTimeFormatter = new Intl.DateTimeFormat(undefined, { timeStyle: "short", dateStyle: "short" }) this.agoFormatter = new AgoFormatter() - this.daysAgoFormatter = new DaysAgoFormatter() this.indaysFormatter = new InDaysFormatter() + this.daysagoFormatter = new DaysAgoFormatter() } connect() { @@ -43,14 +44,14 @@ export default class extends Controller { this.#formatTime(this.agoFormatter, target) } - daysAgoTargetConnected(target) { - this.#formatTime(this.daysAgoFormatter, target) - } - indaysTargetConnected(target) { this.#formatTime(this.indaysFormatter, target) } + daysagoTargetConnected(target) { + this.#formatTime(this.daysagoFormatter, target) + } + #refreshRelativeTimes() { this.agoTargets.forEach(target => { this.#formatTime(this.agoFormatter, target) @@ -92,27 +93,9 @@ class AgoFormatter { } } -class DaysAgoFormatter { - format(dt) { - const now = new Date() - - const startOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate()) - const startOfGivenDay = new Date(dt.getFullYear(), dt.getMonth(), dt.getDate()) - - const msPerDay = 1000 * 60 * 60 * 24 - const dayDiff = Math.floor((startOfToday - startOfGivenDay) / msPerDay) - - if (dayDiff === 0) return "Today" - if (dayDiff === 1) return "Yesterday" - return `${dayDiff} days ago` - } -} - class InDaysFormatter { - format(dt) { - const target = this.#beginningOfDay(dt) - const today = this.#beginningOfDay(new Date()) - const days = Math.round((target - today) / (1000 * 60 * 60 * 24)) + format(date) { + const days = differenceInDays(new Date(), date) if (days <= 0) { return "today" @@ -123,8 +106,19 @@ class InDaysFormatter { return `in ${Math.round(days)} days` } +} - #beginningOfDay(dt) { - return new Date(dt.getFullYear(), dt.getMonth(), dt.getDate()) +class DaysAgoFormatter { + format(date) { + const days = differenceInDays(date, new Date()) + + if (days <= 0) { + return "today" + } + if (days === 1) { + return "yesterday" + } + + return `${Math.round(days)} days ago` } } diff --git a/app/javascript/helpers/date_helpers.js b/app/javascript/helpers/date_helpers.js new file mode 100644 index 000000000..9f3dffc4d --- /dev/null +++ b/app/javascript/helpers/date_helpers.js @@ -0,0 +1,7 @@ +export function differenceInDays(fromDate, toDate) { + return Math.round(Math.abs((beginningOfDay(toDate) - beginningOfDay(fromDate)) / (1000 * 60 * 60 * 24))) +} + +export function beginningOfDay(date) { + return new Date(date.getFullYear(), date.getMonth(), date.getDate()) +} diff --git a/app/views/bubbles/cards/_mini.html.erb b/app/views/bubbles/cards/_mini.html.erb index f90fd167d..298658446 100644 --- a/app/views/bubbles/cards/_mini.html.erb +++ b/app/views/bubbles/cards/_mini.html.erb @@ -7,7 +7,7 @@
<%= "Added to #{bubble.bucket.name} by #{bubble.creator.name}" %> - <%= local_datetime_tag(bubble.created_at, style: :daysAgo) %> + <%= local_datetime_tag(bubble.created_at, style: :daysago) %>
diff --git a/app/views/bubbles/cards/common/_meta.html.erb b/app/views/bubbles/cards/common/_meta.html.erb index 59f51c8a5..b5f644f9e 100644 --- a/app/views/bubbles/cards/common/_meta.html.erb +++ b/app/views/bubbles/cards/common/_meta.html.erb @@ -1,18 +1,18 @@
<%= bubble.creating? ? "Added" : "Updated" %> - <%= local_datetime_tag(bubble.updated_at, style: :daysAgo) %> + <%= local_datetime_tag(bubble.updated_at, style: :daysago) %>
<% if bubble.creating? %> Expires - <%= local_datetime_tag(bubble.auto_pop_at, style: :daysAgo) %> + <%= local_datetime_tag(bubble.auto_pop_at, style: :daysago) %> <% else %> Added - <%= local_datetime_tag(bubble.created_at, style: :daysAgo) %> + <%= local_datetime_tag(bubble.created_at, style: :daysago) %> <% end %>
From a0579f7b6f6868d6587a4336fa2fd9e08fb07372 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Sat, 5 Apr 2025 13:31:25 +0200 Subject: [PATCH 080/104] Inject a span with a class with the value so that we can style it https://37s.fizzy.37signals.com/buckets/693169850/bubbles/999008854 --- app/assets/stylesheets/cards.css | 4 ++ .../controllers/local_time_controller.js | 46 ++++++++----------- app/views/bubbles/cards/common/_meta.html.erb | 2 +- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 83d137151..254c75be2 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -86,6 +86,10 @@ inline-size: calc(100dvw - var(--actions-inline-inset) * 2 - var(--btn-size) * 2); } + .local-time-value { + font-weight: bold; + } + @media (prefers-color-scheme: dark) { --border-color: var(--color-subtle-dark); --border-size: 1px; diff --git a/app/javascript/controllers/local_time_controller.js b/app/javascript/controllers/local_time_controller.js index 11c1bd923..bdfbe677a 100644 --- a/app/javascript/controllers/local_time_controller.js +++ b/app/javascript/controllers/local_time_controller.js @@ -1,5 +1,5 @@ import { Controller } from "@hotwired/stimulus" -import { differenceInDays } from "helpers/date_helpers"; +import { differenceInDays } from "helpers/date_helpers" export default class extends Controller { static targets = [ "time", "date", "datetime", "shortdate", "ago", "indays", "daysago" ] @@ -12,8 +12,8 @@ export default class extends Controller { this.shortDateFormatter = new Intl.DateTimeFormat(undefined, { month: "short", day: "numeric" }) this.dateTimeFormatter = new Intl.DateTimeFormat(undefined, { timeStyle: "short", dateStyle: "short" }) this.agoFormatter = new AgoFormatter() - this.indaysFormatter = new InDaysFormatter() this.daysagoFormatter = new DaysAgoFormatter() + this.indaysFormatter = new InDaysFormatter() } connect() { @@ -60,7 +60,7 @@ export default class extends Controller { #formatTime(formatter, target) { const dt = new Date(target.getAttribute("datetime")) - target.textContent = formatter.format(dt) + target.innerHTML = formatter.format(dt) target.title = this.dateTimeFormatter.format(dt) } } @@ -93,32 +93,26 @@ class AgoFormatter { } } -class InDaysFormatter { - format(date) { - const days = differenceInDays(new Date(), date) - - if (days <= 0) { - return "today" - } - if (days === 1) { - return "tomorrow" - } - - return `in ${Math.round(days)} days` - } -} - class DaysAgoFormatter { format(date) { const days = differenceInDays(date, new Date()) - if (days <= 0) { - return "today" - } - if (days === 1) { - return "yesterday" - } - - return `${Math.round(days)} days ago` + if (days <= 0) return styleableValue("today") + if (days === 1) return styleableValue("yesterday") + return `${styleableValue(days)} days ago` } } + +class InDaysFormatter { + format(date) { + const days = differenceInDays(new Date(), date) + + if (days <= 0) return styleableValue("today") + if (days === 1) return styleableValue("tomorrow") + return `in ${styleableValue(days)} days` + } +} + +function styleableValue(value) { + return `${value}` +} diff --git a/app/views/bubbles/cards/common/_meta.html.erb b/app/views/bubbles/cards/common/_meta.html.erb index b5f644f9e..3efe7970d 100644 --- a/app/views/bubbles/cards/common/_meta.html.erb +++ b/app/views/bubbles/cards/common/_meta.html.erb @@ -8,7 +8,7 @@ <% if bubble.creating? %> Expires - <%= local_datetime_tag(bubble.auto_pop_at, style: :daysago) %> + <%= local_datetime_tag(bubble.auto_pop_at, style: :indays) %> <% else %> Added From a7aae833d1ed7796ad31b63a8575dab5fcf7df24 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Mon, 7 Apr 2025 11:14:50 +0200 Subject: [PATCH 081/104] Extract helper with fallback for the "go to back" and use consistently --- app/helpers/navigation_helper.rb | 6 ++++++ app/views/bubbles/show.html.erb | 6 +----- app/views/buckets/edit.html.erb | 5 +---- app/views/notifications/settings/show.html.erb | 5 +---- app/views/users/edit.html.erb | 9 +++------ app/views/users/show.html.erb | 5 +---- app/views/workflows/index.html.erb | 6 ++---- app/views/workflows/new.html.erb | 5 +---- 8 files changed, 16 insertions(+), 31 deletions(-) diff --git a/app/helpers/navigation_helper.rb b/app/helpers/navigation_helper.rb index d7c99ec86..39f008a90 100644 --- a/app/helpers/navigation_helper.rb +++ b/app/helpers/navigation_helper.rb @@ -6,4 +6,10 @@ module NavigationHelper icon_tag(icon) + tag.span(label, class: "for-screen-reader") end end + + def link_to_back(fallback_path: root_path) + link_to "#", class: "btn flex-item-justify-start", data: { controller: "back-navigation hotkey", action: "keydown.esc@document->hotkey#click", back_navigation_fallback_destination_value: fallback_path } do + icon_tag("arrow-left") + tag.span("Go Back", class: "for-screen-reader") + end + end end diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb index cdd73d38f..8d98ac80a 100644 --- a/app/views/bubbles/show.html.erb +++ b/app/views/bubbles/show.html.erb @@ -22,12 +22,8 @@
diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb index 8d98ac80a..8fa468387 100644 --- a/app/views/bubbles/show.html.erb +++ b/app/views/bubbles/show.html.erb @@ -94,7 +94,7 @@
diff --git a/app/views/buckets/_access_toggle.erb b/app/views/buckets/_access_toggle.erb index b45067866..aee7bb248 100644 --- a/app/views/buckets/_access_toggle.erb +++ b/app/views/buckets/_access_toggle.erb @@ -1,6 +1,6 @@
  • - <%= avatar_tag user, loading: :lazy %> + <%= avatar_tag user %>
    diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index 4bbe0d96b..f90ed8ee6 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -1,6 +1,6 @@ <%= comment_tag comment do %> <%= render "comments/body", comment: comment %> diff --git a/app/views/comments/_new.html.erb b/app/views/comments/_new.html.erb index c0c2def66..53474199e 100644 --- a/app/views/comments/_new.html.erb +++ b/app/views/comments/_new.html.erb @@ -1,6 +1,6 @@
    diff --git a/app/views/comments/reactions/_reaction.html.erb b/app/views/comments/reactions/_reaction.html.erb index 062646767..4e29ea0ca 100644 --- a/app/views/comments/reactions/_reaction.html.erb +++ b/app/views/comments/reactions/_reaction.html.erb @@ -6,7 +6,7 @@ data-controller="reaction-delete" data-reaction-delete-perform-class="reaction--deleting" data-reaction-delete-reveal-class="expanded" data-reaction-delete-reacter-id-value="<%= reaction.reacter.id %>">
    - <%= avatar_tag reaction.reacter, aria: { label: "#{reaction.reacter.name} reacted #{reaction.content}" }, loading: :lazy %> + <%= avatar_tag reaction.reacter, aria: { label: "#{reaction.reacter.name} reacted #{reaction.content}" } %>
    <%= tag.span reaction.content, role: "button", From e4f7837ebe75cf413557aa5b987c7654b1f14ea0 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Mon, 7 Apr 2025 13:28:18 +0200 Subject: [PATCH 088/104] Remove double nesting under bubbles for engagement --- app/views/bubbles/show.html.erb | 4 ++-- config/routes.rb | 2 +- test/controllers/bubbles/engagements_controller_test.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb index 8d98ac80a..36bb3d6c9 100644 --- a/app/views/bubbles/show.html.erb +++ b/app/views/bubbles/show.html.erb @@ -27,7 +27,7 @@
    Considering <% if @bubble.doing? %> - <%= form_with url: bucket_bubble_engagement_path(@bubble.bucket, @bubble), method: :delete, data: { controller: "form" }, class: "flex" do %> + <%= form_with url: bubble_engagement_path(@bubble), method: :delete, data: { controller: "form" }, class: "flex" do %> <% end %> <% else %> - <%= form_with url: bucket_bubble_engagement_path(@bubble.bucket, @bubble), method: :post, data: { controller: "form" }, class: "flex" do %> + <%= form_with url: bubble_engagement_path(@bubble), method: :post, data: { controller: "form" }, class: "flex" do %>