coplan-engine 0.1.3 → 0.2.0

data/app/views/coplan/plans/show.html.erb

@@ -5,6 +5,7 @@
 <div class="plan-content card">
   <% if @plan.current_content.present? %>
     <div class="plan-layout" data-controller="coplan--text-selection" data-coplan--text-selection-plan-id-value="<%= @plan.id %>">
+      <div class="plan-layout__margin" data-coplan--text-selection-target="margin"></div>
       <div class="plan-layout__content" data-coplan--text-selection-target="content">
         <%= render_markdown(@plan.current_content) %>
 
@@ -13,39 +14,14 @@
             💬 Comment
           </button>
         </div>
-      </div>
 
-      <div class="plan-layout__sidebar">
         <%= render partial: "coplan/comment_threads/new_comment_form", locals: { plan: @plan } %>
+      </div>
 
-        <div class="comment-tabs" data-controller="coplan--tabs" data-coplan--tabs-active-class="comment-tab--active">
-          <div class="comment-tabs__nav">
-            <button class="comment-tab comment-tab--active" data-coplan--tabs-target="tab" data-action="coplan--tabs#switch coplan--text-selection#repositionThreads" data-index="0">
-              Open <span class="comment-tab__count" id="open-thread-count"><%= @active_threads.size if @active_threads.any? %></span>
-            </button>
-            <button class="comment-tab" data-coplan--tabs-target="tab" data-action="coplan--tabs#switch coplan--text-selection#repositionThreads" data-index="1">
-              Resolved <span class="comment-tab__count" id="resolved-thread-count"><%= @archived_threads.size if @archived_threads.any? %></span>
-            </button>
-          </div>
-
-          <div class="comment-tabs__panel" data-coplan--tabs-target="panel">
-            <div class="comment-threads-list" id="comment-threads">
-              <% @active_threads.each do |thread| %>
-                <%= render partial: "coplan/comment_threads/thread", locals: { thread: thread, plan: @plan, current_user: current_user } %>
-              <% end %>
-              <p class="text-sm text-muted" id="open-threads-empty" <% if @active_threads.any? %>style="display: none;"<% end %>>No open comments.</p>
-            </div>
-          </div>
-
-          <div class="comment-tabs__panel" data-coplan--tabs-target="panel" style="display: none;">
-            <div class="comment-threads-list" id="resolved-comment-threads">
-              <% @archived_threads.each do |thread| %>
-                <%= render partial: "coplan/comment_threads/thread", locals: { thread: thread, plan: @plan, current_user: current_user } %>
-              <% end %>
-              <p class="text-sm text-muted" id="resolved-threads-empty" <% if @archived_threads.any? %>style="display: none;"<% end %>>No resolved comments.</p>
-            </div>
-          </div>
-        </div>
+      <div id="plan-threads" data-coplan--text-selection-target="threads">
+        <% @threads.select(&:anchored?).each do |thread| %>
+          <%= render partial: "coplan/comment_threads/thread_popover", locals: { thread: thread, plan: @plan, current_user: current_user } %>
+        <% end %>
       </div>
     </div>
   <% else %>
@@ -54,3 +30,19 @@
     </div>
   <% end %>
 </div>
+
+<% open_count = @threads.count(&:open?) %>
+<% if @threads.any? %>
+  <div class="comment-toolbar" data-controller="coplan--comment-nav" data-coplan--comment-nav-plan-id-value="<%= @plan.id %>">
+    <span class="comment-toolbar__count">💬 <%= open_count %> open</span>
+    <div class="comment-toolbar__nav">
+      <button class="btn btn--secondary btn--sm" data-action="coplan--comment-nav#prev" title="Previous comment">↑</button>
+      <span class="comment-toolbar__position" data-coplan--comment-nav-target="position"></span>
+      <button class="btn btn--secondary btn--sm" data-action="coplan--comment-nav#next" title="Next comment">↓</button>
+    </div>
+    <label class="comment-toolbar__toggle">
+      <input type="checkbox" data-action="coplan--comment-nav#toggleResolved" data-coplan--comment-nav-target="resolvedToggle">
+      Show resolved (<%= @threads.count { |t| !t.open? } %>)
+    </label>
+  </div>
+<% end %>

data/app/views/layouts/coplan/application.html.erb

