Merge pull request #24732 from opf/remove-project-types

Remove `Project#types` association as this broke with the `ProjectType` model

Author: klaustopher

app/components/work_packages/moves/form_component.html.erb

@@ -71,7 +71,7 @@ See COPYRIGHT and LICENSE files for more details.
                 <%= styled_select_tag(
                       "new_type_id",
                       content_tag("option", t(:label_no_change_option), value: "") +
-                        options_from_collection_for_select(available_types, "id", "name", target_type&.id),
+                        options_from_collection_for_select(available_variants, "type_id", "name", target_variant&.type_id),
                       data: {
                         action: "change->refresh-on-form-changes#triggerTurboStream"
                       }
@@ -213,8 +213,8 @@ See COPYRIGHT and LICENSE files for more details.
                                           } %>
               </div>
             </div>
-            <% if target_type_variant %>
-              <% target_type_variant.custom_fields.required.each do |custom_field| %>
+            <% if target_variant %>
+              <% target_variant.custom_fields.required.each do |custom_field| %>
                 <div class="form--field">
                   <%= blank_custom_field_label_tag("", custom_field) %>
                   <div class="form--field-container">

app/components/work_packages/moves/form_component.rb

@@ -69,18 +69,16 @@ def turbo_stream_url
         url_helpers.refresh_form_move_work_packages_path
       end
 
-      def available_types
-        @available_types ||= target_project.types.order(:position)
+      def available_variants
+        @available_variants ||= target_project.enabled_variants.includes(:type).to_a
       end
 
-      def target_type
-        @target_type ||= available_types.find { |type| type.id.to_s == selected_values[:type_id].to_s }
+      def available_type_ids
+        @available_type_ids ||= available_variants.map(&:type_id)
       end
 
-      def target_type_variant
-        return unless target_type
-
-        target_project.type_variant(target_type)
+      def target_variant
+        @target_variant ||= available_variants.find { |variant| variant.type_id.to_s == selected_values[:type_id].to_s }
       end
 
       def available_versions
@@ -98,7 +96,7 @@ def unavailable_type_in_target_project?
       end
 
       def current_types_missing_in_target?
-        work_packages.map(&:type_id).uniq.difference(available_types.pluck(:id)).any?
+        work_packages.map(&:type_id).uniq.difference(available_type_ids).any?
       end
 
       def descendant_types_missing_in_target?
@@ -108,7 +106,7 @@ def descendant_types_missing_in_target?
         Type.where(id: hierarchies.map { it.descendant.type_id })
             .select("distinct id")
             .pluck(:id)
-            .difference(available_types.pluck(:id))
+            .difference(available_type_ids)
             .any?
       end
 

app/contracts/projects/create_artifact_work_package_contract.rb

@@ -55,7 +55,7 @@ def allowed_to_create_work_package
     def validate_work_package_type
       if project.project_creation_wizard_work_package_type_id.blank?
         add_error :project_creation_wizard_work_package_type_id, :blank
-      elsif !project.project_creation_wizard_work_package_type_id.in?(project.type_ids)
+      elsif !project.project_types.exists?(type_id: project.project_creation_wizard_work_package_type_id)
         add_error :project_creation_wizard_work_package_type_id, :inclusion
       end
     end

app/contracts/projects/settings_contract.rb

@@ -59,7 +59,7 @@ def validate_work_package_type
       if model.project_creation_wizard_work_package_type_id.blank?
         errors.add :project_creation_wizard_work_package_type_id, :blank
       else
-        unless model.types.exists?(id: model.project_creation_wizard_work_package_type_id)
+        unless model.project_types.exists?(type_id: model.project_creation_wizard_work_package_type_id)
           errors.add :project_creation_wizard_work_package_type_id, :inclusion
         end
       end

app/contracts/work_packages/base_contract.rb

@@ -201,11 +201,7 @@ def assignable_statuses(include_default: false)
     end
 
     def assignable_types
-      scope = if model.project.nil?
-                Type
-              else
-                model.project.types.includes(:color)
-              end
+      scope = model.project&.enabled_types || Type
 
       scope.includes(:color)
     end
@@ -280,7 +276,7 @@ def validate_after_soonest_start(date_attribute)
 
     def validate_enabled_type
       # Checks that the issue can not be added/moved to a disabled type
-      if type_context_changed? && model.project.types.exclude?(model.type)
+      if type_context_changed? && model.project.project_types.none? { |pt| pt.type_id == model.type_id }
         errors.add :type_id, :inclusion
       end
     end

app/controllers/versions_controller.rb

@@ -37,7 +37,7 @@ class VersionsController < ApplicationController
   before_action :authorize
 
   def index
-    @types = @project.types.order(Arel.sql("position"))
+    @types = @project.enabled_types
     retrieve_selected_type_ids(@types, @types.select(&:is_in_roadmap?))
 
     @versions = find_versions(with_subprojects, params[:completed])

app/controllers/work_packages/bulk_controller.rb

@@ -113,7 +113,7 @@ def destroy # rubocop:disable Metrics/AbcSize
   def setup_edit
     @available_statuses = @projects.map { |p| Workflow.available_statuses(p) }.inject(&:&)
     @assignables = @responsibles = Principal.possible_assignee(@projects)
-    @types = @projects.map(&:types).inject(&:&)
+    @types = @projects.map { |project| project.enabled_types.to_a }.inject(&:&)
     @custom_fields = editable_custom_fields
   end
 

app/forms/projects/settings/creation_wizard/submission_form.rb

@@ -43,7 +43,7 @@ class SubmissionForm < ApplicationForm
               action: "change->refresh-on-form-changes#triggerTurboStream"
             }
           ) do |list|
-            model.types.each do |type|
+            model.enabled_types.each do |type|
               list.option(
                 value: type.id,
                 label: type.name,

app/models/permitted_params.rb

@@ -315,7 +315,6 @@ def project
                                                 :status_code,
                                                 :status_explanation,
                                                 work_package_custom_field_ids: [],
-                                                type_ids: [],
                                                 enabled_module_names: [],
                                                 custom_comments: {})
 

app/models/project.rb

@@ -73,8 +73,6 @@ class Project < ApplicationRecord
   has_many :enabled_modules, dependent: :delete_all, after_remove: :module_disabled
   has_many :project_types, dependent: :delete_all
 
-  # Enabled root-types, variants need to be determined explicitly
-  has_many :types, -> { order("#{::Type.table_name}.position") }, through: :project_types
   has_many :work_packages, -> {
     order("#{WorkPackage.table_name}.created_at DESC")
       .includes(:status, :type)