Address CR comments

config/locales/en.yml

@@ -1235,12 +1235,12 @@ en:
             type:
               type_and_class_name_mismatch: "must be a Project::Gate"
             date:
-              non_continuous_dates: "can’t be earlier than the previous %{step}'s end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
         project/stage:
           attributes:
             date_range:
               start_date_must_be_before_end_date: "start date must be before the end date."
-              non_continuous_dates: "can’t be earlier than the previous %{step}'s end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
               incomplete: "is incomplete."
             type:
               type_and_class_name_mismatch: "must be a Project::Stage"

frontend/src/turbo/turbo-global-listeners.ts

@@ -69,7 +69,7 @@ export function addTurboGlobalListeners() {
     const element = event.target as HTMLElement;
 
     // In case the element is an OpenProject custom dom element, morphing is prevented.
-    if (element.tagName.startsWith('OPCE-')) {
+    if (element.tagName.toUpperCase().startsWith('OPCE-')) {
       event.preventDefault();
     }
   });

lib/primer/open_project/forms/date_picker.html.erb

@@ -1,3 +1,32 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
 <%= render(FormControl.new(input: @input, tag: :"primer-datepicker-field")) do %>
   <%= content_tag(:div, **@field_wrap_arguments) do %>
     <%# leading spinner implies a leading visual %>

lib/primer/open_project/forms/date_picker.rb

@@ -1,5 +1,33 @@
 # frozen_string_literal: true
 
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
 module Primer
   module OpenProject
     module Forms

lib/primer/open_project/forms/dsl/range_date_picker_input.rb

@@ -1,5 +1,33 @@
 # frozen_string_literal: true
 
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
 module Primer
   module OpenProject
     module Forms

lib/primer/open_project/forms/dsl/single_date_picker_input.rb

@@ -1,5 +1,33 @@
 # frozen_string_literal: true
 
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
 module Primer
   module OpenProject
     module Forms

modules/overviews/app/components/project_life_cycles/sections/edit_component.rb

@@ -32,10 +32,6 @@ class EditComponent < ApplicationComponent
       include ApplicationHelper
       include OpTurbo::Streamable
       include OpPrimer::ComponentHelpers
-
-      def life_cycle_steps
-        model.life_cycle_steps.active.eager_load(:definition).order(position: :asc)
-      end
     end
   end
 end

modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.html.erb

@@ -1,7 +1,7 @@
 <%=
   render(Primer::Alpha::Dialog.new(title: t("label_life_cycle_step_plural"),
                                    size: :large,
-                                   id: "edit-project-life-cycles-dialog")) do |d|
+                                   id: dialog_id)) do |d|
     d.with_header(variant: :large)
     d.with_body(classes: "Overlay-body_autocomplete_height") do
       render(::ProjectLifeCycles::Sections::EditComponent.new(model))
@@ -10,7 +10,7 @@
       component_collection do |footer_collection|
         footer_collection.with_component(Primer::ButtonComponent.new(
           data: {
-            'close-dialog-id': "edit-project-life-cycles-dialog"
+            "close-dialog-id": dialog_id
           }
         )) do
           t("button_cancel")

modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.rb

@@ -32,6 +32,10 @@ class EditDialogComponent < ApplicationComponent
       include ApplicationHelper
       include OpTurbo::Streamable
       include OpPrimer::ComponentHelpers
+
+      def dialog_id
+        "edit-project-life-cycles-dialog"
+      end
     end
   end
 end

modules/overviews/app/components/project_life_cycles/sections/project_life_cycles/show_component.rb

@@ -40,18 +40,14 @@ def not_set?
         end
 
         def render_value
-          case model
-          when Project::Gate
-            render(Primer::Beta::Text.new) do
-              concat helpers.format_date(model.date)
-            end
-          when Project::Stage
-            render(Primer::Beta::Text.new) do
-              concat [
-                helpers.format_date(model.start_date),
-                helpers.format_date(model.end_date)
-              ].join(" - ")
-            end
+          render(Primer::Beta::Text.new) do
+            concat [
+              model.start_date,
+              model.end_date
+            ]
+            .compact
+            .map { |d| helpers.format_date(d) }
+            .join(" - ")
           end
         end
 