@@ -6,6 +6,9 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <%= yield :head %>
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Lexend:wght@300;400;500;600;700&display=swap" rel="stylesheet">
     <%= stylesheet_link_tag "coplan/application", "data-turbo-track": "reload" %>
     <%= javascript_importmap_tags %>
   </head>

data/config/routes.rb

@@ -7,7 +7,7 @@ CoPlan::Engine.routes.draw do
       member do
         patch :resolve
         patch :accept
-        patch :dismiss
+        patch :discard
         patch :reopen
       end
       resources :comments, only: [:create]
@@ -31,7 +31,7 @@ CoPlan::Engine.routes.draw do
         resources :comments, only: [:create], controller: "comments" do
           post :reply, on: :member
           patch :resolve, on: :member
-          patch :dismiss, on: :member
+          patch :discard, on: :member
         end
       end
     end

data/db/migrate/20260320145453_migrate_comment_thread_statuses.rb

@@ -0,0 +1,31 @@
+class MigrateCommentThreadStatuses < ActiveRecord::Migration[8.0]
+  def up
+    # open → pending (default for new comments from non-authors)
+    # accepted → resolved (collapse accepted into resolved)
+    # dismissed → discarded (rename)
+    # resolved stays resolved
+    #
+    # We also add "todo" as a new status (author agrees with feedback).
+    # Existing "open" threads become "pending" since we can't determine authorship here.
+    execute <<~SQL
+      UPDATE coplan_comment_threads SET status = 'pending' WHERE status = 'open'
+    SQL
+    execute <<~SQL
+      UPDATE coplan_comment_threads SET status = 'discarded' WHERE status = 'dismissed'
+    SQL
+    execute <<~SQL
+      UPDATE coplan_comment_threads SET status = 'resolved' WHERE status = 'accepted'
+    SQL
+    change_column_default :coplan_comment_threads, :status, "pending"
+  end
+
+  def down
+    change_column_default :coplan_comment_threads, :status, "open"
+    execute <<~SQL
+      UPDATE coplan_comment_threads SET status = 'open' WHERE status IN ('pending', 'todo')
+    SQL
+    execute <<~SQL
+      UPDATE coplan_comment_threads SET status = 'dismissed' WHERE status = 'discarded'
+    SQL
+  end
+end

data/lib/coplan/version.rb

@@ -1,3 +1,3 @@
 module CoPlan
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coplan-engine
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Block
@@ -159,9 +159,10 @@ files:
 - app/helpers/coplan/application_helper.rb
 - app/helpers/coplan/comments_helper.rb
 - app/helpers/coplan/markdown_helper.rb
+- app/javascript/controllers/coplan/comment_form_controller.js
+- app/javascript/controllers/coplan/comment_nav_controller.js
 - app/javascript/controllers/coplan/dropdown_controller.js
 - app/javascript/controllers/coplan/line_selection_controller.js
-- app/javascript/controllers/coplan/tabs_controller.js
 - app/javascript/controllers/coplan/text_selection_controller.js
 - app/jobs/coplan/application_job.rb
 - app/jobs/coplan/automated_review_job.rb
@@ -197,6 +198,7 @@ files:
 - app/views/coplan/comment_threads/_new_comment_form.html.erb
 - app/views/coplan/comment_threads/_reply_form.html.erb
 - app/views/coplan/comment_threads/_thread.html.erb
+- app/views/coplan/comment_threads/_thread_popover.html.erb
 - app/views/coplan/comments/_comment.html.erb
 - app/views/coplan/dashboard/show.html.erb
 - app/views/coplan/plan_versions/index.html.erb
@@ -216,6 +218,7 @@ files:
 - config/routes.rb
 - db/migrate/20260226200000_create_coplan_schema.rb
 - db/migrate/20260313210000_expand_content_markdown_to_mediumtext.rb
+- db/migrate/20260320145453_migrate_comment_thread_statuses.rb
 - lib/coplan.rb
 - lib/coplan/configuration.rb
 - lib/coplan/engine.rb

data/app/javascript/controllers/coplan/tabs_controller.js

@@ -1,18 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["tab", "panel"]
-  static classes = ["active"]
-
-  switch(event) {
-    const index = parseInt(event.currentTarget.dataset.index)
-
-    this.tabTargets.forEach((tab, i) => {
-      tab.classList.toggle(this.activeClass, i === index)
-    })
-
-    this.panelTargets.forEach((panel, i) => {
-      panel.style.display = i === index ? "" : "none"
-    })
-  }
-}