Allow to import different jira projects into gitlab project

Upated the code to allow for different projects to be imported
into same gitlab project by running the import multiple times.

app/controllers/projects/import/jira_controller.rb

@@ -7,20 +7,16 @@ module Projects
       before_action :jira_integration_configured?
 
       def show
-        prev_imported_project_key = @project.import_data&.data&.dig("jira", "project", "key")
-        @jira_projects = [prev_imported_project_key].compact
-
-        unless @project.import_state&.in_progress? || prev_imported_project_key
+        unless @project.import_state&.in_progress?
           jira_client = @project.jira_service.client
-          @jira_projects = jira_client.Project.all.map { |p| ["#{p.name}(#{p.key})", p.key] }
+          @jira_projects = jira_client.Project.all.map { |p| ["#{p.name} (#{p.key})", p.key] }
         end
 
         flash[:notice] = _("Import %{status}") % { status: @project.import_state.status } if @project.import_state.present? && !@project.import_state.none?
       end
 
       def import
-        import_state = @project.import_state
-        import_state = @project.create_import_state unless import_state.present?
+        import_state = @project.import_state || @project.create_import_state
 
         schedule_import(jira_import_params) unless import_state.in_progress?
 
@@ -29,22 +25,29 @@ module Projects
 
       private
 
-      def jira_integration_configured?
-        unless @project.jira_service
-          flash[:notice] = _("Configure Jira Integration first at Settings > Integrations > Jira")
+      def jira_import_enabled?
+        return if Feature.enabled?(:jira_issue_import, @project)
+
         redirect_to project_issues_path(@project)
       end
-      end
 
-      def jira_import_enabled?
-        redirect_to project_issues_path(@project) unless Feature.enabled?(:jira_issue_import, @project)
+      def jira_integration_configured?
+        return if @project.jira_service
+
+        flash[:notice] = _("Configure the Jira integration first on your project's %{strong_start} Settings > Integrations > Jira%{strong_end} page." %
+           { strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe })
+        redirect_to project_issues_path(@project)
       end
 
       def schedule_import(params)
-        return @project.import_state.schedule if @project.import_data
+        import_data = @project.create_or_update_import_data(data: {}).becomes(JiraImportData)
+
+        import_data << JiraImportData::JiraProjectDetails.new(
+          params[:jira_project_key],
+          Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          { user_id: current_user.id, name: current_user.name }
+        )
 
-        jira_data = { jira: { project: { key: params[:jira_project_key] } } }
-        @project.create_or_update_import_data(data: jira_data)
         @project.import_type = 'jira'
         @project.import_state.schedule if @project.save
       end

app/models/jira_import_data.rb

+# frozen_string_literal: true
+
+class JiraImportData < ProjectImportData
+  JiraProjectDetails = Struct.new(:key, :scheduled_at, :scheduled_by)
+
+  def projects
+    return [] unless data
+
+    projects = data.dig('jira', 'projects').map do |p|
+      JiraProjectDetails.new(p['key'], p['scheduled_at'], p['scheduled_by'])
+    end
+    projects.sort_by { |jp| jp.scheduled_at }
+  end
+
+  def <<(project)
+    self.data ||= { jira: { projects: [] } }
+    self.data['jira']['projects'] << project.to_h.deep_stringify_keys!
+  end
+end

app/views/projects/import/jira/show.html.haml

@@ -5,18 +5,20 @@
 
 = render 'import/shared/errors'
 
-- unless @project.import_state&.in_progress?
-  %h3.page-title
-    = icon 'issues', text: _('Import Issues From Jira')
+- if @project.import_state&.in_progress?
+  %h3.page-title.d-flex.align-items-center
+    = sprite_icon('issues', size: 16, css_class: 'mr-1')
+    = _('Import in progress')
+- else
+  %h3.page-title.d-flex.align-items-center
+    = sprite_icon('issues', size: 16, css_class: 'mr-1')
+    = _('Import issues from Jira')
 
   = form_tag import_project_import_jira_path(@project), method: :post do
     .form-group.row
-      = label_tag :jira_project_key, _('From Project'), class: 'col-form-label col-md-2'
+      = label_tag :jira_project_key, _('From project'), class: 'col-form-label col-md-2'
       .col-md-4
         = select_tag :jira_project_key, options_for_select(@jira_projects, ''), { class: 'select2' }
     .form-actions
-      = submit_tag _('Import Issues'), class: 'btn btn-success'
+      = submit_tag _('Import issues'), class: 'btn btn-success'
       = link_to _('Cancel'), project_issues_path(@project), class: 'btn btn-cancel'
-- else
-  %h3.page-title
-    = icon 'issues', text: _('Import in progress')

app/views/projects/issues/import_csv/_button.html.haml

@@ -8,4 +8,4 @@
     = _('Import CSV')
 
 - if Feature.enabled?(:jira_issue_import, @project)
-  = link_to _("Import Jira Issues"), project_import_jira_path(@project), class: "btn btn-default"
+  = link_to _("Import Jira issues"), project_import_jira_path(@project), class: "btn btn-default"