modules/overviews/app/components/project_life_cycles/sections/show_component.html.erb

@@ -21,7 +21,7 @@
 
       flex_layout do |details_container|
         @life_cycle_steps.each_with_index do |life_cycle_step, i|
-          margin =  i == @life_cycle_steps.size - 1 ? 0 : 3
+          margin = i == @life_cycle_steps.size - 1 ? 0 : 3
           details_container.with_row(mb: margin) do
             render(ProjectLifeCycles::Sections::ProjectLifeCycles::ShowComponent.new(
               life_cycle_step

modules/overviews/app/components/project_life_cycles/sections/show_component.rb

@@ -37,8 +37,7 @@ def initialize(project:)
         super
 
         @project = project
-        @life_cycle_steps =
-          @project.life_cycle_steps.active.eager_load(:definition).order(position: :asc)
+        @life_cycle_steps = @project.available_life_cycle_steps
       end
 
       private

modules/overviews/lib/overviews/engine.rb

@@ -47,8 +47,7 @@ class Engine < ::Rails::Engine
         OpenProject::AccessControl.permission(:view_project)
           .controller_actions
           .push(
-            "overviews/overviews/show",
-            "overviews/overviews/project_life_cycles_sidebar"
+            "overviews/overviews/show"
           )
 
         OpenProject::AccessControl.permission(:view_project_attributes)

spec/contracts/project_life_cycle_steps/base_contract_spec.rb

@@ -37,7 +37,7 @@
   let(:contract) { described_class.new(project, user) }
   let(:project) { build_stubbed(:project) }
 
-  context "with authorised user" do
+  context "with authorized user" do
     let(:user) { build_stubbed(:user) }
     let(:project) { build_stubbed(:project, available_life_cycle_steps: steps) }
     let(:steps) { [] }
@@ -145,7 +145,7 @@
     end
   end
 
-  context "with unauthorised user" do
+  context "with unauthorized user" do
     let(:user) { build_stubbed(:user) }
 
     it_behaves_like "contract user is unauthorized"

spec/features/projects/life_cycle/overview_page/dialog/permission_spec.rb

@@ -60,6 +60,7 @@
         expect(page).to have_text("Project lifecycle")
       end
     end
+  end
 
   describe "with Edit project permissions" do
     let(:permissions) { [:view_project, :view_project_stages_and_gates, :edit_project] }

spec/features/projects/project_custom_fields/overview_page/dialog/permission_spec.rb

@@ -31,7 +31,6 @@
 
 RSpec.describe "Edit project custom fields on project overview page", :js do
   include_context "with seeded projects, members and project custom fields"
-
   let(:overview_page) { Pages::Projects::Show.new(project) }
 
   describe "with insufficient View attributes permissions" do

spec/models/project/stage_spec.rb

@@ -139,6 +139,9 @@
                 .and_return([])
 
       expect(subject.working_days_count).to eq(0)
+
+      expect(Day).to have_received(:working).with(no_args)
+      expect(Day).to have_received(:from_range).with(from: subject.start_date, to: subject.end_date)
     end
   end
 end

spec/support/pages/projects/show.rb

@@ -51,12 +51,12 @@ def visit_page
 
       def expect_no_visible_sidebar
         expect_angular_frontend_initialized
-        expect(page).to have_no_css(".op-grid-page--grid-container")
+        expect(page).to have_no_css(".op-grid-page--sidebar")
       end
 
       def expect_visible_sidebar
         expect_angular_frontend_initialized
-        expect(page).to have_css(".op-grid-page--grid-container")
+        expect(page).to have_css(".op-grid-page--sidebar")
       end
 
       def within_project_attributes_sidebar(&)