diff --git a/Gemfile b/Gemfile index 314849ff2..bafc88826 100644 --- a/Gemfile +++ b/Gemfile @@ -64,6 +64,7 @@ gem "auto_strip_attributes" # Use sidekiq for background processing gem "sidekiq" gem "sidekiq-cron" +gem "unread" group :development, :test do # Check gems for known vulnerabilities diff --git a/app/components/unread_notification.html.erb b/app/components/unread_notification.html.erb new file mode 100644 index 000000000..acdf2d859 --- /dev/null +++ b/app/components/unread_notification.html.erb @@ -0,0 +1,15 @@ +
+
+
+
+
+

<%= oldest_unread_notification.title %>

+ <%= govuk_link_to oldest_unread_notification.link_text, notification_path(oldest_unread_notification), class: "govuk-link--inverse govuk-!-font-weight-bold"%> +
+

+ <%= govuk_link_to "Dismiss", notification_dismiss_path(oldest_unread_notification), class: "govuk-link--inverse"%> +

+
+
+
+
diff --git a/app/components/unread_notification.rb b/app/components/unread_notification.rb new file mode 100644 index 000000000..d86280e31 --- /dev/null +++ b/app/components/unread_notification.rb @@ -0,0 +1,12 @@ +class UnreadNotification < ViewComponent::Base + attr_reader :current_user + + def initialize(current_user:) + @current_user = current_user + super + end + + def oldest_unread_notification + Notification.unread_by(@current_user).first + end +end diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb new file mode 100644 index 000000000..73fe702d7 --- /dev/null +++ b/app/controllers/notifications_controller.rb @@ -0,0 +1,8 @@ +class NotificationsController < ApplicationController + + def dismiss + Notification.find(params[:notification_id]).mark_as_read! for: current_user + + redirect_to root_path + end +end diff --git a/app/frontend/styles/_unread-notification.scss b/app/frontend/styles/_unread-notification.scss new file mode 100644 index 000000000..d76b36fa2 --- /dev/null +++ b/app/frontend/styles/_unread-notification.scss @@ -0,0 +1,7 @@ +.app-unread-notification { + background-color: govuk-colour("blue"); +} + +.app-unread-notification p { + color: govuk-colour("white"); +} diff --git a/app/frontend/styles/application.scss b/app/frontend/styles/application.scss index ddf368807..272310b5b 100644 --- a/app/frontend/styles/application.scss +++ b/app/frontend/styles/application.scss @@ -25,7 +25,9 @@ $govuk-breakpoints: ( @import "accessible-autocomplete"; @import "button"; @import "card"; +@import "delete-logs-table"; @import "document-list"; +@import "errors"; @import "feedback"; @import "filter"; @import "filter-layout"; @@ -43,8 +45,7 @@ $govuk-breakpoints: ( @import "primary-navigation"; @import "search"; @import "sub-navigation"; -@import "errors"; -@import "delete-logs-table"; +@import "unread-notification"; // App utilities .app-\!-colour-muted { diff --git a/app/models/notification.rb b/app/models/notification.rb new file mode 100644 index 000000000..9e3a8482f --- /dev/null +++ b/app/models/notification.rb @@ -0,0 +1,3 @@ +class Notification < ApplicationRecord + acts_as_readable +end diff --git a/app/models/user.rb b/app/models/user.rb index bd04ba2b2..74ac34547 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,6 @@ class User < ApplicationRecord + acts_as_reader + # Include default devise modules. Others available are: # :omniauthable devise :database_authenticatable, :recoverable, :rememberable, diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 30ec7d098..c540ad5cc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -101,6 +101,11 @@ end end %> + <% if current_user.present? && current_page?("/") && Notification.unread_by(current_user).present? %> + <%= render UnreadNotification.new(current_user:) %> + <% end %> + + <% feedback_link = govuk_link_to "giving us your feedback (opens in a new tab)", t("feedback_form"), rel: "noreferrer noopener", target: "_blank" %> <%= govuk_phase_banner( @@ -109,7 +114,7 @@ text: "This is a new service – help us improve it by #{feedback_link}".html_safe, ) %> - <% if !current_user.nil? %> + <% if current_user.present? %> <%= render PrimaryNavigationComponent.new( items: primary_items(request.path, current_user), ) %> @@ -124,7 +129,7 @@ <%= govuk_notification_banner( title_text: "Success", success: true, title_heading_level: 3, - title_id: "swanky-notifications" + title_id: "flash-notice" ) do |notification_banner| notification_banner.heading(text: flash.notice.html_safe) if flash[:notification_banner_body] diff --git a/config/routes.rb b/config/routes.rb index 94626f34d..4339892dd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -128,6 +128,10 @@ Rails.application.routes.draw do end end + resources :notifications do + get "dismiss", to: "notifications#dismiss" + end + resources :organisations do get "duplicates", to: "duplicate_logs#index" diff --git a/db/migrate/20240108152935_unread_migration.rb b/db/migrate/20240108152935_unread_migration.rb new file mode 100644 index 000000000..099e74b4a --- /dev/null +++ b/db/migrate/20240108152935_unread_migration.rb @@ -0,0 +1,24 @@ +class UnreadMigration < ActiveRecord::Migration[6.0] + def self.up + create_table ReadMark, force: true, options: create_options do |t| + t.references :readable, polymorphic: { null: false } + t.references :reader, polymorphic: { null: false } + t.datetime :timestamp, null: false + end + + add_index ReadMark, [:reader_id, :reader_type, :readable_type, :readable_id], name: 'read_marks_reader_readable_index', unique: true + end + + def self.down + drop_table ReadMark + end + + def self.create_options + options = '' + if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) \ + && ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) + options = 'DEFAULT CHARSET=latin1' + end + options + end +end diff --git a/db/schema.rb b/db/schema.rb index ffe8275cb..e75f47e60 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[7.0].define(version: 2024_01_08_145545) do +ActiveRecord::Schema[7.0].define(version: 2024_01_08_152935) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -457,6 +457,17 @@ ActiveRecord::Schema[7.0].define(version: 2024_01_08_145545) do t.index ["old_visible_id"], name: "index_organisations_on_old_visible_id", unique: true end + create_table "read_marks", force: :cascade do |t| + t.string "readable_type", null: false + t.bigint "readable_id" + t.string "reader_type", null: false + t.bigint "reader_id" + t.datetime "timestamp", precision: nil, null: false + t.index ["readable_type", "readable_id"], name: "index_read_marks_on_readable_type_and_readable_id" + t.index ["reader_id", "reader_type", "readable_type", "readable_id"], name: "read_marks_reader_readable_index", unique: true + t.index ["reader_type", "reader_id"], name: "index_read_marks_on_reader_type_and_reader_id" + end + create_table "sales_logs", force: :cascade do |t| t.integer "status", default: 0 t.datetime "saledate"