From 57b00b6402e0a44a5103a59bc5075f8e73fcf16e Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@hey.com>
Date: Fri, 26 Sep 2025 12:47:12 +0200
Subject: [PATCH] Drop into the stream working

---
 .../columns/cards/drops/not_nows_controller.rb         |  2 +-
 .../columns/cards/drops/streams_controller.rb          | 10 ++++++++++
 app/models/card/postponable.rb                         | 10 ++++++++++
 app/models/card/triageable.rb                          |  3 +--
 app/views/collections/show/_columns.html.erb           |  2 +-
 app/views/collections/show/_not_now.html.erb           |  2 +-
 app/views/collections/show/_stream.html.erb            |  6 +++---
 config/routes.rb                                       |  1 +
 8 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 app/controllers/columns/cards/drops/streams_controller.rb

diff --git a/app/controllers/columns/cards/drops/not_nows_controller.rb b/app/controllers/columns/cards/drops/not_nows_controller.rb
index 6948efe9f..959cdb96e 100644
--- a/app/controllers/columns/cards/drops/not_nows_controller.rb
+++ b/app/controllers/columns/cards/drops/not_nows_controller.rb
@@ -4,6 +4,6 @@ class Columns::Cards::Drops::NotNowsController < ApplicationController
   def create
     @card.postpone
 
-    render turbo_stream: turbo_stream.replace("now-now-cards", partial: "collections/show/not_now", locals: { collection: @card.collection })
+    render turbo_stream: turbo_stream.replace("not-now", partial: "collections/show/not_now", locals: { collection: @card.collection })
   end
 end
diff --git a/app/controllers/columns/cards/drops/streams_controller.rb b/app/controllers/columns/cards/drops/streams_controller.rb
new file mode 100644
index 000000000..981ad7853
--- /dev/null
+++ b/app/controllers/columns/cards/drops/streams_controller.rb
@@ -0,0 +1,10 @@
+class Columns::Cards::Drops::StreamsController < ApplicationController
+  include CardScoped
+
+  def create
+    @card.send_back_to_triage
+    set_page_and_extract_portion_from @collection.cards.awaiting_triage.reverse_chronologically
+
+    render turbo_stream: turbo_stream.replace("the-stream", partial: "collections/show/stream", locals: { collection: @card.collection, page: @page })
+  end
+end
diff --git a/app/models/card/postponable.rb b/app/models/card/postponable.rb
index 7646ee03e..a150fc413 100644
--- a/app/models/card/postponable.rb
+++ b/app/models/card/postponable.rb
@@ -26,4 +26,14 @@ module Card::Postponable
       end
     end
   end
+
+  def resume
+    if postponed?
+      transaction do
+        reopen
+        activity_spike&.destroy
+        not_now.destroy
+      end
+    end
+  end
 end
diff --git a/app/models/card/triageable.rb b/app/models/card/triageable.rb
index a0bae3b0e..22e80a544 100644
--- a/app/models/card/triageable.rb
+++ b/app/models/card/triageable.rb
@@ -28,8 +28,7 @@ module Card::Triageable
 
   def send_back_to_triage
     transaction do
-      reopen
-      activity_spike&.destroy
+      resume
       update!(column: nil)
     end
   end
diff --git a/app/views/collections/show/_columns.html.erb b/app/views/collections/show/_columns.html.erb
index 90348ccbd..e4c7a86d1 100644
--- a/app/views/collections/show/_columns.html.erb
+++ b/app/views/collections/show/_columns.html.erb
@@ -5,7 +5,7 @@
         <%= render "collections/show/not_now", collection: collection %>
       </div>
 
-      <%= render "collections/show/stream", page: page, collection: collection %>
+      <%= render "collections/show/stream", collection: collection, page: page %>
 
       <div class="card-columns__right">
         <%= render partial: "collections/show/column", collection: collection.columns, cached: true %>
diff --git a/app/views/collections/show/_not_now.html.erb b/app/views/collections/show/_not_now.html.erb
index 3a8e27657..96647e618 100644
--- a/app/views/collections/show/_not_now.html.erb
+++ b/app/views/collections/show/_not_now.html.erb
@@ -1,4 +1,4 @@
-<section id="now-now-cards" class="cards cards--on-deck is-collapsed" style="--card-color: var(--color-card-complete);"
+<section id="not-now" class="cards cards--on-deck is-collapsed" style="--card-color: var(--color-card-complete);"
   data-collapsible-columns-target="column"
   data-drag-and-drop-target="container"
   data-drag-and-drop-url="<%= columns_card_drops_not_now_path("__id__") %>"
diff --git a/app/views/collections/show/_stream.html.erb b/app/views/collections/show/_stream.html.erb
index 2516e5168..fcbf10a46 100644
--- a/app/views/collections/show/_stream.html.erb
+++ b/app/views/collections/show/_stream.html.erb
@@ -1,12 +1,12 @@
-<section id="considering-cards" class="cards cards--considering"
+<section id="the-stream" class="cards cards--considering"
   data-drag-and-drop-target="container"
-  data-drop-target="considering">
+  data-drag-and-drop-url="<%= columns_card_drops_stream_path("__id__") %>">
   <div class="cards__decoration"></div>
 
   <%= render "columns/show/add_card_button", collection: collection %>
 
   <% if page.used? %>
-    <%= render "collections/columns/list", cards: @page.records, draggable: true %>
+    <%= render "collections/columns/list", cards: page.records, draggable: true %>
 
     <% unless page.last? %>
       <div class="full-width">
diff --git a/config/routes.rb b/config/routes.rb
index 42c4eb9c7..3eeec7d76 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,6 +40,7 @@ Rails.application.routes.draw do
       scope module: "cards" do
         namespace :drops do
           resource :not_now
+          resource :stream
           resource :closure
           resources :columns
         end