Merge branch 'main' into cascade-layers-2

app/assets/stylesheets/cards.css

@@ -362,12 +362,10 @@
 
   .card__move-button {
     --btn-background: color-mix(in srgb, var(--bubble-color) 40%, var(--color-ink));
-    --btn-border-radius: 0.2em;
 
     margin-block-start: calc(var(--block-space) * 1.2);
     margin-inline-end: calc(var(--inline-space) * -4);
-    padding-inline-start: var(--inline-space);
-    transform: skewX(-15deg);
+    padding-inline-end: var(--inline-space);
   }
 
   .card__stages {

app/helpers/bubbles_helper.rb

@@ -21,8 +21,4 @@ module BubblesHelper
       }
     end
   end
-
-  def editable_bubble_stage?(bubble)
-    !bubble.popped? && bubble.doing?
-  end
 end

app/models/bubble/engageable.rb

@@ -6,8 +6,8 @@ module Bubble::Engageable
   included do
     has_one :engagement, dependent: :destroy, class_name: "Bubble::Engagement"
 
-    scope :doing, -> { active.joins(:engagement) }
-    scope :considering, -> { active.where.missing(:engagement) }
+    scope :doing, -> { published.active.joins(:engagement) }
+    scope :considering, -> { published.active.where.missing(:engagement) }
 
     scope :stagnated, -> { doing.where(last_active_at: ..STAGNATED_AFTER.ago) }
   end
@@ -25,11 +25,11 @@ module Bubble::Engageable
   end
 
   def doing?
-    active? && engagement.present?
+    active? && published? && engagement.present?
   end
 
   def considering?
-    active? && !doing?
+    active? && published? && !doing?
   end
 
   def engage

app/views/bubbles/cards/_mini.html.erb

@@ -3,7 +3,7 @@
 
   <div class="card__body flex flex-column gap-half full-width flex-item-grow min-width max-width">
     <h3 class="card__title">
-      <%= bubble.title %>
+      <%= bubble_title(bubble) %>
     </h3>
     <div class="txt-small overflow-ellipsis txt-uppercase"><%= "Added to #{bubble.bucket.name} by #{bubble.creator.name}" %>
       <%= local_datetime_tag(bubble.created_at, style: :daysAgo) %>

app/views/bubbles/cards/_perma.html.erb

@@ -27,14 +27,16 @@
         </h1>
       </div>
 
-      <%= turbo_frame_tag dom_id(@bubble, :stages) do %>
-        <%= render "bubbles/stagings/stages", bubble: bubble %>
+      <% if bubble.doing? %>
+        <%= turbo_frame_tag dom_id(@bubble, :stages) do %>
+          <%= 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 %>
-          <%= icon_tag "menu" %>
           <span class="txt-nowrap">Move to Doing</span>
+          <%= icon_tag "assigned" %>
         <% end %>
       <% end %>
     </div>

app/views/bubbles/cards/_preview.html.erb

@@ -12,13 +12,13 @@
         <h1 class="card__title">
           <span class="card__title-link overflow-line-clamp"><%= bubble_title(bubble) %></span>
         </h1>
-
-        <%= link_to bucket_bubble_path(bubble.bucket, bubble), class: "card__link" do %>
-          <span class="for-screen-reader"><%= bubble_title(bubble) %></span>
-        <% end %>
       </div>
 
-      <%= render "bubbles/stagings/stages", bubble: bubble %>
+      <%= link_to bucket_bubble_path(bubble.bucket, bubble), class: "card__link" do %>
+        <span class="for-screen-reader"><%= bubble_title(bubble) %></span>
+      <% end %>
+
+      <%= render "bubbles/stagings/stages", bubble: bubble if bubble.doing? %>
     </div>
 
     <footer class="card__footer full-width flex align-start gap">