A platform for community discussion. Free, open, simple.
UX: suppress new feature notifications on brand new sites (#40135)
Kris992f0a6188b9
diff --git a/app/jobs/scheduled/check_new_features.rb b/app/jobs/scheduled/check_new_features.rbindex b249903ab79..2f5c23c0ba7 100644--- a/app/jobs/scheduled/check_new_features.rb+++ b/app/jobs/scheduled/check_new_features.rb@@ -63,6 +63,17 @@ module Jobsend)+ # On brand new sites (< 1h old), seed every admin's last viewed date to+ # the newest item so they don't get a back-catalog notification covering+ # features that pre-date the site. Genuinely new features arriving later+ # will still notify normally.+ if Migration::Helpers.new_site? && !Rails.env.development?+ admin_ids.each do |admin_id|+ DiscourseUpdates.bump_last_viewed_feature_date(admin_id, most_recent_created_at)+ end+ return+ end+admin_ids.each do |admin_id|admin_last_viewed_feature_date = DiscourseUpdates.get_last_viewed_feature_date(admin_id)if admin_last_viewed_feature_date.blank? ||diff --git a/spec/jobs/check_new_features_spec.rb b/spec/jobs/check_new_features_spec.rbindex 7980392a002..3e218a761a9 100644--- a/spec/jobs/check_new_features_spec.rb+++ b/spec/jobs/check_new_features_spec.rb@@ -61,6 +61,7 @@ RSpec.describe Jobs::CheckNewFeatures doendbefore do+ Migration::Helpers.stubs(:new_site?).returns(false)DiscourseUpdates.stubs(:current_version).returns("2.8.1.beta13")freeze_timestub_new_features_endpoint(feature1, feature2, pending_feature)@@ -103,6 +104,59 @@ RSpec.describe Jobs::CheckNewFeatures do).to eq(1)end+ context "when the site is brand new (< 1 hour old)" do+ before { Migration::Helpers.stubs(:new_site?).returns(true) }++ it "suppresses the back-catalog notification and seeds last_viewed_feature_date" do+ Notification.destroy_all++ described_class.new.execute({})++ expect(+ admin1.notifications.where(notification_type: Notification.types[:new_features]),+ ).to be_empty+ expect(+ admin2.notifications.where(notification_type: Notification.types[:new_features]),+ ).to be_empty++ # pending_feature is filtered out by version (beta14 > current beta13), so+ # feature2 is the newest visible item.+ newest_at = Time.zone.parse(feature2[:created_at])+ expect(DiscourseUpdates.get_last_viewed_feature_date(admin1.id)).to be_within_one_second_of(+ newest_at,+ )+ expect(DiscourseUpdates.get_last_viewed_feature_date(admin2.id)).to be_within_one_second_of(+ newest_at,+ )+ end++ it "still notifies once a newer feature lands after the site is established" do+ Notification.destroy_all++ described_class.new.execute({})++ Migration::Helpers.stubs(:new_site?).returns(false)+ newer_feature =+ build_feature_hash(id: 99, created_at: 1.hour.from_now, discourse_version: "2.8.1.beta13")+ stub_new_features_endpoint(newer_feature, feature1, feature2, pending_feature)++ described_class.new.execute({})++ expect(+ admin1+ .notifications+ .where(notification_type: Notification.types[:new_features], read: false)+ .count,+ ).to eq(1)+ expect(+ admin2+ .notifications+ .where(notification_type: Notification.types[:new_features], read: false)+ .count,+ ).to eq(1)+ end+ end+context "when a permanent upcoming change is merged into an empty new-features feed" dobefore dostub_permanent_upcoming_changes!(permanent_upcoming_changes)