<%= form_with model: [ @card, @comment ], class: "flex flex-column gap full-width",
data: { controller: "form", action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do |form| %>
- <%= form.rich_textarea :body, required: true, autofocus: true, placeholder: new_comment_placeholder(@card) %>
+ <%= form.rich_textarea :body, required: true, autofocus: true, placeholder: new_comment_placeholder(@card) do %>
+ <%= mentions_prompt(@card.collection) %>
+ <%= cards_prompt %>
+ <% end %>
<%= form.button class: "btn btn--reversed", type: :submit do %>
Save changes
@@ -18,7 +21,7 @@
<% end %>
<%= tag.button type: :submit, class: "btn btn--negative flex-item-justify-end", form: dom_id(@comment, :delete_form),
- data: { turbo_confirm: "Are you sure you want to delete this comment?" } do %>
+ data: { turbo_confirm: "Are you sure you want to delete this comment?" } do %>
<%= icon_tag "trash" %>
Delete
<% end %>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb
index 0a45685e9..fe66f6020 100644
--- a/app/views/cards/container/_title.html.erb
+++ b/app/views/cards/container/_title.html.erb
@@ -20,7 +20,10 @@
<%= form.rich_textarea :description, class: "card-field__description",
placeholder: "Add some notes, context, pictures, or video about this…",
- data: { action: "actiontext:change->auto-save#change focusout->auto-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } %>
+ data: { action: "actiontext:change->auto-save#change focusout->auto-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do %>
+ <%= mentions_prompt(card.collection) %>
+ <%= cards_prompt %>
+ <% end %>
<% end %>
<% end %>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index d7cbe9e6c..e438dbbdb 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -10,7 +10,10 @@
<%= form.rich_textarea :description, class: "card-field__description rich-text-content",
placeholder: "Add some notes, context, pictures, or video about this…",
- data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } %>
+ data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do %>
+ <%= mentions_prompt(@card.collection) %>
+ <%= cards_prompt %>
+ <% end %>
<%= form.button "Save changes", type: :submit, class: "btn btn--reversed", style: "--btn-background: #{@card.color}" %>
<%= link_to "Close editor and discard changes", collection_card_path(@card.collection, @card), data: { form_target: "cancel" }, hidden: true %>
diff --git a/app/views/prompts/cards/_card.html.erb b/app/views/prompts/cards/_card.html.erb
new file mode 100644
index 000000000..ebecb20a6
--- /dev/null
+++ b/app/views/prompts/cards/_card.html.erb
@@ -0,0 +1,8 @@
+
+
+ #<%= card.id %> <%= card.title %>
+
+
+ <%= link_to "##{card.id} #{card.title}", collection_card_url(card.collection, card) %>
+
+
diff --git a/app/views/prompts/cards/index.html.erb b/app/views/prompts/cards/index.html.erb
new file mode 100644
index 000000000..253e6e543
--- /dev/null
+++ b/app/views/prompts/cards/index.html.erb
@@ -0,0 +1 @@
+<%= render partial: "prompts/cards/card", collection: @cards %>
diff --git a/app/views/prompts/collections/users/_user.html.erb b/app/views/prompts/collections/users/_user.html.erb
new file mode 100644
index 000000000..836467bca
--- /dev/null
+++ b/app/views/prompts/collections/users/_user.html.erb
@@ -0,0 +1,10 @@
+
" sgid="<%= user.attachable_sgid %>">
+
+ <%= avatar_image_tag user %>
+ <%= user.name %>
+
+
+ <%= avatar_image_tag user %>
+ <%= user.first_name %>
+
+
diff --git a/app/views/prompts/collections/users/index.html.erb b/app/views/prompts/collections/users/index.html.erb
new file mode 100644
index 000000000..3ece68eab
--- /dev/null
+++ b/app/views/prompts/collections/users/index.html.erb
@@ -0,0 +1 @@
+<%= render partial: "prompts/collections/users/user", collection: @users %>
diff --git a/app/views/users/_attachable.html.erb b/app/views/users/_attachable.html.erb
new file mode 100644
index 000000000..d6e474b6c
--- /dev/null
+++ b/app/views/users/_attachable.html.erb
@@ -0,0 +1,2 @@
+<%= avatar_image_tag user %>
+<%= user.first_name %>
diff --git a/config/routes.rb b/config/routes.rb
index 3e9761dd4..db0cf3cd6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -103,6 +103,15 @@ Rails.application.routes.draw do
resources :pins
end
+ namespace :prompts do
+ resources :cards
+ resources :collections do
+ scope module: :collections do
+ resources :users
+ end
+ end
+ end
+
namespace :public do
resources :collections do
scope module: :collections do
diff --git a/db/schema.rb b/db/schema.rb
index d27ab0295..dff0ccb02 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -324,6 +324,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_06_09_102553) do
t.datetime "created_at", null: false
t.string "title"
t.datetime "updated_at", null: false
+ t.index ["title"], name: "index_tags_on_account_id_and_title", unique: true
end
create_table "users", force: :cascade do |t|
diff --git a/db/schema_cache.yml b/db/schema_cache.yml
index 479604bf0..89fca8331 100644
--- a/db/schema_cache.yml
+++ b/db/schema_cache.yml
@@ -2200,7 +2200,23 @@ indexes:
nulls_not_distinct:
comment:
valid: true
- tags: []
+ tags:
+ - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
+ table: tags
+ name: index_tags_on_account_id_and_title
+ unique: true
+ columns:
+ - title
+ lengths: {}
+ orders: {}
+ opclasses: {}
+ where:
+ type:
+ using:
+ include:
+ nulls_not_distinct:
+ comment:
+ valid: true
users:
- !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition
table: users
diff --git a/test/models/concerns/mentions_test.rb b/test/models/concerns/mentions_test.rb
index f7454a322..006d77ec0 100644
--- a/test/models/concerns/mentions_test.rb
+++ b/test/models/concerns/mentions_test.rb
@@ -5,7 +5,7 @@ class MentionsTest < ActiveSupport::TestCase
Current.session = sessions(:david)
end
- test "create mentions when creating messages" do
+ test "create mentions from plain text mentions" do
assert_difference -> { Mention.count }, +1 do
perform_enqueued_jobs only: Mention::CreateJob do
collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, @david?"
@@ -13,6 +13,27 @@ class MentionsTest < ActiveSupport::TestCase
end
end
+ test "create mentions from rich text mentions" do
+ assert_difference -> { Mention.count }, +1 do
+ perform_enqueued_jobs only: Mention::CreateJob do
+ attachment = ActionText::Attachment.from_attachable(users(:david))
+ collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, #{attachment.to_html}?"
+ end
+ end
+ end
+
+ test "can't mention users that don't have access to the collection" do
+ collections(:writebook).update! all_access: false
+ collections(:writebook).accesses.revoke_from(users(:david))
+
+ assert_no_difference -> { Mention.count }, +1 do
+ perform_enqueued_jobs only: Mention::CreateJob do
+ attachment = ActionText::Attachment.from_attachable(users(:david))
+ collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup, #{attachment.to_html}?"
+ end
+ end
+ end
+
test "mentionees are added as watchers of the card" do
perform_enqueued_jobs only: Mention::CreateJob do
card = collections(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup @kevin?"