Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 18 deletions

diff --git a/app/graphql/mutations/jira_import/start.rb b/app/graphql/mutations/jira_import/start.rb
index ffd3ce53b57..6b80c9f8ca4 100644
--- a/app/graphql/mutations/jira_import/start.rb
+++ b/app/graphql/mutations/jira_import/start.rb
@@ -30,11 +30,11 @@ module Mutations
         service_response = ::JiraImport::StartImportService
                              .new(context[:current_user], project, jira_project_key)
                              .execute
-        import_data = service_response.payload[:import_data]
-
+        jira_import = service_response.success? ? service_response.payload[:import_data] : nil
+        errors = service_response.error? ? [service_response.message] : []
         {
-          jira_import: import_data.errors.blank? ? import_data.projects.last : nil,
-          errors: errors_on_object(import_data)
+          jira_import: jira_import,
+          errors: errors
         }
       end
 
diff --git a/app/graphql/resolvers/projects/jira_imports_resolver.rb b/app/graphql/resolvers/projects/jira_imports_resolver.rb
index e7403745bea..9f71d4f187e 100644
--- a/app/graphql/resolvers/projects/jira_imports_resolver.rb
+++ b/app/graphql/resolvers/projects/jira_imports_resolver.rb
@@ -8,11 +8,9 @@ module Resolvers
       alias_method :project, :object
 
       def resolve(**args)
-        return JiraImportData.none unless project&.import_data.present?
-
         authorize!(project)
 
-        project.import_data.becomes(JiraImportData).projects
+        project.jira_imports
       end
 
       def authorized_resource?(project)
diff --git a/app/graphql/types/jira_import_type.rb b/app/graphql/types/jira_import_type.rb
index 01ec6184844..ccd463370b6 100644
--- a/app/graphql/types/jira_import_type.rb
+++ b/app/graphql/types/jira_import_type.rb
@@ -8,20 +8,12 @@ module Types
     graphql_name 'JiraImport'
 
     field :scheduled_at, Types::TimeType, null: true,
-          description: 'Timestamp of when the Jira import was created/started'
+          method: :created_at,
+          description: 'Timestamp of when the Jira import was created'
     field :scheduled_by, Types::UserType, null: true,
           description: 'User that started the Jira import'
     field :jira_project_key, GraphQL::STRING_TYPE, null: false,
-          description: 'Project key for the imported Jira project',
-          method: :key
-
-    def scheduled_at
-      DateTime.parse(object.scheduled_at)
-    end
-
-    def scheduled_by
-      ::Gitlab::Graphql::Loaders::BatchModelLoader.new(User, object.scheduled_by['user_id']).find
-    end
+          description: 'Project key for the imported Jira project'
   end
   # rubocop: enable Graphql/AuthorizeTypes
 end