activeadmin_annotations 0.1.1 → 0.1.2

data/lib/activeadmin/annotations/review_panel.rb

@@ -69,7 +69,8 @@ module ActiveAdmin::Annotations
         display_version: display_version,
         annotations: annotations,
         content_stale: false,
-        advance_review_url: nil
+        advance_review_url: nil,
+        readonly: review.blank? || display_version != review.content_revision_version
       )
     end
 
@@ -84,7 +85,7 @@ module ActiveAdmin::Annotations
       context = @context_builder.call(content_subject)
       digest = Context.digest_for(context)
 
-      review = ReviewService.find_or_sync_review!(
+      review = ReviewService.preview_review(
         subject: @subject,
         reviewer: @reviewer,
         context: context,
@@ -107,11 +108,12 @@ module ActiveAdmin::Annotations
         display_version: review.content_revision_version,
         annotations: annotations,
         content_stale: review.context_stale?,
-        advance_review_url: revision_enabled ? @advance_review_url : nil
+        advance_review_url: revision_enabled ? @advance_review_url : nil,
+        readonly: false
       )
     end
 
-    def render_panel(review:, content_subject:, revision_enabled:, latest_version:, display_version:, annotations:, content_stale:, advance_review_url:)
+    def render_panel(review:, content_subject:, revision_enabled:, latest_version:, display_version:, annotations:, content_stale:, advance_review_url:, readonly: false)
       context = @context_builder.call(content_subject)
 
       @view_context.helpers.activeadmin_annotations_panel(
@@ -129,12 +131,13 @@ module ActiveAdmin::Annotations
         annotations: annotations,
         review: review,
         categories: @categories,
-        category_label: @category_label
+        category_label: @category_label,
+        readonly: readonly
       )
     end
 
     def annotations_for_review(review:, revision_enabled:, display_version:)
-      return [] if review.blank?
+      return [] unless review&.persisted?
 
       scope = review.annotations.where(field_name: @field).order(:created_at)
       return scope unless revision_enabled

data/lib/activeadmin/annotations/span_create.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module ActiveAdmin::Annotations
+  class SpanCreate
+    class ReadOnly < StandardError; end
+
+    def self.review_for!(params:, reviewer:)
+      new(params: params, reviewer: reviewer).review
+    end
+
+    def initialize(params:, reviewer:)
+      @params = params
+      @reviewer = reviewer
+    end
+
+    def review
+      resolved = existing_review_or_persist_from_subject
+      reject_read_only!(resolved)
+      resolved
+    end
+
+    private
+
+    def existing_review_or_persist_from_subject
+      review_id = annotation_hash[:annotation_review_id]
+      if review_id.present?
+        ReviewAccess.review_for_span_create!(review_id: review_id, reviewer: @reviewer)
+      else
+        persist_from_subject!
+      end
+    end
+
+    def persist_from_subject!
+      raise ReviewAccess::Forbidden, "Review access denied" if @reviewer.blank?
+
+      subject = ReviewAccess.subject_for_span_create!(
+        subject_type: annotation_hash[:subject_type],
+        subject_id: annotation_hash[:subject_id]
+      )
+      revision_enabled = ContentRevision.enabled_for?(subject)
+      ReviewService.find_or_sync_review!(
+        subject: subject,
+        reviewer: @reviewer,
+        context: context_from_params,
+        context_digest: annotation_hash[:context_digest],
+        content_revision_version: revision_enabled ? ContentRevision.current_version_for(subject) : 0,
+        content_revision_enabled: revision_enabled
+      )
+    end
+
+    def reject_read_only!(review)
+      return unless annotation_hash.key?(:displayed_content_revision_version)
+      return if annotation_hash[:displayed_content_revision_version].to_i == review.content_revision_version
+
+      raise ReadOnly, "This version is read-only."
+    end
+
+    def context_from_params
+      context = annotation_hash[:context_json].presence || {}
+      context = context.to_unsafe_h if context.respond_to?(:to_unsafe_h)
+      context
+    end
+
+    def annotation_hash
+      raw = @params[:annotation] || @params["annotation"] || {}
+      raw = raw.to_unsafe_h if raw.respond_to?(:to_unsafe_h)
+      raw.respond_to?(:with_indifferent_access) ? raw.with_indifferent_access : raw
+    end
+  end
+end

data/lib/activeadmin/annotations/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveAdmin
   module Annotations
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/activeadmin_annotations.rb

@@ -9,5 +9,7 @@ require "activeadmin/annotations/exporter"
 require "activeadmin/annotations/copy_text"
 require "activeadmin/annotations/content_revision"
 require "activeadmin/annotations/review_access"
+require "activeadmin/annotations/span_create"
+require "activeadmin/annotations/panel_html"
 require "activeadmin/annotations/review_panel"
 require "activeadmin/annotations/engine"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_annotations
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrei Makarov
@@ -309,14 +309,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 description: Collect text highlights and comments inside a bounded ActiveAdmin block,
   with optional review context, content revision pinning, and JSONL export.
 email:
@@ -335,8 +335,14 @@ files:
 - activeadmin_annotations.gemspec
 - admin/annotation_reviews.rb
 - admin/annotations.rb
+- app/assets/controllers/activeadmin_annotations/annotation_client.js
+- app/assets/controllers/activeadmin_annotations/annotation_list.js
 - app/assets/controllers/activeadmin_annotations/annotator_controller.js
 - app/assets/controllers/activeadmin_annotations/clipboard_controller.js
+- app/assets/controllers/activeadmin_annotations/composer.js
+- app/assets/controllers/activeadmin_annotations/highlights.js
+- app/assets/controllers/activeadmin_annotations/selection.js
+- app/assets/javascripts/activeadmin_annotations/annotator_logic.mjs
 - app/assets/stylesheets/activeadmin_annotations.css
 - app/helpers/active_admin/annotations/panel_helper.rb
 - app/models/active_admin/annotations/annotation.rb
@@ -358,8 +364,10 @@ files:
 - lib/activeadmin/annotations/copy_text.rb
 - lib/activeadmin/annotations/engine.rb
 - lib/activeadmin/annotations/exporter.rb
+- lib/activeadmin/annotations/panel_html.rb
 - lib/activeadmin/annotations/review_access.rb
 - lib/activeadmin/annotations/review_panel.rb
+- lib/activeadmin/annotations/span_create.rb
 - lib/activeadmin/annotations/version.rb
 - lib/activeadmin_annotations.rb
 - sig/activeadmin/annotations.rbs
@@ -380,7 +388,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="