Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

1 files changed, 16 insertions, 2 deletions

diff --git a/app/services/work_items/export_csv_service.rb b/app/services/work_items/export_csv_service.rb
index 9bef75e2c40..ee20a2832ce 100644
--- a/app/services/work_items/export_csv_service.rb
+++ b/app/services/work_items/export_csv_service.rb
@@ -11,24 +11,38 @@ module WorkItems
     end
 
     def email(mail_to_user)
-      # TODO - will be implemented as part of https://gitlab.com/gitlab-org/gitlab/-/issues/379082
+      Notify.export_work_items_csv_email(mail_to_user, resource_parent, csv_data, csv_builder.status).deliver_now
     end
 
     private
 
     def associations_to_preload
-      [:work_item_type, :author]
+      [:project, [work_item_type: :enabled_widget_definitions], :author]
     end
 
     def header_to_value_hash
       {
         'Id' => 'iid',
         'Title' => 'title',
+        'Description' => ->(work_item) { get_widget_value_for(work_item, :description) },
         'Type' => ->(work_item) { work_item.work_item_type.name },
         'Author' => 'author_name',
         'Author Username' => ->(work_item) { work_item.author.username },
         'Created At (UTC)' => ->(work_item) { work_item.created_at.to_s(:csv) }
       }
     end
+
+    def get_widget_value_for(work_item, field)
+      widget_name = field_to_widget_map[field]
+      widget = work_item.get_widget(widget_name)
+
+      widget.try(field)
+    end
+
+    def field_to_widget_map
+      {
+        description: :description
+      }
+    end
   end
 end