Merge remote-tracking branch 'origin/chore/pir-ee-flag' into release/17.1

oliverguenther · oliverguenther · commit 01f8dd52f5d5 · 2026-02-02T14:29:52.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -202,7 +202,7 @@ gem "aws-sdk-core", "~> 3.241"
 # File upload via fog + screenshots on travis
 gem "aws-sdk-s3", "~> 1.211"
 
-gem "openproject-token", "~> 8.5.0"
+gem "openproject-token", "~> 8.6.0"
 
 gem "plaintext", "~> 0.3.7"
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -884,7 +884,7 @@ GEM
       activesupport (>= 7.2.0)
       openproject-octicons (>= 19.30.1)
       view_component (>= 3.1, < 5.0)
-    openproject-token (8.5.0)
+    openproject-token (8.6.0)
       activemodel
     openssl (4.0.0)
     openssl-signature_algorithm (1.3.0)
@@ -1657,7 +1657,7 @@ DEPENDENCIES
   openproject-reporting!
   openproject-storages!
   openproject-team_planner!
-  openproject-token (~> 8.5.0)
+  openproject-token (~> 8.6.0)
   openproject-two_factor_authentication!
   openproject-webhooks!
   openproject-xls_export!
@@ -2033,7 +2033,7 @@ CHECKSUMS
   openproject-reporting (1.0.0)
   openproject-storages (1.0.0)
   openproject-team_planner (1.0.0)
-  openproject-token (8.5.0) sha256=c32481bf8c4a55c44a8ed826e3772c0585e6c5fec1cc0dd28f737de24904631c
+  openproject-token (8.6.0) sha256=f5865070bd0586f618f476d22544cfa680916e3ff23aea8199a46e31b8a2970e
   openproject-two_factor_authentication (1.0.0)
   openproject-webhooks (1.0.0)
   openproject-xls_export (1.0.0)
diff --git a/app/assets/images/enterprise/project-creation-wizard.png b/app/assets/images/enterprise/project-creation-wizard.png
diff --git a/app/controllers/projects/settings/creation_wizard_controller.rb b/app/controllers/projects/settings/creation_wizard_controller.rb
@@ -33,7 +33,7 @@ class Projects::Settings::CreationWizardController < Projects::SettingsControlle
 
   menu_item :settings_creation_wizard
 
-  before_action :check_feature_flag
+  before_action :check_enterprise_plan, only: :toggle
 
   def show; end
 
@@ -92,6 +92,16 @@ def disable_all_of_section
 
   private
 
+  def check_enterprise_plan
+    # Allow disabling even without enterprise plan
+    return if @project.project_creation_wizard_enabled
+
+    unless EnterpriseToken.allows_to?(:project_creation_wizard)
+      flash[:error] = I18n.t(:notice_requires_enterprise_token)
+      redirect_to project_settings_creation_wizard_path(@project, tab: "attributes"), status: :see_other
+    end
+  end
+
   def update_section_mappings(value)
     section_id = permitted_params.project_custom_field_project_mapping[:custom_field_section_id]
     project_id = permitted_params.project_custom_field_project_mapping[:project_id]
@@ -108,12 +118,6 @@ def update_section_mappings(value)
     redirect_to project_settings_creation_wizard_path(@project, tab: "attributes"), status: :see_other
   end
 
-  def check_feature_flag
-    unless OpenProject::FeatureDecisions.project_initiation_active?
-      render_404
-    end
-  end
-
   def update_settings_for_tab(tab, settings_params)
     call = Projects::UpdateService
              .new(model: @project, user: current_user, contract_class: Projects::SettingsContract)
diff --git a/app/services/projects/creation_wizard/reupload_artifact_on_status_changes_service.rb b/app/services/projects/creation_wizard/reupload_artifact_on_status_changes_service.rb
@@ -46,7 +46,6 @@ def initialize(current_user:, work_package:)
     end
 
     def call!(changes:)
-      return unless OpenProject::FeatureDecisions.project_initiation_active?
       return if changes["status_id"].blank?
       return unless update_is_artifact_work_package?
 
diff --git a/app/views/projects/settings/creation_wizard/show.html.erb b/app/views/projects/settings/creation_wizard/show.html.erb
@@ -42,5 +42,9 @@ See COPYRIGHT and LICENSE files for more details.
     <%= render partial: "export" %>
   <% end %>
 <% else %>
-  <%= render Projects::Settings::CreationWizard::BlankSlateComponent.new(project: @project) %>
+  <% with_enterprise_banner_guard(:project_creation_wizard,
+                                  variant: :large,
+                                  image: "enterprise/project-creation-wizard.png") do %>
+    <%= render Projects::Settings::CreationWizard::BlankSlateComponent.new(project: @project) %>
+  <% end %>
 <% end %>
diff --git a/config/initializers/feature_decisions.rb b/config/initializers/feature_decisions.rb
@@ -67,5 +67,3 @@
                                   description: "Enables the new project overview experience.",
                                   force_active: true
 
