collavre 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fa2404d51d4e3c83b1c475d2ceb48d2bc834193f825e25cfcb15f5d8dc1a3c7
-  data.tar.gz: 9139d284ca5dd900d79a048b299995558cfbc5dc6acf7324416fac394aa60982
+  metadata.gz: 88ee0fe394fdf6b52cb501be92fbac6b05e549adf30aa46937d7e9a14a690e7c
+  data.tar.gz: e3573f4001310e3227e6084f5544af98412ba341d217cec06731974d57fc154d
 SHA512:
-  metadata.gz: 25d88e2068d1810640e9325ed5bcac9d1a07e8452f7843bb646b4d005314bd664f5b0247dbf92036954e688d98f12e9aef65e1ece13d841e07954619e2483339
-  data.tar.gz: 531f7331c316c8d8f1847bbbd6b0dfd386022a968fbdcbf9c0564b1d34b16599fa450841a140bf0619b12df683c3bc8a3cecb8d0b691a242aca3b5efbfcffcb5
+  metadata.gz: a139147e03c807d07ab876d053172acfb736956fb5d6a8e1d519a070b83913caba150389153329461963129394b52af20cbd53b7e0506a68f5c4210dc6625cc2
+  data.tar.gz: f9f2ea3a2921c3baee34452e8908cd48e93b59692124b54b672312255eb8a25eb77f8b3dad61f3ce17e6533f9d79e7b11ce7bd928dfcc74ea336dc30329204b0

data/app/assets/stylesheets/collavre/comment_versions.css

