<%= render "coplan/plans/sidebar" %>
- <%= render partial: "coplan/shared/folder_picker", locals: { folders: @folders } %>
<%# The whole pane is a drop target for the folder you're looking at —
Finder semantics: drop on empty space to file right here. Specific
diff --git a/engine/app/views/coplan/plans/show.html.erb b/engine/app/views/coplan/plans/show.html.erb
index cbb1b63..f0c484a 100644
--- a/engine/app/views/coplan/plans/show.html.erb
+++ b/engine/app/views/coplan/plans/show.html.erb
@@ -121,21 +121,29 @@
re-run anchor highlighting once each diagram settles so comments
anchored to diagram labels get their marks (and pending ?thread=
deep links can resolve). %>
-
-
- <%= render partial: "coplan/plans/content_body", locals: { plan: @plan } %>
-
+
+ <%# Selection-to-comment is scoped to this inner wrapper: the back
+ matter below shares the column but must not offer comment
+ anchors — they'd never resolve against the document body. %>
+
+
+ <%= render partial: "coplan/plans/content_body", locals: { plan: @plan } %>
+
+
+
-
- <%= render partial: "coplan/comment_threads/new_comment_form", locals: { plan: @plan } %>
+ <%= render partial: "coplan/plans/footnotes",
+ locals: { plan: @plan, references: @references, attachments: @attachments } %>
This plan has no content yet.
+ <%# No content, no layout columns — back matter still belongs on the page. %>
+ <%= render partial: "coplan/plans/footnotes",
+ locals: { plan: @plan, references: @references, attachments: @attachments } %>
<% end %>
-<%# Back matter: references and attachments live under the document like
- footnotes — same page, quieter surface, each with a one-click "+". %>
-
-
<%= render partial: "coplan/shared/folder_picker", locals: { folders: @my_folders } %>
<%# Headless comment navigation — no floating toolbar, just the keyboard:
diff --git a/spec/requests/plans_spec.rb b/spec/requests/plans_spec.rb
index 7a48e1d..5fec026 100644
--- a/spec/requests/plans_spec.rb
+++ b/spec/requests/plans_spec.rb
@@ -41,12 +41,14 @@
expect(response.body).not_to include("Other Plan")
end
- it "index shows tag badges on plan cards" do
+ it "index lists tags in the sidebar, not as chips on the rows" do
plan.tag_names = [ "infra", "api" ]
get plans_path
- expect(response.body).to include("badge--tag")
- expect(response.body).to include("infra")
- expect(response.body).to include("api")
+ expect(response.body).to include("#infra")
+ expect(response.body).to include("#api")
+ # Row tag chips were dropped: they crowded the byline off its corner
+ # and the sidebar already filters by tag.
+ expect(response.body).not_to include("badge--tag")
end
it "index shows active tag filter bar" do
@@ -850,7 +852,7 @@ def alice_placement
}.not_to change(CoPlan::PlanEvent, :count)
end
- it "renders drag handles and save bookmarks on every row" do
+ it "renders every row draggable into the viewer's library" do
plan # alice's plan
bobs_plan = create(:plan, :considering, created_by_user: bob, title: "Bobs Plan")
get plans_path(scope: "all")
@@ -860,9 +862,11 @@ def alice_placement
# Anyone can shelve any visible plan into their own library.
expect(alice_row).to include('draggable="true"')
expect(bob_row).to include('draggable="true"')
- expect(response.body.scan("plan-row__save").size).to be >= 2
- # One shared navigator popover per page, with the folder tree inside.
- expect(response.body.scan('id="folder-picker-modal"').size).to eq(1)
+ # No per-row bookmark (and so no navigator popover) on the workspace:
+ # rows file via drag & drop; the plan page's title bookmark is the
+ # click path.
+ expect(response.body).not_to include("plan-row__save")
+ expect(response.body).not_to include('id="folder-picker-modal"')
end
end
diff --git a/spec/system/folders_workspace_spec.rb b/spec/system/folders_workspace_spec.rb
index b899de6..01788b3 100644
--- a/spec/system/folders_workspace_spec.rb
+++ b/spec/system/folders_workspace_spec.rb
@@ -207,29 +207,17 @@ def sign_in(user)
expect(infra.reload.parent).to eq(team)
end
- it "files a plan via the row bookmark's folder navigator" do
- visit plans_path
-
- row = find(".plan-row[data-plan-id='#{developing_plan.id}']")
- row.find(".plan-row__save", visible: :all).click
-
- within("#folder-picker-modal") do
- # The tree is hierarchical: Q3 nests under Team EBT.
- expect(page).to have_css(".folder-picker__tree--nested .folder-picker__name", text: "Q3")
- find(".folder-picker__option", text: "Q3").click
- end
-
- expect(page).to have_css(".flash--notice", text: "Team EBT/Q3", wait: 5)
- expect(author.library.placements.find_by(plan_id: developing_plan.id).folder).to eq(q3)
- end
-
it "saves from the plan page via the bookmark beside the title" do
visit plan_path(developing_plan)
# The bookmark mounts into the title row (it's stamped client-side —
# the broadcast-replaced header can't render viewer state itself).
+ # It's also the only click path into the folder navigator: workspace
+ # rows file via drag & drop and carry no bookmark of their own.
find(".page-header__title-row .plan-bookmark").click
within("#folder-picker-modal") do
+ # The tree is hierarchical: Q3 nests under Team EBT.
+ expect(page).to have_css(".folder-picker__tree--nested .folder-picker__name", text: "Q3")
find(".folder-picker__option", text: "Infra").click
end
@@ -241,26 +229,29 @@ def sign_in(user)
it "unsaves a filed plan with a second bookmark click — no dialog, no toast" do
CoPlan::Plans::Place.call(plan: developing_plan, folder: q3, actor: author)
- visit plans_path(folder: q3.id)
+ visit plan_path(developing_plan)
- row = find(".plan-row[data-plan-id='#{developing_plan.id}']")
- row.find(".plan-row__save--saved", visible: :all).click
+ find(".page-header__title-row .plan-bookmark--saved").click
# The bookmark just lets go: no navigator, no confirmation, no toast —
- # the page re-renders and the plan is out of the folder.
+ # the page re-renders with the bookmark back in its unsaved state.
expect(page).not_to have_css("#folder-picker-modal:popover-open")
- expect(page).not_to have_css(".plan-row[data-plan-id='#{developing_plan.id}']", wait: 5)
+ expect(page).to have_css(".page-header__title-row .plan-bookmark:not(.plan-bookmark--saved)", wait: 5)
expect(page).not_to have_css(".flash--notice")
expect(author.library.placements.where(plan_id: developing_plan.id)).to be_empty
end
- it "offers save controls on other users' plans too (shelving)" do
+ it "offers shelving on other users' plans too" do
other_plan = create(:plan, :considering, created_by_user: other, title: "Someone Elses Plan")
visit plans_path(scope: "all")
+ # The row drags into your library like any of your own…
row = find(".plan-row[data-plan-id='#{other_plan.id}']")
expect(row["draggable"]).to eq("true")
- expect(row).to have_css(".plan-row__save", visible: :all)
+
+ # …and the plan page offers the bookmark.
+ visit plan_path(other_plan)
+ expect(page).to have_css(".page-header__title-row .plan-bookmark")
end
end
diff --git a/spec/system/references_spec.rb b/spec/system/references_spec.rb
index 1362262..f248e8c 100644
--- a/spec/system/references_spec.rb
+++ b/spec/system/references_spec.rb
@@ -31,7 +31,9 @@ def open_add_reference_modal
visit plan_path(plan)
expect(page).to have_content("Some content here")
- expect(page).to have_content("No references yet")
+ # Empty state is one quiet line, scoped to the section (attachments
+ # has its own "None yet").
+ expect(page).to have_css("#footnote-references .plan-footnote__empty", text: "None yet")
expect(page).to have_css("#footnote-references .plan-footnote__title", text: /references/i)
end
end
@@ -66,7 +68,7 @@ def open_add_reference_modal
# Turbo Stream replaces the list — reference appears without navigation
expect(page).to have_link("My Repo", href: "https://github.com/org/repo")
- expect(page).not_to have_content("No references yet")
+ expect(page).not_to have_css("#footnote-references .plan-footnote__empty")
# Count span updated in-place via Turbo Stream (separate stream target)
expect(page).to have_css("#references-count", text: "1")
@@ -119,7 +121,7 @@ def open_add_reference_modal
# Turbo Stream removes the reference and updates count
expect(page).not_to have_content("Doomed")
expect(page).to have_css("#references-count", text: "0")
- expect(page).to have_content("No references yet")
+ expect(page).to have_css("#footnote-references .plan-footnote__empty", text: "None yet")
end
end