-OpenProject::FeatureDecisions.add :project_initiation,
-                                  description: "Activate the project creation and initiation wizard"
diff --git a/config/initializers/menus.rb b/config/initializers/menus.rb
@@ -742,8 +742,7 @@
     },
     project_custom_fields: { caption: :label_project_attributes_plural },
     creation_wizard: {
-      caption: :"settings.project_initiation_request.name.options.project_initiation_request",
-      if: ->(_) { OpenProject::FeatureDecisions.project_initiation_active? }
+      caption: :"settings.project_initiation_request.name.options.project_initiation_request"
     },
     modules: { caption: :label_module_plural },
     template: { caption: :"projects.settings.template.menu_title" },
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -2592,6 +2592,7 @@ en:
       one_drive_sharepoint_file_storage: OneDrive/SharePoint File Storage
       placeholder_users: Placeholder Users
       portfolio_management: Portfolio management
+      project_creation_wizard: Project initiation request
       project_list_sharing: Project List Sharing
       readonly_work_packages: Readonly Work Packages
       scim_api: SCIM server API
@@ -2677,6 +2678,8 @@ en:
         description: "Enable users to log in via external SSO providers using SAML or OpenID Connect for seamless access and integration with existing identity systems."
       virus_scanning:
         description: "Ensure uploaded files in OpenProject are scanned for viruses before being accessible by other users."
+      project_creation_wizard:
+        description: "Generate a step-by-step wizard to help project managers fill out a project initiation request."
       placeholder_users:
         title: Placeholder users
         description: >
diff --git a/modules/overviews/app/components/overviews/page_header_component.rb b/modules/overviews/app/components/overviews/page_header_component.rb
@@ -78,8 +78,7 @@ def allowed_to_archive?
     end
 
     def allowed_to_export_project_initiation_pdf?
-      OpenProject::FeatureDecisions.project_initiation_active? &&
-        project.project_creation_wizard_enabled &&
+      project.project_creation_wizard_enabled &&
         current_user.allowed_in_project?(:export_projects, project)
     end
   end
diff --git a/modules/overviews/spec/components/overviews/page_header_component_spec.rb b/modules/overviews/spec/components/overviews/page_header_component_spec.rb
@@ -120,7 +120,7 @@ def render_component(...)
       expect(rendered_component).to have_element "action-menu", "data-select-variant": "none"
     end
 
-    context "without manage project permissions", with_flag: { project_initiation_active: true } do
+    context "without manage project permissions" do
       let(:user) do
         create(:user,
                member_with_permissions: { project => %i[view_project export_projects] })
@@ -135,7 +135,7 @@ def render_component(...)
       end
     end
 
-    context "without export project permissions", with_flag: { project_initiation_active: true } do
+    context "without export project permissions" do
       let(:user) do
         create(:user,
                member_with_permissions: { project => %i[view_project select_project_custom_fields] })
@@ -150,7 +150,7 @@ def render_component(...)
       end
     end
 
-    context "without manage and export project permissions", with_flag: { project_initiation_active: true } do
+    context "without manage and export project permissions" do
       let(:user) { create(:user) }
 
       it "renders action menu items", :aggregate_failures do
@@ -161,7 +161,7 @@ def render_component(...)
       end
     end
 
-    context "with project project creation wizard disabled", with_flag: { project_initiation: true } do
+    context "with project project creation wizard disabled" do
       let(:project) { build_stubbed(:project, name: "Too big to fail", workspace_type:, project_creation_wizard_enabled: false) }
 
       it "renders action menu items", :aggregate_failures do
@@ -174,14 +174,15 @@ def render_component(...)
       end
     end
 
-    context "with manage permissions", with_flag: { project_initiation: false } do
+    context "with manage permissions" do
       let(:user) { build_stubbed(:admin) }
 
       it "renders action menu items", :aggregate_failures do
         expect(rendered_component).to have_menu do |menu|
-          expect(menu).to have_selector :menuitem, count: 3
+          expect(menu).to have_selector :menuitem, count: 4
           expect(menu).to have_selector :menuitem, text: "Add to favorites"
           expect(menu).to have_selector :menuitem, text: "Manage project attributes"
+          expect(menu).to have_selector :menuitem, text: "Export PDF for Project creation wizard"
           expect(menu).to have_selector :menuitem, text: "Archive project"
         end
       end
diff --git a/spec/features/projects/settings/creation_wizard/attributes_spec.rb b/spec/features/projects/settings/creation_wizard/attributes_spec.rb
@@ -31,8 +31,7 @@
 
 RSpec.describe "Project creation wizard settings - attributes tab",
                :js,
-               :with_cuprite,
-               with_flag: { project_initiation: true } do
+               :with_cuprite do
   let(:admin) { create(:admin) }
   let(:project) { create(:project, name: "Test Project", project_creation_wizard_enabled: true) }
 
