[#61070] Remove feature flag for start/end times for time logging (opf#17775)

* [#61070] Remove feature flag for start/end times for time logging

https://community.openproject.org/work_packages/61070

* remove track_start_and_end_times_for_time_entries feature decision

Author: klaustopher

Diff for: modules/costs/app/models/time_entry.rb

@@ -164,8 +164,7 @@ def end_timestamp
 
   class << self
     def can_track_start_and_end_time?(_project: nil)
-      OpenProject::FeatureDecisions.track_start_and_end_times_for_time_entries_active? &&
-        Setting.allow_tracking_start_and_end_times?
+      Setting.allow_tracking_start_and_end_times?
       # TODO: Add project check when we have decided if we also want a project specific flag
     end
 

Diff for: modules/costs/app/views/costs_settings/show.html.erb

@@ -52,15 +52,13 @@ See COPYRIGHT and LICENSE files for more details.
           <%= setting_text_field :costs_currency_format, type: :string, container_class: "-middle" %>
         </div>
 
-        <%- if OpenProject::FeatureDecisions.track_start_and_end_times_for_time_entries_active? %>
-          <div class="form--field">
-            <%= setting_check_box :allow_tracking_start_and_end_times, container_class: "-middle" %>
-          </div>
-
-          <div class="form--field">
-            <%= setting_check_box :enforce_tracking_start_and_end_times, container_class: "-middle" %>
-          </div>
-        <%- end %>
+        <div class="form--field">
+          <%= setting_check_box :allow_tracking_start_and_end_times, container_class: "-middle" %>
+        </div>
+
+        <div class="form--field">
+          <%= setting_check_box :enforce_tracking_start_and_end_times, container_class: "-middle" %>
+        </div>
       </section>
 
 

Diff for: modules/costs/lib/costs/engine.rb

@@ -146,11 +146,6 @@ class Engine < ::Rails::Engine
       ::Settings::Definition.add "enforce_tracking_start_and_end_times", default: false, format: :boolean
     end
 
-    initializer "costs.feature_decisions" do
-      OpenProject::FeatureDecisions.add :track_start_and_end_times_for_time_entries,
-                                        description: "Allows admins to enable tracking start and end times for time entries"
-    end
-
     activity_provider :time_entries, class_name: "Activities::TimeEntryActivityProvider", default: false
 
     patches %i[Project User PermittedParams]

Diff for: modules/costs/spec/features/time_entry_dialog_spec.rb

@@ -30,7 +30,7 @@
 
 require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper.rb")
 
-RSpec.describe "time entry dialog", :js, with_flag: :track_start_and_end_times_for_time_entries do
+RSpec.describe "time entry dialog", :js do
   include Redmine::I18n
 
   shared_let(:project) { create(:project_with_types) }

Diff for: modules/costs/spec/models/time_entry_spec.rb

@@ -408,24 +408,12 @@ def ensure_membership(project, user, permissions)
   end
 
   describe ".can_track_start_and_end_time?" do
-    context "with the feature flag enabled", with_flag: { track_start_and_end_times_for_time_entries: true } do
-      context "with the setting enabled", with_settings: { allow_tracking_start_and_end_times: true } do
-        it { expect(described_class).to be_can_track_start_and_end_time }
-      end
-
-      context "with the setting disabled", with_settings: { allow_tracking_start_and_end_times: false } do
-        it { expect(described_class).not_to be_can_track_start_and_end_time }
-      end
+    context "with the setting enabled", with_settings: { allow_tracking_start_and_end_times: true } do
+      it { expect(described_class).to be_can_track_start_and_end_time }
     end
 
-    context "with the feature flag disabled", with_flag: { track_start_and_end_times_for_time_entries: false } do
-      context "with the setting enabled", with_settings: { allow_tracking_start_and_end_times: true } do
-        it { expect(described_class).not_to be_can_track_start_and_end_time }
-      end
-
-      context "with the setting disabled", with_settings: { allow_tracking_start_and_end_times: false } do
-        it { expect(described_class).not_to be_can_track_start_and_end_time }
-      end
+    context "with the setting disabled", with_settings: { allow_tracking_start_and_end_times: false } do
+      it { expect(described_class).not_to be_can_track_start_and_end_time }
     end
   end
 
@@ -522,47 +510,23 @@ def ensure_membership(project, user, permissions)
   end
 
   describe ".must_track_start_and_end_time?" do
-    context "with the feature flag enabled", with_flag: { track_start_and_end_times_for_time_entries: true } do
-      context "with the allow setting enabled", with_settings: { allow_tracking_start_and_end_times: true } do
-        context "with the enforce setting enabled", with_settings: { enforce_tracking_start_and_end_times: true } do
-          it { expect(described_class).to be_must_track_start_and_end_time }
-        end
-
-        context "with the enforce setting disabled", with_settings: { enforce_tracking_start_and_end_times: false } do
-          it { expect(described_class).not_to be_must_track_start_and_end_time }
-        end
+    context "with the allow setting enabled", with_settings: { allow_tracking_start_and_end_times: true } do
+      context "with the enforce setting enabled", with_settings: { enforce_tracking_start_and_end_times: true } do
+        it { expect(described_class).to be_must_track_start_and_end_time }
       end
 
-      context "with the allow setting disabled", with_settings: { allow_tracking_start_and_end_times: false } do
-        context "with the enforce setting enabled", with_settings: { enforce_tracking_start_and_end_times: true } do
-          it { expect(described_class).not_to be_must_track_start_and_end_time }
-        end
-
-        context "with the enforce setting disabled", with_settings: { enforce_tracking_start_and_end_times: false } do
-          it { expect(described_class).not_to be_must_track_start_and_end_time }
-        end
+      context "with the enforce setting disabled", with_settings: { enforce_tracking_start_and_end_times: false } do
+        it { expect(described_class).not_to be_must_track_start_and_end_time }
       end
     end
 
-    context "with the feature flag disabled", with_flag: { track_start_and_end_times_for_time_entries: false } do
-      context "with the allow setting enabled", with_settings: { allow_tracking_start_and_end_times: true } do
-        context "with the enforce setting enabled", with_settings: { enforce_tracking_start_and_end_times: true } do
-          it { expect(described_class).not_to be_must_track_start_and_end_time }
-        end
-
-        context "with the enforce setting disabled", with_settings: { enforce_tracking_start_and_end_times: false } do
-          it { expect(described_class).not_to be_must_track_start_and_end_time }
-        end
+    context "with the allow setting disabled", with_settings: { allow_tracking_start_and_end_times: false } do
+      context "with the enforce setting enabled", with_settings: { enforce_tracking_start_and_end_times: true } do
+        it { expect(described_class).not_to be_must_track_start_and_end_time }
       end
 
-      context "with the allow setting disabled", with_settings: { allow_tracking_start_and_end_times: false } do
-        context "with the enforce setting enabled", with_settings: { enforce_tracking_start_and_end_times: true } do
-          it { expect(described_class).not_to be_must_track_start_and_end_time }
-        end
-
-        context "with the enforce setting disabled", with_settings: { enforce_tracking_start_and_end_times: false } do
-          it { expect(described_class).not_to be_must_track_start_and_end_time }
-        end
+      context "with the enforce setting disabled", with_settings: { enforce_tracking_start_and_end_times: false } do
+        it { expect(described_class).not_to be_must_track_start_and_end_time }
       end
     end
   end

Diff for: modules/costs/spec/requests/api/time_entry_resource_spec.rb

@@ -333,9 +333,7 @@
       end
     end
 
-    context "when start- & end-time tracking is enabled",
-            with_flag: { track_start_and_end_times_for_time_entries: true },
-            with_settings: { allow_tracking_start_and_end_times: true } do
+    context "when start- & end-time tracking is enabled", with_settings: { allow_tracking_start_and_end_times: true } do
       context "when start and end time were tracked" do
         let!(:time_entry) do
           create(:time_entry, :with_start_and_end_time, project:, work_package:, user: current_user)
@@ -373,9 +371,7 @@
       end
     end
 
-    context "when start- & end-time tracking is disabled",
-            with_flag: { track_start_and_end_times_for_time_entries: false },
-            with_settings: { allow_tracking_start_and_end_times: false } do
+    context "when start- & end-time tracking is disabled", with_settings: { allow_tracking_start_and_end_times: false } do
       context "when start and end time were tracked" do
         let!(:time_entry) do
           create(:time_entry, :with_start_and_end_time, project:, work_package:, user: current_user)

Diff for: modules/reporting/spec/features/export_cost_report_spec.rb

@@ -31,7 +31,7 @@
 require_relative "../spec_helper"
 require_relative "support/pages/cost_report_page"
 
-RSpec.describe "Cost reports XLS export", :js, with_flag: { track_start_and_end_times_for_time_entries: true } do
+RSpec.describe "Cost reports XLS export", :js do
   shared_let(:project) { create(:project) }
   shared_let(:user) { create(:admin) }
   shared_let(:cost_type) { create(:cost_type, name: "Post-war", unit: "cap", unit_plural: "caps") }

Diff for: modules/reporting/spec/features/time_entries_spec.rb

@@ -4,8 +4,7 @@
 require_relative "support/pages/cost_report_page"
 require_relative "support/components/cost_reports_base_table"
 
-RSpec.describe "Cost report showing time entries with start & end times", :js,
-               with_flag: { track_start_and_end_times_for_time_entries: true } do
+RSpec.describe "Cost report showing time entries with start & end times", :js do
   shared_let(:project) { create(:project) }
   shared_let(:user) { create(:admin) }
   shared_let(:work_package) { create(:work_package, project:) }