@@ -0,0 +1,76 @@
+.comment-version-navigator {
+  display: flex;
+  align-items: center;
+  gap: var(--space-2, 0.25rem);
+  margin-top: var(--space-2, 0.25rem);
+  font-size: var(--text-xs, 0.75rem);
+}
+
+.comment-version-btn {
+  background: none;
+  border: 1px solid var(--border-color, #ddd);
+  border-radius: var(--radius-1, 4px);
+  cursor: pointer;
+  padding: 0 var(--space-2, 0.25rem);
+  font-size: var(--text-xs, 0.75rem);
+  line-height: 1.6;
+  color: var(--text-color, #333);
+}
+
+.comment-version-btn:hover:not(:disabled) {
+  background: var(--surface-hover, #f0f0f0);
+}
+
+.comment-version-btn:disabled {
+  opacity: 0.3;
+  cursor: default;
+}
+
+.comment-version-indicator {
+  color: var(--text-muted, #888);
+  font-variant-numeric: tabular-nums;
+  min-width: 3em;
+  text-align: center;
+}
+
+.comment-version-delete-btn {
+  background: none;
+  border: none;
+  cursor: pointer;
+  color: var(--text-muted, #888);
+  font-size: var(--text-xs, 0.75rem);
+  padding: 0 var(--space-1, 0.125rem);
+  margin-left: var(--space-1, 0.125rem);
+}
+
+.comment-version-delete-btn:hover {
+  color: var(--danger-color, #e53e3e);
+}
+
+.comment-version-selected {
+  color: var(--primary-color, #4a90d9);
+  font-weight: bold;
+}
+
+.comment-version-select-btn {
+  background: none;
+  border: 1px solid var(--primary-color, #4a90d9);
+  border-radius: var(--radius-1, 4px);
+  cursor: pointer;
+  color: var(--primary-color, #4a90d9);
+  font-size: var(--text-xs, 0.75rem);
+  padding: 0 var(--space-2, 0.25rem);
+  margin-left: var(--space-1, 0.125rem);
+  line-height: 1.6;
+}
+
+.comment-version-select-btn:hover:not(:disabled) {
+  background: var(--primary-color, #4a90d9);
+  color: white;
+}
+
+.comment-version-select-btn:disabled,
+.comment-version-delete-btn:disabled {
+  opacity: 0.3;
+  cursor: default;
+}

data/app/assets/stylesheets/collavre/comments_popup.css

@@ -138,8 +138,12 @@ body.chat-fullscreen {
 
 #new-comment-form textarea {
     width: 96%;
-    resize: vertical;
+    resize: none;
     font-size: var(--text-1);
+    overflow-y: auto;
+    min-height: calc(var(--text-1) * 1.5 * 2); /* 2 lines minimum */
+    max-height: calc(var(--text-1) * 1.5 * 10); /* 10 lines maximum */
+    transition: height 0.1s ease-out;
     /* Prevent iOS zoom on focus */
 }
 
@@ -196,10 +200,11 @@ body.chat-fullscreen {
     margin-bottom: 0.2em;
 }
 
-.comment-quoted-text {
+.comment-quoted-text,
+.comment-content blockquote {
     border-left: 3px solid var(--color-border);
-    padding: 0.3em 0.6em;
-    margin: 0;
+    padding: 0.2em 0.6em;
+    margin: 0 0 0.3em 0;
     color: var(--color-muted);
     font-size: 0.9em;
     background: color-mix(in srgb, var(--color-section-bg) 50%, transparent);
@@ -208,6 +213,10 @@ body.chat-fullscreen {
     word-break: break-word;
 }
 
+.comment-content blockquote p {
+    margin: 0;
+}
+
 /* Quote indicator in form */
 .comment-quote-indicator {
     display: flex;
@@ -245,6 +254,100 @@ body.chat-fullscreen {
     color: var(--color-text);
 }
 
+/* Review quote chips */
+.review-quotes-container {
+    display: flex;
+    flex-direction: column;
+    gap: 0.25em;
+    padding: 0.4em 0.5em;
+    max-height: 8em;
+    overflow-y: auto;
+}
+
+.review-quote-chip {
+    display: flex;
+    align-items: center;
+    gap: 0.3em;
+    padding: 0.25em 0.5em;
+    background: color-mix(in srgb, var(--color-section-bg) 50%, transparent);
+    border-left: 3px solid var(--color-muted);
+    border-radius: 0 var(--radius-2) var(--radius-2) 0;
+    font-size: var(--text-0);
+    color: var(--color-muted);
+    line-height: 1.3;
+    transition: border-color 0.15s ease, background 0.15s ease;
+}
+
+.review-quote-chip--active {
+    border-left-color: var(--color-active);
+    background: color-mix(in srgb, var(--color-active) 8%, transparent);
+}
+
+.review-quote-type-toggle {
+    border: none;
+    background: none;
+    cursor: pointer;
+    padding: 0 0.1em;
+    font-size: 0.85em;
+    line-height: 1;
+    flex-shrink: 0;
+    opacity: 0.8;
+    transition: opacity 0.15s ease;
+}
+
+.review-quote-type-toggle:hover {
+    opacity: 1;
+}
+
+.review-quote-chip-text {
+    flex: 1;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    cursor: pointer;
+}
+
+.review-quote-chip-text:hover {
+    color: var(--color-text);
+}
+
+.review-quote-chip-feedback {
+    flex-shrink: 1;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-size: 0.85em;
+    color: var(--color-text);
+    opacity: 0.7;
+}
+
+.review-quote-chip-remove {
+    border: none;
+    background: none;
+    cursor: pointer;
+    color: var(--color-muted);
+    font-size: 1em;
+    padding: 0 0.15em;
+    line-height: 1;
+    flex-shrink: 0;
+}
+
+.review-quote-chip-remove:hover {
+    color: var(--color-danger);
+}
+
+.review-submit-btn {
+    font-size: var(--text-0) !important;
+    white-space: nowrap;
+}
+
+.comment-highlight {
+    background: color-mix(in srgb, var(--color-active) 15%, transparent) !important;
+    transition: background 0.3s ease;
+}
+
 /* Review popup (uses common-popup) */
 .comment-review-popup {
     min-width: auto;
@@ -599,7 +702,6 @@ body.chat-fullscreen {
 .delete-comment-btn,
 .edit-comment-btn,
 .review-comment-btn,
-.replace-comment-btn,
 .copy-comment-link-btn {
     border: none;
     background: none;
@@ -614,11 +716,6 @@ body.chat-fullscreen {
     display: none;
 }
 
-.replace-comment-btn:disabled {
-    opacity: 0.35;
-    cursor: default;
-}
-
 .comment-copy-notice {
     position: absolute;
     right: 0.2em;
@@ -1022,35 +1119,81 @@ body.chat-fullscreen {
     outline: none;
 }
 
-/* Selection hint popup */
-.selection-hint-popup {
-    position: fixed;
+/* Selection action bar */
+.selection-action-bar {
+    position: sticky;
+    bottom: 0;
     background: var(--surface-section);
-    border: 1px solid var(--border-color);
-    border-radius: 8px;
-    padding: var(--space-2) 12px;
-    box-shadow: var(--shadow-2);
-    white-space: nowrap;
-    z-index: 10000;
-    animation: hint-fade-in 0.2s ease-out;
+    border-top: 1px solid var(--border-color);
+    padding: var(--space-2) var(--space-3);
+    z-index: 100;
+    animation: action-bar-slide-up 0.2s ease-out;
 }
 
-.selection-hint-popup .hint-content {
+.selection-action-bar-main {
     display: flex;
-    flex-direction: column;
-    gap: var(--space-1);
-    font-size: 0.8em;
+    align-items: center;
+    gap: var(--space-2);
+    flex-wrap: wrap;
+}
+
+.selection-action-bar-count {
+    font-size: 0.85em;
+    font-weight: bold;
+    color: var(--color-text);
+    margin-right: var(--space-1);
+}
+
+.selection-action-bar-btn {
+    border: none;
+    background: none;
+    cursor: pointer;
+    font-size: 0.85em;
+    color: var(--color-chat-btn-text);
+    font-weight: bold;
+    padding: var(--space-1) var(--space-2);
+    border-radius: var(--radius-2);
+    white-space: nowrap;
+}
+
+.selection-action-bar-btn:hover {
+    background: var(--surface-hover, rgba(0, 0, 0, 0.05));
+}
+
+.selection-action-delete:hover {
+    color: var(--color-danger);
+}
+
+.selection-action-bar-close {
+    border: none;
+    background: none;
+    cursor: pointer;
+    font-size: 1em;
     color: var(--text-muted);
+    margin-left: auto;
+    padding: var(--space-1);
 }
 
-.selection-hint-popup .hint-content span {
-    display: block;
+.selection-action-bar-close:hover {
+    color: var(--color-text);
 }
 
-@keyframes hint-fade-in {
+.selection-action-bar-hint {
+    font-size: 0.75em;
+    color: var(--text-muted);
+    margin-top: var(--space-1);
+}
+
+@media (pointer: coarse) {
+    .selection-action-bar-hint.no-touch {
+        display: none;
+    }
+}
+
+@keyframes action-bar-slide-up {
     from {
         opacity: 0;
-        transform: translateY(-4px);
+        transform: translateY(8px);
     }
     to {
         opacity: 1;
@@ -1058,14 +1201,7 @@ body.chat-fullscreen {
     }
 }
 
-/* Dark mode support */
-@media (prefers-color-scheme: dark) {
-    .selection-hint-popup {
-        background: var(--surface-section);
-        border-color: var(--border-color);
-    }
-}
-
+/* Floating search popups — positioned by CommonPopup inside #comments-popup */
 /* Override popup-close-btn absolute positioning inside comments popup header */
 .comments-popup-actions .popup-close-btn {
   position: static;
@@ -1122,3 +1258,21 @@ body.chat-fullscreen {
     0%, 100% { opacity: 1; }
     50% { opacity: 0; }
 }
+
+.review-hint {
+    background: var(--surface-3, #333);
+    color: var(--text-1, #fff);
+    padding: var(--space-2, 4px) var(--space-3, 8px);
+    border-radius: var(--radius-2, 4px);
+    font-size: var(--text-0, 0.75rem);
+    white-space: nowrap;
+    z-index: var(--layer-important, 999);
+    animation: review-hint-fade 3s ease-out forwards;
+    pointer-events: none;
+    box-shadow: var(--shadow-2, 0 2px 8px rgba(0,0,0,0.15));
+}
+
+@keyframes review-hint-fade {
+    0%, 70% { opacity: 1; }
+    100% { opacity: 0; }
+}

data/app/assets/stylesheets/collavre/popup.css

@@ -37,8 +37,10 @@
   margin-right: 0.4em;
 }
 
-#link-creative-modal {
+#link-creative-modal,
+#topic-search-modal {
   min-width: 320px;
+  z-index: calc(var(--layer-modal) + 10);
 }
 
 .common-popup {

data/app/controllers/collavre/comments/versions_controller.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Collavre
+  module Comments
+    class VersionsController < ApplicationController
+      before_action :set_creative
+      before_action :set_comment
+
+      def index
+        versions = @comment.comment_versions.order(:version_number).map do |v|
+          {
+            id: v.id,
+            version_number: v.version_number,
+            content: v.content,
+            created_at: v.created_at.iso8601
+          }
+        end
+
+        render json: {
+          versions: versions,
+          selected_version_id: @comment.selected_version_id,
+          total: versions.size
+        }
+      end
+
+      def select
+        unless @comment.user == Current.user || @creative.has_permission?(Current.user, :admin)
+          render json: { error: I18n.t("collavre.comments.not_owner") }, status: :forbidden and return
+        end
+
+        version = @comment.comment_versions.find(params[:id])
+        @comment.update!(selected_version_id: version.id, content: version.content)
+
+        render json: { selected_version_id: version.id, content: version.content }
+      end
+
+      def destroy
+        unless @comment.user == Current.user || @creative.has_permission?(Current.user, :admin)
+          render json: { error: I18n.t("collavre.comments.not_owner") }, status: :forbidden and return
+        end
+
+        version = @comment.comment_versions.find(params[:id])
+        was_selected = @comment.selected_version_id == version.id
+        version.destroy!
+
+        if was_selected
+          # Roll back to the latest remaining version
+          latest = @comment.comment_versions.order(:version_number).last
+          if latest
+            @comment.update!(selected_version_id: latest.id, content: latest.content)
+          else
+            @comment.update!(selected_version_id: nil)
+          end
+        end
+
+        remaining = @comment.comment_versions.count
+        render json: {
+          selected_version_id: @comment.selected_version_id,
+          content: @comment.content,
+          total: remaining
+        }
+      end
+
+      private
+
+      def set_creative
+        @creative = Creative.find(params[:creative_id]).effective_origin
+      end
+
+      def set_comment
+        @comment = @creative.comments
+                             .where(
+                               "comments.private = ? OR comments.user_id = ? OR comments.approver_id = ?",
+                               false,
+                               Current.user.id,
+                               Current.user.id
+                             )
+                             .find(params[:comment_id])
+      end
+    end
+  end
+end

data/app/controllers/collavre/comments_controller.rb

@@ -25,7 +25,7 @@ module Collavre
         Current.user.id,
         Current.user.id
       )
-      scope = visible_scope.with_attached_images.includes(:topic, :comment_reactions)
+      scope = visible_scope.with_attached_images.includes(:topic, :comment_reactions, :comment_versions)
 
       if params[:search].present?
         search_term = ActiveRecord::Base.sanitize_sql_like(params[:search].to_s.strip.downcase)
@@ -191,7 +191,7 @@ module Collavre
             )
           end
         end
-        @comment = Comment.with_attached_images.includes(:comment_reactions).find(@comment.id)
+        @comment = Comment.with_attached_images.includes(:comment_reactions, :comment_versions, :selected_version).find(@comment.id)
         render partial: "collavre/comments/comment", locals: { comment: @comment, current_topic_id: current_topic_context }, status: :created
       else
         render json: { errors: @comment.errors.full_messages }, status: :unprocessable_entity
@@ -206,7 +206,7 @@ module Collavre
         end
 
         if @comment.update(safe_params)
-          @comment = Comment.with_attached_images.includes(:comment_reactions).find(@comment.id)
+          @comment = Comment.with_attached_images.includes(:comment_reactions, :comment_versions, :selected_version).find(@comment.id)
           render partial: "collavre/comments/comment", locals: { comment: @comment, current_topic_id: current_topic_context }
         else
           render json: { errors: @comment.errors.full_messages }, status: :unprocessable_entity
@@ -295,7 +295,7 @@ module Collavre
 
       begin
         ::Comments::ActionExecutor.new(comment: @comment, executor: Current.user).call
-        @comment = Comment.with_attached_images.includes(:comment_reactions).find(@comment.id)
+        @comment = Comment.with_attached_images.includes(:comment_reactions, :comment_versions, :selected_version).find(@comment.id)
         render partial: "collavre/comments/comment", locals: { comment: @comment, current_topic_id: current_topic_context }
       rescue ::Comments::ActionExecutor::ExecutionError => e
         render json: { error: e.message }, status: :unprocessable_entity
@@ -365,7 +365,7 @@ module Collavre
       elsif executed_error
         render json: { error: I18n.t("collavre.comments.approve_already_executed") }, status: :unprocessable_entity
       elsif update_success
-        @comment = Comment.with_attached_images.includes(:comment_reactions).find(@comment.id)
+        @comment = Comment.with_attached_images.includes(:comment_reactions, :comment_versions, :selected_version).find(@comment.id)
         render partial: "collavre/comments/comment", locals: { comment: @comment, current_topic_id: current_topic_context }
       else
         error_message = @comment.errors.full_messages.to_sentence.presence || I18n.t("collavre.comments.action_update_error")
@@ -406,6 +406,40 @@ module Collavre
       render json: CommandMenuService.new(user: Current.user).items
     end
 
+    MAX_BATCH_DELETE = 100
+
+    def batch_destroy
+      comment_ids = Array(params[:comment_ids]).map(&:to_i).uniq.first(MAX_BATCH_DELETE)
+      if comment_ids.empty?
+        render json: { error: I18n.t("collavre.comments.batch_delete_no_selection") }, status: :unprocessable_entity and return
+      end
+
+      is_admin = @creative.has_permission?(Current.user, :admin)
+      is_creative_owner = @creative.user == Current.user
+
+      visible_scope = @creative.comments.where(
+        "comments.private = ? OR comments.user_id = ? OR comments.approver_id = ?",
+        false, Current.user.id, Current.user.id
+      )
+      comments = visible_scope.where(id: comment_ids).to_a
+
+      if comments.length != comment_ids.length
+        render json: { error: I18n.t("collavre.comments.batch_delete_not_found") }, status: :not_found and return
+      end
+
+      # Check permissions: user must own all comments, or be admin/creative owner
+      unless is_admin || is_creative_owner
+        unauthorized = comments.reject { |c| c.user == Current.user }
+        if unauthorized.any?
+          render json: { error: I18n.t("collavre.comments.not_owner") }, status: :forbidden and return
+        end
+      end
+
+      Comment.where(id: comments.map(&:id)).destroy_all
+
+      head :no_content
+    end
+
     def move
       result = CommentMoveService.new(creative: @creative, user: Current.user).call(
         comment_ids: params[:comment_ids],
@@ -438,7 +472,7 @@ module Collavre
     end
 
     def comment_params
-      params.require(:comment).permit(:content, :private, :topic_id, :quoted_comment_id, :quoted_text, images: [])
+      params.require(:comment).permit(:content, :private, :topic_id, :quoted_comment_id, :quoted_text, :review_type, images: [])
     end
 
     def can_convert_comment?