diff --git a/spec/features/projects/settings/creation_wizard_name_spec.rb b/spec/features/projects/settings/creation_wizard_name_spec.rb
@@ -30,29 +30,53 @@
 
 require "spec_helper"
 
-RSpec.describe "Project creation wizard name settings", :js,
-               with_flag: { project_initiation_active: true } do
+RSpec.describe "Project creation wizard name settings", :js do
   shared_let(:admin) { create(:admin) }
 
-  let!(:project) { create(:project, project_creation_wizard_enabled: true) }
-  let(:name_page) { Pages::Projects::Settings::CreationWizard.new(project, tab: "name") }
+  let(:project_creation_wizard_enabled) { true }
+  let!(:project) { create(:project, project_creation_wizard_enabled:) }
+  let(:settings_page) { Pages::Projects::Settings::CreationWizard.new(project, tab: "name") }
 
   current_user { admin }
 
-  describe "configuring name settings" do
-    it "allows admin to configure artifact name" do
-      name_page.visit!
+  context "with feature available", with_ee: %i[project_creation_wizard] do
+    describe "configuring name settings" do
+      it "allows admin to configure artifact name" do
+        settings_page.visit!
 
-      expect(page).to have_select("Artifact name")
-      expect(page).to have_text("Choose the name for this artifact that your project management framework recommends.")
+        expect(page).to have_select("Artifact name")
+        expect(page).to have_text("Choose the name for this artifact that your project management framework recommends.")
 
-      select "Project initiation request", from: "Artifact name"
-      click_button "Save"
+        select "Project initiation request", from: "Artifact name"
+        click_button "Save"
 
-      expect_and_dismiss_flash(message: "Successful update.")
+        expect_and_dismiss_flash(message: "Successful update.")
 
-      project.reload
-      expect(project.project_creation_wizard_artifact_name).to eq("project_initiation_request")
+        project.reload
+        expect(project.project_creation_wizard_artifact_name).to eq("project_initiation_request")
+      end
+    end
+
+    context "with feature not active" do
+      let(:project_creation_wizard_enabled) { false }
+
+      it "allows to turn on" do
+        settings_page.visit!
+
+        expect(page).to have_text("Initiation request not enabled")
+        expect(page).not_to have_enterprise_banner(:premium)
+      end
+    end
+  end
+
+  context "with feature not available" do
+    let(:settings_page) { Pages::Projects::Settings::CreationWizard.new(project) }
+    let(:project_creation_wizard_enabled) { false }
+
+    it "allows does not allow to turn on" do
+      settings_page.visit!
+      expect(page).to have_enterprise_banner(:premium)
+      expect(page).to have_no_text("Initiation request not enabled")
     end
   end
 end
diff --git a/spec/features/projects/settings/creation_wizard_submission_spec.rb b/spec/features/projects/settings/creation_wizard_submission_spec.rb
@@ -30,8 +30,7 @@
 
 require "spec_helper"
 
-RSpec.describe "Project creation wizard submission settings", :js,
-               with_flag: { project_initiation_active: true } do
+RSpec.describe "Project creation wizard submission settings", :js do
   include Components::Autocompleter::NgSelectAutocompleteHelpers
 
   shared_let(:admin) { create(:admin) }
diff --git a/spec/features/projects/template_spec.rb b/spec/features/projects/template_spec.rb
@@ -91,8 +91,7 @@
              global_permissions:)
     end
 
-    it "does not show a special heading when the project initiation feature is enabled",
-       with_flag: { project_initiation_active: true } do
+    it "does not show a special heading when the project initiation feature is enabled" do
       visit new_project_path(template_id: template.id)
       expect(page).to have_heading "New project"
     end
diff --git a/spec/models/project/pdf_export/project_initiation_spec.rb b/spec/models/project/pdf_export/project_initiation_spec.rb
@@ -32,7 +32,7 @@
 require "pdf/inspector"
 require_relative "../../projects/exporter/exportable_project_context"
 
-RSpec.describe Project::PDFExport::ProjectInitiation, with_flag: { project_initiation: true } do
+RSpec.describe Project::PDFExport::ProjectInitiation do
   include PDFExportSpecUtils
   include ProjectHelper
   include Redmine::I18n
diff --git a/spec/services/projects/creation_wizard/reupload_artifact_on_status_changes_service_spec.rb b/spec/services/projects/creation_wizard/reupload_artifact_on_status_changes_service_spec.rb
@@ -30,8 +30,7 @@
 
 require "spec_helper"
 
-RSpec.describe Projects::CreationWizard::ReuploadArtifactOnStatusChangesService,
-               with_flag: { project_initiation: true } do
+RSpec.describe Projects::CreationWizard::ReuploadArtifactOnStatusChangesService do
   shared_let(:status_new) { create(:status, name: "New") }
   shared_let(:status_approved) { create(:status, name: "Approved") }
   shared_let(:type) { create(:type, name: "Project initiation") }
