diff --git a/lib/gitlab/database_importers/work_items/base_type_importer.rb b/lib/gitlab/database_importers/work_items/base_type_importer.rb
index 48472db1b4766d8995dd1477b53b27a3509cfa1d..ce2e845a449aadc5cfb131e530f61c9a824bd953 100644
--- a/lib/gitlab/database_importers/work_items/base_type_importer.rb
+++ b/lib/gitlab/database_importers/work_items/base_type_importer.rb
@@ -35,148 +35,148 @@ module BaseTypeImporter
         WIDGETS_FOR_TYPE = {
           issue: [
             :assignees,
-            :labels,
+            :award_emoji,
+            :crm_contacts,
+            :current_user_todos,
             :description,
+            :designs,
+            :development,
+            :health_status,
             :hierarchy,
-            :start_and_due_date,
+            :iteration,
+            :labels,
+            :linked_items,
             :milestone,
             :notes,
-            :iteration,
-            [:weight, { editable: true, rollup: false }],
-            :health_status,
             :notifications,
-            :current_user_todos,
-            :award_emoji,
-            :linked_items,
             :participants,
+            :start_and_due_date,
             :time_tracking,
-            :designs,
-            :development,
-            :crm_contacts
+            [:weight, { editable: true, rollup: false }]
           ],
           incident: [
             :assignees,
+            :award_emoji,
+            :crm_contacts,
+            :current_user_todos,
             :description,
+            :development,
             :hierarchy,
+            :linked_items,
             :notes,
             :notifications,
-            :current_user_todos,
-            :award_emoji,
-            :linked_items,
             :participants,
-            :time_tracking,
-            :development,
-            :crm_contacts
+            :time_tracking
           ],
           test_case: [
+            :award_emoji,
+            :current_user_todos,
             :description,
+            :linked_items,
             :notes,
             :notifications,
-            :current_user_todos,
-            :award_emoji,
-            :linked_items,
             :participants,
             :time_tracking
           ],
           requirement: [
+            :award_emoji,
+            :current_user_todos,
             :description,
+            :linked_items,
             :notes,
-            :status,
-            :requirement_legacy,
-            :test_reports,
             :notifications,
-            :current_user_todos,
-            :award_emoji,
-            :linked_items,
             :participants,
+            :requirement_legacy,
+            :status,
+            :test_reports,
             :time_tracking
           ],
           task: [
             :assignees,
-            :labels,
+            :award_emoji,
+            :crm_contacts,
+            :current_user_todos,
             :description,
             :hierarchy,
-            :start_and_due_date,
+            :iteration,
+            :labels,
+            :linked_items,
             :milestone,
             :notes,
-            :iteration,
-            [:weight, { editable: true, rollup: false }],
             :notifications,
-            :current_user_todos,
-            :award_emoji,
-            :linked_items,
             :participants,
+            :start_and_due_date,
             :time_tracking,
-            :crm_contacts
+            [:weight, { editable: true, rollup: false }]
           ],
           objective: [
             :assignees,
-            :labels,
+            :award_emoji,
+            :current_user_todos,
             :description,
+            :health_status,
             :hierarchy,
+            :labels,
+            :linked_items,
             :milestone,
             :notes,
-            :health_status,
-            :progress,
             :notifications,
-            :current_user_todos,
-            :award_emoji,
-            :linked_items,
-            :participants
+            :participants,
+            :progress
           ],
           key_result: [
             :assignees,
-            :labels,
+            :award_emoji,
+            :current_user_todos,
             :description,
+            :health_status,
             :hierarchy,
-            :start_and_due_date,
+            :labels,
+            :linked_items,
             :notes,
-            :health_status,
-            :progress,
             :notifications,
-            :current_user_todos,
-            :award_emoji,
-            :linked_items,
-            :participants
+            :participants,
+            :start_and_due_date,
+            :progress
           ],
           epic: [
             :assignees,
+            :award_emoji,
+            :color,
+            :crm_contacts,
+            :current_user_todos,
             :description,
+            :health_status,
             :hierarchy,
             :labels,
+            :linked_items,
             :notes,
-            [:weight, { editable: false, rollup: true }],
-            :start_and_due_date,
-            :health_status,
-            :status,
             :notifications,
-            :current_user_todos,
-            :award_emoji,
-            :linked_items,
-            :color,
-            :rolledup_dates,
             :participants,
+            :rolledup_dates,
+            :start_and_due_date,
+            :status,
             :time_tracking,
-            :crm_contacts
+            [:weight, { editable: false, rollup: true }]
           ],
           ticket: [
             :assignees,
-            :labels,
+            :award_emoji,
+            :crm_contacts,
+            :current_user_todos,
             :description,
+            :health_status,
             :hierarchy,
-            :start_and_due_date,
+            :iteration,
+            :labels,
+            :linked_items,
             :milestone,
             :notes,
-            :iteration,
-            [:weight, { editable: true, rollup: false }],
-            :health_status,
             :notifications,
-            :current_user_todos,
-            :award_emoji,
-            :linked_items,
             :participants,
+            :start_and_due_date,
             :time_tracking,
-            :crm_contacts
+            [:weight, { editable: true, rollup: false }]
           ]
         }.freeze