+
<%= avatar_image_tag(notification.creator) %>
-
-
<%= notification_title(notification) %>
-
<%= notification_body(notification) %> · <%= local_datetime_tag(notification.created_at, style: :ago) %>
+
+
<%= notification_title(notification) %>
+
<%= notification_body(notification) %> · <%= notification.bubble.bucket.name %> · <%= local_datetime_tag(notification.created_at, style: :ago) %>
+
+
+
<% end %>
diff --git a/app/views/notifications/_tray.html.erb b/app/views/notifications/_tray.html.erb
index 71ada65cb..55fbfa570 100644
--- a/app/views/notifications/_tray.html.erb
+++ b/app/views/notifications/_tray.html.erb
@@ -1,5 +1,19 @@
<%= turbo_stream_from Current.user, :notifications %>
-<%= tag.div id: "notification-tray", class: "notification-tray flex flex-column gap", data: { turbo_permanent: true } do %>
- <%= turbo_frame_tag("notifications", src: notifications_path) %>
+<%= tag.dialog id: "notification-tray", class: "notification-tray flex flex-column gap unpad borderless justify-end fill-transparent",
+ data: { controller: "dialog", turbo_permanent: true, dialog_modal_value: false, dialog_target: "dialog", action: "keydown.esc->dialog#close:stop click@document->dialog#closeOnClickOutside" } do %>
+ <%= turbo_frame_tag("notifications", src: notifications_tray_path) -%>
+
+ <%= button_to notifications_mark_all_read_path, class: "notification-tray__read_action btn flex-item-justify-start", data: { action: "click->dialog#close", turbo_frame: "notifications" } do %>
+ Mark all as read
+ <% end %>
+
+ <%= link_to notifications_path, class: "notification-tray__all_action btn flex-item-justify-end", data: { action: "click->dialog#close"} do %>
+ <%= image_tag "bell.svg", aria: { hidden: true }, size: 24 %>
+ See all notifications
+ <% end %>
+
+
+
<% end %>
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index ee91b07e4..5040fe0ac 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -1,3 +1,36 @@
-<%= turbo_frame_tag "notifications" do %>
- <%= render @notifications %>
+<% @page_title = "Notifications" %>
+
+<% content_for :header do %>
+
+<% end %>
+
+
+ <% if @unread.any? %>
+ New for you
+ <%= render @unread %>
+ <% else %>
+
+ Nothing new for you.
+
+ <% end %>
+
+
+<% if @page.records.any? %>
+
+ Previously seen
+ <%= render @page.records %>
+
+
+ <%= notifications_next_page_link(@page) %>
<% end %>
diff --git a/app/views/notifications/index.turbo_stream.erb b/app/views/notifications/index.turbo_stream.erb
new file mode 100644
index 000000000..00d744dcd
--- /dev/null
+++ b/app/views/notifications/index.turbo_stream.erb
@@ -0,0 +1,7 @@
+<%= turbo_stream.append :notifications_list_read do %>
+ <%= render @page.records %>
+<% end %>
+
+<%= turbo_stream.replace :next_page do %>
+ <%= notifications_next_page_link(@page) %>
+<% end %>
diff --git a/app/views/notifications/mark_all_reads/create.html.erb b/app/views/notifications/mark_all_reads/create.html.erb
new file mode 100644
index 000000000..52d6bcd10
--- /dev/null
+++ b/app/views/notifications/mark_all_reads/create.html.erb
@@ -0,0 +1 @@
+<%= turbo_frame_tag "notifications" %>
diff --git a/app/views/notifications/trays/show.html.erb b/app/views/notifications/trays/show.html.erb
new file mode 100644
index 000000000..051055670
--- /dev/null
+++ b/app/views/notifications/trays/show.html.erb
@@ -0,0 +1,3 @@
+<%= turbo_frame_tag "notifications" do %>
+ <%= render collection: @notifications, partial: "notifications/notification" %>
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index e950c0ce8..b2cbcb76c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,7 +18,11 @@ Rails.application.routes.draw do
end
resources :bubbles
- resources :notifications
+ resources :notifications, only: :index
+ namespace :notifications do
+ resource :tray, only: :show
+ resource :mark_all_read, only: :create
+ end
resources :buckets do
resources :bubbles do
diff --git a/db/migrate/20250116163344_change_notification_read_to_read_at.rb b/db/migrate/20250116163344_change_notification_read_to_read_at.rb
new file mode 100644
index 000000000..c9bd6bf64
--- /dev/null
+++ b/db/migrate/20250116163344_change_notification_read_to_read_at.rb
@@ -0,0 +1,12 @@
+class ChangeNotificationReadToReadAt < ActiveRecord::Migration[8.1]
+ def change
+ remove_index :notifications, %i[ user_id read created_at ], order: { read: :desc, created_at: :desc }
+
+ change_table :notifications do |t|
+ t.remove :read
+ t.datetime :read_at
+
+ t.index %i[ user_id read_at created_at ], order: { read_at: :desc, created_at: :desc }
+ end
+ end
+end
diff --git a/db/migrate/20250121174109_create_filter_stages_join_table.rb b/db/migrate/20250121174109_create_filter_stages_join_table.rb
new file mode 100644
index 000000000..268e648d3
--- /dev/null
+++ b/db/migrate/20250121174109_create_filter_stages_join_table.rb
@@ -0,0 +1,8 @@
+class CreateFilterStagesJoinTable < ActiveRecord::Migration[8.1]
+ def change
+ create_join_table :filters, :stages do |t|
+ t.index :filter_id
+ t.index :stage_id
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0122e336d..3cf72d01e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.1].define(version: 2025_01_17_142146) do
+ActiveRecord::Schema[8.1].define(version: 2025_01_21_174109) do
create_table "accesses", force: :cascade do |t|
t.integer "bucket_id", null: false
t.integer "user_id", null: false
@@ -162,6 +162,13 @@ ActiveRecord::Schema[8.1].define(version: 2025_01_17_142146) do
t.index ["creator_id", "params_digest"], name: "index_filters_on_creator_id_and_params_digest", unique: true
end
+ create_table "filters_stages", id: false, force: :cascade do |t|
+ t.integer "filter_id", null: false
+ t.integer "stage_id", null: false
+ t.index ["filter_id"], name: "index_filters_stages_on_filter_id"
+ t.index ["stage_id"], name: "index_filters_stages_on_stage_id"
+ end
+
create_table "filters_tags", id: false, force: :cascade do |t|
t.integer "filter_id", null: false
t.integer "tag_id", null: false
@@ -185,13 +192,13 @@ ActiveRecord::Schema[8.1].define(version: 2025_01_17_142146) do
t.integer "bubble_id", null: false
t.string "resource_type", null: false
t.integer "resource_id", null: false
- t.boolean "read", default: false, null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.datetime "read_at"
t.index ["bubble_id"], name: "index_notifications_on_bubble_id"
t.index ["event_id"], name: "index_notifications_on_event_id"
t.index ["resource_type", "resource_id"], name: "index_notifications_on_resource"
- t.index ["user_id", "read", "created_at"], name: "index_notifications_on_user_id_and_read_and_created_at", order: { read: :desc, created_at: :desc }
+ t.index ["user_id", "read_at", "created_at"], name: "index_notifications_on_user_id_and_read_at_and_created_at", order: { read_at: :desc, created_at: :desc }
t.index ["user_id"], name: "index_notifications_on_user_id"
end
diff --git a/test/controllers/notifications/mark_all_reads_controller_test.rb b/test/controllers/notifications/mark_all_reads_controller_test.rb
new file mode 100644
index 000000000..ea43e1be6
--- /dev/null
+++ b/test/controllers/notifications/mark_all_reads_controller_test.rb
@@ -0,0 +1,17 @@
+require "test_helper"
+
+class Notifications::MarkAllReadsControllerTest < ActionDispatch::IntegrationTest
+ setup do
+ sign_in_as :kevin
+ end
+
+ test "show" do
+ assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
+ assert_changes -> { notifications(:layout_commented_kevin).reload.read? }, from: false, to: true do
+ post notifications_mark_all_read_url
+ end
+ end
+
+ assert_response :success
+ end
+end
diff --git a/test/controllers/notifications/trays_controller_test.rb b/test/controllers/notifications/trays_controller_test.rb
new file mode 100644
index 000000000..7d44a3e00
--- /dev/null
+++ b/test/controllers/notifications/trays_controller_test.rb
@@ -0,0 +1,14 @@
+require "test_helper"
+
+class Notifications::TraysControllerTest < ActionDispatch::IntegrationTest
+ setup do
+ sign_in_as :kevin
+ end
+
+ test "show" do
+ get notifications_tray_url
+
+ assert_response :success
+ assert_select "div", text: /Layout is broken/
+ end
+end
diff --git a/test/controllers/notifications_controller_test.rb b/test/controllers/notifications_controller_test.rb
index fc4c2bfee..20b28201d 100644
--- a/test/controllers/notifications_controller_test.rb
+++ b/test/controllers/notifications_controller_test.rb
@@ -1,14 +1,7 @@
require "test_helper"
class NotificationsControllerTest < ActionDispatch::IntegrationTest
- setup do
- sign_in_as :kevin
- end
-
- test "index" do
- get notifications_url
-
- assert_response :success
- assert_select "div", text: /Layout is broken/
- end
+ # test "the truth" do
+ # assert true
+ # end
end
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index 89a8256ee..7bff2665c 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -3,7 +3,6 @@ logo_published_kevin:
event: logo_published
bubble: logo
resource: logo (Bubble)
- read: false
created_at: <%= 1.week.ago %>
layout_commented_kevin:
@@ -11,5 +10,4 @@ layout_commented_kevin:
event: layout_commented
bubble: layout
resource: layout_overflowing_david (Comment)
- read: false
created_at: <%= 1.week.ago %>
diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb
index c653551dd..28842e66a 100644
--- a/test/models/filter_test.rb
+++ b/test/models/filter_test.rb
@@ -8,6 +8,7 @@ class FilterTest < ActiveSupport::TestCase
bubbles(:layout).capture Comment.new(body: "I hate haggis")
bubbles(:logo).capture Comment.new(body: "I love haggis")
+ bubbles(:logo).update(stage: workflow_stages(:qa_triage))
end
assert_not_includes users(:kevin).filters.new.bubbles, @new_bubble
@@ -18,6 +19,9 @@ class FilterTest < ActiveSupport::TestCase
filter = users(:david).filters.new assigner_ids: [ users(:david).id ], tag_ids: [ tags(:mobile).id ]
assert_equal [ bubbles(:layout) ], filter.bubbles
+ filter = users(:david).filters.new stage_ids: [ workflow_stages(:qa_triage).id ]
+ assert_equal [ bubbles(:logo) ], filter.bubbles
+
filter = users(:david).filters.new assignment_status: "unassigned", bucket_ids: [ @new_bucket.id ]
assert_equal [ @new_bubble ], filter.bubbles
@@ -100,6 +104,12 @@ class FilterTest < ActiveSupport::TestCase
test "summary" do
assert_equal "Most discussed, tagged #Mobile, and assigned to JZ in all projects", filters(:jz_assignments).summary
+
+ filters(:jz_assignments).update!(stages: workflow_stages(:qa_triage, :qa_in_progress))
+ assert_equal "Most discussed, tagged #Mobile, assigned to JZ, and staged in Triage or In Progress in all projects", filters(:jz_assignments).summary
+
+ filters(:jz_assignments).update!(stages: [], assignees: [], tags: [], buckets: [ buckets(:writebook) ])
+ assert_equal "Most discussed in Writebook", filters(:jz_assignments).summary
end
test "params without a key-value pair" do