+ <%= govuk_button_link_to "Back to #{current_user.present? ? 'Home' : 'Start'}", root_path %>
+
diff --git a/app/views/start/index.html.erb b/app/views/start/index.html.erb
index 17e15d34e..a726be277 100644
--- a/app/views/start/index.html.erb
+++ b/app/views/start/index.html.erb
@@ -23,10 +23,10 @@
If you need to set up a new account, speak to your organisation’s CORE data coordinator. If you don’t know who that is, <%= govuk_link_to("contact the helpdesk", GlobalConstants::HELPDESK_URL) %>.
You can <%= govuk_mail_to("dluhc.digital-services@levellingup.gov.uk", "request an account", subject: "CORE: Request a new account") %> if your organisation doesn’t have one.
<%= render partial: "layouts/collection_resources" %>
diff --git a/config/routes.rb b/config/routes.rb
index 94626f34d..06cb4f8d3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -128,6 +128,10 @@ Rails.application.routes.draw do
end
end
+ resource :notifications do
+ get "dismiss", to: "notifications#dismiss"
+ end
+
resources :organisations do
get "duplicates", to: "duplicate_logs#index"
diff --git a/db/migrate/20240108145545_create_notification.rb b/db/migrate/20240108145545_create_notification.rb
new file mode 100644
index 000000000..dc69a8efe
--- /dev/null
+++ b/db/migrate/20240108145545_create_notification.rb
@@ -0,0 +1,14 @@
+class CreateNotification < ActiveRecord::Migration[7.0]
+ def change
+ create_table :notifications do |t|
+ t.string :title
+ t.string :link_text
+ t.string :page_content
+ t.datetime :start_date
+ t.datetime :end_date
+ t.boolean :show_on_unauthenticated_pages
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20240108152935_unread_migration.rb b/db/migrate/20240108152935_unread_migration.rb
new file mode 100644
index 000000000..25067b439
--- /dev/null
+++ b/db/migrate/20240108152935_unread_migration.rb
@@ -0,0 +1,25 @@
+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
+ t.timestamps
+ end
+
+ add_index ReadMark, %i[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 22d67bb9f..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: 2023_12_18_105226) 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"
@@ -393,6 +393,17 @@ ActiveRecord::Schema[7.0].define(version: 2023_12_18_105226) do
t.string "new_organisation_telephone_number"
end
+ create_table "notifications", force: :cascade do |t|
+ t.string "title"
+ t.string "link_text"
+ t.string "page_content"
+ t.datetime "start_date"
+ t.datetime "end_date"
+ t.boolean "show_on_unauthenticated_pages"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
create_table "organisation_relationships", force: :cascade do |t|
t.integer "child_organisation_id"
t.integer "parent_organisation_id"
@@ -446,6 +457,17 @@ ActiveRecord::Schema[7.0].define(version: 2023_12_18_105226) 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"
diff --git a/spec/factories/notification.rb b/spec/factories/notification.rb
new file mode 100644
index 000000000..05d4faa3f
--- /dev/null
+++ b/spec/factories/notification.rb
@@ -0,0 +1,10 @@
+FactoryBot.define do
+ factory :notification do
+ title { "Notification title" }
+ link_text { "Link text" }
+ page_content { "Some html content" }
+ start_date { Time.zone.yesterday }
+ end_date { Time.zone.tomorrow }
+ show_on_unauthenticated_pages { false }
+ end
+end
diff --git a/spec/features/home_page_spec.rb b/spec/features/home_page_spec.rb
index 908961e33..0e8e99ff7 100644
--- a/spec/features/home_page_spec.rb
+++ b/spec/features/home_page_spec.rb
@@ -4,6 +4,124 @@ require_relative "form/helpers"
RSpec.describe "Home Page Features" do
include Helpers
+ context "when there are notifications" do
+ let!(:user) { FactoryBot.create(:user) }
+
+ context "when the notifications are currently active" do
+ before do
+ create(:notification, title: "Notification title 1")
+ create(:notification, title: "Notification title 2")
+ create(:notification, title: "Notification title 3")
+ sign_in user
+ visit(root_path)
+ end
+
+ it "shows the latest notification with count and dismiss link" do
+ expect(page).to have_content("Notification 1 of 3")
+ expect(page).to have_content("Notification title 3")
+ expect(page).to have_link("Dismiss")
+ expect(page).to have_link("Link text")
+ end
+
+ context "when the user clicks a notification link" do
+ before do
+ click_link("Link text")
+ end
+
+ it "takes them to the notification details page" do
+ expect(page).to have_current_path(notifications_path)
+ expect(page).to have_content("Notification title 3")
+ expect(page).to have_content("Some html content")
+ expect(page).to have_link("Back to Home")
+ end
+
+ context "when they return" do
+ before do
+ click_link("Back to Home")
+ end
+
+ it "the notification has not been dismissed" do
+ expect(page).to have_current_path(root_path)
+ expect(page).to have_content("Notification 1 of 3")
+ expect(page).to have_content("Notification title 3")
+ expect(page).to have_link("Dismiss")
+ expect(page).to have_link("Link text")
+ end
+ end
+ end
+
+ context "when the user clicks a dismiss link" do
+ before do
+ click_link("Dismiss")
+ end
+
+ it "dismisses the notification and takes them back" do
+ expect(page).to have_current_path(root_path)
+ expect(page).to have_content("Notification 1 of 2")
+ expect(page).to have_content("Notification title 2")
+ expect(page).to have_link("Dismiss")
+ expect(page).to have_link("Link text")
+ end
+
+ context "when the user dismisses the penultimate notification" do
+ before do
+ click_link("Dismiss")
+ end
+
+ it "no longer displays the count" do
+ expect(page).to have_current_path(root_path)
+ expect(page).not_to have_content("Notification 1 of")
+ expect(page).to have_content("Notification title 1")
+ end
+
+ context "when the user dismisses the final notification" do
+ before do
+ click_link("Dismiss")
+ end
+
+ it "no longer displays any notification" do
+ expect(page).to have_current_path(root_path)
+ expect(page).not_to have_content("Notification")
+ expect(page).not_to have_link("Dismiss")
+ expect(page).not_to have_link("Link_text")
+ end
+ end
+ end
+ end
+
+ context "when another user has dismissed all their notifications" do
+ before do
+ other_user = create(:user)
+ Notification.mark_as_read! :all, for: other_user
+ visit(root_path)
+ end
+
+ it "the first user can still see the notifications" do
+ expect(page).to have_content("Notification 1 of 3")
+ expect(page).to have_content("Notification title 3")
+ expect(page).to have_link("Dismiss")
+ expect(page).to have_link("Link text")
+ end
+ end
+ end
+
+ context "when the notifications are not currently active" do
+ before do
+ create(:notification, end_date: Time.zone.yesterday, title: "Notification title 1")
+ create(:notification, start_date: Time.zone.tomorrow, title: "Notification title 2")
+ sign_in user
+ visit(root_path)
+ end
+
+ it "does not show any notifications" do
+ expect(page).not_to have_content("Notification title")
+ expect(page).not_to have_content("Notification 1 of")
+ expect(page).not_to have_link("Dismiss")
+ expect(page).not_to have_link("Link text")
+ end
+ end
+ end
+
context "when the user is a data provider" do
let(:user) { FactoryBot.create(:user, name: "Provider") }
@@ -13,7 +131,7 @@ RSpec.describe "Home Page Features" do
create_list(:lettings_log, 4, :completed, owning_organisation: user.organisation, created_by: user)
create_list(:lettings_log, 2, :completed)
sign_in user
- visit("/")
+ visit(root_path)
end
it "displays the correct welcome text" do
@@ -26,7 +144,7 @@ RSpec.describe "Home Page Features" do
before do
create_list(:sales_log, 5, :in_progress, owning_organisation: user.organisation, created_by: user)
create_list(:sales_log, 3, :completed, owning_organisation: user.organisation, created_by: user)
- visit("/")
+ visit(root_path)
end
it "displays correct data boxes, counts and links" do
@@ -41,7 +159,7 @@ RSpec.describe "Home Page Features" do
context "when their organisation has never submitted sales logs" do
before do
- visit("/")
+ visit(root_path)
end
it "displays correct data boxes, counts and links" do
@@ -63,7 +181,7 @@ RSpec.describe "Home Page Features" do
create_list(:lettings_log, 2, :completed)
create_list(:scheme, 1, :incomplete, owning_organisation: user.organisation)
sign_in user
- visit("/")
+ visit(root_path)
end
let(:user) { FactoryBot.create(:user, :data_coordinator, name: "Coordinator") }
@@ -78,7 +196,7 @@ RSpec.describe "Home Page Features" do
before do
create_list(:sales_log, 5, :in_progress, owning_organisation: user.organisation)
create_list(:sales_log, 3, :completed, owning_organisation: user.organisation)
- visit("/")
+ visit(root_path)
end
it "displays correct data boxes, counts and links" do
@@ -95,7 +213,7 @@ RSpec.describe "Home Page Features" do
context "when their organisation has never submitted sales logs" do
before do
- visit("/")
+ visit(root_path)
end
it "displays correct data boxes, counts and links" do
@@ -135,7 +253,7 @@ RSpec.describe "Home Page Features" do
click_button("Sign in")
fill_in("code", with: otp)
click_button("Submit")
- visit("/")
+ visit(root_path)
end
it "displays the correct welcome text" do
diff --git a/spec/features/notifications_page_spec.rb b/spec/features/notifications_page_spec.rb
new file mode 100644
index 000000000..97bbeb7eb
--- /dev/null
+++ b/spec/features/notifications_page_spec.rb
@@ -0,0 +1,41 @@
+require "rails_helper"
+require_relative "form/helpers"
+
+RSpec.describe "Notifications Page Features" do
+ include Helpers
+
+ context "when there are notifications" do
+ let!(:user) { FactoryBot.create(:user) }
+
+ context "when the notifications are currently active" do
+ before do
+ create(:notification, title: "Notification title 1")
+ create(:notification, title: "Notification title 2")
+ create(:notification, title: "Notification title 3")
+ sign_in user
+ visit(notifications_path)
+ end
+
+ it "does not show the notification banner" do
+ expect(page).not_to have_content("Notification 1 of")
+ expect(page).not_to have_link("Dismiss")
+ expect(page).not_to have_link("Link text")
+ end
+ end
+
+ context "when the notifications are not currently active" do
+ before do
+ create(:notification, end_date: Time.zone.yesterday, title: "Notification title 1")
+ create(:notification, start_date: Time.zone.tomorrow, title: "Notification title 2")
+ sign_in user
+ visit(notifications_path)
+ end
+
+ it "does not show the notifications banner" do
+ expect(page).not_to have_content("Notification 1 of")
+ expect(page).not_to have_link("Dismiss")
+ expect(page).not_to have_link("Link text")
+ end
+ end
+ end
+end
diff --git a/spec/features/start_page_spec.rb b/spec/features/start_page_spec.rb
index f7c008553..d90a0c1f0 100644
--- a/spec/features/start_page_spec.rb
+++ b/spec/features/start_page_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe "Start Page Features" do
end
it "takes you to the home page" do
- visit("/")
+ visit(root_path)
expect(page).to have_current_path("/")
expect(page).to have_content("Welcome back")
end
@@ -19,7 +19,7 @@ RSpec.describe "Start Page Features" do
context "when the user is not signed in" do
it "takes you to sign in and then to the home page" do
- visit("/")
+ visit(root_path)
click_link("Start now")
expect(page).to have_current_path("/account/sign-in?start=true")
fill_in("user[email]", with: user.email)
@@ -28,5 +28,20 @@ RSpec.describe "Start Page Features" do
expect(page).to have_current_path("/")
expect(page).to have_content("Welcome back")
end
+
+ context "when the unauthenticated user clicks a notification link" do
+ before do
+ create(:notification, show_on_unauthenticated_pages: true)
+ visit(root_path)
+ click_link("Link text")
+ end
+
+ it "takes them to the notification details page" do
+ expect(page).to have_current_path(notifications_path)
+ expect(page).to have_content("Notification title")
+ expect(page).to have_content("Some html content")
+ expect(page).to have_link("Back to Start")
+ end
+ end
end
end
diff --git a/spec/features/test_spec.rb b/spec/features/test_spec.rb
index ef54fa631..6dc977a9b 100644
--- a/spec/features/test_spec.rb
+++ b/spec/features/test_spec.rb
@@ -1,7 +1,7 @@
require "rails_helper"
RSpec.describe "Test Features" do
it "Displays the name of the app" do
- visit("/")
+ visit(root_path)
expect(page).to have_content("Submit social housing lettings and sales data (CORE)")
end
diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb
index 61788f89e..6b0c450f2 100644
--- a/spec/features/user_spec.rb
+++ b/spec/features/user_spec.rb
@@ -126,7 +126,7 @@ RSpec.describe "User Features" do
end
it "Can navigate and sign in page with sign in button" do
- visit("/")
+ visit(root_path)
expect(page).to have_link("Sign in")
click_link("Sign in")
fill_in("user[email]", with: user.email)
diff --git a/spec/views/layouts/application_layout_spec.rb b/spec/views/layouts/application_layout_spec.rb
index ac4a10a98..55e97bc20 100644
--- a/spec/views/layouts/application_layout_spec.rb
+++ b/spec/views/layouts/application_layout_spec.rb
@@ -54,4 +54,35 @@ RSpec.describe "layouts/application" do
include_examples "analytics cookie elements", banner: false, scripts: false
end
+
+ context "with a notification present" do
+ context "when notification is shown on unauthenticated pages" do
+ before do
+ create(:notification, title: "Old notification title", show_on_unauthenticated_pages: true)
+ create(:notification, title: "New notification title", show_on_unauthenticated_pages: true)
+ render
+ end
+
+ it "shows the most recent notification without dismiss link or count" do
+ expect(rendered).to have_content("New notification title")
+ expect(rendered).to have_link("Link text")
+ expect(rendered).not_to have_link("Dismiss")
+ expect(rendered).not_to have_content("Notification 1 of")
+ end
+ end
+
+ context "when notification is not shown on unauthenticated pages" do
+ before do
+ create(:notification)
+ render
+ end
+
+ it "does not show the notification banner" do
+ expect(rendered).not_to have_content("Notification title")
+ expect(rendered).not_to have_link("Link text")
+ expect(rendered).not_to have_link("Dismiss")
+ expect(rendered).not_to have_content("Notification 1 of")
+ end
+ end
+ end
end