Merge pull request #24735 from opf/chore/remove-type-custom-field-accessors

Remove custom fields, attribute group accessors on type

Author: klaustopher

app/controllers/work_packages/bulk_controller.rb

@@ -122,12 +122,12 @@ def editable_custom_fields
     @projects.map(&:all_work_package_custom_fields).inject(&:&) & custom_fields_of_type_variants
   end
 
-  # Each project may resolve a family to its own variant, so the types are resolved per project
+  # Each project applies its own variant of a type, so the variant is resolved per project
   # before #custom_fields follows the form configuration link from there.
   def custom_fields_of_type_variants
     @projects.flat_map { |project| project.type_variants(*@types) }
              .uniq
-             .flat_map { |type| type.custom_fields.to_a }
+             .flat_map { |variant| variant.custom_fields.to_a }
              .uniq
   end
 

app/helpers/types_helper.rb

@@ -113,15 +113,15 @@ def accessible_type_icon_attributes(type)
 
   ##
   # Collect active and inactive form configuration groups for editing.
-  def form_configuration_groups(type)
-    available = type.work_package_attributes
+  def form_configuration_groups(variant)
+    available = variant.work_package_attributes
     # First we create a complete list of all attributes.
     # Later we will remove those that are members of an attribute group.
     # This way attributes that were created after the las group definitions
     # will fall back into the inactives group.
     inactive = available.clone
 
-    active_form = get_active_groups(type, available, inactive)
+    active_form = get_active_groups(variant, available, inactive)
     inactive_form = inactive
                       .map { |key, attribute| attr_form_map(key, attribute) }
                       .sort_by { |attr| attr[:translation] }
@@ -161,8 +161,8 @@ def query_to_query_props(group)
   # Collect active attributes from the current form configuration.
   # Using the available attributes from +work_package_attributes+,
   # determines which attributes are not used
-  def get_active_groups(type, available, inactive)
-    type.attribute_groups.map do |group|
+  def get_active_groups(variant, available, inactive)
+    variant.attribute_groups.map do |group|
       {
         key: group.key,
         type: group.group_type,

app/models/type.rb

@@ -73,54 +73,6 @@ def default_variant
     variants.detect(&:is_default_variant?)
   end
 
-  # Form custom fields live on the base variant. Prefer `default_variant.custom_fields`.
-  # Kept temporarily so the many call sites that still write `type.custom_fields << cf` keep
-  # working while they are migrated.
-  def custom_fields
-    OpenProject::Deprecation.replaced("Type#custom_fields", "Type#default_variant.custom_fields", caller_locations)
-
-    default_variant.custom_fields
-  end
-
-  def custom_fields=(values)
-    OpenProject::Deprecation.replaced("Type#custom_fields=", "Type#default_variant.custom_fields=", caller_locations)
-
-    default_variant.custom_fields = values
-  end
-
-  def custom_field_ids
-    OpenProject::Deprecation.replaced("Type#custom_field_ids", "Type#default_variant.custom_field_ids", caller_locations)
-
-    default_variant.custom_field_ids
-  end
-
-  def custom_field_ids=(values)
-    OpenProject::Deprecation.replaced("Type#custom_field_ids=", "Type#default_variant.custom_field_ids=", caller_locations)
-
-    default_variant.custom_field_ids = values
-  end
-
-  # Form configuration lives on the base variant. Prefer `default_variant.attribute_groups`.
-  def attribute_groups
-    OpenProject::Deprecation.replaced("Type#attribute_groups", "Type#default_variant.attribute_groups", caller_locations)
-
-    default_variant.attribute_groups
-  end
-
-  def attribute_groups=(values)
-    OpenProject::Deprecation.replaced("Type#attribute_groups=", "Type#default_variant.attribute_groups=", caller_locations)
-
-    default_variant.attribute_groups = values
-  end
-
-  def reset_attribute_groups
-    OpenProject::Deprecation.replaced("Type#reset_attribute_groups",
-                                      "Type#default_variant.reset_attribute_groups",
-                                      caller_locations)
-
-    default_variant.reset_attribute_groups
-  end
-
   def <=>(other)
     name <=> other.name
   end

app/workers/import/jira_import_projects_job.rb

@@ -150,7 +150,7 @@ def import_issue(jira_issue, project, custom_field_registry)
     end
 
     def new_custom_fields_in_type(jira_issue, type, custom_field_registry)
-      existing_cf_ids = type.custom_field_ids
+      existing_cf_ids = type.default_variant.custom_field_ids
       custom_fields_for_issue(custom_field_registry, jira_issue).reject { |cf| existing_cf_ids.include?(cf.id) }
     end
 

modules/xls_export/spec/models/xls_export/work_package/exporter/xls_integration_spec.rb

@@ -175,7 +175,8 @@
     end
     let(:type) do
       type = project.enabled_types.first
-      type.custom_fields << custom_field
+      type.default_variant.custom_fields << custom_field
+
       type
     end
     let(:project) do

spec/contracts/work_packages/update_contract_spec.rb

@@ -318,7 +318,7 @@
 
           before do
             persisted_project.work_package_custom_fields << cf1
-            persisted_type.custom_fields << cf1
+            persisted_type.default_variant.custom_fields << cf1
             work_package.custom_field_values = { cf1.id => "test" }
             contract.validate
           end

spec/controllers/journals_controller_spec.rb

@@ -138,7 +138,7 @@
       let!(:custom_field) do
         create(factory_name).tap do |custom_field|
           project.work_package_custom_fields << custom_field
-          type.custom_fields << custom_field
+          type.default_variant.custom_fields << custom_field
         end
       end
 

spec/features/admin/custom_fields/work_packages/long_text_spec.rb

@@ -46,7 +46,7 @@
       # textareas get carriage returns entered
       expect(cf.default_value.gsub("\r\n", "\n").strip).to eq default_text.strip
 
-      type.custom_fields << cf
+      type.default_variant.custom_fields << cf
       type.save!
 
       wp_page.visit!

spec/features/custom_fields/activate_in_project_spec.rb

@@ -37,7 +37,7 @@
   let(:project_specific_cf) { create(:integer_wp_custom_field) }
   let(:work_package) do
     build(:work_package) do |wp|
-      wp.type.custom_fields = [for_all_cf, project_specific_cf]
+      wp.type.default_variant.custom_fields = [for_all_cf, project_specific_cf]
       wp.save!
     end
   end

spec/features/search/search_spec.rb

@@ -62,7 +62,7 @@ def char_for(integer)
            is_filter:,
            searchable:).tap do |custom_field|
       project.work_package_custom_fields << custom_field
-      work_packages.first.type.custom_fields << custom_field
+      work_packages.first.type.default_variant.custom_fields << custom_field
 
       create(:work_package_custom_value,
              custom_field:,
@@ -77,7 +77,7 @@ def char_for(integer)
            is_filter:,
            searchable:).tap do |custom_field|
       custom_field.save
-      work_packages.first.type.custom_fields << custom_field
+      work_packages.first.type.default_variant.custom_fields << custom_field
 
       create(:work_package_custom_value,
              custom_field:,