locale/gitlab.pot

@@ -5115,9 +5115,6 @@ msgstr ""
 msgid "Configure Gitaly timeouts."
 msgstr ""
 
-msgid "Configure Jira Integration first at Settings > Integrations > Jira"
-msgstr ""
-
 msgid "Configure Let's Encrypt"
 msgstr ""
 
@@ -5157,6 +5154,9 @@ msgstr ""
 msgid "Configure the %{link} integration."
 msgstr ""
 
+msgid "Configure the Jira integration first on your project's %{strong_start} Settings > Integrations > Jira%{strong_end} page."
+msgstr ""
+
 msgid "Configure the way a user creates a new account."
 msgstr ""
 
@@ -8959,15 +8959,15 @@ msgstr ""
 msgid "From Google Code"
 msgstr ""
 
-msgid "From Project"
-msgstr ""
-
 msgid "From issue creation until deploy to production"
 msgstr ""
 
 msgid "From merge request merge until deploy to production"
 msgstr ""
 
+msgid "From project"
+msgstr ""
+
 msgid "From the Kubernetes cluster details view, install Runner from the applications list"
 msgstr ""
 
@@ -10620,13 +10620,7 @@ msgstr ""
 msgid "Import CSV"
 msgstr ""
 
-msgid "Import Issues"
-msgstr ""
-
-msgid "Import Issues From Jira"
-msgstr ""
-
-msgid "Import Jira Issues"
+msgid "Import Jira issues"
 msgstr ""
 
 msgid "Import Projects from Gitea"
@@ -10650,6 +10644,9 @@ msgstr ""
 msgid "Import issues"
 msgstr ""
 
+msgid "Import issues from Jira"
+msgstr ""
+
 msgid "Import members"
 msgstr ""
 

spec/controllers/projects/import/jira_controller_spec.rb

@@ -64,7 +64,7 @@ describe Projects::Import::JiraController do
       context 'when jira service is enabled for the project' do
         let_it_be(:jira_service) { create(:jira_service, project: project) }
 
-        context 'when jira no import state before' do
+        context 'when running jira import first time' do
           context 'get show' do
             it 'renders show template' do
               allow(JIRA::Resource::Project).to receive(:all).and_return([])
@@ -83,9 +83,11 @@ describe Projects::Import::JiraController do
               post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: 'Test' }
 
               project.reload
+
+              jira_project = project.import_data.data.dig('jira', 'projects').first
               expect(project.import_type).to eq 'jira'
               expect(project.import_state.status).to eq 'scheduled'
-              expect(project.import_data.data.dig('jira', 'project', 'key')).to eq 'Test'
+              expect(jira_project['key']).to eq 'Test'
               expect(response).to redirect_to(project_import_jira_path(project))
             end
           end
@@ -106,15 +108,61 @@ describe Projects::Import::JiraController do
           context 'post import' do
             before do
               project.reload
-              project.create_import_data(data: { 'jira': { 'project': { 'key': 'Test' } } })
+              project.create_import_data(
+                data: {
+                  'jira': {
+                    'projects': [{ 'key': 'Test', scheduled_at: 5.days.ago, scheduled_by: { user_id: user.id, name: user.name } }]
+                  }
+                }
+              )
             end
 
             it 'uses the existing import data' do
+              expect(controller).not_to receive(:schedule_import)
+
+              post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: 'New Project' }
+
+              expect(response).to redirect_to(project_import_jira_path(project))
+            end
+          end
+        end
+
+        context 'when jira import ran before' do
+          let_it_be(:import_state) { create(:import_state, project: project, status: :finished) }
+
+          context 'get show' do
+            it 'renders import status' do
+              allow(JIRA::Resource::Project).to receive(:all).and_return([])
+              get :show, params: { namespace_id: project.namespace.to_param, project_id: project }
+
+              expect(project.import_state.status).to eq 'finished'
+              expect(flash.now[:notice]).to eq 'Import finished'
+            end
+          end
+
+          context 'post import' do
+            before do
+              project.reload
+              project.create_import_data(
+                data: {
+                  'jira': {
+                    'projects': [{ 'key': 'Test', scheduled_at: 5.days.ago, scheduled_by: { user_id: user.id, name: user.name } }]
+                  }
+                }
+              )
+            end
+
+            it 'uses the existing import data' do
+              expect(controller).to receive(:schedule_import).and_call_original
+
               post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: 'New Project' }
 
               project.reload
               expect(project.import_state.status).to eq 'scheduled'
-              expect(project.import_data.data.dig('jira', 'project', 'key')).to eq 'Test'
+              jira_imported_projects = project.import_data.data.dig('jira', 'projects')
+              expect(jira_imported_projects.size).to eq 2
+              expect(jira_imported_projects.first['key']).to eq 'Test'
+              expect(jira_imported_projects.last['key']).to eq 'New Project'
               expect(response).to redirect_to(project_import_jira_path(project))
             end
           end