diff --git a/modules/costs/app/views/projects/settings/cost_types/index.html.erb b/modules/costs/app/views/projects/settings/cost_types/index.html.erb
new file mode 100644
index 000000000000..cc8a2930862c
--- /dev/null
+++ b/modules/costs/app/views/projects/settings/cost_types/index.html.erb
@@ -0,0 +1,77 @@
+<%#-- 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(
+ Projects::Settings::TimeAndCosts::PageHeaderComponent.new(
+ project: @project,
+ selected: :cost_types
+ )
+ )
+%>
+
+<% enabled_ids = CostTypesProject.where(project_id: @project.id).pluck(:cost_type_id).to_set %>
+
+<% if @cost_types.empty? %>
+ <%=
+ render Primer::Beta::Blankslate.new(border: true) do |c|
+ c.with_visual_icon(icon: :checklist)
+ c.with_heading(tag: :h2).with_content(I18n.t("cost_types.settings.cost_types.heading"))
+ c.with_description { I18n.t("cost_types.admin.cost_type_projects.no_projects.description") }
+ end
+ %>
+<% else %>
+
+
+
+ | <%= CostType.model_name.human %> |
+ |
+
+
+
+ <% @cost_types.each do |cost_type| %>
+
+ | <%= h cost_type.name %> |
+
+ <% if cost_type.is_for_all? %>
+ <%= t(:label_for_all) rescue "For all projects" %>
+ <% else %>
+ <%= button_to(
+ enabled_ids.include?(cost_type.id) ? t(:button_disable) : t(:button_enable),
+ toggle_project_settings_cost_type_path(@project, cost_type),
+ method: :put,
+ class: "button",
+ form: { data: { turbo: false } }
+ ) %>
+ <% end %>
+ |
+
+ <% end %>
+
+
+<% end %>
diff --git a/modules/costs/app/views/projects/settings/time_entry_activities/show.html.erb b/modules/costs/app/views/projects/settings/time_entry_activities/show.html.erb
index 2a5237bea489..3582d7e9aff6 100644
--- a/modules/costs/app/views/projects/settings/time_entry_activities/show.html.erb
+++ b/modules/costs/app/views/projects/settings/time_entry_activities/show.html.erb
@@ -28,14 +28,12 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
<%=
- render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { t(:enumeration_activities) }
- header.with_breadcrumbs(
- [{ href: project_overview_path(@project.id), text: @project.name },
- { href: project_settings_general_path(@project.id), text: I18n.t(:label_project_settings) },
- t(:enumeration_activities)]
+ render(
+ Projects::Settings::TimeAndCosts::PageHeaderComponent.new(
+ project: @project,
+ selected: :time_entry_activities
)
- end
+ )
%>
<% if TimeEntryActivity.any? %>
diff --git a/modules/costs/config/locales/en.yml b/modules/costs/config/locales/en.yml
index cd8642843f37..f4e8385ed956 100644
--- a/modules/costs/config/locales/en.yml
+++ b/modules/costs/config/locales/en.yml
@@ -47,6 +47,8 @@ en:
unit: "Unit name"
unit_plural: "Pluralized unit name"
default: "Cost type by default"
+ is_for_all: "For all projects"
+ rates: "Rates"
work_package:
costs_by_type: "Spent units"
labor_costs: "Labor costs"
@@ -252,6 +254,24 @@ en:
validation:
start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date."
+ label_available_cost_types_projects: "Available cost types projects"
+ cost_types:
+ errors:
+ no_cost_types_available: "No cost types are available in this project. Please contact an administrator."
+ admin:
+ cost_type_projects:
+ is_for_all_blank_slate:
+ heading: "This cost type is enabled in all projects"
+ description: "Uncheck \"For all projects\" on the details tab to limit this cost type to specific projects."
+ no_projects:
+ heading: "No projects assigned"
+ description: "Add projects so this cost type can be used in them."
+ settings:
+ time_and_costs: "Time & Costs"
+ cost_types:
+ heading: "Cost types"
+ none_active: "No cost types are currently active in this project."
+
costs:
widgets:
actual_costs:
diff --git a/modules/costs/config/routes.rb b/modules/costs/config/routes.rb
index e3eea05aa91f..5fb911cbefdc 100644
--- a/modules/costs/config/routes.rb
+++ b/modules/costs/config/routes.rb
@@ -62,6 +62,9 @@
scope "projects/:project_id", as: "project", module: "projects" do
namespace "settings" do
resource :time_entry_activities, only: %i[show update]
+ resources :cost_types, only: %i[index] do
+ member { put :toggle }
+ end
end
end
@@ -93,6 +96,11 @@
put :set_rate
patch :restore
end
+
+ scope module: :cost_types do
+ resources :projects, controller: :cost_type_projects, only: %i[index new create]
+ resource :project, controller: :cost_type_projects, only: :destroy
+ end
end
resource :costs,
diff --git a/modules/costs/lib/costs/engine.rb b/modules/costs/lib/costs/engine.rb
index 1fe57a590fd1..ec6f54e3856f 100644
--- a/modules/costs/lib/costs/engine.rb
+++ b/modules/costs/lib/costs/engine.rb
@@ -67,7 +67,10 @@ class Engine < ::Rails::Engine
require: :member
permission :manage_project_activities,
- { "projects/settings/time_entry_activities": %i[show update] },
+ {
+ "projects/settings/time_entry_activities": %i[show update],
+ "projects/settings/cost_types": %i[index toggle]
+ },
permissible_on: :project,
require: :member
@@ -222,6 +225,7 @@ class Engine < ::Rails::Engine
current_user.allowed_in_project?(:log_own_costs, represented.project)
} do
next unless represented.costs_enabled? && represented.persisted?
+ next unless represented.project&.cost_types_available?
{
href: new_work_packages_cost_entry_path(represented),
@@ -349,6 +353,10 @@ class Engine < ::Rails::Engine
::Queries::Register.register(::Query) do
select Costs::QueryCurrencySelect
end
+
+ ::Queries::Register.register(::ProjectQuery) do
+ filter ::Queries::Projects::Filters::AvailableCostTypesProjectsFilter
+ end
end
end
end
diff --git a/modules/costs/lib/costs/patches/permitted_params_patch.rb b/modules/costs/lib/costs/patches/permitted_params_patch.rb
index 5f5d9f9dd30b..b414babec7f5 100644
--- a/modules/costs/lib/costs/patches/permitted_params_patch.rb
+++ b/modules/costs/lib/costs/patches/permitted_params_patch.rb
@@ -56,6 +56,7 @@ def cost_type
:unit,
:unit_plural,
:default,
+ :is_for_all,
{ new_rate_attributes: %i[valid_from rate] },
existing_rate_attributes: %i[valid_from rate])
end
diff --git a/modules/costs/lib/costs/patches/project_patch.rb b/modules/costs/lib/costs/patches/project_patch.rb
index b0b1402e338b..aa0f32a1bb77 100644
--- a/modules/costs/lib/costs/patches/project_patch.rb
+++ b/modules/costs/lib/costs/patches/project_patch.rb
@@ -49,5 +49,9 @@ module InstanceMethods
def costs_enabled?
module_enabled?(:costs)
end
+
+ def cost_types_available?
+ CostType.available_for_project(self).active.exists?
+ end
end
end
diff --git a/modules/costs/spec/controllers/costlog_controller_spec.rb b/modules/costs/spec/controllers/costlog_controller_spec.rb
index c6b7f11b81c2..c194024171b7 100644
--- a/modules/costs/spec/controllers/costlog_controller_spec.rb
+++ b/modules/costs/spec/controllers/costlog_controller_spec.rb
@@ -132,7 +132,10 @@ def disable_flash_sweep
end
describe "WHEN user allowed to create new cost_entry" do
+ let(:expected_cost_type) { cost_type }
+
before do
+ cost_type.save!
grant_current_user_permissions user, %i[view_project view_work_packages log_costs]
end
@@ -154,7 +157,10 @@ def disable_flash_sweep
end
describe "WHEN user is allowed to create new own cost_entry" do
+ let(:expected_cost_type) { cost_type }
+
before do
+ cost_type.save!
grant_current_user_permissions user, %i[view_project view_work_packages log_own_costs]
end
@@ -172,6 +178,53 @@ def disable_flash_sweep
describe "WHEN user is not a project member" do
it_behaves_like "not_found new"
end
+
+ describe "WHEN no cost type is available in the project" do
+ let(:scoped_cost_type) { create(:cost_type, is_for_all: false) }
+
+ before do
+ CostType.destroy_all
+ scoped_cost_type # only project-scoped cost type, not mapped to this project
+ grant_current_user_permissions user, %i[view_project view_work_packages log_costs]
+ get :new, params:
+ end
+
+ it "redirects with an error flash explaining no cost types are available" do
+ expect(response).to be_redirect
+ expect(flash[:error]).to eq(I18n.t("cost_types.errors.no_cost_types_available"))
+ end
+ end
+
+ describe "WHEN the project's default cost type is global" do
+ let(:expected_cost_type) { cost_type }
+
+ before do
+ CostType.destroy_all
+ cost_type.is_for_all = true
+ cost_type.default = true
+ cost_type.save!
+ grant_current_user_permissions user, %i[view_project view_work_packages log_costs]
+ end
+
+ it_behaves_like "successful new"
+ end
+
+ describe "WHEN the global default cost type is unavailable in the project, " \
+ "but another non-global cost type is enabled" do
+ let(:scoped_cost_type) { create(:cost_type, is_for_all: false) }
+ let(:global_default) { create(:cost_type, is_for_all: false, default: true) }
+ let(:expected_cost_type) { scoped_cost_type }
+
+ before do
+ CostType.destroy_all
+ global_default
+ scoped_cost_type
+ CostTypesProject.create!(project:, cost_type: scoped_cost_type)
+ grant_current_user_permissions user, %i[view_project view_work_packages log_costs]
+ end
+
+ it_behaves_like "successful new"
+ end
end
describe "GET edit" do
diff --git a/modules/costs/spec/features/costs_context_menu_spec.rb b/modules/costs/spec/features/costs_context_menu_spec.rb
index f075b3d1484e..77780e0faafd 100644
--- a/modules/costs/spec/features/costs_context_menu_spec.rb
+++ b/modules/costs/spec/features/costs_context_menu_spec.rb
@@ -3,6 +3,7 @@
RSpec.describe "Work package table log unit costs", :js do
let(:user) { create(:admin) }
let(:work_package) { create(:work_package) }
+ let!(:cost_type) { create(:cost_type, is_for_all: true) }
let(:wp_table) { Pages::WorkPackagesTable.new }
let(:menu) { Components::WorkPackages::ContextMenu.new }
diff --git a/modules/costs/spec/features/time_entry/activity_spec.rb b/modules/costs/spec/features/time_entry/activity_spec.rb
index 5cbf6029139d..3cd636ed305d 100644
--- a/modules/costs/spec/features/time_entry/activity_spec.rb
+++ b/modules/costs/spec/features/time_entry/activity_spec.rb
@@ -62,7 +62,7 @@
visit project_settings_general_path(project)
- click_on "Time tracking activities"
+ click_on I18n.t("cost_types.settings.time_and_costs")
expect(page).to have_field("Development", checked: true)
diff --git a/modules/costs/spec/lib/api/v3/work_packages/work_package_representer_spec.rb b/modules/costs/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
index 1e742c017bbd..1cdba742a74d 100644
--- a/modules/costs/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
+++ b/modules/costs/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
@@ -73,6 +73,11 @@
embed_links: true)
end
+ # Create a cost type that enables the log unit cost paths
+ let!(:cost_type) do
+ create(:cost_type, is_for_all: true)
+ end
+
before do
allow(User).to receive(:current).and_return user
end
@@ -301,6 +306,38 @@
end
end
end
+
+ describe "logCosts gating by available cost types" do
+ let(:additional_permissions) { %i[log_costs view_time_entries view_cost_entries view_cost_rates] }
+
+ before { CostType.destroy_all }
+
+ context "when at least one cost type is available in the project" do
+ before { create(:cost_type, is_for_all: true) }
+
+ it "has the logCosts link" do
+ expect(subject).to have_json_path("_links/logCosts/href")
+ end
+ end
+
+ context "when no cost type is available in the project" do
+ before { create(:cost_type, is_for_all: false) }
+
+ it "omits the logCosts link" do
+ expect(subject).not_to have_json_path("_links/logCosts/href")
+ end
+ end
+
+ context "when a non-global cost type is explicitly enabled in the project" do
+ let!(:scoped_cost_type) { create(:cost_type, is_for_all: false) }
+
+ before { CostTypesProject.create!(project:, cost_type: scoped_cost_type) }
+
+ it "has the logCosts link" do
+ expect(subject).to have_json_path("_links/logCosts/href")
+ end
+ end
+ end
end
describe "costs module disabled" do
diff --git a/modules/costs/spec/models/cost_type_spec.rb b/modules/costs/spec/models/cost_type_spec.rb
index 2c3b2e5879ec..4f817c4b535f 100644
--- a/modules/costs/spec/models/cost_type_spec.rb
+++ b/modules/costs/spec/models/cost_type_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -29,30 +31,21 @@
require_relative "../spec_helper"
RSpec.describe CostType do
- let(:klass) { CostType }
let(:cost_type) do
- klass.new name: "ct1",
- unit: "singular",
- unit_plural: "plural"
- end
-
- before do
- # as the spec_helper loads fixtures and they are probably needed by other tests
- # we delete them here so they do not interfere.
- # on the long run, fixtures should be removed
-
- CostType.destroy_all
+ described_class.new name: "ct1",
+ unit: "singular",
+ unit_plural: "plural"
end
describe "class" do
describe "active" do
describe "WHEN a CostType instance is deleted" do
before do
- cost_type.deleted_at = Time.now
+ cost_type.deleted_at = Time.zone.now
cost_type.save!
end
- it { expect(klass.active.size).to eq(0) }
+ it { expect(described_class.active.size).to eq(0) }
end
describe "WHEN a CostType instance is not deleted" do
@@ -60,8 +53,59 @@
cost_type.save!
end
- it { expect(klass.active.size).to eq(1) }
- it { expect(klass.active[0]).to eq(cost_type) }
+ it { expect(described_class.active.size).to eq(1) }
+ it { expect(described_class.active[0]).to eq(cost_type) }
+ end
+ end
+ end
+
+ describe ".available_for_project" do
+ let(:project) { create(:project) }
+ let(:other_project) { create(:project) }
+ let!(:global_ct) { create(:cost_type, is_for_all: true) }
+ let!(:scoped_ct) { create(:cost_type, is_for_all: false) }
+ let!(:unrelated_ct) { create(:cost_type, is_for_all: false) }
+
+ before do
+ CostTypesProject.create!(cost_type: scoped_ct, project: project)
+ CostTypesProject.create!(cost_type: unrelated_ct, project: other_project)
+ end
+
+ it "returns global cost types plus those explicitly mapped to the project" do
+ expect(described_class.available_for_project(project)).to contain_exactly(global_ct, scoped_ct)
+ end
+
+ it "accepts a project_id integer too" do
+ expect(described_class.available_for_project(project.id)).to contain_exactly(global_ct, scoped_ct)
+ end
+ end
+
+ describe ".default_for_project" do
+ let(:project) { create(:project) }
+
+ context "when the global default is available in the project" do
+ let!(:default_ct) { create(:cost_type, is_for_all: true, default: true) }
+ let!(:_other) { create(:cost_type, is_for_all: true) }
+
+ it "returns the default" do
+ expect(described_class.default_for_project(project)).to eq(default_ct)
+ end
+ end
+
+ context "when the global default is NOT available in the project" do
+ let!(:default_ct) { create(:cost_type, is_for_all: false, default: true) }
+ let!(:available) { create(:cost_type, is_for_all: true) }
+
+ it "falls back to the first available cost type" do
+ expect(described_class.default_for_project(project)).to eq(available)
+ end
+ end
+
+ context "when no cost type is available in the project" do
+ let!(:_unrelated) { create(:cost_type, is_for_all: false) }
+
+ it "returns nil" do
+ expect(described_class.default_for_project(project)).to be_nil
end
end
end
diff --git a/modules/costs/spec/models/cost_types_project_spec.rb b/modules/costs/spec/models/cost_types_project_spec.rb
new file mode 100644
index 000000000000..5248e6e5f39c
--- /dev/null
+++ b/modules/costs/spec/models/cost_types_project_spec.rb
@@ -0,0 +1,58 @@
+# 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.
+#++
+
+require_relative "../spec_helper"
+
+RSpec.describe CostTypesProject do
+ let(:project) { create(:project) }
+ let(:cost_type) { create(:cost_type, is_for_all: false) }
+
+ it "creates a mapping with both belongs_to associations" do
+ mapping = described_class.create!(project:, cost_type:)
+ expect(mapping.project).to eq(project)
+ expect(mapping.cost_type).to eq(cost_type)
+ end
+
+ it "is destroyed when the cost type is destroyed" do
+ described_class.create!(project:, cost_type:)
+ expect { cost_type.destroy }.to change(described_class, :count).by(-1)
+ end
+
+ it "is deleted when the project is destroyed" do
+ described_class.create!(project:, cost_type:)
+ expect { project.destroy }.to change(described_class, :count).by(-1)
+ end
+
+ it "enforces uniqueness of (project_id, cost_type_id) at the DB level" do
+ described_class.create!(project:, cost_type:)
+ expect { described_class.create!(project:, cost_type:) }
+ .to raise_error(ActiveRecord::RecordNotUnique)
+ end
+end
diff --git a/modules/costs/spec/models/project_cost_types_available_spec.rb b/modules/costs/spec/models/project_cost_types_available_spec.rb
new file mode 100644
index 000000000000..83ccadc2af34
--- /dev/null
+++ b/modules/costs/spec/models/project_cost_types_available_spec.rb
@@ -0,0 +1,58 @@
+# 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.
+#++
+
+require_relative "../spec_helper"
+
+RSpec.describe Project, "#cost_types_available?" do
+ let(:project) { create(:project) }
+
+ before { CostType.destroy_all }
+
+ it "is true when at least one cost type is for all projects" do
+ create(:cost_type, is_for_all: true)
+ expect(project.cost_types_available?).to be true
+ end
+
+ it "is true when a cost type is explicitly enabled in the project" do
+ cost_type = create(:cost_type, is_for_all: false)
+ CostTypesProject.create!(project:, cost_type:)
+ expect(project.cost_types_available?).to be true
+ end
+
+ it "is false when there are no cost types enabled in the project" do
+ create(:cost_type, is_for_all: false)
+ expect(project.cost_types_available?).to be false
+ end
+
+ it "ignores soft-deleted cost types" do
+ create(:cost_type, :deleted, is_for_all: true)
+ expect(project.cost_types_available?).to be false
+ end
+end
diff --git a/modules/costs/spec/models/queries/projects/filters/available_cost_types_projects_filter_spec.rb b/modules/costs/spec/models/queries/projects/filters/available_cost_types_projects_filter_spec.rb
new file mode 100644
index 000000000000..d994a6393090
--- /dev/null
+++ b/modules/costs/spec/models/queries/projects/filters/available_cost_types_projects_filter_spec.rb
@@ -0,0 +1,94 @@
+# 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.
+#++
+
+require_relative "../../../../spec_helper"
+
+RSpec.describe Queries::Projects::Filters::AvailableCostTypesProjectsFilter do
+ let(:instance) { described_class.create!(name: described_class.key) }
+
+ describe ".key" do
+ it { expect(described_class.key).to eq(:available_cost_types_projects) }
+ end
+
+ describe "#allowed_values" do
+ before { CostType.destroy_all }
+
+ let!(:scoped_a) { create(:cost_type, is_for_all: false, name: "Disk") }
+ let!(:scoped_b) { create(:cost_type, is_for_all: false, name: "License") }
+ let!(:_global) { create(:cost_type, is_for_all: true, name: "Travel") }
+
+ it "lists only non-global cost types (so filter validates even before any mapping exists)" do
+ expect(instance.allowed_values).to contain_exactly(
+ ["Disk", scoped_a.id],
+ ["License", scoped_b.id]
+ )
+ end
+ end
+
+ describe "filter is registered with ProjectQuery" do
+ it "is in the ProjectQuery filter registry" do
+ expect(Queries::Register.filters[ProjectQuery]).to include(described_class)
+ end
+ end
+
+ describe "applying the filter via ProjectQuery" do
+ let(:admin) { create(:admin) }
+ let!(:cost_type) { create(:cost_type, is_for_all: false) }
+ let!(:mapped_project) { create(:project) }
+ let!(:unmapped_project) { create(:project) }
+
+ before do
+ login_as(admin)
+ CostTypesProject.create!(cost_type:, project: mapped_project)
+ end
+
+ it "returns only projects mapped to the given cost type" do
+ query = ProjectQuery.new(name: "t") do |q|
+ q.where(:available_cost_types_projects, "=", [cost_type.id])
+ q.select(:name)
+ end
+
+ expect(query).to be_valid
+ expect(query.results.pluck(:id)).to contain_exactly(mapped_project.id)
+ end
+
+ it "returns no projects when the cost type has no mappings (and query stays valid)" do
+ cost_type_without_mappings = create(:cost_type, is_for_all: false)
+
+ query = ProjectQuery.new(name: "t2") do |q|
+ q.where(:available_cost_types_projects, "=", [cost_type_without_mappings.id])
+ q.select(:name)
+ end
+
+ expect(query).to be_valid
+ expect(query.results).to be_empty
+ end
+ end
+end
diff --git a/modules/costs/spec/requests/projects/settings/cost_types_controller_spec.rb b/modules/costs/spec/requests/projects/settings/cost_types_controller_spec.rb
new file mode 100644
index 000000000000..466a094ed030
--- /dev/null
+++ b/modules/costs/spec/requests/projects/settings/cost_types_controller_spec.rb
@@ -0,0 +1,89 @@
+# 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.
+#++
+
+require_relative "../../../spec_helper"
+
+RSpec.describe Projects::Settings::CostTypesController, :skip_csrf, type: :rails_request do
+ shared_let(:project) { create(:project, enabled_module_names: %i[costs]) }
+
+ let(:permissions) { %i[manage_project_activities] }
+ let(:user) { create(:user, member_with_permissions: { project => permissions }) }
+
+ let!(:global_ct) { create(:cost_type, is_for_all: true) }
+ let!(:scoped_ct) { create(:cost_type, is_for_all: false) }
+
+ before { login_as(user) }
+
+ describe "GET #index" do
+ it "renders the list of cost types" do
+ get project_settings_cost_types_path(project)
+ expect(response).to have_http_status(:ok)
+ end
+ end
+
+ describe "PUT #toggle" do
+ context "with a non-global cost type not yet enabled in the project" do
+ it "creates the mapping" do
+ expect do
+ put toggle_project_settings_cost_type_path(project, scoped_ct)
+ end.to change { CostTypesProject.where(project:, cost_type: scoped_ct).count }.from(0).to(1)
+ expect(response).to redirect_to(project_settings_cost_types_path(project))
+ end
+ end
+
+ context "with a non-global cost type already enabled" do
+ before { CostTypesProject.create!(project:, cost_type: scoped_ct) }
+
+ it "removes the mapping" do
+ expect do
+ put toggle_project_settings_cost_type_path(project, scoped_ct)
+ end.to change { CostTypesProject.where(project:, cost_type: scoped_ct).count }.from(1).to(0)
+ end
+ end
+
+ context "with a global cost type" do
+ it "rejects toggling" do
+ expect do
+ put toggle_project_settings_cost_type_path(project, global_ct)
+ end.not_to change(CostTypesProject, :count)
+ expect(flash[:error]).to be_present
+ end
+ end
+ end
+
+ context "when user lacks :manage_project_activities" do
+ let(:permissions) { %i[view_work_packages] }
+
+ it "blocks index" do
+ get project_settings_cost_types_path(project)
+ expect(response).to have_http_status(:forbidden)
+ end
+ end
+end
diff --git a/modules/costs/spec/services/cost_types/cost_type_projects/bulk_create_service_spec.rb b/modules/costs/spec/services/cost_types/cost_type_projects/bulk_create_service_spec.rb
new file mode 100644
index 000000000000..52034023767b
--- /dev/null
+++ b/modules/costs/spec/services/cost_types/cost_type_projects/bulk_create_service_spec.rb
@@ -0,0 +1,43 @@
+# 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.
+#++
+
+require_relative "../../../spec_helper"
+require Rails.root.join("spec/services/bulk_services/project_mappings/behaves_like_bulk_project_mapping_create_service")
+
+RSpec.describe CostTypes::CostTypeProjects::BulkCreateService do
+ shared_let(:cost_type) { create(:cost_type, is_for_all: false) }
+
+ it_behaves_like "BulkServices project mappings create service" do
+ let(:model) { cost_type }
+ let(:model_mapping_class) { CostTypesProject }
+ let(:model_foreign_key_id) { :cost_type_id }
+ let(:required_permission) { :manage_project_activities }
+ end
+end
diff --git a/modules/costs/spec/services/cost_types/cost_type_projects/delete_service_spec.rb b/modules/costs/spec/services/cost_types/cost_type_projects/delete_service_spec.rb
new file mode 100644
index 000000000000..2c0d8e4ecb7d
--- /dev/null
+++ b/modules/costs/spec/services/cost_types/cost_type_projects/delete_service_spec.rb
@@ -0,0 +1,72 @@
+# 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.
+#++
+
+require_relative "../../../spec_helper"
+
+RSpec.describe CostTypes::CostTypeProjects::DeleteService do
+ shared_let(:project) { create(:project) }
+ shared_let(:cost_type) { create(:cost_type, is_for_all: false) }
+
+ let!(:mapping) { CostTypesProject.create!(project:, cost_type:) }
+
+ context "with an admin user" do
+ let(:user) { create(:admin) }
+
+ it "removes the mapping" do
+ expect { described_class.new(user:, model: mapping).call }
+ .to change(CostTypesProject, :count).by(-1)
+ end
+ end
+
+ context "with a user lacking permissions" do
+ let(:user) { create(:user, member_with_permissions: { project => %i[view_work_packages] }) }
+
+ it "does not remove the mapping" do
+ result = described_class.new(user:, model: mapping).call
+
+ expect(result).to be_failure
+ expect(CostTypesProject.where(id: mapping.id)).to exist
+ end
+ end
+
+ context "when the cost type is is_for_all" do
+ let(:user) { create(:admin) }
+
+ before { cost_type.update!(is_for_all: true) }
+
+ it "refuses to delete the mapping" do
+ result = described_class.new(user:, model: mapping).call
+
+ expect(result).to be_failure
+ expect(result.errors.symbols_for(:cost_type_id)).to include(:is_for_all_cannot_modify)
+ expect(CostTypesProject.where(id: mapping.id)).to exist
+ end
+ end
+end