From 35cf5018d5e2646cd37ccf05543dbcbcd0e42b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Fri, 20 Sep 2024 14:28:37 +0200 Subject: [PATCH] Remove feature flag for meeting update flash (#16759) --- config/initializers/feature_decisions.rb | 4 ---- .../meeting/app/components/meetings/header_component.html.erb | 2 +- modules/meeting/app/components/meetings/header_component.rb | 2 +- .../structured_meeting_update_flash_spec.rb | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/initializers/feature_decisions.rb b/config/initializers/feature_decisions.rb index 62a972b4993c..77adfa592a2d 100644 --- a/config/initializers/feature_decisions.rb +++ b/config/initializers/feature_decisions.rb @@ -43,9 +43,5 @@ "Will be enabled by default in OpenProject 15.0. " \ "See work package #52233 for more details." -OpenProject::FeatureDecisions.add :meeting_updated_notification, - description: "Allow flash messages to notify users about concurrent meeting edits. " \ - "See work package #54744 for more details." - OpenProject::FeatureDecisions.add :built_in_oauth_applications, description: "Allows the display and use of built-in OAuth applications." diff --git a/modules/meeting/app/components/meetings/header_component.html.erb b/modules/meeting/app/components/meetings/header_component.html.erb index a09e5b63ad11..13a451beba3b 100644 --- a/modules/meeting/app/components/meetings/header_component.html.erb +++ b/modules/meeting/app/components/meetings/header_component.html.erb @@ -10,7 +10,7 @@ render(Primer::OpenProject::PageHeader.new( test_selector: "meeting-page-header", state: @state, - data: OpenProject::FeatureDecisions.meeting_updated_notification_active? ? params : {} + data: params )) do |header| header.with_title do |title| title.with_editable_form(model: @meeting, diff --git a/modules/meeting/app/components/meetings/header_component.rb b/modules/meeting/app/components/meetings/header_component.rb index 41d52b5f58db..08bcba7912fa 100644 --- a/modules/meeting/app/components/meetings/header_component.rb +++ b/modules/meeting/app/components/meetings/header_component.rb @@ -46,7 +46,7 @@ def initialize(meeting:, project: nil, state: STATE_DEFAULT) # Define the interval so it can be overriden through tests def check_for_updates_interval - OpenProject::FeatureDecisions.meeting_updated_notification_active? ? 10_000 : 0 + 10_000 end private diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb index 495b4e77861c..a0c0e91314c3 100644 --- a/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb +++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb @@ -44,7 +44,7 @@ let(:meeting) { create(:structured_meeting, project:, author: current_user) } let(:show_page) { Pages::StructuredMeeting::Show.new(meeting) } - describe "meeting update flash", with_flag: { meeting_updated_notification: true } do + describe "meeting update flash" do before do # Disable the polling so we can trigger it manually allow_any_instance_of(Meetings::HeaderComponent) # rubocop:disable RSpec/AnyInstance